date:20070313

Rev 11337: Merge upstream in file:///home/jelmer/bzr.samba/4.0-debian/

2007-03-13 Thread Jelmer Vernooij

At file:///home/jelmer/bzr.samba/4.0-debian/


revno: 11337
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: 4.0-debian
timestamp: Wed 2007-03-14 01:49:08 +0100
message:
  Merge upstream
modified:
  debian/libsamba-dev.installsvn-v2:[EMAIL PROTECTED]
  debian/libsamba0.install   svn-v2:[EMAIL PROTECTED]
  source/lib/registry/registry.h svn-v2:[EMAIL PROTECTED]
  source/librpc/config.mksvn-v2:[EMAIL PROTECTED]
  source/rpc_server/dcerpc_server.c svn-v2:[EMAIL PROTECTED]
  source/rpc_server/dcerpc_server.h svn-v2:[EMAIL PROTECTED]
  source/script/tests/mk-openldap.sh svn-v2:[EMAIL PROTECTED]
  source/torture/config.mk   svn-v2:[EMAIL PROTECTED]

revno: 11321.1.419
merged: svn-v2:[EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: jelmer
timestamp: Wed 2007-03-14 00:44:29 +
message:
  Make dcerpc_mgmt a separate library again, as the linker leaves it out 
when it's part of dcerpc.

revno: 11321.1.418.1.1
merged: [EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: SAMBA_4_0
timestamp: Wed 2007-03-14 01:42:36 +0100
message:
  Make dcerpc_mgmt a separate library again, as the linker leaves it 
out when it's part of dcerpc.

revno: 11321.1.418
merged: svn-v2:[EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: abartlet
timestamp: Tue 2007-03-13 23:16:09 +
message:
  Assume that if an OpenLDAP system is 'modular' then everything is a
  module, so we have to bring in syncprov too.
  
  Andrew Bartlett

revno: 11321.1.417
merged: svn-v2:[EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: tridge
timestamp: Tue 2007-03-13 22:58:23 +
message:
  
  fixed a rpc server bug where we failed to remove a call from one
  linked list when moving it to another. This could cause a valgrind
  error under the RPC-SCANNER test.
=== modified file 'debian/libsamba-dev.install'
--- a/debian/libsamba-dev.install   2007-03-13 21:50:58 +
+++ b/debian/libsamba-dev.install   2007-03-14 00:49:08 +
@@ -102,6 +102,7 @@
 usr/lib/pkgconfig/dcerpc_atsvc.pc
 usr/lib/pkgconfig/dcerpc_samr.pc
 usr/lib/pkgconfig/dcerpc_svcctl.pc
+usr/lib/pkgconfig/dcerpc_mgmt.pc
 usr/lib/pkgconfig/samba-net.pc
 usr/lib/pkgconfig/socket_wrapper.pc
 usr/lib/pkgconfig/cli_wrepl.pc
@@ -121,6 +122,7 @@
 usr/lib/libsamba3.so
 usr/lib/libdcerpc_svcctl.so
 usr/lib/libdcerpc_samr.so
+usr/lib/libdcerpc_mgmt.so
 usr/lib/libtorture.so
 usr/lib/libcli_wrepl.so
 usr/lib/libcli_smb.so

=== modified file 'debian/libsamba0.install'
--- a/debian/libsamba0.install  2007-03-13 21:50:58 +
+++ b/debian/libsamba0.install  2007-03-14 00:49:08 +
@@ -10,6 +10,7 @@
 usr/lib/libtorture.so.*
 usr/lib/libdcerpc_samr.so.*
 usr/lib/libdcerpc_svcctl.so.*
+usr/lib/libdcerpc_mgmt.so.*
 usr/lib/libwinbind-client.so.*
 usr/lib/libsmbcalls.so.*
 usr/lib/libdcerpc_atsvc.so.*

=== modified file 'source/lib/registry/registry.h'
--- a/source/lib/registry/registry.h2007-03-13 20:44:14 +
+++ b/source/lib/registry/registry.h2007-03-14 00:44:29 +
@@ -183,6 +183,10 @@
 struct auth_session_info;
 struct event_context;
 
+#ifndef _PUBLIC_
+#define _PUBLIC_
+#endif
+
 _PUBLIC_ WERROR reg_open_local (TALLOC_CTX *mem_ctx, 
struct registry_context **ctx, 
struct auth_session_info *session_info, 

=== modified file 'source/librpc/config.mk'
--- a/source/librpc/config.mk   2007-03-13 20:51:53 +
+++ b/source/librpc/config.mk   2007-03-14 00:49:08 +
@@ -412,9 +412,12 @@
 OBJ_FILES = gen_ndr/ndr_initshutdown_c.o
 PUBLIC_DEPENDENCIES = dcerpc NDR_INITSHUTDOWN
 
-[SUBSYSTEM::RPC_NDR_MGMT]
+[LIBRARY::dcerpc_mgmt]
 OBJ_FILES = gen_ndr/ndr_mgmt_c.o
 PRIVATE_DEPENDENCIES = NDR_MGMT
+VERSION = 0.0.1
+SO_VERSION = 0
+DESCRIPTION = DCE/RPC client library - MGMT
 
 [SUBSYSTEM::RPC_NDR_PROTECTED_STORAGE]
 OBJ_FILES = gen_ndr/ndr_protected_storage_c.o
@@ -483,7 +486,7 @@
rpc/dcerpc_connect.o
 PRIVATE_DEPENDENCIES = \
samba-socket LIBCLI_RESOLVE LIBCLI_SMB LIBCLI_SMB2 \
-   LIBNDR NDR_DCERPC RPC_NDR_EPMAPPER RPC_NDR_MGMT \
+   LIBNDR NDR_DCERPC RPC_NDR_EPMAPPER \
NDR_SCHANNEL RPC_NDR_NETLOGON \
gensec LIBCLI_AUTH LIBCLI_RAW CREDENTIALS
 # End SUBSYSTEM dcerpc

=== modified file 'source/rpc_server/dcerpc_server.c

Rev 11733: Integrate mgmt in libdcerpc. We have enough libraries as it is and mgmt is part of the DCE/RPC standard. in file:///home/jelmer/bzr.samba/SAMBA_4_0/

2007-03-13 Thread Jelmer Vernooij

At file:///home/jelmer/bzr.samba/SAMBA_4_0/


revno: 11733
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: SAMBA_4_0
timestamp: Tue 2007-03-13 21:20:37 +0100
message:
  Integrate mgmt in libdcerpc. We have enough libraries as it is and mgmt is 
part of the DCE/RPC standard.
modified:
  source/librpc/config.mksvn-v2:[EMAIL PROTECTED]
=== modified file 'source/librpc/config.mk'
--- a/source/librpc/config.mk   2007-02-27 18:00:15 +
+++ b/source/librpc/config.mk   2007-03-13 20:20:37 +
@@ -405,12 +405,9 @@
 OBJ_FILES = gen_ndr/ndr_initshutdown_c.o
 PUBLIC_DEPENDENCIES = dcerpc NDR_INITSHUTDOWN
 
-[LIBRARY::dcerpc_mgmt]
+[SUBSYSTEM::RPC_NDR_MGMT]
 OBJ_FILES = gen_ndr/ndr_mgmt_c.o
-PUBLIC_DEPENDENCIES = dcerpc NDR_MGMT
-VERSION = 0.0.1
-SO_VERSION = 0
-DESCRIPTION = DCE/RPC client library - MGMT
+PRIVATE_DEPENDENCIES = NDR_MGMT
 
 [SUBSYSTEM::RPC_NDR_PROTECTED_STORAGE]
 OBJ_FILES = gen_ndr/ndr_protected_storage_c.o
@@ -479,7 +476,7 @@
rpc/dcerpc_connect.o
 PRIVATE_DEPENDENCIES = \
samba-socket LIBCLI_RESOLVE LIBCLI_SMB LIBCLI_SMB2 \
-   LIBNDR NDR_DCERPC RPC_NDR_EPMAPPER \
+   LIBNDR NDR_DCERPC RPC_NDR_EPMAPPER RPC_NDR_MGMT \
NDR_SCHANNEL RPC_NDR_NETLOGON \
gensec LIBCLI_AUTH LIBCLI_RAW CREDENTIALS
 # End SUBSYSTEM dcerpc

Rev 11336: Merge more upstream fixes. in file:///home/jelmer/bzr.samba/4.0-debian/

2007-03-13 Thread Jelmer Vernooij

At file:///home/jelmer/bzr.samba/4.0-debian/


revno: 11336
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: 4.0-debian
timestamp: Tue 2007-03-13 23:08:06 +0100
message:
  Merge more upstream fixes.
modified:
  source/lib/registry/tools/regdiff.c svn-v2:[EMAIL PROTECTED]
  source/lib/registry/tools/regpatch.c svn-v2:[EMAIL PROTECTED]
  source/lib/registry/tools/regshell.c svn-v2:[EMAIL PROTECTED]
  source/lib/registry/tools/regtree.c svn-v2:[EMAIL PROTECTED]

revno: 11321.1.416
merged: svn-v2:[EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: jelmer
timestamp: Tue 2007-03-13 22:03:04 +
message:
  Remove unnecessary includes

revno: 11321.1.415.1.1
merged: [EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: SAMBA_4_0
timestamp: Tue 2007-03-13 23:02:03 +0100
message:
  Remove unnecessary includes
=== modified file 'source/lib/registry/tools/regdiff.c'
--- a/source/lib/registry/tools/regdiff.c   2006-09-16 16:59:37 +
+++ b/source/lib/registry/tools/regdiff.c   2007-03-13 22:03:04 +
@@ -22,7 +22,6 @@
 #include "includes.h"
 #include "lib/registry/registry.h"
 #include "lib/events/events.h"
-#include "lib/registry/reg_backend_rpc.h"
 #include "lib/cmdline/popt_common.h"
 
 int main(int argc, char **argv)

=== modified file 'source/lib/registry/tools/regpatch.c'
--- a/source/lib/registry/tools/regpatch.c  2006-09-16 16:59:37 +
+++ b/source/lib/registry/tools/regpatch.c  2007-03-13 22:03:04 +
@@ -23,7 +23,6 @@
 #include "lib/events/events.h"
 #include "lib/registry/registry.h"
 #include "lib/cmdline/popt_common.h"
-#include "lib/registry/reg_backend_rpc.h"
 
 int main(int argc, char **argv)
 {

=== modified file 'source/lib/registry/tools/regshell.c'
--- a/source/lib/registry/tools/regshell.c  2006-09-16 16:59:37 +
+++ b/source/lib/registry/tools/regshell.c  2007-03-13 22:03:04 +
@@ -23,7 +23,6 @@
 #include "lib/registry/registry.h"
 #include "lib/cmdline/popt_common.h"
 #include "lib/events/events.h"
-#include "lib/registry/reg_backend_rpc.h"
 #include "system/time.h"
 #include "lib/smbreadline/smbreadline.h"
 #include "librpc/gen_ndr/ndr_security.h"

=== modified file 'source/lib/registry/tools/regtree.c'
--- a/source/lib/registry/tools/regtree.c   2006-09-16 16:59:37 +
+++ b/source/lib/registry/tools/regtree.c   2007-03-13 22:03:04 +
@@ -22,7 +22,6 @@
 #include "includes.h"
 #include "lib/registry/registry.h"
 #include "lib/events/events.h"
-#include "lib/registry/reg_backend_rpc.h"
 #include "lib/cmdline/popt_common.h"
 
 static void print_tree(int l, struct registry_key *p, int fullpath, int novals)

Rev 11734: Fix header installation, remove proto header with a single prototype. in file:///home/jelmer/bzr.samba/SAMBA_4_0/

2007-03-13 Thread Jelmer Vernooij

At file:///home/jelmer/bzr.samba/SAMBA_4_0/


revno: 11734
revision-id: [EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: SAMBA_4_0
timestamp: Tue 2007-03-13 21:42:24 +0100
message:
  Fix header installation, remove proto header with a single prototype.
modified:
  source/headermap.txt   svn-v2:[EMAIL PROTECTED]
  source/lib/registry/config.mk  svn-v2:[EMAIL PROTECTED]
  source/lib/registry/registry.h svn-v2:[EMAIL PROTECTED]
  source/torture/config.mk   svn-v2:[EMAIL PROTECTED]
=== modified file 'source/headermap.txt'
--- a/source/headermap.txt  2007-02-12 12:12:12 +
+++ b/source/headermap.txt  2007-03-13 20:42:24 +
@@ -33,8 +33,6 @@
 gtk/common/select.h: gtk/select.h
 librpc/ndr/libndr.h: ndr.h
 lib/registry/registry.h: registry.h
-lib/registry/reg_backend_rpc.h: registry_rpc.h
-lib/registry/registry_proto.h: registry/proto.h
 libcli/util/nterr.h: core/nterr.h
 libcli/util/doserr.h: core/doserr.h
 libcli/util/nt_status.h: core/ntstatus.h

=== modified file 'source/lib/registry/config.mk'
--- a/source/lib/registry/config.mk 2007-03-13 20:08:44 +
+++ b/source/lib/registry/config.mk 2007-03-13 20:42:24 +
@@ -52,7 +52,6 @@
 # Start MODULE registry_rpc
 [MODULE::registry_rpc]
 INIT_FUNCTION = registry_rpc_init
-PUBLIC_PROTO_HEADER = reg_backend_rpc.h
 OUTPUT_TYPE = INTEGRATED
 SUBSYSTEM = registry
 OBJ_FILES = \

=== modified file 'source/lib/registry/registry.h'
--- a/source/lib/registry/registry.h2007-03-13 20:08:44 +
+++ b/source/lib/registry/registry.h2007-03-13 20:42:24 +
@@ -188,6 +188,11 @@
struct auth_session_info *session_info, 
struct cli_credentials *credentials);
 
+_PUBLIC_ WERROR reg_open_remote(struct registry_context **ctx, 
+   struct 
auth_session_info *session_info, 
+   struct 
cli_credentials *credentials, 
+   const char 
*location, struct event_context *ev);
+
 _PUBLIC_ NTSTATUS registry_register(const void *_hive_ops);
 _PUBLIC_ NTSTATUS registry_init(void);
 _PUBLIC_ BOOL reg_has_backend(const char *backend);
@@ -232,4 +237,6 @@
 _PUBLIC_ struct reg_diff *reg_diff_load(TALLOC_CTX *ctx, const char *fn);
 _PUBLIC_ BOOL reg_diff_apply (const struct reg_diff *diff, struct 
registry_context *ctx);
 
+NTSTATUS registry_rpc_init(void);
+
 #endif /* _REGISTRY_H */

=== modified file 'source/torture/config.mk'
--- a/source/torture/config.mk  2007-03-05 22:26:38 +
+++ b/source/torture/config.mk  2007-03-13 20:42:24 +
@@ -161,7 +161,7 @@
 PUBLIC_DEPENDENCIES = \
NDR_TABLE RPC_NDR_UNIXINFO dcerpc_samr RPC_NDR_WINREG 
RPC_NDR_INITSHUTDOWN \
RPC_NDR_OXIDRESOLVER RPC_NDR_EVENTLOG RPC_NDR_ECHO 
RPC_NDR_SVCCTL \
-   dcerpc_mgmt RPC_NDR_NETLOGON dcerpc_atsvc RPC_NDR_DRSUAPI \
+   RPC_NDR_NETLOGON dcerpc_atsvc RPC_NDR_DRSUAPI \
RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_SPOOLSS \
RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP \
RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER WB_HELPER LIBSAMBA-NET \

Rev 11332: Merge upstream. in file:///home/jelmer/bzr.samba/4.0-debian/

2007-03-13 Thread Jelmer Vernooij

At file:///home/jelmer/bzr.samba/4.0-debian/


revno: 11332
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: 4.0-debian
timestamp: Tue 2007-03-13 21:51:53 +0100
message:
  Merge upstream.
modified:
  source/headermap.txt   svn-v2:[EMAIL PROTECTED]
  source/lib/registry/config.mk  svn-v2:[EMAIL PROTECTED]
  source/lib/registry/registry.h svn-v2:[EMAIL PROTECTED]
  source/libnet/libnet_become_dc.c svn-v2:[EMAIL PROTECTED]
  source/libnet/libnet_unbecome_dc.c svn-v2:[EMAIL PROTECTED]
  source/librpc/config.mksvn-v2:[EMAIL PROTECTED]
  source/torture/config.mk   svn-v2:[EMAIL PROTECTED]
  source/torture/rpc/testjoin.c  svn-v2:[EMAIL PROTECTED]

revno: 11321.1.413
merged: svn-v2:[EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: jelmer
timestamp: Tue 2007-03-13 20:44:14 +
message:
  Fix header installation, remove proto header with a single prototype.

revno: 11321.1.412.1.1
merged: [EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: SAMBA_4_0
timestamp: Tue 2007-03-13 21:42:24 +0100
message:
  Fix header installation, remove proto header with a single prototype.

revno: 11321.1.412
merged: svn-v2:[EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: jelmer
timestamp: Tue 2007-03-13 20:26:35 +
message:
   Integrate mgmt in libdcerpc. We have enough libraries as it is and mgmt 
is part of the DCE/RPC standard.

revno: 11321.1.411.1.1
merged: [EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: SAMBA_4_0
timestamp: Tue 2007-03-13 21:24:40 +0100
message:
   Integrate mgmt in libdcerpc. We have enough libraries as it is and 
mgmt is part of the DCE/RPC standard.

revno: 11321.1.411
merged: svn-v2:[EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: jelmer
timestamp: Tue 2007-03-13 20:08:44 +
message:
  Hardcode prototypes, as they're a public API.

revno: 11321.1.410.1.1
merged: [EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: SAMBA_4_0
timestamp: Tue 2007-03-13 20:44:54 +0100
message:
  Hardcode prototypes, as they're a public API.

revno: 11321.1.410
merged: svn-v2:[EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: metze
timestamp: Tue 2007-03-13 18:17:31 +
message:
  move comments to the place where the functionality is implemented
  
  metze

revno: 11321.1.409
merged: svn-v2:[EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: metze
timestamp: Tue 2007-03-13 18:12:21 +
message:
  reorder functions
  
  metze

revno: 11321.1.408
merged: svn-v2:[EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: metze
timestamp: Tue 2007-03-13 15:41:25 +
message:
  move comment about the becoming a dc to the code which implements it
  and extent the comments a bit
  
  metze

revno: 11321.1.407
merged: svn-v2:[EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: metze
timestamp: Tue 2007-03-13 14:32:20 +
message:
  move function, so that all are in top-down order as they get called
  
  metze

Diff too large for email (1678 lines, the limit is 1000).

Rev 11334: Fix some more missing files. in file:///home/jelmer/bzr.samba/4.0-debian/

2007-03-13 Thread Jelmer Vernooij

At file:///home/jelmer/bzr.samba/4.0-debian/


revno: 11334
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: 4.0-debian
timestamp: Tue 2007-03-13 22:50:58 +0100
message:
  Fix some more missing files.
modified:
  debian/libsamba-dev.installsvn-v2:[EMAIL PROTECTED]
  debian/libsamba0.install   svn-v2:[EMAIL PROTECTED]
=== modified file 'debian/libsamba-dev.install'
--- a/debian/libsamba-dev.install   2007-03-13 20:50:54 +
+++ b/debian/libsamba-dev.install   2007-03-13 21:50:58 +
@@ -34,6 +34,8 @@
 usr/include/samba-4.0/credentials/proto.h
 usr/include/samba-4.0/auth.h
 usr/include/samba-4.0/auth/proto.h
+usr/include/samba-4.0/param/share.h
+usr/include/samba-4.0/param/share_proto.h
 usr/include/samba-4.0/libnet.h
 usr/include/samba-4.0/libnet/join.h
 usr/include/samba-4.0/libnet/lookup.h
@@ -135,5 +137,4 @@
 usr/lib/libndr.so
 usr/lib/libprocess_model.so
 usr/lib/libregistry.so
-usr/lib/libdcerpc_mgmt.so
 usr/lib/libshare.so

=== modified file 'debian/libsamba0.install'
--- a/debian/libsamba0.install  2007-03-13 20:50:54 +
+++ b/debian/libsamba0.install  2007-03-13 21:50:58 +
@@ -19,7 +19,6 @@
 usr/lib/libndr_compression.so.*
 usr/lib/libprocess_model.so.*
 usr/lib/libregistry.so.*
-usr/lib/libdcerpc_mgmt.so.*
 usr/lib/libsamba-config.so.*
 usr/lib/libcli_cldap.so.*
 usr/lib/libsamba3.so.*

Rev 11740: Make dcerpc_mgmt a separate library again, as the linker leaves it out when it's part of dcerpc. in file:///home/jelmer/bzr.samba/SAMBA_4_0/

2007-03-13 Thread Jelmer Vernooij

At file:///home/jelmer/bzr.samba/SAMBA_4_0/


revno: 11740
revision-id: [EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: SAMBA_4_0
timestamp: Wed 2007-03-14 01:42:36 +0100
message:
  Make dcerpc_mgmt a separate library again, as the linker leaves it out when 
it's part of dcerpc.
modified:
  source/lib/registry/registry.h svn-v2:[EMAIL PROTECTED]
  source/librpc/config.mksvn-v2:[EMAIL PROTECTED]
  source/torture/config.mk   svn-v2:[EMAIL PROTECTED]
=== modified file 'source/lib/registry/registry.h'
--- a/source/lib/registry/registry.h2007-03-13 20:44:14 +
+++ b/source/lib/registry/registry.h2007-03-14 00:42:36 +
@@ -183,6 +183,10 @@
 struct auth_session_info;
 struct event_context;
 
+#ifndef _PUBLIC_
+#define _PUBLIC_
+#endif
+
 _PUBLIC_ WERROR reg_open_local (TALLOC_CTX *mem_ctx, 
struct registry_context **ctx, 
struct auth_session_info *session_info, 

=== modified file 'source/librpc/config.mk'
--- a/source/librpc/config.mk   2007-03-13 20:26:35 +
+++ b/source/librpc/config.mk   2007-03-14 00:42:36 +
@@ -405,9 +405,12 @@
 OBJ_FILES = gen_ndr/ndr_initshutdown_c.o
 PUBLIC_DEPENDENCIES = dcerpc NDR_INITSHUTDOWN
 
-[SUBSYSTEM::RPC_NDR_MGMT]
+[LIBRARY::dcerpc_mgmt]
 OBJ_FILES = gen_ndr/ndr_mgmt_c.o
 PRIVATE_DEPENDENCIES = NDR_MGMT
+VERSION = 0.0.1
+SO_VERSION = 0
+DESCRIPTION = DCE/RPC client library - MGMT
 
 [SUBSYSTEM::RPC_NDR_PROTECTED_STORAGE]
 OBJ_FILES = gen_ndr/ndr_protected_storage_c.o
@@ -476,7 +479,7 @@
rpc/dcerpc_connect.o
 PRIVATE_DEPENDENCIES = \
samba-socket LIBCLI_RESOLVE LIBCLI_SMB LIBCLI_SMB2 \
-   LIBNDR NDR_DCERPC RPC_NDR_EPMAPPER RPC_NDR_MGMT \
+   LIBNDR NDR_DCERPC RPC_NDR_EPMAPPER \
NDR_SCHANNEL RPC_NDR_NETLOGON \
gensec LIBCLI_AUTH LIBCLI_RAW CREDENTIALS
 # End SUBSYSTEM dcerpc

=== modified file 'source/torture/config.mk'
--- a/source/torture/config.mk  2007-03-13 20:44:14 +
+++ b/source/torture/config.mk  2007-03-14 00:42:36 +
@@ -161,7 +161,7 @@
 PUBLIC_DEPENDENCIES = \
NDR_TABLE RPC_NDR_UNIXINFO dcerpc_samr RPC_NDR_WINREG 
RPC_NDR_INITSHUTDOWN \
RPC_NDR_OXIDRESOLVER RPC_NDR_EVENTLOG RPC_NDR_ECHO 
RPC_NDR_SVCCTL \
-   RPC_NDR_NETLOGON dcerpc_atsvc RPC_NDR_DRSUAPI \
+   RPC_NDR_NETLOGON dcerpc_atsvc dcerpc_mgmt RPC_NDR_DRSUAPI \
RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_SPOOLSS \
RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP \
RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER WB_HELPER LIBSAMBA-NET \

Rev 11335: Merge upstream in file:///home/jelmer/bzr.samba/4.0-debian/

2007-03-13 Thread Jelmer Vernooij

At file:///home/jelmer/bzr.samba/4.0-debian/


revno: 11335
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: 4.0-debian
timestamp: Tue 2007-03-13 22:51:37 +0100
message:
  Merge upstream
modified:
  source/main.mk svn-v2:[EMAIL PROTECTED]

revno: 11321.1.415
merged: svn-v2:[EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: jelmer
timestamp: Tue 2007-03-13 21:47:57 +
message:
  Don't install static libs, they can't be used anyway.

revno: 11321.1.414.1.1
merged: [EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: SAMBA_4_0
timestamp: Tue 2007-03-13 22:46:33 +0100
message:
  Don't install static libs, they can't be used anyway.
=== modified file 'source/main.mk'
--- a/source/main.mk2007-03-13 14:49:19 +
+++ b/source/main.mk2007-03-13 21:51:37 +
@@ -140,7 +140,7 @@
 
 installlib: $(INSTALLABLE_SHARED_LIBS) $(STATIC_LIBS) installdirs
@$(SHELL) $(srcdir)/script/installlib.sh $(DESTDIR)$(LIBDIR) 
"$(SHLIBEXT)" $(INSTALLABLE_SHARED_LIBS) 
-   @$(SHELL) $(srcdir)/script/installlib.sh $(DESTDIR)$(LIBDIR) 
"$(STLIBEXT)" $(STATIC_LIBS)
+   [EMAIL PROTECTED](SHELL) $(srcdir)/script/installlib.sh 
$(DESTDIR)$(LIBDIR) "$(STLIBEXT)" $(STATIC_LIBS)
 
 installheader: headers installdirs
@srcdir=$(srcdir) builddir=$(builddir) $(PERL) 
$(srcdir)/script/installheader.pl $(DESTDIR)$(INCLUDEDIR) $(PUBLIC_HEADERS) 
$(DEFAULT_HEADERS)
@@ -174,7 +174,7 @@
 
 uninstalllib:
@$(SHELL) $(srcdir)/script/uninstalllib.sh $(DESTDIR)$(LIBDIR) 
$(SHARED_LIBS)
-   @$(SHELL) $(srcdir)/script/uninstalllib.sh $(DESTDIR)$(LIBDIR) 
$(STATIC_LIBS) 
+   [EMAIL PROTECTED](SHELL) $(srcdir)/script/uninstalllib.sh 
$(DESTDIR)$(LIBDIR) $(STATIC_LIBS) 
 
 uninstallheader:
@$(SHELL) $(srcdir)/script/uninstallheader.sh $(DESTDIR)$(INCLUDEDIR) 
$(PUBLIC_HEADERS)

Rev 11333: Merge upstream in file:///home/jelmer/bzr.samba/4.0-debian/

2007-03-13 Thread Jelmer Vernooij

At file:///home/jelmer/bzr.samba/4.0-debian/


revno: 11333
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: 4.0-debian
timestamp: Tue 2007-03-13 22:09:54 +0100
message:
  Merge upstream
modified:
  .bzrignore svn-v2:[EMAIL PROTECTED]

revno: 11321.1.414
merged: svn-v2:[EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: jelmer
timestamp: Tue 2007-03-13 21:00:27 +
message:
  Ignore some more autogenerated files.

revno: 11321.1.413.1.1
merged: [EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: SAMBA_4_0
timestamp: Tue 2007-03-13 21:59:11 +0100
message:
  Ignore some more autogenerated files.
=== modified file '.bzrignore'
--- a/.bzrignore2007-03-13 18:20:56 +
+++ b/.bzrignore2007-03-13 21:09:54 +
@@ -55,9 +55,7 @@
 source/lib/charset/charset_proto.h
 source/lib/cmdline/credentials.h
 source/lib/ldb/samba/ldif_handlers.h
-source/lib/registry/reg_backend_rpc.h
 source/lib/registry/regf.h
-source/lib/registry/registry_proto.h
 source/lib/registry/tdr_regf.c
 source/lib/registry/tdr_regf.h
 source/lib/samba3/samba3_proto.h
@@ -196,3 +194,5 @@
 debian/*.substvars
 debian/*.debhelper
 debian/files
+source/tests
+source/torture/unix/proto.h

Rev 11330: Fix build of the Debian packages. in file:///home/jelmer/bzr.samba/4.0-debian/

2007-03-13 Thread Jelmer Vernooij

At file:///home/jelmer/bzr.samba/4.0-debian/


revno: 11330
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: 4.0-debian
timestamp: Tue 2007-03-13 19:20:56 +0100
message:
  Fix build of the Debian packages.
modified:
  .bzrignore svn-v2:[EMAIL PROTECTED]
  debian/libgensec0.install  svn-v2:[EMAIL PROTECTED]
  debian/libsamba-dev.installsvn-v2:[EMAIL PROTECTED]
  debian/libsamba0.install   svn-v2:[EMAIL PROTECTED]
  source/lib/util/config.mk  svn-v2:[EMAIL PROTECTED]
  source/librpc/config.mksvn-v2:[EMAIL PROTECTED]
=== modified file '.bzrignore'
--- a/.bzrignore2007-03-13 14:49:19 +
+++ b/.bzrignore2007-03-13 18:20:56 +
@@ -193,3 +193,6 @@
 webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/translation/messages.pot
 source/torture/ndr/proto.h
 source/bin/modules/*
+debian/*.substvars
+debian/*.debhelper
+debian/files

=== modified file 'debian/libgensec0.install'
--- a/debian/libgensec0.install 2007-01-27 22:11:08 +
+++ b/debian/libgensec0.install 2007-03-13 18:20:56 +
@@ -1,2 +1,2 @@
 usr/lib/libgensec.so.0.*
-usr/lib/samba/gensec/*.so
+#usr/lib/samba/gensec/*.so

=== modified file 'debian/libsamba-dev.install'
--- a/debian/libsamba-dev.install   2007-01-27 22:11:08 +
+++ b/debian/libsamba-dev.install   2007-03-13 18:20:56 +
@@ -1,4 +1,4 @@
-usr/include/samba-4.0/gen_ndr/samr.h
+usr/include/samba-4.0/dcerpc/samr.h
 usr/include/samba-4.0/gen_ndr/dcerpc.h
 usr/include/samba-4.0/gen_ndr/ndr_dcerpc.h
 usr/include/samba-4.0/gen_ndr/lsa.h
@@ -41,7 +41,7 @@
 usr/include/samba-4.0/libnet/userinfo.h
 usr/include/samba-4.0/libnet/userman.h
 usr/include/samba-4.0/socket_wrapper.h
-usr/include/samba-4.0/torture.h
+usr/include/samba-4.0/torture/torture.h
 usr/include/samba-4.0/torture/proto.h
 usr/include/samba-4.0/torture/util.h
 usr/include/samba-4.0/ldap.h
@@ -90,97 +90,23 @@
 usr/lib/pkgconfig/samba3.pc
 usr/lib/libsamba-config.so
 usr/lib/libndr_compression.so
-usr/lib/librpc_ndr_policyagent.so
-usr/lib/libndr_efs.so
-usr/lib/libndr_winsrepl.so
-usr/lib/libndr_scerpc.so
 usr/lib/libcli_cldap.so
-usr/lib/libndr_wins.so
-usr/lib/libndr_irpc.so
-usr/lib/libndr_dsbackup.so
 usr/lib/libsamba3.so
-usr/lib/librpc_ndr_wkssvc.so
-usr/lib/librpc_ndr_svcctl.so
-usr/lib/librpc_ndr_scerpc.so
-usr/lib/librpc_ndr_spoolss.so
-usr/lib/librpc_ndr_samr.so
+usr/lib/libdcerpc_svcctl.so
+usr/lib/libdcerpc_samr.so
 usr/lib/libtorture.so
 usr/lib/libcli_wrepl.so
-usr/lib/libndr_mgmt.so
-usr/lib/libndr_spoolss.so
 usr/lib/libheimdal.so
 usr/lib/libsocket_wrapper.so
 usr/lib/libsamba-net.so
-usr/lib/librpc_ndr_dbgidl.so
-usr/lib/libndr_srvsvc.so
 usr/lib/libdcerpc.so
-usr/lib/libndr_eventlog.so
-usr/lib/libndr_dssetup.so
-usr/lib/libndr_oxidresolver.so
 usr/lib/libtdr.so
-usr/lib/librpc_ndr_drsuapi.so
-usr/lib/libndr_wkssvc.so
-usr/lib/librpc_ndr_keysvc.so
-usr/lib/librpc_ndr_oxidresolver.so
-usr/lib/libndr_dfs.so
-usr/lib/libndr_wzcsvc.so
 usr/lib/libsamba-util.so
-usr/lib/librpc_ndr_rot.so
-usr/lib/librpc_ndr_w32time.so
-usr/lib/librpc_ndr_eventlog.so
-usr/lib/librpc_ndr_ntsvcs.so
-usr/lib/libndr_table.so
-usr/lib/librpc_ndr_efs.so
-usr/lib/libndr_winstation.so
-usr/lib/libndr_samr.so
-usr/lib/librpc_ndr_wzcsvc.so
-usr/lib/librpc_ndr_srvsvc.so
-usr/lib/librpc_ndr_initshutdown.so
 usr/lib/libwinbind-client.so
-usr/lib/libndr_msgsvc.so
-usr/lib/libndr_remact.so
-usr/lib/libndr_lsa.so
 usr/lib/libsmbcalls.so
-usr/lib/libndr_dnsserver.so
-usr/lib/libndr_security.so
-usr/lib/libndr_unixinfo.so
-usr/lib/libndr_winreg.so
-usr/lib/librpc_ndr_atsvc.so
-usr/lib/librpc_ndr_netlogon.so
-usr/lib/librpc_ndr_trkwks.so
-usr/lib/libndr_atsvc.so
-usr/lib/libndr_dbgidl.so
-usr/lib/librpc_ndr_dfs.so
-usr/lib/libndr_trkwks.so
-usr/lib/libndr_browser.so
-usr/lib/libndr_audiosrv.so
-usr/lib/libndr_drsuapi.so
-usr/lib/libndr_keysvc.so
+usr/lib/libdcerpc_atsvc.so
 usr/lib/libntvfs.so
-usr/lib/libndr_ntsvcs.so
-usr/lib/libndr_protected_storage.so
-usr/lib/librpc_ndr_msgsvc.so
-usr/lib/librpc_ndr_protected_storage.so
-usr/lib/libdynconfig.so
-usr/lib/libndr_netlogon.so
-usr/lib/librpc_ndr_unixinfo.so
-usr/lib/librpc_ndr_dsbackup.so
-usr/lib/libndr_xattr.so
 usr/lib/libndr.so
-usr/lib/libndr_epmapper.so
-usr/lib/librpc_ndr_epmapper.so
-usr/lib/librpc_ndr_remact.so
-usr/lib/librpc_ndr_winreg.so
-usr/lib/libndr_initshutdown.so
-usr/lib/libndr_drsblobs.so
-usr/lib/librpc_ndr_audiosrv.so
-usr/lib/librpc_ndr_dssetup.so
 usr/lib/libprocess_model.so
-usr/lib/libndr_svcctl.so
-usr/lib/librpc_ndr_lsa.so
 usr/lib/libregistry.so
-usr/lib/librpc_ndr_wins.so
-usr/lib/librpc_ndr_mgmt.so
-usr/lib/libndr_w32time.so
-usr/lib/librpc_ndr_echo.so
-usr/lib/libndr_policyagent.so
+usr/lib/libdcerpc_mgmt.so

=== modified file 'debian/libsamba0.install'
--- a/debian/libsamba0.install  2007-01-27 22:11:08 +
+++ b/debian/libsamba0.install  2007-03-13 18:20:56 +
@@ -1

Rev 11735: Ignore some more autogenerated files. in file:///home/jelmer/bzr.samba/SAMBA_4_0/

2007-03-13 Thread Jelmer Vernooij

At file:///home/jelmer/bzr.samba/SAMBA_4_0/


revno: 11735
revision-id: [EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: SAMBA_4_0
timestamp: Tue 2007-03-13 21:59:11 +0100
message:
  Ignore some more autogenerated files.
modified:
  .bzrignore svn-v2:[EMAIL PROTECTED]
=== modified file '.bzrignore'
--- a/.bzrignore2007-03-03 00:27:46 +
+++ b/.bzrignore2007-03-13 20:59:11 +
@@ -55,9 +55,7 @@
 source/lib/charset/charset_proto.h
 source/lib/cmdline/credentials.h
 source/lib/ldb/samba/ldif_handlers.h
-source/lib/registry/reg_backend_rpc.h
 source/lib/registry/regf.h
-source/lib/registry/registry_proto.h
 source/lib/registry/tdr_regf.c
 source/lib/registry/tdr_regf.h
 source/lib/samba3/samba3_proto.h
@@ -171,3 +169,5 @@
 webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/translation/messages.pot
 source/torture/ndr/proto.h
 source/bin/modules/*
+source/tests
+source/torture/unix/proto.h

Rev 11737: Remove unnecessary includes in file:///home/jelmer/bzr.samba/SAMBA_4_0/

2007-03-13 Thread Jelmer Vernooij

At file:///home/jelmer/bzr.samba/SAMBA_4_0/


revno: 11737
revision-id: [EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: SAMBA_4_0
timestamp: Tue 2007-03-13 23:02:03 +0100
message:
  Remove unnecessary includes
modified:
  source/lib/registry/tools/regdiff.c svn-v2:[EMAIL PROTECTED]
  source/lib/registry/tools/regpatch.c svn-v2:[EMAIL PROTECTED]
  source/lib/registry/tools/regshell.c svn-v2:[EMAIL PROTECTED]
  source/lib/registry/tools/regtree.c svn-v2:[EMAIL PROTECTED]
=== modified file 'source/lib/registry/tools/regdiff.c'
--- a/source/lib/registry/tools/regdiff.c   2006-09-16 16:59:37 +
+++ b/source/lib/registry/tools/regdiff.c   2007-03-13 22:02:03 +
@@ -22,7 +22,6 @@
 #include "includes.h"
 #include "lib/registry/registry.h"
 #include "lib/events/events.h"
-#include "lib/registry/reg_backend_rpc.h"
 #include "lib/cmdline/popt_common.h"
 
 int main(int argc, char **argv)

=== modified file 'source/lib/registry/tools/regpatch.c'
--- a/source/lib/registry/tools/regpatch.c  2006-09-16 16:59:37 +
+++ b/source/lib/registry/tools/regpatch.c  2007-03-13 22:02:03 +
@@ -23,7 +23,6 @@
 #include "lib/events/events.h"
 #include "lib/registry/registry.h"
 #include "lib/cmdline/popt_common.h"
-#include "lib/registry/reg_backend_rpc.h"
 
 int main(int argc, char **argv)
 {

=== modified file 'source/lib/registry/tools/regshell.c'
--- a/source/lib/registry/tools/regshell.c  2006-09-16 16:59:37 +
+++ b/source/lib/registry/tools/regshell.c  2007-03-13 22:02:03 +
@@ -23,7 +23,6 @@
 #include "lib/registry/registry.h"
 #include "lib/cmdline/popt_common.h"
 #include "lib/events/events.h"
-#include "lib/registry/reg_backend_rpc.h"
 #include "system/time.h"
 #include "lib/smbreadline/smbreadline.h"
 #include "librpc/gen_ndr/ndr_security.h"

=== modified file 'source/lib/registry/tools/regtree.c'
--- a/source/lib/registry/tools/regtree.c   2006-09-16 16:59:37 +
+++ b/source/lib/registry/tools/regtree.c   2007-03-13 22:02:03 +
@@ -22,7 +22,6 @@
 #include "includes.h"
 #include "lib/registry/registry.h"
 #include "lib/events/events.h"
-#include "lib/registry/reg_backend_rpc.h"
 #include "lib/cmdline/popt_common.h"
 
 static void print_tree(int l, struct registry_key *p, int fullpath, int novals)

Rev 11733: Integrate mgmt in libdcerpc. We have enough libraries as it is and mgmt is part of the DCE/RPC standard. in file:///home/jelmer/bzr.samba/SAMBA_4_0/

2007-03-13 Thread Jelmer Vernooij

At file:///home/jelmer/bzr.samba/SAMBA_4_0/


revno: 11733
revision-id: [EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: SAMBA_4_0
timestamp: Tue 2007-03-13 21:24:40 +0100
message:
   Integrate mgmt in libdcerpc. We have enough libraries as it is and mgmt is 
part of the DCE/RPC standard.
modified:
  source/librpc/config.mksvn-v2:[EMAIL PROTECTED]
=== modified file 'source/librpc/config.mk'
--- a/source/librpc/config.mk   2007-02-27 18:00:15 +
+++ b/source/librpc/config.mk   2007-03-13 20:24:40 +
@@ -405,12 +405,9 @@
 OBJ_FILES = gen_ndr/ndr_initshutdown_c.o
 PUBLIC_DEPENDENCIES = dcerpc NDR_INITSHUTDOWN
 
-[LIBRARY::dcerpc_mgmt]
+[SUBSYSTEM::RPC_NDR_MGMT]
 OBJ_FILES = gen_ndr/ndr_mgmt_c.o
-PUBLIC_DEPENDENCIES = dcerpc NDR_MGMT
-VERSION = 0.0.1
-SO_VERSION = 0
-DESCRIPTION = DCE/RPC client library - MGMT
+PRIVATE_DEPENDENCIES = NDR_MGMT
 
 [SUBSYSTEM::RPC_NDR_PROTECTED_STORAGE]
 OBJ_FILES = gen_ndr/ndr_protected_storage_c.o
@@ -479,7 +476,7 @@
rpc/dcerpc_connect.o
 PRIVATE_DEPENDENCIES = \
samba-socket LIBCLI_RESOLVE LIBCLI_SMB LIBCLI_SMB2 \
-   LIBNDR NDR_DCERPC RPC_NDR_EPMAPPER \
+   LIBNDR NDR_DCERPC RPC_NDR_EPMAPPER RPC_NDR_MGMT \
NDR_SCHANNEL RPC_NDR_NETLOGON \
gensec LIBCLI_AUTH LIBCLI_RAW CREDENTIALS
 # End SUBSYSTEM dcerpc

Rev 11732: Hardcode prototypes, as they're a public API. in file:///home/jelmer/bzr.samba/SAMBA_4_0/

2007-03-13 Thread Jelmer Vernooij

At file:///home/jelmer/bzr.samba/SAMBA_4_0/


revno: 11732
revision-id: [EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: SAMBA_4_0
timestamp: Tue 2007-03-13 20:44:54 +0100
message:
  Hardcode prototypes, as they're a public API.
modified:
  source/lib/registry/config.mk  svn-v2:[EMAIL PROTECTED]
  source/lib/registry/registry.h svn-v2:[EMAIL PROTECTED]
=== modified file 'source/lib/registry/config.mk'
--- a/source/lib/registry/config.mk 2007-03-04 18:21:59 +
+++ b/source/lib/registry/config.mk 2007-03-13 19:44:54 +
@@ -86,7 +86,6 @@
patchfile.o
 PUBLIC_DEPENDENCIES = \
LIBSAMBA-UTIL CHARSET
-PUBLIC_PROTO_HEADER = registry_proto.h
 PUBLIC_HEADERS = registry.h
 # End MODULE registry_ldb
 

=== modified file 'source/lib/registry/registry.h'
--- a/source/lib/registry/registry.h2007-02-12 13:04:09 +
+++ b/source/lib/registry/registry.h2007-03-13 19:44:54 +
@@ -183,6 +183,53 @@
 struct auth_session_info;
 struct event_context;
 
-#include "lib/registry/registry_proto.h"
+_PUBLIC_ WERROR reg_open_local (TALLOC_CTX *mem_ctx, 
+   struct registry_context **ctx, 
+   struct auth_session_info *session_info, 
+   struct cli_credentials *credentials);
+
+_PUBLIC_ NTSTATUS registry_register(const void *_hive_ops);
+_PUBLIC_ NTSTATUS registry_init(void);
+_PUBLIC_ BOOL reg_has_backend(const char *backend);
+_PUBLIC_ int reg_list_predefs(TALLOC_CTX *mem_ctx, char ***predefs, uint32_t 
**hkeys);
+_PUBLIC_ const char *reg_get_predef_name(uint32_t hkey);
+_PUBLIC_ WERROR reg_get_predefined_key_by_name(struct registry_context *ctx, 
const char *name, struct registry_key **key);
+_PUBLIC_ WERROR reg_get_predefined_key(struct registry_context *ctx, uint32_t 
hkey, struct registry_key **key);
+_PUBLIC_ WERROR reg_open_hive(TALLOC_CTX *parent_ctx, const char *backend, 
const char *location, struct auth_session_info *session_info, struct 
cli_credentials *credentials, struct registry_key **root);
+_PUBLIC_ WERROR reg_open_key(TALLOC_CTX *mem_ctx, struct registry_key *parent, 
const char *name, struct registry_key **result);
+_PUBLIC_ WERROR reg_key_get_value_by_index(TALLOC_CTX *mem_ctx, const struct 
registry_key *key, int idx, struct registry_value **val);
+_PUBLIC_ WERROR reg_key_num_subkeys(const struct registry_key *key, uint32_t 
*count);
+_PUBLIC_ WERROR reg_key_num_values(const struct registry_key *key, uint32_t 
*count);
+_PUBLIC_ WERROR reg_key_get_subkey_by_index(TALLOC_CTX *mem_ctx, const struct 
registry_key *key, int idx, struct registry_key **subkey);
+WERROR reg_key_get_subkey_by_name(TALLOC_CTX *mem_ctx, const struct 
registry_key *key, const char *name, struct registry_key **subkey);
+_PUBLIC_ WERROR reg_key_get_value_by_name(TALLOC_CTX *mem_ctx, const struct 
registry_key *key, const char *name, struct registry_value **val);
+_PUBLIC_ WERROR reg_key_del(struct registry_key *parent, const char *name);
+_PUBLIC_ WERROR reg_key_add_name(TALLOC_CTX *mem_ctx, const struct 
registry_key *parent, const char *name, uint32_t access_mask, struct 
security_descriptor *desc, struct registry_key **newkey);
+_PUBLIC_ WERROR reg_val_set(struct registry_key *key, const char *value, 
uint32_t type, DATA_BLOB data);
+_PUBLIC_ WERROR reg_get_sec_desc(TALLOC_CTX *ctx, const struct registry_key 
*key, struct security_descriptor **secdesc);
+_PUBLIC_ WERROR reg_del_value(const struct registry_key *key, const char 
*valname);
+_PUBLIC_ WERROR reg_key_flush(const struct registry_key *key);
+_PUBLIC_ WERROR reg_key_subkeysizes(const struct registry_key *key, uint32_t 
*max_subkeylen, uint32_t *max_subkeysize);
+_PUBLIC_ WERROR reg_key_valuesizes(const struct registry_key *key, uint32_t 
*max_valnamelen, uint32_t *max_valbufsize);
+
+/* Utility functions */
+
+_PUBLIC_ const char *str_regtype(int type);
+_PUBLIC_ char *reg_val_data_string(TALLOC_CTX *mem_ctx, uint32_t type, 
DATA_BLOB *data);
+_PUBLIC_ char *reg_val_description(TALLOC_CTX *mem_ctx, struct registry_value 
*val) ;
+_PUBLIC_ BOOL reg_string_to_val(TALLOC_CTX *mem_ctx, const char *type_str, 
const char *data_str, uint32_t *type, DATA_BLOB *data);
+char *reg_path_win2unix(char *path) ;
+char *reg_path_unix2win(char *path) ;
+WERROR reg_open_key_abs(TALLOC_CTX *mem_ctx, struct registry_context *handle, 
const char *name, struct registry_key **result);
+WERROR reg_key_del_abs(struct registry_context *ctx, const char *path);
+WERROR reg_key_add_abs(TALLOC_CTX *mem_ctx, struct registry_context *ctx, 
const char *path, uint32_t access_mask, struct security_descriptor *sec_desc, 
struct registry_key **result);
+
+
+/* Patch files */
+
+_PUBLIC_ struct reg_diff *reg_generate_diff(TALLOC_CTX *mem_ctx, struct 
registry_context *ctx1, struct registry_context *ctx2);
+_PUBLI

svn commit: samba r21837 - in branches/SAMBA_4_0: . source/lib/registry source/librpc source/torture

2007-03-13 Thread jelmer

Author: jelmer
Date: 2007-03-14 00:44:29 + (Wed, 14 Mar 2007)
New Revision: 21837

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21837

Log:
Make dcerpc_mgmt a separate library again, as the linker leaves it out when 
it's part of dcerpc.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/lib/registry/registry.h
   branches/SAMBA_4_0/source/librpc/config.mk
   branches/SAMBA_4_0/source/torture/config.mk


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
...skipped...

Modified: branches/SAMBA_4_0/source/lib/registry/registry.h
===
--- branches/SAMBA_4_0/source/lib/registry/registry.h   2007-03-13 23:16:09 UTC 
(rev 21836)
+++ branches/SAMBA_4_0/source/lib/registry/registry.h   2007-03-14 00:44:29 UTC 
(rev 21837)
@@ -183,6 +183,10 @@
 struct auth_session_info;
 struct event_context;
 
+#ifndef _PUBLIC_
+#define _PUBLIC_
+#endif
+
 _PUBLIC_ WERROR reg_open_local (TALLOC_CTX *mem_ctx, 
struct registry_context **ctx, 
struct auth_session_info *session_info, 

Modified: branches/SAMBA_4_0/source/librpc/config.mk
===
--- branches/SAMBA_4_0/source/librpc/config.mk  2007-03-13 23:16:09 UTC (rev 
21836)
+++ branches/SAMBA_4_0/source/librpc/config.mk  2007-03-14 00:44:29 UTC (rev 
21837)
@@ -405,9 +405,12 @@
 OBJ_FILES = gen_ndr/ndr_initshutdown_c.o
 PUBLIC_DEPENDENCIES = dcerpc NDR_INITSHUTDOWN
 
-[SUBSYSTEM::RPC_NDR_MGMT]
+[LIBRARY::dcerpc_mgmt]
 OBJ_FILES = gen_ndr/ndr_mgmt_c.o
 PRIVATE_DEPENDENCIES = NDR_MGMT
+VERSION = 0.0.1
+SO_VERSION = 0
+DESCRIPTION = DCE/RPC client library - MGMT
 
 [SUBSYSTEM::RPC_NDR_PROTECTED_STORAGE]
 OBJ_FILES = gen_ndr/ndr_protected_storage_c.o
@@ -476,7 +479,7 @@
rpc/dcerpc_connect.o
 PRIVATE_DEPENDENCIES = \
samba-socket LIBCLI_RESOLVE LIBCLI_SMB LIBCLI_SMB2 \
-   LIBNDR NDR_DCERPC RPC_NDR_EPMAPPER RPC_NDR_MGMT \
+   LIBNDR NDR_DCERPC RPC_NDR_EPMAPPER \
NDR_SCHANNEL RPC_NDR_NETLOGON \
gensec LIBCLI_AUTH LIBCLI_RAW CREDENTIALS
 # End SUBSYSTEM dcerpc

Modified: branches/SAMBA_4_0/source/torture/config.mk
===
--- branches/SAMBA_4_0/source/torture/config.mk 2007-03-13 23:16:09 UTC (rev 
21836)
+++ branches/SAMBA_4_0/source/torture/config.mk 2007-03-14 00:44:29 UTC (rev 
21837)
@@ -161,7 +161,7 @@
 PUBLIC_DEPENDENCIES = \
NDR_TABLE RPC_NDR_UNIXINFO dcerpc_samr RPC_NDR_WINREG 
RPC_NDR_INITSHUTDOWN \
RPC_NDR_OXIDRESOLVER RPC_NDR_EVENTLOG RPC_NDR_ECHO 
RPC_NDR_SVCCTL \
-   RPC_NDR_NETLOGON dcerpc_atsvc RPC_NDR_DRSUAPI \
+   RPC_NDR_NETLOGON dcerpc_atsvc dcerpc_mgmt RPC_NDR_DRSUAPI \
RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_SPOOLSS \
RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP \
RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER WB_HELPER LIBSAMBA-NET \

Build status as of Wed Mar 14 00:00:02 2007

2007-03-13 Thread build

URL: http://build.samba.org/

--- /home/build/master/cache/broken_results.txt.old 2007-03-13 
00:01:17.0 +
+++ /home/build/master/cache/broken_results.txt 2007-03-14 00:01:53.0 
+
@@ -1,4 +1,4 @@
-Build status as of Tue Mar 13 00:00:02 2007
+Build status as of Wed Mar 14 00:00:02 2007
 
 Build counts:
 Tree Total  Broken Panic 
@@ -17,7 +17,7 @@
 samba-docs   0  0  0 
 samba-gtk4  4  0 
 samba4   37 12 0 
-samba_3_039 16 1 
+samba_3_039 14 1 
 smb-build29 29 0 
 talloc   33 1  0 
 tdb  31 3  0

svn commit: samba r21836 - in branches/SAMBA_4_0/source/script/tests: .

2007-03-13 Thread abartlet

Author: abartlet
Date: 2007-03-13 23:16:09 + (Tue, 13 Mar 2007)
New Revision: 21836

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21836

Log:
Assume that if an OpenLDAP system is 'modular' then everything is a
module, so we have to bring in syncprov too.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/script/tests/mk-openldap.sh


Changeset:
Modified: branches/SAMBA_4_0/source/script/tests/mk-openldap.sh
===
--- branches/SAMBA_4_0/source/script/tests/mk-openldap.sh   2007-03-13 
22:58:23 UTC (rev 21835)
+++ branches/SAMBA_4_0/source/script/tests/mk-openldap.sh   2007-03-13 
23:16:09 UTC (rev 21836)
@@ -103,6 +103,7 @@
 cat > $MODCONF <

svn commit: samba r21835 - in branches/SAMBA_4_0/source/rpc_server: .

2007-03-13 Thread tridge

Author: tridge
Date: 2007-03-13 22:58:23 + (Tue, 13 Mar 2007)
New Revision: 21835

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21835

Log:

fixed a rpc server bug where we failed to remove a call from one
linked list when moving it to another. This could cause a valgrind
error under the RPC-SCANNER test.

Modified:
   branches/SAMBA_4_0/source/rpc_server/dcerpc_server.c
   branches/SAMBA_4_0/source/rpc_server/dcerpc_server.h


Changeset:
Modified: branches/SAMBA_4_0/source/rpc_server/dcerpc_server.c
===
--- branches/SAMBA_4_0/source/rpc_server/dcerpc_server.c2007-03-13 
22:03:04 UTC (rev 21834)
+++ branches/SAMBA_4_0/source/rpc_server/dcerpc_server.c2007-03-13 
22:58:23 UTC (rev 21835)
@@ -401,6 +401,43 @@
 }
 
 /*
+  move a call from an existing linked list to the specified list. This
+  prevents bugs where we forget to remove the call from a previous
+  list when moving it.
+ */
+static void dcesrv_call_set_list(struct dcesrv_call_state *call, 
+enum dcesrv_call_list list)
+{
+   switch (call->list) {
+   case DCESRV_LIST_NONE:
+   break;
+   case DCESRV_LIST_CALL_LIST:
+   DLIST_REMOVE(call->conn->call_list, call);
+   break;
+   case DCESRV_LIST_FRAGMENTED_CALL_LIST:
+   DLIST_REMOVE(call->conn->incoming_fragmented_call_list, call);
+   break;
+   case DCESRV_LIST_PENDING_CALL_LIST:
+   DLIST_REMOVE(call->conn->pending_call_list, call);
+   break;
+   }
+   call->list = list;
+   switch (list) {
+   case DCESRV_LIST_NONE:
+   break;
+   case DCESRV_LIST_CALL_LIST:
+   DLIST_ADD_END(call->conn->call_list, call, struct 
dcesrv_call_state *);
+   break;
+   case DCESRV_LIST_FRAGMENTED_CALL_LIST:
+   DLIST_ADD_END(call->conn->incoming_fragmented_call_list, call, 
struct dcesrv_call_state *);
+   break;
+   case DCESRV_LIST_PENDING_CALL_LIST:
+   DLIST_ADD_END(call->conn->pending_call_list, call, struct 
dcesrv_call_state *);
+   break;
+   }
+}
+
+/*
   return a dcerpc fault
 */
 static NTSTATUS dcesrv_fault(struct dcesrv_call_state *call, uint32_t 
fault_code)
@@ -433,7 +470,7 @@
dcerpc_set_frag_length(&rep->blob, rep->blob.length);
 
DLIST_ADD_END(call->replies, rep, struct data_blob_list_item *);
-   DLIST_ADD_END(call->conn->call_list, call, struct dcesrv_call_state *);
+   dcesrv_call_set_list(call, DCESRV_LIST_CALL_LIST);
 
return NT_STATUS_OK;
 }
@@ -472,7 +509,7 @@
dcerpc_set_frag_length(&rep->blob, rep->blob.length);
 
DLIST_ADD_END(call->replies, rep, struct data_blob_list_item *);
-   DLIST_ADD_END(call->conn->call_list, call, struct dcesrv_call_state *);
+   dcesrv_call_set_list(call, DCESRV_LIST_CALL_LIST);
 
return NT_STATUS_OK;
 }
@@ -612,7 +649,7 @@
dcerpc_set_frag_length(&rep->blob, rep->blob.length);
 
DLIST_ADD_END(call->replies, rep, struct data_blob_list_item *);
-   DLIST_ADD_END(call->conn->call_list, call, struct dcesrv_call_state *);
+   dcesrv_call_set_list(call, DCESRV_LIST_CALL_LIST);
 
return NT_STATUS_OK;
 }
@@ -750,7 +787,7 @@
dcerpc_set_frag_length(&rep->blob, rep->blob.length);
 
DLIST_ADD_END(call->replies, rep, struct data_blob_list_item *);
-   DLIST_ADD_END(call->conn->call_list, call, struct dcesrv_call_state *);
+   dcesrv_call_set_list(call, DCESRV_LIST_CALL_LIST);
 
return NT_STATUS_OK;
 }
@@ -814,7 +851,7 @@
}
 
/* add the call to the pending list */
-   DLIST_ADD_END(call->conn->pending_call_list, call, struct 
dcesrv_call_state *);
+   dcesrv_call_set_list(call, DCESRV_LIST_PENDING_CALL_LIST);
 
if (call->state_flags & DCESRV_CALL_STATE_FLAG_ASYNC) {
return NT_STATUS_OK;
@@ -905,8 +942,7 @@
} while (stub.length != 0);
 
/* move the call from the pending to the finished calls list */
-   DLIST_REMOVE(call->conn->pending_call_list, call);
-   DLIST_ADD_END(call->conn->call_list, call, struct dcesrv_call_state *);
+   dcesrv_call_set_list(call, DCESRV_LIST_CALL_LIST);
 
if (call->conn->call_list && call->conn->call_list->replies) {
if (call->conn->transport.report_output_data) {
@@ -968,6 +1004,15 @@
 }
 
 /*
+  remove the call from the right list when freed
+ */
+static int dcesrv_call_dequeue(struct dcesrv_call_state *call)
+{
+   dcesrv_call_set_list(call, DCESRV_LIST_NONE);
+   return 0;
+}
+
+/*
   process some input to a dcerpc endpoint server.
 */
 NTSTATUS dcesrv_input_process(struct dcesrv_connection *dce_conn)
@@ -987,7 +1032,10 @@
call->msg_ctx   = dce_conn->msg_ctx;
call->state_flags   = call->conn->state_flags;
call-

svn commit: samba r21834 - in branches/SAMBA_4_0: . source/lib/registry/tools

2007-03-13 Thread jelmer

Author: jelmer
Date: 2007-03-13 22:03:04 + (Tue, 13 Mar 2007)
New Revision: 21834

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21834

Log:
Remove unnecessary includes
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/lib/registry/tools/regdiff.c
   branches/SAMBA_4_0/source/lib/registry/tools/regpatch.c
   branches/SAMBA_4_0/source/lib/registry/tools/regshell.c
   branches/SAMBA_4_0/source/lib/registry/tools/regtree.c


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
...skipped...

Modified: branches/SAMBA_4_0/source/lib/registry/tools/regdiff.c
===
--- branches/SAMBA_4_0/source/lib/registry/tools/regdiff.c  2007-03-13 
21:47:57 UTC (rev 21833)
+++ branches/SAMBA_4_0/source/lib/registry/tools/regdiff.c  2007-03-13 
22:03:04 UTC (rev 21834)
@@ -22,7 +22,6 @@
 #include "includes.h"
 #include "lib/registry/registry.h"
 #include "lib/events/events.h"
-#include "lib/registry/reg_backend_rpc.h"
 #include "lib/cmdline/popt_common.h"
 
 int main(int argc, char **argv)

Modified: branches/SAMBA_4_0/source/lib/registry/tools/regpatch.c
===
--- branches/SAMBA_4_0/source/lib/registry/tools/regpatch.c 2007-03-13 
21:47:57 UTC (rev 21833)
+++ branches/SAMBA_4_0/source/lib/registry/tools/regpatch.c 2007-03-13 
22:03:04 UTC (rev 21834)
@@ -23,7 +23,6 @@
 #include "lib/events/events.h"
 #include "lib/registry/registry.h"
 #include "lib/cmdline/popt_common.h"
-#include "lib/registry/reg_backend_rpc.h"
 
 int main(int argc, char **argv)
 {

Modified: branches/SAMBA_4_0/source/lib/registry/tools/regshell.c
===
--- branches/SAMBA_4_0/source/lib/registry/tools/regshell.c 2007-03-13 
21:47:57 UTC (rev 21833)
+++ branches/SAMBA_4_0/source/lib/registry/tools/regshell.c 2007-03-13 
22:03:04 UTC (rev 21834)
@@ -23,7 +23,6 @@
 #include "lib/registry/registry.h"
 #include "lib/cmdline/popt_common.h"
 #include "lib/events/events.h"
-#include "lib/registry/reg_backend_rpc.h"
 #include "system/time.h"
 #include "lib/smbreadline/smbreadline.h"
 #include "librpc/gen_ndr/ndr_security.h"

Modified: branches/SAMBA_4_0/source/lib/registry/tools/regtree.c
===
--- branches/SAMBA_4_0/source/lib/registry/tools/regtree.c  2007-03-13 
21:47:57 UTC (rev 21833)
+++ branches/SAMBA_4_0/source/lib/registry/tools/regtree.c  2007-03-13 
22:03:04 UTC (rev 21834)
@@ -22,7 +22,6 @@
 #include "includes.h"
 #include "lib/registry/registry.h"
 #include "lib/events/events.h"
-#include "lib/registry/reg_backend_rpc.h"
 #include "lib/cmdline/popt_common.h"
 
 static void print_tree(int l, struct registry_key *p, int fullpath, int novals)

svn commit: samba r21833 - in branches/SAMBA_4_0: . source

2007-03-13 Thread jelmer

Author: jelmer
Date: 2007-03-13 21:47:57 + (Tue, 13 Mar 2007)
New Revision: 21833

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21833

Log:
Don't install static libs, they can't be used anyway.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/main.mk


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
...skipped...

Modified: branches/SAMBA_4_0/source/main.mk
===
--- branches/SAMBA_4_0/source/main.mk   2007-03-13 21:00:27 UTC (rev 21832)
+++ branches/SAMBA_4_0/source/main.mk   2007-03-13 21:47:57 UTC (rev 21833)
@@ -140,7 +140,7 @@
 
 installlib: $(INSTALLABLE_SHARED_LIBS) $(STATIC_LIBS) installdirs
@$(SHELL) $(srcdir)/script/installlib.sh $(DESTDIR)$(LIBDIR) 
"$(SHLIBEXT)" $(INSTALLABLE_SHARED_LIBS) 
-   @$(SHELL) $(srcdir)/script/installlib.sh $(DESTDIR)$(LIBDIR) 
"$(STLIBEXT)" $(STATIC_LIBS)
+   [EMAIL PROTECTED](SHELL) $(srcdir)/script/installlib.sh 
$(DESTDIR)$(LIBDIR) "$(STLIBEXT)" $(STATIC_LIBS)
 
 installheader: headers installdirs
@srcdir=$(srcdir) builddir=$(builddir) $(PERL) 
$(srcdir)/script/installheader.pl $(DESTDIR)$(INCLUDEDIR) $(PUBLIC_HEADERS) 
$(DEFAULT_HEADERS)
@@ -174,7 +174,7 @@
 
 uninstalllib:
@$(SHELL) $(srcdir)/script/uninstalllib.sh $(DESTDIR)$(LIBDIR) 
$(SHARED_LIBS)
-   @$(SHELL) $(srcdir)/script/uninstalllib.sh $(DESTDIR)$(LIBDIR) 
$(STATIC_LIBS) 
+   [EMAIL PROTECTED](SHELL) $(srcdir)/script/uninstalllib.sh 
$(DESTDIR)$(LIBDIR) $(STATIC_LIBS) 
 
 uninstallheader:
@$(SHELL) $(srcdir)/script/uninstallheader.sh $(DESTDIR)$(INCLUDEDIR) 
$(PUBLIC_HEADERS)

svn commit: samba r21832 - in branches/SAMBA_4_0: .

2007-03-13 Thread jelmer

Author: jelmer
Date: 2007-03-13 21:00:27 + (Tue, 13 Mar 2007)
New Revision: 21832

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21832

Log:
Ignore some more autogenerated files.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/.bzrignore


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
...skipped...

Modified: branches/SAMBA_4_0/.bzrignore
===
--- branches/SAMBA_4_0/.bzrignore   2007-03-13 20:53:38 UTC (rev 21831)
+++ branches/SAMBA_4_0/.bzrignore   2007-03-13 21:00:27 UTC (rev 21832)
@@ -55,9 +55,7 @@
 source/lib/charset/charset_proto.h
 source/lib/cmdline/credentials.h
 source/lib/ldb/samba/ldif_handlers.h
-source/lib/registry/reg_backend_rpc.h
 source/lib/registry/regf.h
-source/lib/registry/registry_proto.h
 source/lib/registry/tdr_regf.c
 source/lib/registry/tdr_regf.h
 source/lib/samba3/samba3_proto.h
@@ -171,3 +169,5 @@
 webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/translation/messages.pot
 source/torture/ndr/proto.h
 source/bin/modules/*
+source/tests
+source/torture/unix/proto.h

svn commit: samba r21831 - in branches/SAMBA_3_0/source: include libads libsmb passdb utils

2007-03-13 Thread vlendec

Author: vlendec
Date: 2007-03-13 20:53:38 + (Tue, 13 Mar 2007)
New Revision: 21831

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21831

Log:
Back out r21823 for a while, this is going into a bzr tree first.

Volker

Modified:
   branches/SAMBA_3_0/source/include/secrets.h
   branches/SAMBA_3_0/source/libads/util.c
   branches/SAMBA_3_0/source/libsmb/trusts_util.c
   branches/SAMBA_3_0/source/passdb/secrets.c
   branches/SAMBA_3_0/source/utils/net.c
   branches/SAMBA_3_0/source/utils/net_domain.c
   branches/SAMBA_3_0/source/utils/net_rpc_join.c


Changeset:
Modified: branches/SAMBA_3_0/source/include/secrets.h
===
--- branches/SAMBA_3_0/source/include/secrets.h 2007-03-13 20:44:14 UTC (rev 
21830)
+++ branches/SAMBA_3_0/source/include/secrets.h 2007-03-13 20:53:38 UTC (rev 
21831)
@@ -26,7 +26,6 @@
 */
 #define SECRETS_MACHINE_ACCT_PASS "SECRETS/$MACHINE.ACC"
 #define SECRETS_MACHINE_PASSWORD "SECRETS/MACHINE_PASSWORD"
-#define SECRETS_MACHINE_ACCOUNTNAME "SECRETS/MACHINE_ACCOUNTNAME"
 #define SECRETS_MACHINE_LAST_CHANGE_TIME "SECRETS/MACHINE_LAST_CHANGE_TIME"
 #define SECRETS_MACHINE_SEC_CHANNEL_TYPE "SECRETS/MACHINE_SEC_CHANNEL_TYPE"
 #define SECRETS_MACHINE_TRUST_ACCOUNT_NAME 
"SECRETS/SECRETS_MACHINE_TRUST_ACCOUNT_NAME"

Modified: branches/SAMBA_3_0/source/libads/util.c
===
--- branches/SAMBA_3_0/source/libads/util.c 2007-03-13 20:44:14 UTC (rev 
21830)
+++ branches/SAMBA_3_0/source/libads/util.c 2007-03-13 20:53:38 UTC (rev 
21831)
@@ -42,9 +42,7 @@
goto failed;
}
 
-   if (!secrets_store_machine_password(new_password, global_myname(),
-   lp_workgroup(),
-   sec_channel_type)) {
+   if (!secrets_store_machine_password(new_password, lp_workgroup(), 
sec_channel_type)) {
DEBUG(1,("Failed to save machine password\n"));
ret = ADS_ERROR_SYSTEM(EACCES);
goto failed;

Modified: branches/SAMBA_3_0/source/libsmb/trusts_util.c
===
--- branches/SAMBA_3_0/source/libsmb/trusts_util.c  2007-03-13 20:44:14 UTC 
(rev 21830)
+++ branches/SAMBA_3_0/source/libsmb/trusts_util.c  2007-03-13 20:53:38 UTC 
(rev 21831)
@@ -104,10 +104,7 @@
 * Return the result of trying to write the new password
 * back into the trust account file.
 */
-   if (!secrets_store_machine_password(new_trust_passwd,
-   global_myname(),
-   domain,
-   sec_channel_type)) {
+   if (!secrets_store_machine_password(new_trust_passwd, domain, 
sec_channel_type)) {
nt_status = NT_STATUS_UNSUCCESSFUL;
}
}

Modified: branches/SAMBA_3_0/source/passdb/secrets.c
===
--- branches/SAMBA_3_0/source/passdb/secrets.c  2007-03-13 20:44:14 UTC (rev 
21830)
+++ branches/SAMBA_3_0/source/passdb/secrets.c  2007-03-13 20:53:38 UTC (rev 
21831)
@@ -553,10 +553,7 @@
 the password is assumed to be a null terminated ascii string
 /
 
-BOOL secrets_store_machine_password(const char *pass,
-   const char *accountname,
-   const char *domain,
-   uint32 sec_channel)
+BOOL secrets_store_machine_password(const char *pass, const char *domain, 
uint32 sec_channel)
 {
char *key = NULL;
BOOL ret = False;
@@ -584,22 +581,6 @@
goto fail;
}

-   if (asprintf(&key, "%s/%s", SECRETS_MACHINE_ACCOUNTNAME,
-domain) == -1) {
-   DEBUG(5, ("asprintf failed\n"));
-   goto fail;
-   }
-   strupper_m(key);
-
-   ret = secrets_store(key, accountname, strlen(accountname)+1);
-   SAFE_FREE(key);
-
-   if (!ret) {
-   DEBUG(5, ("secrets_store failed: %s\n",
- tdb_errorstr(tdb)));
-   goto fail;
-   }
-   
if (asprintf(&key, "%s/%s", SECRETS_MACHINE_LAST_CHANGE_TIME,
 domain) == -1) {
DEBUG(5, ("asprintf failed\n"));

Modified: branches/SAMBA_3_0/source/utils/net.c
===
--- branches/SAMBA_3_0/source/utils/net.c   2007-03-13 20:44:14 UTC (rev 
21830)
+++ branches/SAMBA_3_0/source/utils/net.c   2007-03-13 20:53:38 UTC (rev 
21831)
@@ -555,9 +555,7 @@
 
trust_pw = get_pass("Enter machine password: ", opt_stdin);
 
-

svn commit: samba r21830 - in branches/SAMBA_4_0: . source source/lib/registry source/torture

2007-03-13 Thread jelmer

Author: jelmer
Date: 2007-03-13 20:44:14 + (Tue, 13 Mar 2007)
New Revision: 21830

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21830

Log:
Fix header installation, remove proto header with a single prototype.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/headermap.txt
   branches/SAMBA_4_0/source/lib/registry/config.mk
   branches/SAMBA_4_0/source/lib/registry/registry.h
   branches/SAMBA_4_0/source/torture/config.mk


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
...skipped...

Modified: branches/SAMBA_4_0/source/headermap.txt
===
--- branches/SAMBA_4_0/source/headermap.txt 2007-03-13 20:26:35 UTC (rev 
21829)
+++ branches/SAMBA_4_0/source/headermap.txt 2007-03-13 20:44:14 UTC (rev 
21830)
@@ -33,8 +33,6 @@
 gtk/common/select.h: gtk/select.h
 librpc/ndr/libndr.h: ndr.h
 lib/registry/registry.h: registry.h
-lib/registry/reg_backend_rpc.h: registry_rpc.h
-lib/registry/registry_proto.h: registry/proto.h
 libcli/util/nterr.h: core/nterr.h
 libcli/util/doserr.h: core/doserr.h
 libcli/util/nt_status.h: core/ntstatus.h

Modified: branches/SAMBA_4_0/source/lib/registry/config.mk
===
--- branches/SAMBA_4_0/source/lib/registry/config.mk2007-03-13 20:26:35 UTC 
(rev 21829)
+++ branches/SAMBA_4_0/source/lib/registry/config.mk2007-03-13 20:44:14 UTC 
(rev 21830)
@@ -52,7 +52,6 @@
 # Start MODULE registry_rpc
 [MODULE::registry_rpc]
 INIT_FUNCTION = registry_rpc_init
-PUBLIC_PROTO_HEADER = reg_backend_rpc.h
 OUTPUT_TYPE = INTEGRATED
 SUBSYSTEM = registry
 OBJ_FILES = \

Modified: branches/SAMBA_4_0/source/lib/registry/registry.h
===
--- branches/SAMBA_4_0/source/lib/registry/registry.h   2007-03-13 20:26:35 UTC 
(rev 21829)
+++ branches/SAMBA_4_0/source/lib/registry/registry.h   2007-03-13 20:44:14 UTC 
(rev 21830)
@@ -188,6 +188,11 @@
struct auth_session_info *session_info, 
struct cli_credentials *credentials);
 
+_PUBLIC_ WERROR reg_open_remote(struct registry_context **ctx, 
+   struct 
auth_session_info *session_info, 
+   struct 
cli_credentials *credentials, 
+   const char 
*location, struct event_context *ev);
+
 _PUBLIC_ NTSTATUS registry_register(const void *_hive_ops);
 _PUBLIC_ NTSTATUS registry_init(void);
 _PUBLIC_ BOOL reg_has_backend(const char *backend);
@@ -232,4 +237,6 @@
 _PUBLIC_ struct reg_diff *reg_diff_load(TALLOC_CTX *ctx, const char *fn);
 _PUBLIC_ BOOL reg_diff_apply (const struct reg_diff *diff, struct 
registry_context *ctx);
 
+NTSTATUS registry_rpc_init(void);
+
 #endif /* _REGISTRY_H */

Modified: branches/SAMBA_4_0/source/torture/config.mk
===
--- branches/SAMBA_4_0/source/torture/config.mk 2007-03-13 20:26:35 UTC (rev 
21829)
+++ branches/SAMBA_4_0/source/torture/config.mk 2007-03-13 20:44:14 UTC (rev 
21830)
@@ -161,7 +161,7 @@
 PUBLIC_DEPENDENCIES = \
NDR_TABLE RPC_NDR_UNIXINFO dcerpc_samr RPC_NDR_WINREG 
RPC_NDR_INITSHUTDOWN \
RPC_NDR_OXIDRESOLVER RPC_NDR_EVENTLOG RPC_NDR_ECHO 
RPC_NDR_SVCCTL \
-   dcerpc_mgmt RPC_NDR_NETLOGON dcerpc_atsvc RPC_NDR_DRSUAPI \
+   RPC_NDR_NETLOGON dcerpc_atsvc RPC_NDR_DRSUAPI \
RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_SPOOLSS \
RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP \
RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER WB_HELPER LIBSAMBA-NET \

svn commit: samba r21829 - in branches/SAMBA_4_0: . source/librpc

2007-03-13 Thread jelmer

Author: jelmer
Date: 2007-03-13 20:26:35 + (Tue, 13 Mar 2007)
New Revision: 21829

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21829

Log:
 Integrate mgmt in libdcerpc. We have enough libraries as it is and mgmt is 
part of the DCE/RPC standard.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/librpc/config.mk


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
...skipped...

Modified: branches/SAMBA_4_0/source/librpc/config.mk
===
--- branches/SAMBA_4_0/source/librpc/config.mk  2007-03-13 20:08:44 UTC (rev 
21828)
+++ branches/SAMBA_4_0/source/librpc/config.mk  2007-03-13 20:26:35 UTC (rev 
21829)
@@ -405,12 +405,9 @@
 OBJ_FILES = gen_ndr/ndr_initshutdown_c.o
 PUBLIC_DEPENDENCIES = dcerpc NDR_INITSHUTDOWN
 
-[LIBRARY::dcerpc_mgmt]
+[SUBSYSTEM::RPC_NDR_MGMT]
 OBJ_FILES = gen_ndr/ndr_mgmt_c.o
-PUBLIC_DEPENDENCIES = dcerpc NDR_MGMT
-VERSION = 0.0.1
-SO_VERSION = 0
-DESCRIPTION = DCE/RPC client library - MGMT
+PRIVATE_DEPENDENCIES = NDR_MGMT
 
 [SUBSYSTEM::RPC_NDR_PROTECTED_STORAGE]
 OBJ_FILES = gen_ndr/ndr_protected_storage_c.o
@@ -479,7 +476,7 @@
rpc/dcerpc_connect.o
 PRIVATE_DEPENDENCIES = \
samba-socket LIBCLI_RESOLVE LIBCLI_SMB LIBCLI_SMB2 \
-   LIBNDR NDR_DCERPC RPC_NDR_EPMAPPER \
+   LIBNDR NDR_DCERPC RPC_NDR_EPMAPPER RPC_NDR_MGMT \
NDR_SCHANNEL RPC_NDR_NETLOGON \
gensec LIBCLI_AUTH LIBCLI_RAW CREDENTIALS
 # End SUBSYSTEM dcerpc

svn commit: samba r21828 - in branches/SAMBA_4_0: . source/lib/registry

2007-03-13 Thread jelmer

Author: jelmer
Date: 2007-03-13 20:08:44 + (Tue, 13 Mar 2007)
New Revision: 21828

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21828

Log:
Hardcode prototypes, as they're a public API.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/lib/registry/config.mk
   branches/SAMBA_4_0/source/lib/registry/registry.h


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
...skipped...

Modified: branches/SAMBA_4_0/source/lib/registry/config.mk
===
--- branches/SAMBA_4_0/source/lib/registry/config.mk2007-03-13 18:17:31 UTC 
(rev 21827)
+++ branches/SAMBA_4_0/source/lib/registry/config.mk2007-03-13 20:08:44 UTC 
(rev 21828)
@@ -86,7 +86,6 @@
patchfile.o
 PUBLIC_DEPENDENCIES = \
LIBSAMBA-UTIL CHARSET
-PUBLIC_PROTO_HEADER = registry_proto.h
 PUBLIC_HEADERS = registry.h
 # End MODULE registry_ldb
 

Modified: branches/SAMBA_4_0/source/lib/registry/registry.h
===
--- branches/SAMBA_4_0/source/lib/registry/registry.h   2007-03-13 18:17:31 UTC 
(rev 21827)
+++ branches/SAMBA_4_0/source/lib/registry/registry.h   2007-03-13 20:08:44 UTC 
(rev 21828)
@@ -183,6 +183,53 @@
 struct auth_session_info;
 struct event_context;
 
-#include "lib/registry/registry_proto.h"
+_PUBLIC_ WERROR reg_open_local (TALLOC_CTX *mem_ctx, 
+   struct registry_context **ctx, 
+   struct auth_session_info *session_info, 
+   struct cli_credentials *credentials);
 
+_PUBLIC_ NTSTATUS registry_register(const void *_hive_ops);
+_PUBLIC_ NTSTATUS registry_init(void);
+_PUBLIC_ BOOL reg_has_backend(const char *backend);
+_PUBLIC_ int reg_list_predefs(TALLOC_CTX *mem_ctx, char ***predefs, uint32_t 
**hkeys);
+_PUBLIC_ const char *reg_get_predef_name(uint32_t hkey);
+_PUBLIC_ WERROR reg_get_predefined_key_by_name(struct registry_context *ctx, 
const char *name, struct registry_key **key);
+_PUBLIC_ WERROR reg_get_predefined_key(struct registry_context *ctx, uint32_t 
hkey, struct registry_key **key);
+_PUBLIC_ WERROR reg_open_hive(TALLOC_CTX *parent_ctx, const char *backend, 
const char *location, struct auth_session_info *session_info, struct 
cli_credentials *credentials, struct registry_key **root);
+_PUBLIC_ WERROR reg_open_key(TALLOC_CTX *mem_ctx, struct registry_key *parent, 
const char *name, struct registry_key **result);
+_PUBLIC_ WERROR reg_key_get_value_by_index(TALLOC_CTX *mem_ctx, const struct 
registry_key *key, int idx, struct registry_value **val);
+_PUBLIC_ WERROR reg_key_num_subkeys(const struct registry_key *key, uint32_t 
*count);
+_PUBLIC_ WERROR reg_key_num_values(const struct registry_key *key, uint32_t 
*count);
+_PUBLIC_ WERROR reg_key_get_subkey_by_index(TALLOC_CTX *mem_ctx, const struct 
registry_key *key, int idx, struct registry_key **subkey);
+WERROR reg_key_get_subkey_by_name(TALLOC_CTX *mem_ctx, const struct 
registry_key *key, const char *name, struct registry_key **subkey);
+_PUBLIC_ WERROR reg_key_get_value_by_name(TALLOC_CTX *mem_ctx, const struct 
registry_key *key, const char *name, struct registry_value **val);
+_PUBLIC_ WERROR reg_key_del(struct registry_key *parent, const char *name);
+_PUBLIC_ WERROR reg_key_add_name(TALLOC_CTX *mem_ctx, const struct 
registry_key *parent, const char *name, uint32_t access_mask, struct 
security_descriptor *desc, struct registry_key **newkey);
+_PUBLIC_ WERROR reg_val_set(struct registry_key *key, const char *value, 
uint32_t type, DATA_BLOB data);
+_PUBLIC_ WERROR reg_get_sec_desc(TALLOC_CTX *ctx, const struct registry_key 
*key, struct security_descriptor **secdesc);
+_PUBLIC_ WERROR reg_del_value(const struct registry_key *key, const char 
*valname);
+_PUBLIC_ WERROR reg_key_flush(const struct registry_key *key);
+_PUBLIC_ WERROR reg_key_subkeysizes(const struct registry_key *key, uint32_t 
*max_subkeylen, uint32_t *max_subkeysize);
+_PUBLIC_ WERROR reg_key_valuesizes(const struct registry_key *key, uint32_t 
*max_valnamelen, uint32_t *max_valbufsize);
+
+/* Utility functions */
+
+_PUBLIC_ const char *str_regtype(int type);
+_PUBLIC_ char *reg_val_data_string(TALLOC_CTX *mem_ctx, uint32_t type, 
DATA_BLOB *data);
+_PUBLIC_ char *reg_val_description(TALLOC_CTX *mem_ctx, struct registry_value 
*val) ;
+_PUBLIC_ BOOL reg_string_to_val(TALLOC_CTX *mem_ctx, const char *type_str, 
const char *data_str, uint32_t *type, DATA_BLOB *data);
+char *reg_path_win2unix(char *path) ;
+char *reg_path_unix2win(char *path) ;
+WERROR reg_open_key_abs(TALLOC_CTX *mem_ctx, struct registry_context *handle, 
const char *name, struct registry_key **result);
+WERROR reg_key_del_abs(struct registry_context *ctx, const char *path);
+WERROR reg_key_add_abs(TALLOC_CTX *mem_ctx, struc

svn commit: samba r21827 - in branches/SAMBA_4_0/source: libnet torture/rpc

2007-03-13 Thread metze

Author: metze
Date: 2007-03-13 18:17:31 + (Tue, 13 Mar 2007)
New Revision: 21827

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21827

Log:
move comments to the place where the functionality is implemented

metze
Modified:
   branches/SAMBA_4_0/source/libnet/libnet_unbecome_dc.c
   branches/SAMBA_4_0/source/torture/rpc/testjoin.c


Changeset:
Modified: branches/SAMBA_4_0/source/libnet/libnet_unbecome_dc.c
===
--- branches/SAMBA_4_0/source/libnet/libnet_unbecome_dc.c   2007-03-13 
18:12:21 UTC (rev 21826)
+++ branches/SAMBA_4_0/source/libnet/libnet_unbecome_dc.c   2007-03-13 
18:17:31 UTC (rev 21827)
@@ -29,6 +29,162 @@
 #include "dsdb/common/flags.h"
 #include "librpc/gen_ndr/ndr_drsuapi_c.h"
 
+/*
+ * Windows 2003 (w2k3) does the following steps when changing the server role
+ * from domain controller back to domain member
+ *
+ * We mostly do the same.
+ */
+
+/*
+ * lookup DC:
+ * - using nbt name<1C> request and a samlogon mailslot request
+ * or
+ * - using a DNS SRV _ldap._tcp.dc._msdcs. request and a CLDAP netlogon request
+ *
+ * see: unbecomeDC_send_cldap() and unbecomeDC_recv_cldap()
+ */
+
+/*
+ * Open 1st LDAP connection to the DC using admin credentials
+ *
+ * see: unbecomeDC_ldap_connect()
+ */
+
+/*
+ * LDAP search 1st LDAP connection:
+ *
+ * see: unbecomeDC_ldap_rootdse()
+ *
+ * Request:
+ * basedn: ""
+ * scope:  base
+ * filter: (objectClass=*)
+ * attrs:  defaultNamingContext
+ * configurationNamingContext
+ * Result:
+ *  ""
+ * defaultNamingContext:   
+ * configurationNamingContext:CN=Configuration,
+ */
+
+/*
+ * LDAP search 1st LDAP connection:
+ * 
+ * see: unbecomeDC_ldap_computer_object()
+ *
+ * Request:
+ * basedn: 
+ * scope:  sub
+ * filter: 
(&(|(objectClass=user)(objectClass=computer))(sAMAccountName=))
+ * attrs:  distinguishedName
+ * userAccountControl
+ * Result:
+ *  CN=,CN=Domain Controllers,
+ * distinguishedName:  CN=,CN=Domain 
Controllers,
+ * userAccoountControl:532480 <0x82000>
+ */
+
+/*
+ * LDAP search 1st LDAP connection:
+ * 
+ * see: unbecomeDC_ldap_modify_computer()
+ *
+ * Request:
+ * basedn: CN=,CN=Computers,
+ * scope:  base
+ * filter: (objectClass=*)
+ * attrs:  userAccountControl
+ * Result:
+ *  CN=,CN=Computers,
+ * userAccoountControl:532480 <0x82000>
+ */
+
+/*
+ * LDAP modify 1st LDAP connection:
+ *
+ * see: unbecomeDC_ldap_modify_computer()
+ * 
+ * Request (replace):
+ * CN=,CN=Computers,
+ * userAccoountControl:4096 <0x1000>
+ * Result:
+ * 
+ */
+
+/*
+ * LDAP search 1st LDAP connection:
+ * 
+ * see: unbecomeDC_ldap_move_computer()
+ *
+ * Request:
+ * basedn: >
+ * scope:  base
+ * filter: (objectClass=*)
+ * attrs:  1.1
+ * Result:
+ * CN=Computers,
+ */
+
+/*
+ * LDAP search 1st LDAP connection:
+ *
+ * not implemented because it doesn't give any new information
+ *
+ * Request:
+ * basedn: CN=Computers,
+ * scope:  base
+ * filter: (objectClass=*)
+ * attrs:  distinguishedName
+ * Result:
+ * CN=Computers,
+ * distinguishedName:  CN=Computers,
+ */
+
+/*
+ * LDAP modifyRDN 1st LDAP connection:
+ * 
+ * see: unbecomeDC_ldap_move_computer()
+ *
+ * Request:
+ *  entry: CN=,CN=Domain 
Controllers,
+ * newrdn: CN=
+ * deleteoldrdn:   TRUE
+ * newparent:  CN=Computers,
+ * Result:
+ * 
+ */
+
+/*
+ * LDAP unbind on the 1st LDAP connection
+ *
+ * not implemented, because it's not needed...
+ */
+
+/*
+ * Open 1st DRSUAPI connection to the DC using admin credentials
+ * DsBind with DRSUAPI_DS_BIND_GUID ("e24d201a-4fd6-11d1-a3da-f875ae0d")
+ *
+ * see:unbecomeDC_drsuapi_connect_send(), 
unbecomeDC_drsuapi_connect_recv(),
+ * unbecomeDC_drsuapi_bind_send() and unbecomeDC_drsuapi_bind_recv()
+ */
+
+/*
+ * DsRemoveDsServer to remove the 
+ * 
CN=,CN=Servers,CN=,CN=Configuration,
+ * and CN=NTDS 
Settings,CN=,CN=Servers,CN=,CN=Configuration,
+ * on the 1st DRSUAPI connection
+ *
+ * see: unbecomeDC_drsuapi_remove_ds_server_send() and 
unbecomeDC_drsuapi_remove_ds_server_recv()
+ */
+
+/*
+ * DsUnbind on the 1st DRSUAPI connection
+ *
+ * not implemented, because it's not needed...
+ */
+
+
 struct libnet_UnbecomeDC_state {
struct composite_context *creq;
 

Modified: branches/SAMBA_4_0/source/torture/rpc/testjoin.c
===
--- branches/SAMBA_4_0/source/torture/rpc/testjoin.c2007-03-13 18:12:21 UTC 
(rev 21826)
+++ branches/SAMBA_4_0/source/torture/rpc/testjoin.c2007-03-13 18:17:31 UTC 
(rev 21827)
@@ -672,127 +672,8 @@

svn commit: samba r21826 - in branches/SAMBA_4_0/source/libnet: .

2007-03-13 Thread metze

Author: metze
Date: 2007-03-13 18:12:21 + (Tue, 13 Mar 2007)
New Revision: 21826

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21826

Log:
reorder functions

metze
Modified:
   branches/SAMBA_4_0/source/libnet/libnet_unbecome_dc.c


Changeset:
Modified: branches/SAMBA_4_0/source/libnet/libnet_unbecome_dc.c
===
--- branches/SAMBA_4_0/source/libnet/libnet_unbecome_dc.c   2007-03-13 
17:39:06 UTC (rev 21825)
+++ branches/SAMBA_4_0/source/libnet/libnet_unbecome_dc.c   2007-03-13 
18:12:21 UTC (rev 21826)
@@ -94,6 +94,31 @@
} dest_dsa;
 };
 
+static void unbecomeDC_recv_cldap(struct cldap_request *req);
+
+static void unbecomeDC_send_cldap(struct libnet_UnbecomeDC_state *s)
+{
+   struct composite_context *c = s->creq;
+   struct cldap_request *req;
+
+   s->cldap.io.in.dest_address = s->source_dsa.address;
+   s->cldap.io.in.realm= s->domain.dns_name;
+   s->cldap.io.in.host = s->dest_dsa.netbios_name;
+   s->cldap.io.in.user = NULL;
+   s->cldap.io.in.domain_guid  = NULL;
+   s->cldap.io.in.domain_sid   = NULL;
+   s->cldap.io.in.acct_control = -1;
+   s->cldap.io.in.version  = 6;
+
+   s->cldap.sock = cldap_socket_init(s, s->libnet->event_ctx);
+   if (composite_nomem(s->cldap.sock, c)) return;
+
+   req = cldap_netlogon_send(s->cldap.sock, &s->cldap.io);
+   if (composite_nomem(req, c)) return;
+   req->async.fn   = unbecomeDC_recv_cldap;
+   req->async.private  = s;
+}
+
 static void unbecomeDC_connect_ldap(struct libnet_UnbecomeDC_state *s);
 
 static void unbecomeDC_recv_cldap(struct cldap_request *req)
@@ -120,29 +145,6 @@
unbecomeDC_connect_ldap(s);
 }
 
-static void unbecomeDC_send_cldap(struct libnet_UnbecomeDC_state *s)
-{
-   struct composite_context *c = s->creq;
-   struct cldap_request *req;
-
-   s->cldap.io.in.dest_address = s->source_dsa.address;
-   s->cldap.io.in.realm= s->domain.dns_name;
-   s->cldap.io.in.host = s->dest_dsa.netbios_name;
-   s->cldap.io.in.user = NULL;
-   s->cldap.io.in.domain_guid  = NULL;
-   s->cldap.io.in.domain_sid   = NULL;
-   s->cldap.io.in.acct_control = -1;
-   s->cldap.io.in.version  = 6;
-
-   s->cldap.sock = cldap_socket_init(s, s->libnet->event_ctx);
-   if (composite_nomem(s->cldap.sock, c)) return;
-
-   req = cldap_netlogon_send(s->cldap.sock, &s->cldap.io);
-   if (composite_nomem(req, c)) return;
-   req->async.fn   = unbecomeDC_recv_cldap;
-   req->async.private  = s;
-}
-
 static NTSTATUS unbecomeDC_ldap_connect(struct libnet_UnbecomeDC_state *s)
 {
char *url;

svn commit: samba-docs r1061 - in trunk/smbdotconf: logging printing

2007-03-13 Thread herb

Author: herb
Date: 2007-03-13 17:40:17 + (Tue, 13 Mar 2007)
New Revision: 1061

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-docs&rev=1061

Log:
add documentation for debug prefix timestamp
fix missing tag close in printjobusername

Added:
   trunk/smbdotconf/logging/debugprefixtimestamp.xml
Modified:
   trunk/smbdotconf/printing/printjobusername.xml


Changeset:
Added: trunk/smbdotconf/logging/debugprefixtimestamp.xml
===
--- trunk/smbdotconf/logging/debugprefixtimestamp.xml   2007-03-08 01:42:35 UTC 
(rev 1060)
+++ trunk/smbdotconf/logging/debugprefixtimestamp.xml   2007-03-13 17:40:17 UTC 
(rev 1061)
@@ -0,0 +1,19 @@
+http://www.samba.org/samba/DTD/samba-doc";>
+
+
+With this option enabled, the timestamp message header is prefixed to the 
debug message without the
+filename and function information that is included with the  
+parameter. This gives timestamps to the messages without adding an 
additional line.
+
+
+
+Note that this parameter overrides the  parameter.
+
+
+
+no
+

Modified: trunk/smbdotconf/printing/printjobusername.xml
===
--- trunk/smbdotconf/printing/printjobusername.xml  2007-03-08 01:42:35 UTC 
(rev 1060)
+++ trunk/smbdotconf/printing/printjobusername.xml  2007-03-13 17:40:17 UTC 
(rev 1061)
@@ -3,11 +3,12 @@
 type="string"
 print="1"
  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc";>
- 
+
 This parameter specifies which user information will be 
 passed to the printing system. Usually, the username is sent,
 but in some cases, e.g. the domain prefix is useful, too.
-   
+
+
 printing
 
 %D\%U

svn commit: samba r21825 - in branches: SAMBA_3_0/source/lib SAMBA_3_0/source/param SAMBA_3_0_25/source/lib SAMBA_3_0_25/source/param

2007-03-13 Thread herb

Author: herb
Date: 2007-03-13 17:39:06 + (Tue, 13 Mar 2007)
New Revision: 21825

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21825

Log:
add debug prefix timestamp to allow "short timestamps" to be
added to debug messages

Modified:
   branches/SAMBA_3_0/source/lib/debug.c
   branches/SAMBA_3_0/source/param/loadparm.c
   branches/SAMBA_3_0_25/source/lib/debug.c
   branches/SAMBA_3_0_25/source/param/loadparm.c


Changeset:
Modified: branches/SAMBA_3_0/source/lib/debug.c
===
--- branches/SAMBA_3_0/source/lib/debug.c   2007-03-13 17:05:04 UTC (rev 
21824)
+++ branches/SAMBA_3_0/source/lib/debug.c   2007-03-13 17:39:06 UTC (rev 
21825)
@@ -962,7 +962,7 @@
/* Print the header if timestamps are turned on.  If parameters are
 * not yet loaded, then default to timestamps on.
 */
-   if( lp_timestamp_logs() || !(lp_loaded()) ) {
+   if( lp_timestamp_logs() || lp_debug_prefix_timestamp() || 
!(lp_loaded()) ) {
char header_str[200];
 
header_str[0] = '\0';
@@ -980,9 +980,15 @@
}
   
/* Print it all out at once to prevent split syslog output. */
-   (void)Debug1( "[%s, %d%s] %s:%s(%d)\n",
+   if( lp_debug_prefix_timestamp() ) {
+   (void)Debug1( "[%s, %d%s] ",
current_timestring(lp_debug_hires_timestamp()), level,
+   header_str);
+   } else {
+   (void)Debug1( "[%s, %d%s] %s:%s(%d)\n",
+   current_timestring(lp_debug_hires_timestamp()), level,
header_str, file, func, line );
+   }
}
 
errno = old_errno;

Modified: branches/SAMBA_3_0/source/param/loadparm.c
===
--- branches/SAMBA_3_0/source/param/loadparm.c  2007-03-13 17:05:04 UTC (rev 
21824)
+++ branches/SAMBA_3_0/source/param/loadparm.c  2007-03-13 17:39:06 UTC (rev 
21825)
@@ -290,6 +290,7 @@
BOOL bClientNTLMv2Auth;
BOOL bClientPlaintextAuth;
BOOL bClientUseSpnego;
+   BOOL bDebugPrefixTimestamp;
BOOL bDebugHiresTimestamp;
BOOL bDebugPid;
BOOL bDebugUid;
@@ -952,6 +953,7 @@
{"max log size", P_INTEGER, P_GLOBAL, &Globals.max_log_size, NULL, 
NULL, FLAG_ADVANCED}, 
{"debug timestamp", P_BOOL, P_GLOBAL, &Globals.bTimestampLogs, NULL, 
NULL, FLAG_ADVANCED}, 
{"timestamp logs", P_BOOL, P_GLOBAL, &Globals.bTimestampLogs, NULL, 
NULL, FLAG_ADVANCED}, 
+   {"debug prefix timestamp", P_BOOL, P_GLOBAL, 
&Globals.bDebugPrefixTimestamp, NULL, NULL, FLAG_ADVANCED}, 
{"debug hires timestamp", P_BOOL, P_GLOBAL, 
&Globals.bDebugHiresTimestamp, NULL, NULL, FLAG_ADVANCED}, 
{"debug pid", P_BOOL, P_GLOBAL, &Globals.bDebugPid, NULL, NULL, 
FLAG_ADVANCED}, 
{"debug uid", P_BOOL, P_GLOBAL, &Globals.bDebugUid, NULL, NULL, 
FLAG_ADVANCED}, 
@@ -1516,6 +1518,7 @@
Globals.bSyslogOnly = False;
Globals.bTimestampLogs = True;
string_set(&Globals.szLogLevel, "0");
+   Globals.bDebugPrefixTimestamp = False;
Globals.bDebugHiresTimestamp = False;
Globals.bDebugPid = False;
Globals.bDebugUid = False;
@@ -1947,6 +1950,7 @@
 FN_GLOBAL_INTEGER(lp_server_schannel, &Globals.serverSchannel)
 FN_GLOBAL_BOOL(lp_syslog_only, &Globals.bSyslogOnly)
 FN_GLOBAL_BOOL(lp_timestamp_logs, &Globals.bTimestampLogs)
+FN_GLOBAL_BOOL(lp_debug_prefix_timestamp, &Globals.bDebugPrefixTimestamp)
 FN_GLOBAL_BOOL(lp_debug_hires_timestamp, &Globals.bDebugHiresTimestamp)
 FN_GLOBAL_BOOL(lp_debug_pid, &Globals.bDebugPid)
 FN_GLOBAL_BOOL(lp_debug_uid, &Globals.bDebugUid)

Modified: branches/SAMBA_3_0_25/source/lib/debug.c
===
--- branches/SAMBA_3_0_25/source/lib/debug.c2007-03-13 17:05:04 UTC (rev 
21824)
+++ branches/SAMBA_3_0_25/source/lib/debug.c2007-03-13 17:39:06 UTC (rev 
21825)
@@ -962,7 +962,7 @@
/* Print the header if timestamps are turned on.  If parameters are
 * not yet loaded, then default to timestamps on.
 */
-   if( lp_timestamp_logs() || !(lp_loaded()) ) {
+   if( lp_timestamp_logs() || lp_debug_prefix_timestamp() || 
!(lp_loaded()) ) {
char header_str[200];
 
header_str[0] = '\0';
@@ -980,9 +980,15 @@
}
   
/* Print it all out at once to prevent split syslog output. */
-   (void)Debug1( "[%s, %d%s] %s:%s(%d)\n",
+   if( lp_debug_prefix_timestamp() ) {
+   (void)Debug1( "[%s, %d%s] ",
current_timestring(lp_debug_hires_timestamp()), level,
+   header_str);
+   } else {
+   (void)Debug1( "[%s, %d%s] %s:%s(%d)\n",
+   curr

svn commit: samba r21824 - in branches/SAMBA_3_0_25: .

2007-03-13 Thread jerry

Author: jerry
Date: 2007-03-13 17:05:04 + (Tue, 13 Mar 2007)
New Revision: 21824

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21824

Log:
fix typo in release notes
Modified:
   branches/SAMBA_3_0_25/WHATSNEW.txt


Changeset:
Modified: branches/SAMBA_3_0_25/WHATSNEW.txt
===
--- branches/SAMBA_3_0_25/WHATSNEW.txt  2007-03-13 16:13:24 UTC (rev 21823)
+++ branches/SAMBA_3_0_25/WHATSNEW.txt  2007-03-13 17:05:04 UTC (rev 21824)
@@ -304,7 +304,7 @@
 
 
 o   Jiri Sasek <[EMAIL PROTECTED]>
-* I Fix possible NULL dereference in adt_tree.c
+* Fix possible NULL dereference in adt_tree.c
 
 
 o   Karolin Seeger <[EMAIL PROTECTED]>

svn commit: samba r21823 - in branches/SAMBA_3_0/source: include libads libsmb passdb utils

2007-03-13 Thread vlendec

Author: vlendec
Date: 2007-03-13 16:13:24 + (Tue, 13 Mar 2007)
New Revision: 21823

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21823

Log:
Let secrets_store_machine_password() also store the account name. Not used
yet, the next step will be a secrets_fetch_machine_account() function that
also pulls the account name to be used in the appropriate places.

Volker

Modified:
   branches/SAMBA_3_0/source/include/secrets.h
   branches/SAMBA_3_0/source/libads/util.c
   branches/SAMBA_3_0/source/libsmb/trusts_util.c
   branches/SAMBA_3_0/source/passdb/secrets.c
   branches/SAMBA_3_0/source/utils/net.c
   branches/SAMBA_3_0/source/utils/net_domain.c
   branches/SAMBA_3_0/source/utils/net_rpc_join.c


Changeset:
Modified: branches/SAMBA_3_0/source/include/secrets.h
===
--- branches/SAMBA_3_0/source/include/secrets.h 2007-03-13 16:04:17 UTC (rev 
21822)
+++ branches/SAMBA_3_0/source/include/secrets.h 2007-03-13 16:13:24 UTC (rev 
21823)
@@ -26,6 +26,7 @@
 */
 #define SECRETS_MACHINE_ACCT_PASS "SECRETS/$MACHINE.ACC"
 #define SECRETS_MACHINE_PASSWORD "SECRETS/MACHINE_PASSWORD"
+#define SECRETS_MACHINE_ACCOUNTNAME "SECRETS/MACHINE_ACCOUNTNAME"
 #define SECRETS_MACHINE_LAST_CHANGE_TIME "SECRETS/MACHINE_LAST_CHANGE_TIME"
 #define SECRETS_MACHINE_SEC_CHANNEL_TYPE "SECRETS/MACHINE_SEC_CHANNEL_TYPE"
 #define SECRETS_MACHINE_TRUST_ACCOUNT_NAME 
"SECRETS/SECRETS_MACHINE_TRUST_ACCOUNT_NAME"

Modified: branches/SAMBA_3_0/source/libads/util.c
===
--- branches/SAMBA_3_0/source/libads/util.c 2007-03-13 16:04:17 UTC (rev 
21822)
+++ branches/SAMBA_3_0/source/libads/util.c 2007-03-13 16:13:24 UTC (rev 
21823)
@@ -42,7 +42,9 @@
goto failed;
}
 
-   if (!secrets_store_machine_password(new_password, lp_workgroup(), 
sec_channel_type)) {
+   if (!secrets_store_machine_password(new_password, global_myname(),
+   lp_workgroup(),
+   sec_channel_type)) {
DEBUG(1,("Failed to save machine password\n"));
ret = ADS_ERROR_SYSTEM(EACCES);
goto failed;

Modified: branches/SAMBA_3_0/source/libsmb/trusts_util.c
===
--- branches/SAMBA_3_0/source/libsmb/trusts_util.c  2007-03-13 16:04:17 UTC 
(rev 21822)
+++ branches/SAMBA_3_0/source/libsmb/trusts_util.c  2007-03-13 16:13:24 UTC 
(rev 21823)
@@ -104,7 +104,10 @@
 * Return the result of trying to write the new password
 * back into the trust account file.
 */
-   if (!secrets_store_machine_password(new_trust_passwd, domain, 
sec_channel_type)) {
+   if (!secrets_store_machine_password(new_trust_passwd,
+   global_myname(),
+   domain,
+   sec_channel_type)) {
nt_status = NT_STATUS_UNSUCCESSFUL;
}
}

Modified: branches/SAMBA_3_0/source/passdb/secrets.c
===
--- branches/SAMBA_3_0/source/passdb/secrets.c  2007-03-13 16:04:17 UTC (rev 
21822)
+++ branches/SAMBA_3_0/source/passdb/secrets.c  2007-03-13 16:13:24 UTC (rev 
21823)
@@ -553,7 +553,10 @@
 the password is assumed to be a null terminated ascii string
 /
 
-BOOL secrets_store_machine_password(const char *pass, const char *domain, 
uint32 sec_channel)
+BOOL secrets_store_machine_password(const char *pass,
+   const char *accountname,
+   const char *domain,
+   uint32 sec_channel)
 {
char *key = NULL;
BOOL ret = False;
@@ -581,6 +584,22 @@
goto fail;
}

+   if (asprintf(&key, "%s/%s", SECRETS_MACHINE_ACCOUNTNAME,
+domain) == -1) {
+   DEBUG(5, ("asprintf failed\n"));
+   goto fail;
+   }
+   strupper_m(key);
+
+   ret = secrets_store(key, accountname, strlen(accountname)+1);
+   SAFE_FREE(key);
+
+   if (!ret) {
+   DEBUG(5, ("secrets_store failed: %s\n",
+ tdb_errorstr(tdb)));
+   goto fail;
+   }
+   
if (asprintf(&key, "%s/%s", SECRETS_MACHINE_LAST_CHANGE_TIME,
 domain) == -1) {
DEBUG(5, ("asprintf failed\n"));

Modified: branches/SAMBA_3_0/source/utils/net.c
===
--- branches/SAMBA_3_0/source/utils/net.c   2007-03-13 16:04:17 UTC (rev 
21822)
+++ branches/SAMBA_3_0/source/utils/net.c

svn commit: samba r21822 - in branches: SAMBA_3_0/source SAMBA_3_0/source/libads SAMBA_3_0_25/source SAMBA_3_0_25/source/libads

2007-03-13 Thread gd

Author: gd
Date: 2007-03-13 16:04:17 + (Tue, 13 Mar 2007)
New Revision: 21822

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21822

Log:
Adding experimental krb5 lib locator plugin.

This is a starting point and may get changed. Basically we need follow the
exact same path to detect (K)DCs like other Samba tools/winbind do. In
particular with regard to the server affinity cache and the site-awarness for
DNS SRV lookups.

To compile just call "make bin/smb_krb5_locator.so", copy to
/usr/lib/plugin/krb5/ (Heimdal HEAD) or /usr/lib/krb5/plugins/libkrb5/ (MIT)
and you should immediately be able to kinit to your AD domain without having
your REALM with kdc or kpasswd directives defined in /etc/krb5.conf at all.

Tested with todays Heimdal HEAD and MIT krb5 1.5.

Guenther

Added:
   branches/SAMBA_3_0/source/libads/smb_krb5_locator.c
   branches/SAMBA_3_0_25/source/libads/smb_krb5_locator.c
Modified:
   branches/SAMBA_3_0/source/Makefile.in
   branches/SAMBA_3_0/source/configure.in
   branches/SAMBA_3_0_25/source/Makefile.in
   branches/SAMBA_3_0_25/source/configure.in


Changeset:
Sorry, the patch is too large (899 lines) to include; please use WebSVN to see 
it!
WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21822

svn commit: samba r21821 - in branches/SAMBA_4_0/source: libnet torture/rpc

2007-03-13 Thread metze

Author: metze
Date: 2007-03-13 15:41:25 + (Tue, 13 Mar 2007)
New Revision: 21821

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21821

Log:
move comment about the becoming a dc to the code which implements it
and extent the comments a bit

metze
Modified:
   branches/SAMBA_4_0/source/libnet/libnet_become_dc.c
   branches/SAMBA_4_0/source/torture/rpc/testjoin.c


Changeset:
Sorry, the patch is too large (1109 lines) to include; please use WebSVN to see 
it!
WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21821

svn commit: samba r21820 - in branches/SAMBA_4_0/source/libnet: .

2007-03-13 Thread metze

Author: metze
Date: 2007-03-13 14:32:20 + (Tue, 13 Mar 2007)
New Revision: 21820

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21820

Log:
move function, so that all are in top-down order as they get called

metze
Modified:
   branches/SAMBA_4_0/source/libnet/libnet_become_dc.c


Changeset:
Modified: branches/SAMBA_4_0/source/libnet/libnet_become_dc.c
===
--- branches/SAMBA_4_0/source/libnet/libnet_become_dc.c 2007-03-13 14:05:38 UTC 
(rev 21819)
+++ branches/SAMBA_4_0/source/libnet/libnet_become_dc.c 2007-03-13 14:32:20 UTC 
(rev 21820)
@@ -87,6 +87,31 @@
struct libnet_BecomeDC_Callbacks callbacks;
 };
 
+static void becomeDC_recv_cldap(struct cldap_request *req);
+
+static void becomeDC_send_cldap(struct libnet_BecomeDC_state *s)
+{
+   struct composite_context *c = s->creq;
+   struct cldap_request *req;
+
+   s->cldap.io.in.dest_address = s->source_dsa.address;
+   s->cldap.io.in.realm= s->domain.dns_name;
+   s->cldap.io.in.host = s->dest_dsa.netbios_name;
+   s->cldap.io.in.user = NULL;
+   s->cldap.io.in.domain_guid  = NULL;
+   s->cldap.io.in.domain_sid   = NULL;
+   s->cldap.io.in.acct_control = -1;
+   s->cldap.io.in.version  = 6;
+
+   s->cldap.sock = cldap_socket_init(s, s->libnet->event_ctx);
+   if (composite_nomem(s->cldap.sock, c)) return;
+
+   req = cldap_netlogon_send(s->cldap.sock, &s->cldap.io);
+   if (composite_nomem(req, c)) return;
+   req->async.fn   = becomeDC_recv_cldap;
+   req->async.private  = s;
+}
+
 static void becomeDC_connect_ldap1(struct libnet_BecomeDC_state *s);
 
 static void becomeDC_recv_cldap(struct cldap_request *req)
@@ -115,29 +140,6 @@
becomeDC_connect_ldap1(s);
 }
 
-static void becomeDC_send_cldap(struct libnet_BecomeDC_state *s)
-{
-   struct composite_context *c = s->creq;
-   struct cldap_request *req;
-
-   s->cldap.io.in.dest_address = s->source_dsa.address;
-   s->cldap.io.in.realm= s->domain.dns_name;
-   s->cldap.io.in.host = s->dest_dsa.netbios_name;
-   s->cldap.io.in.user = NULL;
-   s->cldap.io.in.domain_guid  = NULL;
-   s->cldap.io.in.domain_sid   = NULL;
-   s->cldap.io.in.acct_control = -1;
-   s->cldap.io.in.version  = 6;
-
-   s->cldap.sock = cldap_socket_init(s, s->libnet->event_ctx);
-   if (composite_nomem(s->cldap.sock, c)) return;
-
-   req = cldap_netlogon_send(s->cldap.sock, &s->cldap.io);
-   if (composite_nomem(req, c)) return;
-   req->async.fn   = becomeDC_recv_cldap;
-   req->async.private  = s;
-}
-
 static NTSTATUS becomeDC_ldap_connect(struct libnet_BecomeDC_state *s, struct 
becomeDC_ldap *ldap)
 {
char *url;

svn commit: samba r21819 - in branches/SAMBA_3_0/source/passdb: .

2007-03-13 Thread vlendec

Author: vlendec
Date: 2007-03-13 14:05:38 + (Tue, 13 Mar 2007)
New Revision: 21819

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21819

Log:
Wrap all steps in secrets_store_machine_password into one single
transaction. Succeed all or store nothing.

Volker

Modified:
   branches/SAMBA_3_0/source/passdb/secrets.c


Changeset:
Modified: branches/SAMBA_3_0/source/passdb/secrets.c
===
--- branches/SAMBA_3_0/source/passdb/secrets.c  2007-03-13 12:45:20 UTC (rev 
21818)
+++ branches/SAMBA_3_0/source/passdb/secrets.c  2007-03-13 14:05:38 UTC (rev 
21819)
@@ -556,40 +556,78 @@
 BOOL secrets_store_machine_password(const char *pass, const char *domain, 
uint32 sec_channel)
 {
char *key = NULL;
-   BOOL ret;
+   BOOL ret = False;
uint32 last_change_time;
uint32 sec_channel_type;
 
-   asprintf(&key, "%s/%s", SECRETS_MACHINE_PASSWORD, domain);
-   if (!key) 
+   if (tdb_transaction_start(tdb) == -1) {
+   DEBUG(5, ("tdb_transaction_start failed: %s\n",
+ tdb_errorstr(tdb)));
return False;
+   }
+
+   if (asprintf(&key, "%s/%s", SECRETS_MACHINE_PASSWORD, domain) == -1) {
+   DEBUG(5, ("asprintf failed\n"));
+   goto fail;
+   }
strupper_m(key);
 
ret = secrets_store(key, pass, strlen(pass)+1);
SAFE_FREE(key);
 
-   if (!ret)
-   return ret;
+   if (!ret) {
+   DEBUG(5, ("secrets_store failed: %s\n",
+ tdb_errorstr(tdb)));
+   goto fail;
+   }

-   asprintf(&key, "%s/%s", SECRETS_MACHINE_LAST_CHANGE_TIME, domain);
-   if (!key) 
-   return False;
+   if (asprintf(&key, "%s/%s", SECRETS_MACHINE_LAST_CHANGE_TIME,
+domain) == -1) {
+   DEBUG(5, ("asprintf failed\n"));
+   goto fail;
+   }
strupper_m(key);
 
SIVAL(&last_change_time, 0, time(NULL));
ret = secrets_store(key, &last_change_time, sizeof(last_change_time));
SAFE_FREE(key);
 
-   asprintf(&key, "%s/%s", SECRETS_MACHINE_SEC_CHANNEL_TYPE, domain);
-   if (!key) 
-   return False;
+   if (!ret) {
+   DEBUG(5, ("secrets_store failed: %s\n",
+ tdb_errorstr(tdb)));
+   goto fail;
+   }
+   
+   if (asprintf(&key, "%s/%s", SECRETS_MACHINE_SEC_CHANNEL_TYPE,
+domain) == -1) {
+   DEBUG(5, ("asprintf failed\n"));
+   goto fail;
+   }
strupper_m(key);
 
SIVAL(&sec_channel_type, 0, sec_channel);
ret = secrets_store(key, &sec_channel_type, sizeof(sec_channel_type));
SAFE_FREE(key);
 
-   return ret;
+   if (!ret) {
+   DEBUG(5, ("secrets_store failed: %s\n",
+ tdb_errorstr(tdb)));
+   goto fail;
+   }
+
+   if (tdb_transaction_commit(tdb) != 0) {
+   DEBUG(5, ("tdb_transaction_commit failed: %s\n",
+ tdb_errorstr(tdb)));
+   return False;
+   }
+
+   return True;
+
+ fail:
+   if (tdb_transaction_cancel(tdb) != 0) {
+   smb_panic("tdb_transaction_cancel failed!\n");
+   }
+   return False;
 }
 
 /

svn commit: samba r21818 - in branches/SAMBA_3_0/source/passdb: .

2007-03-13 Thread vlendec

Author: vlendec
Date: 2007-03-13 12:45:20 + (Tue, 13 Mar 2007)
New Revision: 21818

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21818

Log:
Remove some unused code
Modified:
   branches/SAMBA_3_0/source/passdb/secrets.c


Changeset:
Modified: branches/SAMBA_3_0/source/passdb/secrets.c
===
--- branches/SAMBA_3_0/source/passdb/secrets.c  2007-03-13 11:10:48 UTC (rev 
21817)
+++ branches/SAMBA_3_0/source/passdb/secrets.c  2007-03-13 12:45:20 UTC (rev 
21818)
@@ -500,20 +500,6 @@
return True;
 }
 
-/
- Routine to set the trust account password for a domain.
-/
-
-BOOL secrets_store_trust_account_password(const char *domain, uint8 
new_pwd[16])
-{
-   struct machine_acct_pass pass;
-
-   pass.mod_time = time(NULL);
-   memcpy(pass.hash, new_pwd, 16);
-
-   return secrets_store(trust_keystr(domain), (void *)&pass, sizeof(pass));
-}
-
 /**
  * Routine to store the password for trusted domain
  *
@@ -656,15 +642,6 @@
 }
 
 /
- Routine to delete the machine trust account password file for a domain.
-/
-
-BOOL trust_password_delete(const char *domain)
-{
-   return secrets_delete(trust_keystr(domain));
-}
-
-/
  Routine to delete the password for trusted domain
 /

svn commit: samba r21817 - in branches/SAMBA_4_0/source: librpc/idl torture/rpc

2007-03-13 Thread metze

Author: metze
Date: 2007-03-13 11:10:48 + (Tue, 13 Mar 2007)
New Revision: 21817

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21817

Log:
give fields a meaning

metze
Modified:
   branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl
   branches/SAMBA_4_0/source/torture/rpc/drsuapi.c


Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl2007-03-13 07:30:26 UTC 
(rev 21816)
+++ branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl2007-03-13 11:10:48 UTC 
(rev 21817)
@@ -162,8 +162,8 @@
 
typedef struct {
drsuapi_DsReplicaObjectIdentifier *naming_context;
-   GUID guid1;
-   astring *string1;
+   GUID source_dsa_guid;
+   astring *other_info; /* I assume this is related to the 
repsFromTo1OtherInfo dns_name */
drsuapi_DsReplicaSyncOptions options;
} drsuapi_DsReplicaSyncRequest1;
 

Modified: branches/SAMBA_4_0/source/torture/rpc/drsuapi.c
===
--- branches/SAMBA_4_0/source/torture/rpc/drsuapi.c 2007-03-13 07:30:26 UTC 
(rev 21816)
+++ branches/SAMBA_4_0/source/torture/rpc/drsuapi.c 2007-03-13 11:10:48 UTC 
(rev 21817)
@@ -448,8 +448,8 @@
nc.dn   = 
priv->domain_obj_dn?priv->domain_obj_dn:"";
 
r.in.req.req1.naming_context= &nc;
-   r.in.req.req1.guid1 = 
priv->dcinfo.ntds_guid;
-   r.in.req.req1.string1   = NULL;
+   r.in.req.req1.source_dsa_guid   = 
priv->dcinfo.ntds_guid;
+   r.in.req.req1.other_info= NULL;
r.in.req.req1.options   = 16;
break;
}

Re: svn commit: samba r21814 - in branches: SAMBA_3_0/source/librpc/ndr SAMBA_4_0/source/librpc/ndr

2007-03-13 Thread Stefan (metze) Metzmacher

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

[EMAIL PROTECTED] schrieb:
> Author: tridge
> Date: 2007-03-13 04:42:49 + (Tue, 13 Mar 2007)
> New Revision: 21814
> 
> WebSVN: 
> http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21814
> 
> Log:
> use ndr_push_error in the ndr layer, not just a NTSTATUS failure

I just wanted to ask about this:-)

metze
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.5 (GNU/Linux)
Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org

iD8DBQFF9mn6m70gjA5TCD8RAnBCAJ92pvsFeroJlicqteEkLUiE1BDb6QCg0W94
7nK6gv4dOFSkzXoo/HRdnqg=
=26Ra
-END PGP SIGNATURE-

38 matches

Mail list logo