svn commit: samba r19852 - in branches/SAMBA_3_0/examples/VFS: .
Author: jpeach
Date: 2006-11-23 06:44:05 + (Thu, 23 Nov 2006)
New Revision: 19852
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19852
Log:
Fix the build for the VFS examples. Fixes bugzilla #3931.
Modified:
branches/SAMBA_3_0/examples/VFS/Makefile.in
branches/SAMBA_3_0/examples/VFS/configure.in
Changeset:
Modified: branches/SAMBA_3_0/examples/VFS/Makefile.in
===
--- branches/SAMBA_3_0/examples/VFS/Makefile.in 2006-11-23 06:07:03 UTC (rev
19851)
+++ branches/SAMBA_3_0/examples/VFS/Makefile.in 2006-11-23 06:44:05 UTC (rev
19852)
@@ -7,7 +7,15 @@
SAMBA_SOURCE = @SAMBA_SOURCE@
SHLIBEXT = @SHLIBEXT@
OBJEXT = @OBJEXT@
-FLAGS = $(CFLAGS) -Iinclude -I$(SAMBA_SOURCE)/include
-I$(SAMBA_SOURCE)/popt -I$(SAMBA_SOURCE)/smbwrapper -I. $(CPPFLAGS)
-I$(SAMBA_SOURCE) -fPIC
+FLAGS = $(CFLAGS) $(CPPFLAGS) -fPIC \
+ -Iinclude -I$(SAMBA_SOURCE)/include \
+ -I$(SAMBA_SOURCE)/popt \
+ -I$(SAMBA_SOURCE)/lib/replace \
+ -I$(SAMBA_SOURCE)/lib/talloc \
+ -I$(SAMBA_SOURCE)/tdb/include \
+ -I$(SAMBA_SOURCE)/smbwrapper \
+ -I$(SAMBA_SOURCE)/librpc \
+ -I$(SAMBA_SOURCE) -I.
prefix = @prefix@
Modified: branches/SAMBA_3_0/examples/VFS/configure.in
===
--- branches/SAMBA_3_0/examples/VFS/configure.in2006-11-23 06:07:03 UTC
(rev 19851)
+++ branches/SAMBA_3_0/examples/VFS/configure.in2006-11-23 06:44:05 UTC
(rev 19852)
@@ -5,14 +5,14 @@
AC_PREREQ(2.53)
AC_INIT(Makefile.in)
-#dnl Uncomment this if you want to use your own define's too
-#AC_CONFIG_HEADER(module_config.h)
+AC_CONFIG_HEADER(module_config.h)
#dnl To make sure that didn't get #define PACKAGE_* in modules_config.h
#echo "" > confdefs.h
dnl Checks for programs.
AC_PROG_CC
AC_PROG_INSTALL
+AC_CANONICAL_HOST
#
# Directory handling stuff to support both the
@@ -309,6 +309,11 @@
BLDSHARED="false"
LDSHFLAGS=""
;;
+ *darwin*)
+ BLDSHARED="true"
+ LDSHFLAGS="-bundle -flat_namespace -undefined suppress"
+ SHLIBEXT="dylib"
+ ;;
*)
;;
esac
@@ -328,7 +333,7 @@
ac_cv_shlib_works=no
# try building a trivial shared library
if test "$PICSUFFIX" = "po"; then
- $CC $CPPFLAGS $CFLAGS $PICFLAGS -c -o shlib.po ${srcdir-.}/tests/shlib.c
&&
+ $CC $CPPFLAGS $CFLAGS $PICFLAGS -c -o shlib.po
${srcdir-.}/../../source/tests/shlib.c &&
$CC $CPPFLAGS $CFLAGS `eval echo $LDSHFLAGS` -o "shlib.$SHLIBEXT"
shlib.po &&
ac_cv_shlib_works=yes
else
svn commit: samba r19851 - in branches/SAMBA_3_0/source: .
Author: jpeach Date: 2006-11-23 06:07:03 + (Thu, 23 Nov 2006) New Revision: 19851 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19851 Log: Disable gcc PIE options on Darwin. Modified: branches/SAMBA_3_0/source/configure.in Changeset: Modified: branches/SAMBA_3_0/source/configure.in === --- branches/SAMBA_3_0/source/configure.in 2006-11-23 00:34:31 UTC (rev 19850) +++ branches/SAMBA_3_0/source/configure.in 2006-11-23 06:07:03 UTC (rev 19851) @@ -1841,6 +1841,11 @@ BLDSHARED="true" LDSHFLAGS="-bundle -flat_namespace -undefined suppress" SHLIBEXT="dylib" + # Since gcc doesn't fail on unrecognised options, the + # PIE test incorrectly succeeds. Darwin gcc does not + # actually support the PIE stuff. + PIE_LDFLAGS= + PIE_CFLAGS= AC_DEFINE(STAT_ST_BLOCKSIZE,512) ;;
svn commit: samba r19850 - in branches/SAMBA_4_0/source: librpc/idl torture/rpc
Author: jelmer Date: 2006-11-23 00:34:31 + (Thu, 23 Nov 2006) New Revision: 19850 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19850 Log: Fix IDL warnings. Modified: branches/SAMBA_4_0/source/librpc/idl/eventlog.idl branches/SAMBA_4_0/source/torture/rpc/eventlog.c Changeset: Modified: branches/SAMBA_4_0/source/librpc/idl/eventlog.idl === --- branches/SAMBA_4_0/source/librpc/idl/eventlog.idl 2006-11-22 21:40:23 UTC (rev 19849) +++ branches/SAMBA_4_0/source/librpc/idl/eventlog.idl 2006-11-23 00:34:31 UTC (rev 19850) @@ -81,7 +81,7 @@ /* Function: 0x04 */ NTSTATUS eventlog_GetNumRecords( [in] policy_handle *handle, - [out] uint32 number + [out] uint32 *number ); /**/ @@ -119,8 +119,8 @@ [in] uint32 offset, [in] uint32 number_of_bytes, [out,size_is(number_of_bytes)] uint8 *data, - [out] uint32 sent_size, - [out] uint32 real_size + [out] uint32 *sent_size, + [out] uint32 *real_size ); /*/ Modified: branches/SAMBA_4_0/source/torture/rpc/eventlog.c === --- branches/SAMBA_4_0/source/torture/rpc/eventlog.c2006-11-22 21:40:23 UTC (rev 19849) +++ branches/SAMBA_4_0/source/torture/rpc/eventlog.c2006-11-23 00:34:31 UTC (rev 19850) @@ -77,7 +77,7 @@ dcerpc_eventlog_GetNumRecords(p, tctx, &r), "GetNumRecords failed"); - torture_comment(tctx, talloc_asprintf(tctx, "%d records\n", r.out.number)); + torture_comment(tctx, talloc_asprintf(tctx, "%d records\n", *r.out.number)); cr.in.handle = cr.out.handle = &handle; @@ -125,7 +125,7 @@ /* Now read the actual record */ - r.in.number_of_bytes = r.out.real_size; + r.in.number_of_bytes = *r.out.real_size; r.out.data = talloc_size(tctx, r.in.number_of_bytes); status = dcerpc_eventlog_ReadEventLogW(p, tctx, &r); @@ -134,7 +134,7 @@ /* Decode a user-marshalled record */ - blob.length = r.out.sent_size; + blob.length = *r.out.sent_size; blob.data = talloc_steal(tctx, r.out.data); ndr = ndr_pull_init_blob(&blob, tctx);
Build status as of Thu Nov 23 00:00:03 2006
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2006-11-22 00:00:13.0 + +++ /home/build/master/cache/broken_results.txt 2006-11-23 00:00:30.0 + @@ -1,22 +1,22 @@ -Build status as of Wed Nov 22 00:00:02 2006 +Build status as of Thu Nov 23 00:00:03 2006 Build counts: Tree Total Broken Panic SOC 0 0 0 build_farm 0 0 0 -ccache 43 8 0 +ccache 42 8 0 ctdb 0 0 0 distcc 3 0 0 -ldb 41 1 0 +ldb 40 1 0 libreplace 39 2 0 -lorikeet-heimdal 35 19 0 -ppp 18 0 0 +lorikeet-heimdal 34 19 0 +ppp 17 0 0 rsync43 5 0 samba0 0 0 samba-docs 0 0 0 -samba4 42 17 0 -samba_3_043 13 0 -smb-build39 2 0 -talloc 43 3 0 -tdb 42 2 0 +samba4 41 21 0 +samba_3_042 16 0 +smb-build38 2 0 +talloc 42 3 0 +tdb 40 2 0
svn commit: samba r19849 - in branches/SAMBA_3_0/source/rpcclient: .
Author: jelmer
Date: 2006-11-22 21:40:23 + (Wed, 22 Nov 2006)
New Revision: 19849
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19849
Log:
Fix compilation after idl changes.
Modified:
branches/SAMBA_3_0/source/rpcclient/cmd_unixinfo.c
Changeset:
Modified: branches/SAMBA_3_0/source/rpcclient/cmd_unixinfo.c
===
--- branches/SAMBA_3_0/source/rpcclient/cmd_unixinfo.c 2006-11-22 18:57:07 UTC
(rev 19848)
+++ branches/SAMBA_3_0/source/rpcclient/cmd_unixinfo.c 2006-11-22 21:40:23 UTC
(rev 19849)
@@ -27,7 +27,7 @@
int argc, const char **argv)
{
uid_t uid;
- DOM_SID *sid;
+ DOM_SID sid;
NTSTATUS result;
if (argc != 2) {
@@ -41,7 +41,7 @@
if (!NT_STATUS_IS_OK(result))
goto done;
- printf("%s\n", sid_string_static(sid));
+ printf("%s\n", sid_string_static(&sid));
done:
return result;
@@ -81,7 +81,7 @@
int argc, const char **argv)
{
gid_t gid;
- DOM_SID *sid;
+ DOM_SID sid;
NTSTATUS result;
if (argc != 2) {
@@ -96,7 +96,7 @@
if (!NT_STATUS_IS_OK(result))
goto done;
- printf("%s\n", sid_string_static(sid));
+ printf("%s\n", sid_string_static(&sid));
done:
return result;
Re: svn commit: samba r19842 - in branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl: .
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 [EMAIL PROTECTED] schrieb: > Author: jelmer > Date: 2006-11-22 16:53:30 + (Wed, 22 Nov 2006) > New Revision: 19842 > > WebSVN: > http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19842 > > Log: > Complain about unknown pointer types. > Fallback to "unique" when "ptr" is specified instead of failing. Hi Jelmer, that's wrong and don't work against windows, that's why I added the "sptr" type, the implements full pointer support that works in the epmapper pipe against windows. sptr uses 1,2,3,4,5... as pointer values unique uses 0x0002,0x00020004, 0x00020008, 0x0002000C ... to match what w2k3 do please readd 'sptr' as valid pointertype, as pidl supports it and should until we have 'ptr' support! thanks! metze -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.2 (GNU/Linux) Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org iD8DBQFFZKZOm70gjA5TCD8RAiHiAJ9fK0ygOPrnIhxxVovtA6Hz97mjUACcCBCO 5R38slxiWQ3aA4Jvd84plOs= =phOP -END PGP SIGNATURE-
svn commit: samba r19848 - in branches/SAMBA_3_0/source/librpc: gen_ndr idl
Author: jelmer
Date: 2006-11-22 18:57:07 + (Wed, 22 Nov 2006)
New Revision: 19848
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19848
Log:
Sync with Samba4 - no top-level unique pointers.
Modified:
branches/SAMBA_3_0/source/librpc/gen_ndr/cli_unixinfo.c
branches/SAMBA_3_0/source/librpc/gen_ndr/cli_unixinfo.h
branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_unixinfo.c
branches/SAMBA_3_0/source/librpc/gen_ndr/unixinfo.h
branches/SAMBA_3_0/source/librpc/idl/unixinfo.idl
Changeset:
Modified: branches/SAMBA_3_0/source/librpc/gen_ndr/cli_unixinfo.c
===
--- branches/SAMBA_3_0/source/librpc/gen_ndr/cli_unixinfo.c 2006-11-22
18:40:27 UTC (rev 19847)
+++ branches/SAMBA_3_0/source/librpc/gen_ndr/cli_unixinfo.c 2006-11-22
18:57:07 UTC (rev 19848)
@@ -37,7 +37,7 @@
return r.out.result;
}
-NTSTATUS rpccli_unixinfo_UidToSid(struct rpc_pipe_client *cli, TALLOC_CTX
*mem_ctx, uint64_t uid, struct dom_sid **sid)
+NTSTATUS rpccli_unixinfo_UidToSid(struct rpc_pipe_client *cli, TALLOC_CTX
*mem_ctx, uint64_t uid, struct dom_sid *sid)
{
struct unixinfo_UidToSid r;
NTSTATUS status;
@@ -62,7 +62,7 @@
}
/* Return variables */
- *sid = r.out.sid;
+ *sid = *r.out.sid;
/* Return result */
return r.out.result;
@@ -99,7 +99,7 @@
return r.out.result;
}
-NTSTATUS rpccli_unixinfo_GidToSid(struct rpc_pipe_client *cli, TALLOC_CTX
*mem_ctx, uint64_t gid, struct dom_sid **sid)
+NTSTATUS rpccli_unixinfo_GidToSid(struct rpc_pipe_client *cli, TALLOC_CTX
*mem_ctx, uint64_t gid, struct dom_sid *sid)
{
struct unixinfo_GidToSid r;
NTSTATUS status;
@@ -124,7 +124,7 @@
}
/* Return variables */
- *sid = r.out.sid;
+ *sid = *r.out.sid;
/* Return result */
return r.out.result;
Modified: branches/SAMBA_3_0/source/librpc/gen_ndr/cli_unixinfo.h
===
--- branches/SAMBA_3_0/source/librpc/gen_ndr/cli_unixinfo.h 2006-11-22
18:40:27 UTC (rev 19847)
+++ branches/SAMBA_3_0/source/librpc/gen_ndr/cli_unixinfo.h 2006-11-22
18:57:07 UTC (rev 19848)
@@ -2,8 +2,8 @@
#ifndef __CLI_UNIXINFO__
#define __CLI_UNIXINFO__
NTSTATUS rpccli_unixinfo_SidToUid(struct rpc_pipe_client *cli, TALLOC_CTX
*mem_ctx, struct dom_sid sid, uint64_t *uid);
-NTSTATUS rpccli_unixinfo_UidToSid(struct rpc_pipe_client *cli, TALLOC_CTX
*mem_ctx, uint64_t uid, struct dom_sid **sid);
+NTSTATUS rpccli_unixinfo_UidToSid(struct rpc_pipe_client *cli, TALLOC_CTX
*mem_ctx, uint64_t uid, struct dom_sid *sid);
NTSTATUS rpccli_unixinfo_SidToGid(struct rpc_pipe_client *cli, TALLOC_CTX
*mem_ctx, struct dom_sid sid, uint64_t *gid);
-NTSTATUS rpccli_unixinfo_GidToSid(struct rpc_pipe_client *cli, TALLOC_CTX
*mem_ctx, uint64_t gid, struct dom_sid **sid);
+NTSTATUS rpccli_unixinfo_GidToSid(struct rpc_pipe_client *cli, TALLOC_CTX
*mem_ctx, uint64_t gid, struct dom_sid *sid);
NTSTATUS rpccli_unixinfo_GetPWUid(struct rpc_pipe_client *cli, TALLOC_CTX
*mem_ctx, uint32_t *count, uint64_t *uids, struct unixinfo_GetPWUidInfo
**infos);
#endif /* __CLI_UNIXINFO__ */
Modified: branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_unixinfo.c
===
--- branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_unixinfo.c 2006-11-22
18:40:27 UTC (rev 19847)
+++ branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_unixinfo.c 2006-11-22
18:57:07 UTC (rev 19848)
@@ -128,10 +128,8 @@
NDR_CHECK(ndr_push_hyper(ndr, NDR_SCALARS, r->in.uid));
}
if (flags & NDR_OUT) {
- NDR_CHECK(ndr_push_unique_ptr(ndr, r->out.sid));
- if (r->out.sid) {
- NDR_CHECK(ndr_push_dom_sid(ndr,
NDR_SCALARS|NDR_BUFFERS, r->out.sid));
- }
+ if (r->out.sid == NULL) return NT_STATUS_INVALID_PARAMETER_MIX;
+ NDR_CHECK(ndr_push_dom_sid(ndr, NDR_SCALARS|NDR_BUFFERS,
r->out.sid));
NDR_CHECK(ndr_push_NTSTATUS(ndr, NDR_SCALARS, r->out.result));
}
return NT_STATUS_OK;
@@ -139,26 +137,22 @@
NTSTATUS ndr_pull_unixinfo_UidToSid(struct ndr_pull *ndr, int flags, struct
unixinfo_UidToSid *r)
{
- uint32_t _ptr_sid;
TALLOC_CTX *_mem_save_sid_0;
if (flags & NDR_IN) {
ZERO_STRUCT(r->out);
NDR_CHECK(ndr_pull_hyper(ndr, NDR_SCALARS, &r->in.uid));
+ NDR_PULL_ALLOC(ndr, r->out.sid);
+ ZERO_STRUCTP(r->out.sid);
}
if (flags & NDR_OUT) {
- NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_sid));
- if (_ptr_sid) {
+ if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
NDR_PULL_ALLOC(ndr, r->out.sid);
- } else {
- r->out.sid
svn commit: samba r19847 - in branches/SAMBA_4_0/source: librpc/idl rpc_server/drsuapi
Author: metze
Date: 2006-11-22 18:40:27 + (Wed, 22 Nov 2006)
New Revision: 19847
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19847
Log:
add idl for DsRemoveDSServer(), this is used when a server unbecomes a DC
metze
Modified:
branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl
branches/SAMBA_4_0/source/rpc_server/drsuapi/dcesrv_drsuapi.c
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl2006-11-22 18:06:08 UTC
(rev 19846)
+++ branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl2006-11-22 18:40:27 UTC
(rev 19847)
@@ -945,8 +945,31 @@
/*/
/* Function 0x0e */
- WERROR DRSUAPI_REMOVE_DS_SERVER();
+ typedef struct {
+ [charset(UTF16),string] uint16 *server_dn;
+ [charset(UTF16),string] uint16 *domain_dn;
+ uint32 unknown; /* 0x1 */
+ } drsuapi_DsRemoveDSServerRequest1;
+ typedef [switch_type(int32)] union {
+ [case(1)] drsuapi_DsRemoveDSServerRequest1 req1;
+ } drsuapi_DsRemoveDSServerRequest;
+
+ typedef struct {
+ WERROR status;
+ } drsuapi_DsRemoveDSServerResult1;
+
+ typedef [switch_type(int32)] union {
+ [case(1)] drsuapi_DsRemoveDSServerResult1 res1;
+ } drsuapi_DsRemoveDSServerResult;
+
+ WERROR drsuapi_DsRemoveDSServer(
+ [in] policy_handle *bind_handle,
+ [in,out] int32 level,
+ [in,switch_is(level)] drsuapi_DsRemoveDSServerRequest req,
+ [out,switch_is(level)] drsuapi_DsRemoveDSServerResult res
+ );
+
/*/
/* Function 0x0f */
WERROR DRSUAPI_REMOVE_DS_DOMAIN();
Modified: branches/SAMBA_4_0/source/rpc_server/drsuapi/dcesrv_drsuapi.c
===
--- branches/SAMBA_4_0/source/rpc_server/drsuapi/dcesrv_drsuapi.c
2006-11-22 18:06:08 UTC (rev 19846)
+++ branches/SAMBA_4_0/source/rpc_server/drsuapi/dcesrv_drsuapi.c
2006-11-22 18:40:27 UTC (rev 19847)
@@ -327,10 +327,10 @@
/*
- DRSUAPI_REMOVE_DS_SERVER
+ drsuapi_DsRemoveDSServer
*/
-static WERROR DRSUAPI_REMOVE_DS_SERVER(struct dcesrv_call_state *dce_call,
TALLOC_CTX *mem_ctx,
- struct DRSUAPI_REMOVE_DS_SERVER *r)
+static WERROR drsuapi_DsRemoveDSServer(struct dcesrv_call_state *dce_call,
TALLOC_CTX *mem_ctx,
+ struct drsuapi_DsRemoveDSServer *r)
{
DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
}
svn commit: samba r19846 - in branches/SAMBA_4_0/source: librpc/idl torture/rpc
Author: jelmer
Date: 2006-11-22 18:06:08 + (Wed, 22 Nov 2006)
New Revision: 19846
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19846
Log:
Fix bunch of IDL warnings.
Modified:
branches/SAMBA_4_0/source/librpc/idl/oxidresolver.idl
branches/SAMBA_4_0/source/librpc/idl/remact.idl
branches/SAMBA_4_0/source/librpc/idl/rot.idl
branches/SAMBA_4_0/source/librpc/idl/unixinfo.idl
branches/SAMBA_4_0/source/librpc/idl/winbind.idl
branches/SAMBA_4_0/source/librpc/idl/winreg.idl
branches/SAMBA_4_0/source/librpc/idl/winsrepl.idl
branches/SAMBA_4_0/source/librpc/idl/winstation.idl
branches/SAMBA_4_0/source/torture/rpc/unixinfo.c
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/oxidresolver.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/oxidresolver.idl 2006-11-22
17:13:19 UTC (rev 19845)
+++ branches/SAMBA_4_0/source/librpc/idl/oxidresolver.idl 2006-11-22
18:06:08 UTC (rev 19846)
@@ -16,8 +16,7 @@
uuid("99fcfec4-5260-101b-bbcb-00aa0021347a"),
helpstring("Object Exporter ID Resolver"),
endpoint("ncacn_np:[\\pipe\\epmapper]", "ncacn_ip_tcp:[135]",
"ncalrpc:"),
- pointer_default(unique),
- pointer_default_top(unique)
+ pointer_default(unique)
]
interface IOXIDResolver
{
@@ -33,7 +32,7 @@
[in] OXID pOxid,
[in] uint16 cRequestedProtseqs,
[in, size_is(cRequestedProtseqs)] uint16 arRequestedProtseqs[],
-[out] DUALSTRINGARRAY *ppdsaOxidBindings,
+[out] DUALSTRINGARRAY **ppdsaOxidBindings,
[out,ref] IPID *pipidRemUnknown,
[out,ref] uint32 *pAuthnHint
);
@@ -78,7 +77,7 @@
[in] OXID pOxid,
[in] uint16 cRequestedProtseqs,
[in, size_is(cRequestedProtseqs)] uint16 arRequestedProtseqs[],
-
[out] DUALSTRINGARRAY *pdsaOxidBindings,
+
[out] DUALSTRINGARRAY **pdsaOxidBindings,
[out,ref] IPID *ipidRemUnknown,
[out,ref] uint32 *AuthnHint,
[out,ref] COMVERSION *ComVersion
Modified: branches/SAMBA_4_0/source/librpc/idl/remact.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/remact.idl 2006-11-22 17:13:19 UTC
(rev 19845)
+++ branches/SAMBA_4_0/source/librpc/idl/remact.idl 2006-11-22 18:06:08 UTC
(rev 19846)
@@ -8,7 +8,6 @@
[
uuid("4d9f4ab8-7d1c-11cf-861e-0020af6e7c57"),
pointer_default(unique),
- pointer_default_top(unique),
endpoint("ncalrpc:", "ncacn_ip_tcp:[135]",
"ncacn_np:[\\pipe\\epmapper]")
]
interface IRemoteActivation
Modified: branches/SAMBA_4_0/source/librpc/idl/rot.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/rot.idl2006-11-22 17:13:19 UTC
(rev 19845)
+++ branches/SAMBA_4_0/source/librpc/idl/rot.idl2006-11-22 18:06:08 UTC
(rev 19846)
@@ -4,7 +4,6 @@
uuid("b9e79e60-3d52-11ce-aaa1-6901293f"),
version(0.2),
pointer_default(unique),
- pointer_default_top(unique),
endpoint("ncacn_np:[\\pipe\\epmapper]", "ncacn_ip_tcp:[135]",
"ncalrpc:[EPMAPPER]")
] interface rot
@@ -13,7 +12,7 @@
[in] uint32 flags,
[in] MInterfacePointer *unk,
[in] MInterfacePointer *moniker,
- [out,ref] uint32 *rotid
+ [out] uint32 *rotid
);
WERROR rot_remove (
@@ -26,7 +25,7 @@
WERROR rot_get_interface_pointer (
[in] MInterfacePointer *moniker,
-[out,ref] MInterfacePointer *ip
+[out] MInterfacePointer *ip
);
WERROR rot_set_modification_time (
@@ -36,7 +35,7 @@
WERROR rot_get_modification_time (
[in]
MInterfacePointer *moniker,
-
svn commit: samba r19845 - in branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl: .
Author: jelmer
Date: 2006-11-22 17:13:19 + (Wed, 22 Nov 2006)
New Revision: 19845
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19845
Log:
Add warning for pointer_default_top()
Modified:
branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/NDR.pm
Changeset:
Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/NDR.pm
===
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/NDR.pm2006-11-22
16:55:21 UTC (rev 19844)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/NDR.pm2006-11-22
17:13:19 UTC (rev 19845)
@@ -310,7 +310,6 @@
return "ref" if (has_property($e, "ref"));
return "ptr" if (has_property($e, "ptr"));
- return "sptr" if (has_property($e, "sptr"));
return "unique" if (has_property($e, "unique"));
return "relative" if (has_property($e, "relative"));
return "ignore" if (has_property($e, "ignore"));
@@ -607,6 +606,8 @@
if (not has_property($idl, "pointer_default_top")) {
$idl->{PROPERTIES}->{pointer_default_top} = "ref";
+ } else {
+ nonfatal($idl, "pointer_default_top() is a pidl extension and
should not be used");
}
foreach my $d (@{$idl->{DATA}}) {
svn commit: samba r19844 - in branches/SAMBA_4_0/source: gtk/tools librpc/idl librpc/rpc rpc_server/epmapper torture/rpc
Author: jelmer
Date: 2006-11-22 16:55:21 + (Wed, 22 Nov 2006)
New Revision: 19844
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19844
Log:
Fix warnings and errors in epmapper IDL.
Modified:
branches/SAMBA_4_0/source/gtk/tools/gepdump.c
branches/SAMBA_4_0/source/librpc/idl/epmapper.idl
branches/SAMBA_4_0/source/librpc/rpc/dcerpc_util.c
branches/SAMBA_4_0/source/rpc_server/epmapper/rpc_epmapper.c
branches/SAMBA_4_0/source/torture/rpc/epmapper.c
Changeset:
Modified: branches/SAMBA_4_0/source/gtk/tools/gepdump.c
===
--- branches/SAMBA_4_0/source/gtk/tools/gepdump.c 2006-11-22 16:54:45 UTC
(rev 19843)
+++ branches/SAMBA_4_0/source/gtk/tools/gepdump.c 2006-11-22 16:55:21 UTC
(rev 19844)
@@ -146,13 +146,13 @@
if (!NT_STATUS_IS_OK(status) || r.out.result != 0) {
break;
}
- for (i=0;itower);
}
} while (NT_STATUS_IS_OK(status) &&
r.out.result == 0 &&
-r.out.num_ents == r.in.max_ents);
+*r.out.num_ents == r.in.max_ents);
if (!NT_STATUS_IS_OK(status)) {
gtk_show_ntstatus(mainwin, "Error adding endpoint mapper
entry", status);
Modified: branches/SAMBA_4_0/source/librpc/idl/epmapper.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/epmapper.idl 2006-11-22 16:54:45 UTC
(rev 19843)
+++ branches/SAMBA_4_0/source/librpc/idl/epmapper.idl 2006-11-22 16:55:21 UTC
(rev 19844)
@@ -14,8 +14,7 @@
endpoint("ncacn_np:[\\pipe\\epmapper]", "ncacn_ip_tcp:[135]",
"ncalrpc:[EPMAPPER]"),
helpstring("EndPoint Mapper"),
- pointer_default_top(sptr),
- pointer_default(sptr)
+ pointer_default(ptr)
]
interface epmapper
{
@@ -254,8 +253,8 @@
[in]uint32 vers_option,
[in,out,ref]policy_handle *entry_handle,
[in]uint32 max_ents,
- [out] uint32 num_ents,
- [out, length_is(num_ents), size_is(max_ents)] epm_entry_t
entries[]
+ [out] uint32 *num_ents,
+ [out, length_is(*num_ents), size_is(max_ents)] epm_entry_t
entries[]
);
@@ -271,8 +270,8 @@
[in]epm_twr_t *map_tower,
[in,out,ref]policy_handle *entry_handle,
[in]uint32 max_towers,
- [out] uint32 num_towers,
- [out, length_is(num_towers), size_is(max_towers)] epm_twr_p_t
towers[]
+ [out] uint32 *num_towers,
+ [out, length_is(*num_towers), size_is(max_towers)] epm_twr_p_t
towers[]
);
Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc_util.c
===
--- branches/SAMBA_4_0/source/librpc/rpc/dcerpc_util.c 2006-11-22 16:54:45 UTC
(rev 19843)
+++ branches/SAMBA_4_0/source/librpc/rpc/dcerpc_util.c 2006-11-22 16:55:21 UTC
(rev 19844)
@@ -797,6 +797,8 @@
c->status = dcerpc_pipe_connect_b_recv(ctx, c, &s->pipe);
if (!composite_is_ok(c)) return;
+ s->pipe->conn->flags |= DCERPC_NDR_REF_ALLOC;
+
/* prepare requested binding parameters */
s->binding->object = s->table->syntax_id;
@@ -833,7 +835,7 @@
if (!composite_is_ok(c)) return;
/* check the details */
- if (s->r.out.result != 0 || s->r.out.num_towers != 1) {
+ if (s->r.out.result != 0 || *s->r.out.num_towers != 1) {
composite_error(c, NT_STATUS_PORT_UNREACHABLE);
return;
}
Modified: branches/SAMBA_4_0/source/rpc_server/epmapper/rpc_epmapper.c
===
--- branches/SAMBA_4_0/source/rpc_server/epmapper/rpc_epmapper.c
2006-11-22 16:54:45 UTC (rev 19843)
+++ branches/SAMBA_4_0/source/rpc_server/epmapper/rpc_epmapper.c
2006-11-22 16:55:21 UTC (rev 19844)
@@ -131,7 +131,8 @@
}
*r->out.entry_handle = h->wire_handle;
- r->out.num_ents = num_ents;
+ r->out.num_ents = talloc(mem_ctx, uint32_t);
+ *r->out.num_ents = num_ents;
if (num_ents == 0) {
r->out.entries = NULL;
@@ -179,7 +180,8 @@
count = build_ep_list(mem_ctx, dce_call->conn->dce_ctx->endpoint_list,
&eps);
ZERO_STRUCT(*r->out.entry_handle);
- r->out.num_towers = 1;
+ r->out.num_towers = talloc(mem_ctx, uint32_t);
+ *r->out.num_towers = 1;
r->out.towers = talloc(mem_ctx, struct epm_twr_p_t);
if (!r->out.towers) {
return EPMAPPER_STATUS_NO_MEMORY;
@@ -230,7 +232,7 @@
failed:
- r->out.num_towers = 0;
+
svn commit: samba r19843 - in branches/SAMBA_4_0/source/torture/rpc: .
Author: jelmer
Date: 2006-11-22 16:54:45 + (Wed, 22 Nov 2006)
New Revision: 19843
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19843
Log:
Fix warning.
Modified:
branches/SAMBA_4_0/source/torture/rpc/samr.c
Changeset:
Modified: branches/SAMBA_4_0/source/torture/rpc/samr.c
===
--- branches/SAMBA_4_0/source/torture/rpc/samr.c2006-11-22 16:53:30 UTC
(rev 19842)
+++ branches/SAMBA_4_0/source/torture/rpc/samr.c2006-11-22 16:54:45 UTC
(rev 19843)
@@ -1901,7 +1901,6 @@
{
char simple_pass[9];
char *v = generate_random_str(mem_ctx, 1);
- int i;
ZERO_STRUCT(simple_pass);
memset(simple_pass, *v, sizeof(simple_pass) - 1);
svn commit: samba r19842 - in branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl: .
Author: jelmer
Date: 2006-11-22 16:53:30 + (Wed, 22 Nov 2006)
New Revision: 19842
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19842
Log:
Complain about unknown pointer types.
Fallback to "unique" when "ptr" is specified instead of failing.
Modified:
branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/NDR.pm
Changeset:
Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/NDR.pm
===
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/NDR.pm2006-11-22
16:53:28 UTC (rev 19841)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/NDR.pm2006-11-22
16:53:30 UTC (rev 19842)
@@ -1052,9 +1052,14 @@
ValidProperties($interface,"INTERFACE");
- if (has_property($interface, "pointer_default") &&
- $interface->{PROPERTIES}->{pointer_default} eq "ptr") {
- fatal $interface, "Full pointers are not supported yet\n";
+ if (has_property($interface, "pointer_default")) {
+ if ($interface->{PROPERTIES}->{pointer_default} eq "ptr") {
+ nonfatal $interface, "Full pointers are not supported
yet, falling back to unique";
+ $interface->{PROPERTIES}->{pointer_default} = "unique";
+ } elsif (not grep
(/$interface->{PROPERTIES}->{pointer_default}/,
+ ("ref", "unique", "ptr"))) {
+ fatal $interface, "Unknown default pointer type
`$interface->{PROPERTIES}->{pointer_default}'";
+ }
}
if (has_property($interface, "object")) {
svn commit: samba r19841 - in branches/SAMBA_3_0/source: lib registry
Author: vlendec
Date: 2006-11-22 16:53:28 + (Wed, 22 Nov 2006)
New Revision: 19841
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19841
Log:
Wrap regdb_store_keys and regdb_store_values in tdb transactions
Modified:
branches/SAMBA_3_0/source/lib/util_tdb.c
branches/SAMBA_3_0/source/registry/reg_db.c
Changeset:
Modified: branches/SAMBA_3_0/source/lib/util_tdb.c
===
--- branches/SAMBA_3_0/source/lib/util_tdb.c2006-11-22 16:39:07 UTC (rev
19840)
+++ branches/SAMBA_3_0/source/lib/util_tdb.c2006-11-22 16:53:28 UTC (rev
19841)
@@ -302,6 +302,14 @@
return tdb_store(tdb, key, data, flags);
}
+int tdb_trans_store_bystring(TDB_CONTEXT *tdb, const char *keystr,
+TDB_DATA data, int flags)
+{
+ TDB_DATA key = make_tdb_data(keystr, strlen(keystr)+1);
+
+ return tdb_trans_store(tdb, key, data, flags);
+}
+
/
Fetch a buffer using a null terminated string key. Don't forget to call
free() on the result dptr.
Modified: branches/SAMBA_3_0/source/registry/reg_db.c
===
--- branches/SAMBA_3_0/source/registry/reg_db.c 2006-11-22 16:39:07 UTC (rev
19840)
+++ branches/SAMBA_3_0/source/registry/reg_db.c 2006-11-22 16:53:28 UTC (rev
19841)
@@ -366,15 +366,20 @@
{
int num_subkeys, i;
pstring path;
- REGSUBKEY_CTR *subkeys, *old_subkeys;
+ REGSUBKEY_CTR *subkeys = NULL, *old_subkeys = NULL;
char *oldkeyname;
+ if ( tdb_transaction_start( tdb_reg ) == -1 ) {
+ DEBUG(0, ("regdb_store_keys: tdb_transaction_start failed\n"));
+ return False;
+ }
+
/* fetch a list of the old subkeys so we can determine if any were
* deleted */
if ( !(old_subkeys = TALLOC_ZERO_P( ctr, REGSUBKEY_CTR )) ) {
DEBUG(0,("regdb_store_keys: talloc() failure!\n"));
- return False;
+ goto fail;
}
regdb_fetch_keys( key, old_subkeys );
@@ -383,8 +388,8 @@
if ( !regdb_store_keys_internal( key, ctr ) ) {
DEBUG(0,("regdb_store_keys: Failed to store new subkey list "
-"for parent [%s}\n", key ));
- return False;
+"for parent [%s]\n", key ));
+ goto fail;
}
/* now delete removed keys */
@@ -392,15 +397,30 @@
num_subkeys = regsubkey_ctr_numkeys( old_subkeys );
for ( i=0; i
svn commit: samba r19840 - in branches/SAMBA_3_0/source/utils: .
Author: vlendec
Date: 2006-11-22 16:39:07 + (Wed, 22 Nov 2006)
New Revision: 19840
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19840
Log:
Fix an uninitialized variable
Modified:
branches/SAMBA_3_0/source/utils/net_sam.c
Changeset:
Modified: branches/SAMBA_3_0/source/utils/net_sam.c
===
--- branches/SAMBA_3_0/source/utils/net_sam.c 2006-11-22 15:55:48 UTC (rev
19839)
+++ branches/SAMBA_3_0/source/utils/net_sam.c 2006-11-22 16:39:07 UTC (rev
19840)
@@ -378,6 +378,13 @@
printf("Account policy \"%s\" description: %s\n", account_policy,
account_policy_get_desc(field));
+
+ if (!pdb_get_account_policy(field, &old_value)) {
+fprintf(stderr, "Valid account policy, but unable to "
+"fetch value!\n");
+return -1;
+}
+
printf("Account policy \"%s\" value was: %d\n", account_policy,
old_value);
svn commit: samba r19839 - in branches/SAMBA_3_0/source/registry: .
Author: vlendec Date: 2006-11-22 15:55:48 + (Wed, 22 Nov 2006) New Revision: 19839 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19839 Log: Fix the build, we are not there yet :-) Modified: branches/SAMBA_3_0/source/registry/reg_db.c Changeset: Modified: branches/SAMBA_3_0/source/registry/reg_db.c === --- branches/SAMBA_3_0/source/registry/reg_db.c 2006-11-22 15:41:29 UTC (rev 19838) +++ branches/SAMBA_3_0/source/registry/reg_db.c 2006-11-22 15:55:48 UTC (rev 19839) @@ -46,7 +46,6 @@ KEY_PRINTING, KEY_SHARES, KEY_EVENTLOG, - KEY_SMBCONF, "HKLM\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Perflib", "HKLM\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Perflib\\009", "HKLM\\SYSTEM\\CurrentControlSet\\Control\\Print\\Monitors",
svn commit: samba r19838 - in branches/SAMBA_3_0/source/registry: .
Author: vlendec Date: 2006-11-22 15:41:29 + (Wed, 22 Nov 2006) New Revision: 19838 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19838 Log: We have to delete the value record as well, otherwise the old values pop up again if the key is re-created. Volker Modified: branches/SAMBA_3_0/source/registry/reg_db.c Changeset: Modified: branches/SAMBA_3_0/source/registry/reg_db.c === --- branches/SAMBA_3_0/source/registry/reg_db.c 2006-11-22 15:10:46 UTC (rev 19837) +++ branches/SAMBA_3_0/source/registry/reg_db.c 2006-11-22 15:41:29 UTC (rev 19838) @@ -397,6 +397,10 @@ pstr_sprintf( path, "%s%c%s", key, '/', oldkeyname ); normalize_reg_path( path ); tdb_delete_bystring( tdb_reg, path ); + pstr_sprintf( path, "%s/%s/%s", VALUE_PREFIX, key, + oldkeyname ); + normalize_reg_path( path ); + tdb_delete_bystring( tdb_reg, path ); } }
svn commit: samba r19837 - in branches/SAMBA_3_0/source/registry: .
Author: vlendec
Date: 2006-11-22 15:10:46 + (Wed, 22 Nov 2006)
New Revision: 19837
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19837
Log:
Some reformatting (Jerry, I hope you do not mind
Modified:
branches/SAMBA_3_0/source/registry/reg_db.c
Changeset:
Modified: branches/SAMBA_3_0/source/registry/reg_db.c
===
--- branches/SAMBA_3_0/source/registry/reg_db.c 2006-11-22 14:56:40 UTC (rev
19836)
+++ branches/SAMBA_3_0/source/registry/reg_db.c 2006-11-22 15:10:46 UTC (rev
19837)
@@ -46,6 +46,7 @@
KEY_PRINTING,
KEY_SHARES,
KEY_EVENTLOG,
+ KEY_SMBCONF,
"HKLM\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Perflib",
"HKLM\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Perflib\\009",
"HKLM\\SYSTEM\\CurrentControlSet\\Control\\Print\\Monitors",
@@ -369,7 +370,8 @@
REGSUBKEY_CTR *subkeys, *old_subkeys;
char *oldkeyname;
- /* fetch a list of the old subkeys so we can determine if any were
deleted */
+ /* fetch a list of the old subkeys so we can determine if any were
+* deleted */
if ( !(old_subkeys = TALLOC_ZERO_P( ctr, REGSUBKEY_CTR )) ) {
DEBUG(0,("regdb_store_keys: talloc() failure!\n"));
@@ -381,7 +383,8 @@
/* store the subkey list for the parent */
if ( !regdb_store_keys_internal( key, ctr ) ) {
- DEBUG(0,("regdb_store_keys: Failed to store new subkey list for
parent [%s}\n", key ));
+ DEBUG(0,("regdb_store_keys: Failed to store new subkey list "
+"for parent [%s}\n", key ));
return False;
}
@@ -403,7 +406,8 @@
num_subkeys = regsubkey_ctr_numkeys( ctr );
for ( i=0; i
svn commit: samba r19836 - in branches/SAMBA_4_0/source: gtk/tools librpc/idl torture/rpc
Author: jelmer
Date: 2006-11-22 14:56:40 + (Wed, 22 Nov 2006)
New Revision: 19836
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19836
Log:
Fix warnings in some IDL files.
Modified:
branches/SAMBA_4_0/source/gtk/tools/gwcrontab.c
branches/SAMBA_4_0/source/librpc/idl/atsvc.idl
branches/SAMBA_4_0/source/librpc/idl/dcom.idl
branches/SAMBA_4_0/source/torture/rpc/atsvc.c
Changeset:
Modified: branches/SAMBA_4_0/source/gtk/tools/gwcrontab.c
===
--- branches/SAMBA_4_0/source/gtk/tools/gwcrontab.c 2006-11-22 14:17:36 UTC
(rev 19835)
+++ branches/SAMBA_4_0/source/gtk/tools/gwcrontab.c 2006-11-22 14:56:40 UTC
(rev 19836)
@@ -134,7 +134,7 @@
talloc_free(mem_ctx);
gtk_widget_destroy(d);
- d = gtk_message_dialog_new (GTK_WINDOW(mainwin),
GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, "Job Id: %d",
r.out.job_id);
+ d = gtk_message_dialog_new (GTK_WINDOW(mainwin),
GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, "Job Id: %d",
*r.out.job_id);
gtk_dialog_run(GTK_DIALOG(d));
gtk_widget_destroy(d);
update_joblist();
Modified: branches/SAMBA_4_0/source/librpc/idl/atsvc.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/atsvc.idl 2006-11-22 14:17:36 UTC
(rev 19835)
+++ branches/SAMBA_4_0/source/librpc/idl/atsvc.idl 2006-11-22 14:56:40 UTC
(rev 19836)
@@ -74,7 +74,7 @@
NTSTATUS atsvc_JobAdd(
[in,unique,string,charset(UTF16)] uint16 *servername,
[in] atsvc_JobInfo *job_info,
- [out]uint32 job_id
+ [out,ref]uint32 *job_id
);
/**/
@@ -105,7 +105,7 @@
[in,unique,string,charset(UTF16)] uint16 *servername,
[in,out] atsvc_enum_ctr *ctr,
[in] uint32 preferred_max_len,
- [out]uint32 total_entries,
+ [out,ref]uint32 *total_entries,
[in,out,unique] uint32 *resume_handle
);
@@ -114,6 +114,6 @@
[public] NTSTATUS atsvc_JobGetInfo(
[in,unique,string,charset(UTF16)] uint16 *servername,
[in]uint32 job_id,
- [out,unique]atsvc_JobInfo *job_info
+ [out] atsvc_JobInfo **job_info
);
}
Modified: branches/SAMBA_4_0/source/librpc/idl/dcom.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/dcom.idl 2006-11-22 14:17:36 UTC
(rev 19835)
+++ branches/SAMBA_4_0/source/librpc/idl/dcom.idl 2006-11-22 14:56:40 UTC
(rev 19836)
@@ -47,7 +47,7 @@
{
[local] WERROR CreateInstance([in,unique] MInterfacePointer *pUnknown,
[in,unique] GUID *iid,
- [out, iid_is(riid),unique] MInterfacePointer
*ppv);
+ [out, iid_is(riid)] MInterfacePointer **ppv);
[call_as(CreateInstance)] WERROR RemoteCreateInstance();
@@ -85,7 +85,7 @@
[in] uint32 cRefs, /* count of AddRefs requested */
[in] uint16 cIids, /* count of IIDs that follow */
[in, unique, size_is(cIids)] GUID *iids, /* IIDs to QI for */
- [out, size_is(cIids), unique] MInterfacePointer *ip
+ [out, size_is(cIids)] MInterfacePointer **ip
);
typedef struct
@@ -98,7 +98,7 @@
[call_as(AddRef)] WERROR RemAddRef (
[in] uint16 cInterfaceRefs,
[in, size_is(cInterfaceRefs)] REMINTERFACEREF InterfaceRefs[],
-[out, size_is(cInterfaceRefs), unique] WERROR *pResults
+[out, size_is(cInterfaceRefs)] WERROR **pResults
);
[call_as(Release)] WERROR RemRelease (
@@ -177,9 +177,9 @@
[call_as(QueryInterface2)] WERROR RemQueryInterface2 (
[in, unique] GUID *ripid,
[in] uint16 cIids,
-[in, size_is(cIids), unique] GUID *iids,
-[out, size_is(cIids), unique] WERROR *phr,
-[out, size_is(cIids), unique] MInterfacePointer *ppMIF
+[in, size_is(cIids)] GUID **iids,
+[out, size_is(cIids)] WERROR **phr,
+[out, size_is(cIids)] MInterfacePointer **ppMIF
);
}
@@ -191,8 +191,7 @@
{
/*/
/* Function 0x03 */
- WERROR GetTypeInfoCount(
- [out, unique] uint16 *pctinfo);
+ WERROR GetTypeInfoCount([out] uint16 *pctinfo);
typedef struct {
} REF_ITypeInfo;
@@ -202,7 +201,7 @@
WERROR GetTypeInfo (
[in] uint16 iTInfo,
[in] uint32 lcid,
-
svn commit: samba r19835 - in branches: SAMBA_3_0/source/utils SAMBA_3_0_24/source/utils
Author: vlendec
Date: 2006-11-22 14:17:36 + (Wed, 22 Nov 2006)
New Revision: 19835
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19835
Log:
Some net sam policy improvements.
Thanks to Karolin Seeger <[EMAIL PROTECTED]>
Volker
Modified:
branches/SAMBA_3_0/source/utils/net_sam.c
branches/SAMBA_3_0_24/source/utils/net_sam.c
Changeset:
Modified: branches/SAMBA_3_0/source/utils/net_sam.c
===
--- branches/SAMBA_3_0/source/utils/net_sam.c 2006-11-22 13:59:14 UTC (rev
19834)
+++ branches/SAMBA_3_0/source/utils/net_sam.c 2006-11-22 14:17:36 UTC (rev
19835)
@@ -357,79 +357,106 @@
}
/*
- * Change account policies
+ * Manage account policies
*/
-static int net_sam_policy(int argc, const char **argv)
+static int net_sam_policy_set(int argc, const char **argv)
{
-
const char *account_policy = NULL;
uint32 value, old_value;
int field;
- if ((argc < 1) || (argc > 2)) {
- d_fprintf(stderr, "usage: net sam policy \"\" "
- "-> show current value\n");
- d_fprintf(stderr, "usage: net sam policy \"\" "
- " -> set a new value\n");
- return -1;
- }
+if (argc != 2) {
+d_fprintf(stderr, "usage: net sam policy set"
+ "\"\" \n");
+return -1;
+}
+ value = strtoul(argv[1], NULL, 10);
account_policy = argv[0];
field = account_policy_name_to_fieldnum(account_policy);
- if (field == 0) {
- char *apn = account_policy_names_list();
- d_fprintf(stderr, "No account policy by that name!\n");
- if (apn) {
- d_fprintf(stderr, "Valid account policies "
- "are:\n%s\n", apn);
- }
- SAFE_FREE(apn);
- return -1;
- }
+ printf("Account policy \"%s\" description: %s\n", account_policy,
+ account_policy_get_desc(field));
+printf("Account policy \"%s\" value was: %d\n", account_policy,
+ old_value);
- if (!pdb_get_account_policy(field, &old_value)) {
- fprintf(stderr, "Valid account policy, but unable to "
- "fetch value!\n");
- return -1;
- }
+if (!pdb_set_account_policy(field, value)) {
+d_fprintf(stderr, "Setting account policy %s to %u failed \n",
+ account_policy, value);
+}
- if (argc == 1) {
- /*
-* Just read the value
-*/
+printf("Account policy \"%s\" value is now: %d\n", account_policy,
+ value);
- printf("Account policy \"%s\" description: %s\n",
- account_policy, account_policy_get_desc(field));
- printf("Account policy \"%s\" value is: %d\n", account_policy,
- old_value);
- return 0;
- }
+return 0;
+}
- /*
-* Here we know we have 2 args, so set it
-*/
+static int net_sam_policy_show(int argc, const char **argv)
+{
+ const char *account_policy = NULL;
+uint32 old_value;
+int field;
+
+if (argc != 1) {
+d_fprintf(stderr, "usage: net sam policy show"
+ " \"\" \n");
+return -1;
+}
- value = strtoul(argv[1], NULL, 10);
+ account_policy = argv[0];
+field = account_policy_name_to_fieldnum(account_policy);
- printf("Account policy \"%s\" description: %s\n", account_policy,
- account_policy_get_desc(field));
- printf("Account policy \"%s\" value was: %d\n", account_policy,
+if (field == 0) {
+char *apn = account_policy_names_list();
+d_fprintf(stderr, "No account policy by that name!\n");
+if (apn) {
+d_fprintf(stderr, "Valid account policies "
+ "are:\n%s\n", apn);
+}
+SAFE_FREE(apn);
+return -1;
+}
+
+ if (!pdb_get_account_policy(field, &old_value)) {
+fprintf(stderr, "Valid account policy, but unable to "
+"fetch value!\n");
+return -1;
+}
+
+ printf("Account policy \"%s\" description: %s\n",
+ account_policy, account_policy_get_desc(field));
+printf("Account policy \"%s\" value is: %d\n", account_policy,
old_value);
+return 0;
+}
- if (!pdb_set_account_policy(field, value)) {
- d_fprintf(stderr, "Setting account policy %s to %u failed \n",
- account_policy, value);
+static int net_sam_policy_list(int argc,
svn commit: samba r19834 - in branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl: .
Author: jelmer
Date: 2006-11-22 13:59:14 + (Wed, 22 Nov 2006)
New Revision: 19834
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19834
Log:
Prevent some inaccurate warnings.
Modified:
branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/NDR.pm
Changeset:
Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/NDR.pm
===
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/NDR.pm2006-11-22
12:18:16 UTC (rev 19833)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/NDR.pm2006-11-22
13:59:14 UTC (rev 19834)
@@ -181,9 +181,10 @@
LEVEL => $level
});
- nonfatal($e, "top-level pointer `$e->{NAME}' is not a \[ref\]
pointer")
+ nonfatal($e, "top-level \[out\] pointer `$e->{NAME}' is not a
\[ref\] pointer")
if ($i == 1 and pointer_type($e) ne "ref" and
- $e->{PARENT}->{TYPE} eq "FUNCTION");
+ $e->{PARENT}->{TYPE} eq "FUNCTION" and
+ not has_property($e, "in"));
$pointer_idx++;
svn commit: samba r19833 - in branches/tmp/vl-messaging: examples/misc source source/auth source/client source/include source/lib source/lib/ldb source/lib/ldb/common source/lib/ldb/include source/lib
Author: ab Date: 2006-11-22 12:18:16 + (Wed, 22 Nov 2006) New Revision: 19833 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19833 Log: merge -r 19604:19832 from SAMBA_3_0 Added: branches/tmp/vl-messaging/examples/misc/cldap.pl branches/tmp/vl-messaging/source/lib/ldb/nssldb/ branches/tmp/vl-messaging/source/lib/ldb/standalone.sh branches/tmp/vl-messaging/source/libaddns/dnsmarshall.c branches/tmp/vl-messaging/source/modules/gpfs.c branches/tmp/vl-messaging/source/modules/vfs_gpfs.c Removed: branches/tmp/vl-messaging/source/lib/ldb/modules/schema.c branches/tmp/vl-messaging/source/libaddns/dnsrequest.c branches/tmp/vl-messaging/source/libaddns/dnsresponse.c branches/tmp/vl-messaging/source/libaddns/dnssign.c branches/tmp/vl-messaging/source/libaddns/dnsupdate.c branches/tmp/vl-messaging/source/libaddns/dnsuprequest.c branches/tmp/vl-messaging/source/libaddns/dnsupresp.c Modified: branches/tmp/vl-messaging/source/Makefile.in branches/tmp/vl-messaging/source/VERSION branches/tmp/vl-messaging/source/auth/auth_util.c branches/tmp/vl-messaging/source/client/client.c branches/tmp/vl-messaging/source/configure.in branches/tmp/vl-messaging/source/include/includes.h branches/tmp/vl-messaging/source/include/reg_objects.h branches/tmp/vl-messaging/source/include/smbprofile.h branches/tmp/vl-messaging/source/include/vfs.h branches/tmp/vl-messaging/source/include/vfs_macros.h branches/tmp/vl-messaging/source/lib/fault.c branches/tmp/vl-messaging/source/lib/ldb/Makefile.in branches/tmp/vl-messaging/source/lib/ldb/common/attrib_handlers.c branches/tmp/vl-messaging/source/lib/ldb/common/ldb.c branches/tmp/vl-messaging/source/lib/ldb/common/ldb_attributes.c branches/tmp/vl-messaging/source/lib/ldb/common/ldb_dn.c branches/tmp/vl-messaging/source/lib/ldb/common/ldb_match.c branches/tmp/vl-messaging/source/lib/ldb/common/ldb_modules.c branches/tmp/vl-messaging/source/lib/ldb/common/ldb_msg.c branches/tmp/vl-messaging/source/lib/ldb/config.mk branches/tmp/vl-messaging/source/lib/ldb/include/ldb.h branches/tmp/vl-messaging/source/lib/ldb/include/ldb_private.h branches/tmp/vl-messaging/source/lib/ldb/ldb.pc.in branches/tmp/vl-messaging/source/lib/ldb/ldb_ildap/ldb_ildap.c branches/tmp/vl-messaging/source/lib/ldb/ldb_ldap/ldb_ldap.c branches/tmp/vl-messaging/source/lib/ldb/ldb_sqlite3/ldb_sqlite3.c branches/tmp/vl-messaging/source/lib/ldb/ldb_tdb/ldb_search.c branches/tmp/vl-messaging/source/lib/ldb/modules/asq.c branches/tmp/vl-messaging/source/lib/ldb/modules/ldb_map.c branches/tmp/vl-messaging/source/lib/ldb/modules/ldb_map_inbound.c branches/tmp/vl-messaging/source/lib/ldb/modules/ldb_map_outbound.c branches/tmp/vl-messaging/source/lib/ldb/modules/ldb_map_private.h branches/tmp/vl-messaging/source/lib/ldb/modules/paged_results.c branches/tmp/vl-messaging/source/lib/ldb/modules/rdn_name.c branches/tmp/vl-messaging/source/lib/ldb/modules/sort.c branches/tmp/vl-messaging/source/lib/ldb/samba/ldif_handlers.c branches/tmp/vl-messaging/source/lib/ldb/tests/test-sqlite3.sh branches/tmp/vl-messaging/source/lib/ldb/tools/cmdline.c branches/tmp/vl-messaging/source/lib/sharesec.c branches/tmp/vl-messaging/source/lib/system.c branches/tmp/vl-messaging/source/lib/talloc/talloc.c branches/tmp/vl-messaging/source/lib/talloc/talloc_guide.txt branches/tmp/vl-messaging/source/lib/util_reg.c branches/tmp/vl-messaging/source/lib/util_str.c branches/tmp/vl-messaging/source/libaddns/dns.h branches/tmp/vl-messaging/source/libaddns/dnserr.h branches/tmp/vl-messaging/source/libaddns/dnsgss.c branches/tmp/vl-messaging/source/libaddns/dnsrecord.c branches/tmp/vl-messaging/source/libaddns/dnssock.c branches/tmp/vl-messaging/source/libaddns/dnsutils.c branches/tmp/vl-messaging/source/libads/ldap.c branches/tmp/vl-messaging/source/libmsrpc/cac_winreg.c branches/tmp/vl-messaging/source/librpc/gen_ndr/cli_dfs.c branches/tmp/vl-messaging/source/librpc/gen_ndr/cli_dfs.h branches/tmp/vl-messaging/source/librpc/gen_ndr/cli_echo.c branches/tmp/vl-messaging/source/librpc/gen_ndr/cli_echo.h branches/tmp/vl-messaging/source/librpc/gen_ndr/cli_lsa.c branches/tmp/vl-messaging/source/librpc/gen_ndr/cli_lsa.h branches/tmp/vl-messaging/source/librpc/gen_ndr/cli_netlogon.c branches/tmp/vl-messaging/source/librpc/gen_ndr/cli_netlogon.h branches/tmp/vl-messaging/source/librpc/gen_ndr/cli_srvsvc.c branches/tmp/vl-messaging/source/librpc/gen_ndr/cli_srvsvc.h branches/tmp/vl-messaging/source/librpc/gen_ndr/cli_svcctl.c branches/tmp/vl-messaging/source/librpc/gen_ndr/cli_svcctl.h branches/tmp/vl-messaging/source/librpc/gen_ndr/cli_unixinfo.c branches/tmp/vl-messaging/source/librpc/gen_ndr/cli_unixinfo.h branches/tmp/vl-messaging/source/librpc/gen_ndr/cli_winreg.c branches/tmp/vl-messaging/source/librpc
