From 5a32a8491df9d81d54c3eb12e7b86abac7091bba Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Tue, 18 Feb 2003 05:08:09 +0000
Subject: We don't use mkproto stuff for the python extensions anymore. (This
 used to be commit 8d166ae093655a5a14a7478c7a84474b43e8ee97)

---
 source3/Makefile.in | 29 -----------------------------
 1 file changed, 29 deletions(-)

(limited to 'source3')

diff --git a/source3/Makefile.in b/source3/Makefile.in
index c3b70f9986..bd41d9636c 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1067,35 +1067,6 @@ PYTHON_OBJS = $(LIB_OBJ) $(LIBSMB_OBJ) $(RPC_PARSE_OBJ) $(UBIQX_OBJ) \
 	$(PARAM_OBJ) $(LIBMSRPC_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
 	$(SECRETS_OBJ) $(KRBCLIENT_OBJ)
 
-PY_SPOOLSS_PROTO_OBJ = python/py_spoolss.o \
-		python/py_spoolss_printers.o python/py_spoolss_printers_conv.o\
-		python/py_spoolss_forms.o python/py_spoolss_forms_conv.o \
-		python/py_spoolss_ports.o python/py_spoolss_ports_conv.o \
-		python/py_spoolss_drivers.o python/py_spoolss_drivers_conv.o \
-		python/py_spoolss_jobs.o python/py_spoolss_jobs_conv.o \
-		python/py_spoolss_printerdata.o
-
-PY_LSA_PROTO_OBJ = python/py_lsa.o
-
-PY_COMMON_PROTO_OBJ = python/py_common.c python/py_ntsec.c
-
-python_proto: python_spoolss_proto python_lsa_proto python_common_proto
-
-python_spoolss_proto:
-	@cd $(srcdir) && $(SHELL) script/mkproto.sh $(AWK) \
-		-h _PY_SPOOLSS_PROTO_H python/py_spoolss_proto.h \
-		$(PY_SPOOLSS_PROTO_OBJ)
-
-python_lsa_proto:
-	@cd $(srcdir) && $(SHELL) script/mkproto.sh $(AWK) \
-		-h _PY_LSA_PROTO_H python/py_lsa_proto.h \
-		$(PY_LSA_PROTO_OBJ)
-
-python_common_proto:
-	@cd $(srcdir) && $(SHELL) script/mkproto.sh $(AWK) \
-		-h _PY_COMMON_PROTO_H python/py_common_proto.h \
-		$(PY_COMMON_PROTO_OBJ)
-
 python_ext: $(PYTHON_OBJS)
 	@if test -z "$(PYTHON)"; then \
 		echo Use the option --with-python to configure python; \
-- 
cgit 


From 030beddfb3c5208256c08b3cd2620332113f6308 Mon Sep 17 00:00:00 2001
From: Rafal Szczesniak <mimir@samba.org>
Date: Tue, 18 Feb 2003 14:59:21 +0000
Subject: Fix of two warnings. pull_ucs2_talloc function takes char** pointer,
 not (here explicitly casted) void** one.

Rafal
(This used to be commit e77c44efd95d42a8194f5c3d36c043f8e84dfd1d)
---
 source3/libads/ldap_printer.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'source3')

diff --git a/source3/libads/ldap_printer.c b/source3/libads/ldap_printer.c
index 87ea058896..f5cd4f2885 100644
--- a/source3/libads/ldap_printer.c
+++ b/source3/libads/ldap_printer.c
@@ -85,8 +85,7 @@ static BOOL map_sz(TALLOC_CTX *ctx, ADS_MODLIST *mods,
 		return False;
 
 	if (value->size && *((smb_ucs2_t *) value->data_p)) {
-		pull_ucs2_talloc(ctx, (void **) &str_value, 
-				 (const smb_ucs2_t *) value->data_p);
+		pull_ucs2_talloc(ctx, &str_value, (const smb_ucs2_t *) value->data_p);
 		status = ads_mod_str(ctx, mods, value->valuename, str_value);
 		return ADS_ERR_OK(status);
 	}
@@ -155,9 +154,8 @@ static BOOL map_multi_sz(TALLOC_CTX *ctx, ADS_MODLIST *mods,
 
 		cur_str = (smb_ucs2_t *) value->data_p;
 		for (i=0; i < num_vals; i++)
-			cur_str += pull_ucs2_talloc(ctx, 
-						    (void **) &str_values[i], 
-						    cur_str);
+			cur_str += pull_ucs2_talloc(ctx, &str_values[i],
+			                            cur_str);
 
 		status = ads_mod_strlist(ctx, mods, value->valuename, 
 					 (const char **) str_values);
-- 
cgit 


From c536b88b2b71c264a1e31ada51e463fee5cb949b Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 18 Feb 2003 18:34:48 +0000
Subject: Use the new modules stuff to load dynrpc modules. Basically this
 means: - calling the initialization function in the module init_module()
 instead of rpc_pipe_init() - calling smb_load_module() to do the dlopen(),
 dlsym() and init_module() calls

I'll merge this to 3.0, together with the smb_load_module() function.

Discussed with Anthony.
(This used to be commit 3757ed8df06ca2b306bef336bdb9c7671f5e6a65)
---
 source3/rpc_server/srv_dfs.c     |  2 +-
 source3/rpc_server/srv_lsa.c     |  2 +-
 source3/rpc_server/srv_netlog.c  |  2 +-
 source3/rpc_server/srv_pipe.c    | 31 ++++++-------------------------
 source3/rpc_server/srv_reg.c     |  2 +-
 source3/rpc_server/srv_samr.c    |  2 +-
 source3/rpc_server/srv_spoolss.c |  2 +-
 source3/rpc_server/srv_srvsvc.c  |  2 +-
 source3/rpc_server/srv_wkssvc.c  |  2 +-
 9 files changed, 14 insertions(+), 33 deletions(-)

(limited to 'source3')

diff --git a/source3/rpc_server/srv_dfs.c b/source3/rpc_server/srv_dfs.c
index f6e9ca3d56..14c1cb4088 100644
--- a/source3/rpc_server/srv_dfs.c
+++ b/source3/rpc_server/srv_dfs.c
@@ -159,7 +159,7 @@ static BOOL api_dfs_enum(pipes_struct *p)
 ********************************************************************/
 
 #ifdef RPC_DFS_DYNAMIC
-int rpc_pipe_init(void)
+int init_module(void)
 #else
 int rpc_dfs_init(void)
 #endif
diff --git a/source3/rpc_server/srv_lsa.c b/source3/rpc_server/srv_lsa.c
index fad8f5641a..0e4039326b 100644
--- a/source3/rpc_server/srv_lsa.c
+++ b/source3/rpc_server/srv_lsa.c
@@ -772,7 +772,7 @@ static BOOL api_lsa_remove_acct_rights(pipes_struct *p)
  ***************************************************************************/
 
 #ifdef RPC_LSA_DYNAMIC
-int rpc_pipe_init(void)
+int init_module(void)
 #else
 int rpc_lsa_init(void)
 #endif
diff --git a/source3/rpc_server/srv_netlog.c b/source3/rpc_server/srv_netlog.c
index f377d3952b..c9e4fc1b1f 100644
--- a/source3/rpc_server/srv_netlog.c
+++ b/source3/rpc_server/srv_netlog.c
@@ -322,7 +322,7 @@ static BOOL api_net_logon_ctrl(pipes_struct *p)
  ********************************************************************/
 
 #ifdef RPC_NETLOG_DYNAMIC
-int rpc_pipe_init(void)
+int init_module(void)
 #else
 int rpc_net_init(void)
 #endif
diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
index 50127005a1..0b8b7b229a 100644
--- a/source3/rpc_server/srv_pipe.c
+++ b/source3/rpc_server/srv_pipe.c
@@ -794,42 +794,23 @@ int rpc_pipe_register_commands(const char *clnt, const char *srv, const struct a
 /*******************************************************************
  Register commands to an RPC pipe
 *******************************************************************/
-int rpc_load_module(const char *module)
+NTSTATUS rpc_load_module(const char *module)
 {
-#ifdef HAVE_DLOPEN
-        void *handle;
-        int (*module_init)(void);
         pstring full_path;
-        char *error;
+		NTSTATUS status;
         
         pstrcpy(full_path, lib_path("rpc"));
         pstrcat(full_path, "/librpc_");
         pstrcat(full_path, module);
         pstrcat(full_path, ".");
         pstrcat(full_path, shlib_ext());
-
-        handle = sys_dlopen(full_path, RTLD_LAZY);
-        if (!handle) {
+		
+		if (!NT_STATUS_IS_OK(status = smb_load_module(full_path)))  {
                 DEBUG(0, ("Could not load requested pipe %s as %s\n", 
                     module, full_path));
-                DEBUG(0, (" Error: %s\n", dlerror()));
-                return 0;
         }
         
-        DEBUG(3, ("Module '%s' loaded\n", full_path));
-        
-        module_init = sys_dlsym(handle, "rpc_pipe_init");
-        if ((error = sys_dlerror()) != NULL) {
-                DEBUG(0, ("Error trying to resolve symbol 'rpc_pipe_init' in %s: %s\n",
-                          full_path, error));
-                return 0;
-        }
-        
-        return module_init();
-#else
-        DEBUG(0,("Attempting to load a dynamic RPC pipe when dlopen isn't available\n"));
-        return 0;
-#endif
+		return status;
 }
 
 /*******************************************************************
@@ -877,7 +858,7 @@ BOOL api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p)
                        }
                 }
 
-                if (!api_fd_commands[i].name && !rpc_load_module(p->name)) {
+                if (!api_fd_commands[i].name && !NT_STATUS_IS_OK(rpc_load_module(p->name))) {
                        DEBUG(3,("api_pipe_bind_req: Unknown pipe name %s in bind request.\n",
                                 p->name ));
                        if(!setup_bind_nak(p))
diff --git a/source3/rpc_server/srv_reg.c b/source3/rpc_server/srv_reg.c
index 04960f8e3a..8fc1d42b2f 100644
--- a/source3/rpc_server/srv_reg.c
+++ b/source3/rpc_server/srv_reg.c
@@ -374,7 +374,7 @@ static BOOL api_reg_save_key(pipes_struct *p)
  ********************************************************************/
 
 #ifdef RPC_REG_DYNAMIC
-int rpc_pipe_init(void)
+int init_module(void)
 #else
 int rpc_reg_init(void)
 #endif
diff --git a/source3/rpc_server/srv_samr.c b/source3/rpc_server/srv_samr.c
index 3a31ec82e1..b75195ceef 100644
--- a/source3/rpc_server/srv_samr.c
+++ b/source3/rpc_server/srv_samr.c
@@ -1444,7 +1444,7 @@ static BOOL api_samr_set_dom_info(pipes_struct *p)
  ********************************************************************/
 
 #ifdef RPC_SAMR_DYNAMIC
-int rpc_pipe_init(void)
+int init_module(void)
 #else
 int rpc_samr_init(void)
 #endif
diff --git a/source3/rpc_server/srv_spoolss.c b/source3/rpc_server/srv_spoolss.c
index 5832ae876b..3023922a5b 100755
--- a/source3/rpc_server/srv_spoolss.c
+++ b/source3/rpc_server/srv_spoolss.c
@@ -1581,7 +1581,7 @@ static BOOL api_spoolss_replycloseprinter(pipes_struct *p)
 ********************************************************************/
 
 #ifdef RPC_SPOOLSS_DYNAMIC
-int rpc_pipe_init(void)
+int init_module(void)
 #else
 int rpc_spoolss_init(void)
 #endif
diff --git a/source3/rpc_server/srv_srvsvc.c b/source3/rpc_server/srv_srvsvc.c
index 983c660965..7c5e317c87 100644
--- a/source3/rpc_server/srv_srvsvc.c
+++ b/source3/rpc_server/srv_srvsvc.c
@@ -527,7 +527,7 @@ static BOOL api_srv_net_file_set_secdesc(pipes_struct *p)
 ********************************************************************/
 
 #ifdef RPC_SVC_DYNAMIC
-int rpc_pipe_init(void)
+int init_module(void)
 #else
 int rpc_srv_init(void)
 #endif
diff --git a/source3/rpc_server/srv_wkssvc.c b/source3/rpc_server/srv_wkssvc.c
index 1fed2cc6db..e0d662ea80 100644
--- a/source3/rpc_server/srv_wkssvc.c
+++ b/source3/rpc_server/srv_wkssvc.c
@@ -61,7 +61,7 @@ static BOOL api_wks_query_info(pipes_struct *p)
  ********************************************************************/
 
 #ifdef RPC_WKS_DYNAMIC
-int rpc_pipe_init(void)
+int init_module(void)
 #else
 int rpc_wks_init(void)
 #endif
-- 
cgit 


From 5eb7b6113b8d4b59de5177e8b1485dc0c3ae19db Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 18 Feb 2003 18:43:59 +0000
Subject: Add -V option (to print out version) to utilities where possible
 (pdbedit already has a -V option..) (This used to be commit
 5de622968d95c1436dbd34edc8d0a9bbff68916b)

---
 source3/Makefile.in           | 2 +-
 source3/nsswitch/wbinfo.c     | 1 +
 source3/rpcclient/rpcclient.c | 1 +
 source3/rpcclient/samsync.c   | 1 +
 source3/torture/samtest.c     | 1 +
 source3/torture/vfstest.c     | 1 +
 source3/utils/net.c           | 1 +
 source3/utils/ntlm_auth.c     | 1 +
 source3/utils/status.c        | 1 +
 9 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/Makefile.in b/source3/Makefile.in
index bd41d9636c..e04550cf21 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -597,7 +597,7 @@ WINBINDD_OBJ = \
 		$(PROFILE_OBJ) $(UNIGRP_OBJ) \
 		$(SECRETS_OBJ) $(LIBADS_OBJ) $(KRBCLIENT_OBJ)
 
-WBINFO_OBJ = nsswitch/wbinfo.o libsmb/smbencrypt.o libsmb/smbdes.o
+WBINFO_OBJ = nsswitch/wbinfo.o libsmb/smbencrypt.o libsmb/smbdes.o $(POPT_LIB_OBJ)
 
 WINBIND_NSS_OBJ = nsswitch/winbind_nss.o nsswitch/wb_common.o @WINBIND_NSS_EXTRA_OBJS@
 
diff --git a/source3/nsswitch/wbinfo.c b/source3/nsswitch/wbinfo.c
index f03b0493de..68dc178bcd 100644
--- a/source3/nsswitch/wbinfo.c
+++ b/source3/nsswitch/wbinfo.c
@@ -711,6 +711,7 @@ int main(int argc, char **argv)
 		{ "set-auth-user", 'A', POPT_ARG_STRING, &string_arg, OPT_SET_AUTH_USER, "Store user and password used by winbindd (root only)", "user%password" },
 		{ "get-auth-user", 0, POPT_ARG_NONE, NULL, OPT_GET_AUTH_USER, "Retrieve user and password used by winbindd (root only)", NULL },
 		{ "ping", 'p', POPT_ARG_NONE, 0, 'p', "'ping' winbindd to see if it is alive" },
+		{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version},
 		{ 0, 0, 0, 0 }
 	};
 
diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c
index 81bb62486a..37ce597d4e 100644
--- a/source3/rpcclient/rpcclient.c
+++ b/source3/rpcclient/rpcclient.c
@@ -585,6 +585,7 @@ out_free:
 		{"dest-ip", 'I', POPT_ARG_STRING,   &opt_ipaddr, 'I', "Specify destination IP address", "IP"},
 		{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_debug },
 		{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_configfile },
+		{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version},
 		{ NULL }
 	};
 
diff --git a/source3/rpcclient/samsync.c b/source3/rpcclient/samsync.c
index f941d70e5e..a4061d2a87 100644
--- a/source3/rpcclient/samsync.c
+++ b/source3/rpcclient/samsync.c
@@ -632,6 +632,7 @@ struct poptOption popt_common_interactive[] = {
 		  "Replicate SAM changes" },
 		{ "serial", 0, POPT_ARG_INT, &serial, 0, "SAM serial number" },
 		{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_debug },
+		{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version},
 		{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_auth_info },
 		{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_interactive },
 		POPT_AUTOHELP
diff --git a/source3/torture/samtest.c b/source3/torture/samtest.c
index 17444c0757..a1ccec098b 100644
--- a/source3/torture/samtest.c
+++ b/source3/torture/samtest.c
@@ -369,6 +369,7 @@ int main(int argc, char *argv[])
 		{"command",	'e', POPT_ARG_STRING,	&cmdstr, 'e', "Execute semicolon seperated cmds"},
 		{"logfile",	'l', POPT_ARG_STRING,	&opt_logfile, 'l', "Logfile to use instead of stdout"},
 		{"configfile", 'c', POPT_ARG_STRING, &config_file, 0,"use different configuration file",NULL},
+		{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version},
 		{ 0, 0, 0, 0}
 	};
 
diff --git a/source3/torture/vfstest.c b/source3/torture/vfstest.c
index 78d22a07ac..fef189844b 100644
--- a/source3/torture/vfstest.c
+++ b/source3/torture/vfstest.c
@@ -495,6 +495,7 @@ int main(int argc, char *argv[])
 		{"command",	'c', POPT_ARG_STRING,	&cmdstr, 0, "Execute specified list of commands" },
 		{"logfile",	'l', POPT_ARG_STRING,	&opt_logfile, 'l', "Write output to specified logfile" },
 		{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_debug },
+		{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version},
 		{ 0, 0, 0, 0}
 	};
 
diff --git a/source3/utils/net.c b/source3/utils/net.c
index 33195375f5..ada0ed53e1 100644
--- a/source3/utils/net.c
+++ b/source3/utils/net.c
@@ -537,6 +537,7 @@ static struct functable net_func[] = {
 		{"timeout",	't', POPT_ARG_INT,    &opt_timeout},
 		{"machine-pass",'P', POPT_ARG_NONE,   &opt_machine_pass},
 		{"debuglevel",  'd', POPT_ARG_STRING, &debuglevel},
+		{NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version},
 		{ 0, 0, 0, 0}
 	};
 
diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c
index 9e4318def3..b76308c55f 100644
--- a/source3/utils/ntlm_auth.c
+++ b/source3/utils/ntlm_auth.c
@@ -466,6 +466,7 @@ int main(int argc, const char **argv)
 		{ "password", 0, POPT_ARG_STRING, &password, OPT_PASSWORD, "User's plaintext password"},		
 		{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_debug },
 		{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_configfile },
+		{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version},
 		{ 0, 0, 0, 0 }
 	};
 
diff --git a/source3/utils/status.c b/source3/utils/status.c
index 094dc0ff1c..8014b133d9 100644
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -560,6 +560,7 @@ static int traverse_sessionid(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, vo
 #endif /* WITH_PROFILE */
 		{"byterange",	'B', POPT_ARG_NONE,	&show_brl, 'B', "Include byte range locks"},
 		{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_debug },
+		{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version},
 		{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_configfile },
 		{ 0, 0, 0, 0}
 	};
-- 
cgit 


From 1d278baf06a0560b1e069a945b6db4af1c4f6f5e Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Wed, 19 Feb 2003 00:13:23 +0000
Subject: Remove reference to obsolete samba-bugs address. (This used to be
 commit 8e5f2ac3ca0b4cfb910f38532efb63526f28b579)

---
 source3/change-log | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/change-log b/source3/change-log
index 1f7798b541..71f5012484 100644
--- a/source3/change-log
+++ b/source3/change-log
@@ -2,7 +2,7 @@ SUPERCEDED Change Log for Samba
 ^^^^^^^^^^
 
 Unless otherwise attributed, all changes were made by 
-Andrew.Tridgell@anu.edu.au. All bugs to samba-bugs@samba.org.
+Andrew.Tridgell@anu.edu.au.
 
 NOTE: THIS LOG IS IN CHRONOLOGICAL ORDER
 
-- 
cgit 


From a0913929ef6f1e34ff2654e8773c8bf45c6230af Mon Sep 17 00:00:00 2001
From: Jim McDonough <jmcd@samba.org>
Date: Wed, 19 Feb 2003 00:27:38 +0000
Subject: base64_decode() with heimdal libs, so I've renamed it
 base64_decode_inplace(). (This used to be commit
 8c69212eeb4a0ec144b960d76319fd4940b8c239)

---
 source3/lib/util_str.c | 2 +-
 source3/web/cgi.c      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3')

diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c
index 8fe04f0f58..cc4b6fe5c5 100644
--- a/source3/lib/util_str.c
+++ b/source3/lib/util_str.c
@@ -1585,7 +1585,7 @@ DATA_BLOB base64_decode_data_blob(const char *s)
 /**
  * Decode a base64 string in-place - wrapper for the above
  **/
-void base64_decode(char *s)
+void base64_decode_inplace(char *s)
 {
 	DATA_BLOB decoded = base64_decode_data_blob(s);
 	memcpy(s, decoded.data, decoded.length);
diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 46f33789bf..8abc2f0bd5 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -306,7 +306,7 @@ static BOOL cgi_handle_authorization(char *line)
 	}
 	line += 6;
 	while (line[0] == ' ') line++;
-	base64_decode(line);
+	base64_decode_inplace(line);
 	if (!(p=strchr_m(line,':'))) {
 		/*
 		 * Always give the same error so a cracker
-- 
cgit 


From e354fd27cb05f9d6259ca480831e325d17cfefea Mon Sep 17 00:00:00 2001
From: Jim McDonough <jmcd@samba.org>
Date: Wed, 19 Feb 2003 00:50:38 +0000
Subject: Add support for detecting method of listing encryption types (MIT v
 Heimdal) (This used to be commit 48dcf5b97f2d53617c41237e09369ec678ab65e9)

---
 source3/configure.in | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'source3')

diff --git a/source3/configure.in b/source3/configure.in
index 77553cf5b7..b90d99bf3d 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -2194,6 +2194,9 @@ fi
   AC_CHECK_LIB(krb5, krb5_auth_con_setkey, [AC_DEFINE(HAVE_KRB5_AUTH_CON_SETKEY,1,[Whether krb5_auth_con_setkey is available])])
   AC_CHECK_LIB(krb5, krb5_auth_con_setuseruserkey, [AC_DEFINE(HAVE_KRB5_AUTH_CON_SETUSERUSERKEY,1,[Whether krb5_auth_con_setuseruserkey is available])])
   AC_CHECK_LIB(krb5, krb5_locate_kdc, [AC_DEFINE(HAVE_KRB5_LOCATE_KDC,1,[Whether krb5_locate_kdc is available])])
+  AC_CHECK_LIB(krb5, krb5_get_permitted_enctypes, [AC_DEFINE(HAVE_KRB5_GET_PERMITTED_ENCTYPES,1,[Whether krb5_get_permitted_enctypes is available])])
+  AC_CHECK_LIB(krb5, krb5_get_default_in_tkt_etypes, [AC_DEFINE(HAVE_KRB5_GET_DEFAULT_IN_TKT_ETYPES,1,[Whether krb5_get_default_in_tkt_etypes is available])])
+  AC_CHECK_LIB(krb5, krb5_free_ktypes, [AC_DEFINE(HAVE_KRB5_FREE_KTYPES,1,[Whether krb5_free_ktypes is available])])
 
 AC_CACHE_CHECK([for addrtype in krb5_address],samba_cv_HAVE_ADDRTYPE_IN_KRB5_ADDRESS,[
 AC_TRY_COMPILE([#include <krb5.h>],
-- 
cgit 


From adfefcdcb6e9d8ea0458a11b6f684a5cf231c3ba Mon Sep 17 00:00:00 2001
From: Jim McDonough <jmcd@samba.org>
Date: Wed, 19 Feb 2003 01:16:40 +0000
Subject: Try to get heimdal working with HEAD. - Provide generic functions for
   - get valid encryption types   - free encryption types - Add encryption
 type parm to generic function create_kerberos_key_from_string() - Try to
 merge the two versions (between HEAD and SAMBA_3_0) of kerberos_verify.c

I think this should work for both MIT and heimdal, in HEAD.  If all goes smooth,
I'll move it over to 3.0 soon...
(This used to be commit 45e409fc8da9f26cf888e13d004392660d7c55d4)
---
 source3/include/includes.h       |  5 +++--
 source3/libads/kerberos_verify.c | 27 +++++++--------------------
 source3/libsmb/clikrb5.c         | 38 ++++++++++++++++++++++++++++++++++----
 3 files changed, 44 insertions(+), 26 deletions(-)

(limited to 'source3')

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 988913d16c..c5738f0a61 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -1224,11 +1224,12 @@ krb5_error_code krb5_auth_con_setuseruserkey(krb5_context context, krb5_auth_con
 
 /* Samba wrapper function for krb5 functionality. */
 void setup_kaddr( krb5_address *pkaddr, struct sockaddr *paddr);
-int create_kerberos_key_from_string(krb5_context context, krb5_principal host_princ, krb5_data *password, krb5_keyblock *key);
+int create_kerberos_key_from_string(krb5_context context, krb5_principal host_princ, krb5_data *password, krb5_keyblock *key, krb5_enctype enctype);
 void get_auth_data_from_tkt(DATA_BLOB *auth_data, krb5_ticket *tkt);
 krb5_const_principal get_principal_from_tkt(krb5_ticket *tkt);
 krb5_error_code krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, struct sockaddr **addr_pp, int *naddrs, int get_masters);
-
+krb5_error_code get_kerberos_allowed_etypes(krb5_context context, krb5_enctype **enctypes);
+void free_kerberos_etypes(krb5_context context, krb5_enctype *enctypes);
 #endif /* HAVE_KRB5 */
 
 #endif /* _INCLUDES_H */
diff --git a/source3/libads/kerberos_verify.c b/source3/libads/kerberos_verify.c
index c1402b1370..17fecf60c8 100644
--- a/source3/libads/kerberos_verify.c
+++ b/source3/libads/kerberos_verify.c
@@ -36,8 +36,6 @@ NTSTATUS ads_verify_ticket(ADS_STRUCT *ads, const DATA_BLOB *ticket,
 	krb5_keytab keytab = NULL;
 	krb5_data packet;
 	krb5_ticket *tkt = NULL;
-	krb5_data salt;
-	krb5_encrypt_block eblock;
 	int ret, i;
 	krb5_keyblock * key;
 	krb5_principal host_princ;
@@ -92,17 +90,11 @@ NTSTATUS ads_verify_ticket(ADS_STRUCT *ads, const DATA_BLOB *ticket,
 		return NT_STATUS_LOGON_FAILURE;
 	}
 
-	ret = krb5_principal2salt(context, host_princ, &salt);
-	if (ret) {
-		DEBUG(1,("krb5_principal2salt failed (%s)\n", error_message(ret)));
-		return NT_STATUS_LOGON_FAILURE;
-	}
-    
 	if (!(key = (krb5_keyblock *)malloc(sizeof(*key)))) {
 		return NT_STATUS_NO_MEMORY;
 	}
 	
-	if ((ret = krb5_get_permitted_enctypes(context, &enctypes))) {
+	if ((ret = get_kerberos_allowed_etypes(context, &enctypes))) {
 		DEBUG(1,("krb5_get_permitted_enctypes failed (%s)\n", 
 			 error_message(ret)));
 		return NT_STATUS_LOGON_FAILURE;
@@ -110,10 +102,7 @@ NTSTATUS ads_verify_ticket(ADS_STRUCT *ads, const DATA_BLOB *ticket,
 
 	/* we need to setup a auth context with each possible encoding type in turn */
 	for (i=0;enctypes[i];i++) {
-		krb5_use_enctype(context, &eblock, enctypes[i]);
-
-		ret = krb5_string_to_key(context, &eblock, key, &password, &salt);
-		if (ret) {
+		if (create_kerberos_key_from_string(context, host_princ, &password, key, enctypes[i])) {
 			continue;
 		}
 
@@ -124,7 +113,7 @@ NTSTATUS ads_verify_ticket(ADS_STRUCT *ads, const DATA_BLOB *ticket,
 
 		if (!(ret = krb5_rd_req(context, &auth_context, &packet, 
 				       NULL, keytab, NULL, &tkt))) {
-			krb5_free_ktypes(context, enctypes);
+			free_kerberos_etypes(context, enctypes);
 			auth_ok = True;
 			break;
 		}
@@ -133,6 +122,7 @@ NTSTATUS ads_verify_ticket(ADS_STRUCT *ads, const DATA_BLOB *ticket,
 	if (!auth_ok) {
 		DEBUG(3,("krb5_rd_req with auth failed (%s)\n", 
 			 error_message(ret)));
+		SAFE_FREE(key);
 		return NT_STATUS_LOGON_FAILURE;
 	}
 
@@ -140,11 +130,7 @@ NTSTATUS ads_verify_ticket(ADS_STRUCT *ads, const DATA_BLOB *ticket,
 	file_save("/tmp/ticket.dat", ticket->data, ticket->length);
 #endif
 
-
-	if (tkt->enc_part2) {
-		*auth_data = data_blob(tkt->enc_part2->authorization_data[0]->contents,
-				       tkt->enc_part2->authorization_data[0]->length);
-	}
+	get_auth_data_from_tkt(auth_data, tkt);
 
 #if 0
 	if (tkt->enc_part2) {
@@ -154,7 +140,8 @@ NTSTATUS ads_verify_ticket(ADS_STRUCT *ads, const DATA_BLOB *ticket,
 	}
 #endif
 
-	if ((ret = krb5_unparse_name(context, tkt->enc_part2->client, principal))) {
+	if ((ret = krb5_unparse_name(context, get_principal_from_tkt(tkt),
+				     principal))) {
 		DEBUG(3,("krb5_unparse_name failed (%s)\n", 
 			 error_message(ret)));
 		return NT_STATUS_LOGON_FAILURE;
diff --git a/source3/libsmb/clikrb5.c b/source3/libsmb/clikrb5.c
index e380d80bcc..c13f663381 100644
--- a/source3/libsmb/clikrb5.c
+++ b/source3/libsmb/clikrb5.c
@@ -74,7 +74,8 @@
  int create_kerberos_key_from_string(krb5_context context,
 					krb5_principal host_princ,
 					krb5_data *password,
-					krb5_keyblock *key)
+					krb5_keyblock *key,
+					krb5_enctype enctype)
 {
 	int ret;
 	krb5_data salt;
@@ -85,14 +86,15 @@
 		DEBUG(1,("krb5_principal2salt failed (%s)\n", error_message(ret)));
 		return ret;
 	}
-	krb5_use_enctype(context, &eblock, ENCTYPE_DES_CBC_MD5);
+	krb5_use_enctype(context, &eblock, enctype);
 	return krb5_string_to_key(context, &eblock, key, password, &salt);
 }
 #elif defined(HAVE_KRB5_GET_PW_SALT) && defined(HAVE_KRB5_STRING_TO_KEY_SALT)
  int create_kerberos_key_from_string(krb5_context context,
 					krb5_principal host_princ,
 					krb5_data *password,
-					krb5_keyblock *key)
+					krb5_keyblock *key,
+					krb5_enctype enctype)
 {
 	int ret;
 	krb5_salt salt;
@@ -102,13 +104,41 @@
 		DEBUG(1,("krb5_get_pw_salt failed (%s)\n", error_message(ret)));
 		return ret;
 	}
-	return krb5_string_to_key_salt(context, ENCTYPE_DES_CBC_MD5, password->data,
+	return krb5_string_to_key_salt(context, enctype, password->data,
 		salt, key);
 }
 #else
  __ERROR_XX_UNKNOWN_CREATE_KEY_FUNCTIONS
 #endif
 
+#if defined(HAVE_KRB5_GET_PERMITTED_ENCTYPES)
+krb5_error_code get_kerberos_allowed_etypes(krb5_context context, 
+					    krb5_enctype **enctypes)
+{
+	return krb5_get_permitted_enctypes(context, enctypes);
+}
+#elif defined(HAVE_KRB5_GET_DEFAULT_IN_TKT_ETYPES)
+krb5_error_code get_kerberos_allowed_etypes(krb5_context context, 
+					    krb5_enctype **enctypes)
+{
+	return krb5_get_default_in_tkt_etypes(context, enctypes);
+}
+#else
+ __ERROR_XX_UNKNOWN_GET_ENCTYPES_FUNCTIONS
+#endif
+
+#if defined(HAVE_KRB5_FREE_KTYPES)
+void free_kerberos_etypes(krb5_context context, krb5_enctype *enctypes)
+{
+	return krb5_free_ktypes(context, enctypes);
+}
+#else
+void free_kerberos_etypes(krb5_context context, krb5_enctype *enctypes)
+{
+	return free(enctypes);
+}
+#endif
+
 #if defined(HAVE_KRB5_AUTH_CON_SETKEY) && !defined(HAVE_KRB5_AUTH_CON_SETUSERUSERKEY)
  krb5_error_code krb5_auth_con_setuseruserkey(krb5_context context,
 					krb5_auth_context auth_context,
-- 
cgit 


From e7b5d059c2af0ffb71e3d6b12a35a1dcd3295942 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Wed, 19 Feb 2003 01:38:12 +0000
Subject: Bit of a hack job to prevent smbprn.XXX jobs appearing in the queue
 if the jobid is below the UNIX_JOB_START number. Jeremy. (This used to be
 commit e8a9bf67cbe5b3e33f99e6793fe4ec445d6e8819)

---
 source3/printing/printing.c | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

(limited to 'source3')

diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index 3bf992ad69..c9612ab3a9 100644
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -579,11 +579,13 @@ static uint32 print_parse_jobid(char *fname)
  List a unix job in the print database.
 ****************************************************************************/
 
-static void print_unix_job(int snum, print_queue_struct *q)
+static void print_unix_job(int snum, print_queue_struct *q, uint32 jobid)
 {
-	uint32 jobid = q->job + UNIX_JOB_START;
 	struct printjob pj, *old_pj;
 
+	if (jobid == (uint32)-1)
+		jobid = q->job + UNIX_JOB_START;
+
 	/* Preserve the timestamp on an existing unix print job */
 
 	old_pj = print_job_find(snum, jobid);
@@ -597,11 +599,14 @@ static void print_unix_job(int snum, print_queue_struct *q)
 	pj.status = q->status;
 	pj.size = q->size;
 	pj.spooled = True;
-	pj.smbjob = False;
-	fstrcpy(pj.filename, "");
-	fstrcpy(pj.jobname, q->fs_file);
-	fstrcpy(pj.user, q->fs_user);
-	fstrcpy(pj.queuename, lp_const_servicename(snum));
+	pj.smbjob = (old_pj != NULL ? True : False);
+	fstrcpy(pj.filename, old_pj ? old_pj->filename : "");
+	if (jobid < UNIX_JOB_START)
+		fstrcpy(pj.jobname, old_pj ? old_pj->jobname : "Remote Downlevel Document");
+	else
+		fstrcpy(pj.jobname, old_pj ? old_pj->jobname : q->fs_file);
+	fstrcpy(pj.user, old_pj ? old_pj->user : q->fs_user);
+	fstrcpy(pj.queuename, old_pj ? old_pj->queuename : lp_const_servicename(snum));
 
 	pjob_store(snum, jobid, &pj);
 }
@@ -879,7 +884,7 @@ static void print_queue_update(int snum)
 
 		if (jobid == (uint32)-1) {
 			/* assume its a unix print job */
-			print_unix_job(snum, &queue[i]);
+			print_unix_job(snum, &queue[i], jobid);
 			continue;
 		}
 
@@ -889,7 +894,7 @@ static void print_queue_update(int snum)
 			/* err, somethings wrong. Probably smbd was restarted
 			   with jobs in the queue. All we can do is treat them
 			   like unix jobs. Pity. */
-			print_unix_job(snum, &queue[i]);
+			print_unix_job(snum, &queue[i], jobid);
 			continue;
 		}
 
-- 
cgit 


From b63edf9a28cf81536d45fbbe8021683262ff07a2 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Wed, 19 Feb 2003 02:34:33 +0000
Subject: Fix from Corny.Bondad@hp.com for missing if (setting_acls) on default
 perms. Jeremy. (This used to be commit
 ac96fa173cc3bd1c3226634154d6f99e4034179f)

---
 source3/smbd/posix_acls.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source3')

diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 2739f73b0a..a40fb4042f 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -699,11 +699,11 @@ static BOOL ensure_canon_entry_valid(canon_ace **pp_ace,
 		pace->unix_ug.world = -1;
 		pace->trustee = global_sid_World;
 		pace->attr = ALLOW_ACE;
-		if (setting_acl)
+		if (setting_acl) {
 			pace->perms = 0;
-		else
+			apply_default_perms(fsp, pace, S_IROTH);
+		} else
 			pace->perms = unix_perms_to_acl_perms(pst->st_mode, S_IROTH, S_IWOTH, S_IXOTH);
-		apply_default_perms(fsp, pace, S_IROTH);
 
 		DLIST_ADD(*pp_ace, pace);
 	}
-- 
cgit 


From 3b541bdcfe14d30d961a5de20d382af179c381ee Mon Sep 17 00:00:00 2001
From: Jim McDonough <jmcd@samba.org>
Date: Wed, 19 Feb 2003 03:19:30 +0000
Subject: Get non-krb systems to compile.  How the heck do I keep something
 from being sucked into proto.h? (This used to be commit
 7e84497882df5bf933ab7ae7fe9af3728393202c)

---
 source3/include/includes.h |  2 +-
 source3/libsmb/clikrb5.c   | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'source3')

diff --git a/source3/include/includes.h b/source3/include/includes.h
index c5738f0a61..bb78ae0780 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -1229,7 +1229,7 @@ void get_auth_data_from_tkt(DATA_BLOB *auth_data, krb5_ticket *tkt);
 krb5_const_principal get_principal_from_tkt(krb5_ticket *tkt);
 krb5_error_code krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, struct sockaddr **addr_pp, int *naddrs, int get_masters);
 krb5_error_code get_kerberos_allowed_etypes(krb5_context context, krb5_enctype **enctypes);
-void free_kerberos_etypes(krb5_context context, krb5_enctype *enctypes);
+krb5_error_code free_kerberos_etypes(krb5_context context, krb5_enctype *enctypes);
 #endif /* HAVE_KRB5 */
 
 #endif /* _INCLUDES_H */
diff --git a/source3/libsmb/clikrb5.c b/source3/libsmb/clikrb5.c
index c13f663381..2e07dfdb66 100644
--- a/source3/libsmb/clikrb5.c
+++ b/source3/libsmb/clikrb5.c
@@ -127,17 +127,18 @@ krb5_error_code get_kerberos_allowed_etypes(krb5_context context,
  __ERROR_XX_UNKNOWN_GET_ENCTYPES_FUNCTIONS
 #endif
 
-#if defined(HAVE_KRB5_FREE_KTYPES)
-void free_kerberos_etypes(krb5_context context, krb5_enctype *enctypes)
+ /* the following is defined as krb5_error_code to keep it from
+    being sucked into proto.h */
+krb5_error_code free_kerberos_etypes(krb5_context context, 
+				     krb5_enctype *enctypes)
 {
-	return krb5_free_ktypes(context, enctypes);
-}
+#if defined(HAVE_KRB5_FREE_KTYPES)
+	krb5_free_ktypes(context, enctypes);
 #else
-void free_kerberos_etypes(krb5_context context, krb5_enctype *enctypes)
-{
-	return free(enctypes);
-}
+	SAFE_FREE(enctypes);
 #endif
+	return 0;
+}
 
 #if defined(HAVE_KRB5_AUTH_CON_SETKEY) && !defined(HAVE_KRB5_AUTH_CON_SETUSERUSERKEY)
  krb5_error_code krb5_auth_con_setuseruserkey(krb5_context context,
-- 
cgit 


From f145c2e350db43e401cd477eff89fdef136e7f6c Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 19 Feb 2003 10:12:14 +0000
Subject: Only do a kinit if we got told to use kerberos.

Andrew Bartlett
(This used to be commit 6af9ec50e010d171cf5287f40ec774e79e4a93fe)
---
 source3/libsmb/cliconnect.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'source3')

diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 487b184dd6..c57f92eea9 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -630,19 +630,19 @@ static BOOL cli_session_setup_spnego(struct cli_state *cli, const char *user,
 	/* If password is set we reauthenticate to kerberos server
 	 * and do not store results */
 
-	if (*pass) {
-		int ret;
-
-		use_in_memory_ccache();
-		ret = kerberos_kinit_password(user, pass, 0 /* no time correction for now */);
-
-		if (ret){
-	  		DEBUG(0, ("Kinit failed: %s\n", error_message(ret)));
-			return False;
-		}
-	}
-
 	if (got_kerberos_mechanism && cli->use_kerberos) {
+		if (*pass) {
+			int ret;
+			
+			use_in_memory_ccache();
+			ret = kerberos_kinit_password(user, pass, 0 /* no time correction for now */);
+			
+			if (ret){
+				DEBUG(0, ("Kinit failed: %s\n", error_message(ret)));
+				return False;
+			}
+		}
+		
 		return cli_session_setup_kerberos(cli, principal, workgroup);
 	}
 #endif
-- 
cgit 


From 9e3198cca7068c5125542d661013c7ea48fb7106 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 19 Feb 2003 11:30:09 +0000
Subject: Fix logfile formatting, we were missing a "\n" (This used to be
 commit 53b8f8a44141a9f6d36ed1b237ff65c67119edd0)

---
 source3/smbd/service.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3')

diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index f9d84872d7..1c7e4017b0 100644
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -364,14 +364,14 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser,
 	} else if (vuser) {
 		if (vuser->guest) {
 			if (!lp_guest_ok(snum)) {
-				DEBUG(2, ("guest user (from session setup) not permitted to access this share (%s)", lp_servicename(snum)));
+				DEBUG(2, ("guest user (from session setup) not permitted to access this share (%s)\n", lp_servicename(snum)));
 				      conn_free(conn);
 				      *status = NT_STATUS_ACCESS_DENIED;
 				      return NULL;
 			}
 		} else {
 			if (!user_ok(vuser->user.unix_name, snum, vuser->groups, vuser->n_groups)) {
-				DEBUG(2, ("user '%s' (from session setup) not permitted to access this share (%s)", vuser->user.unix_name, lp_servicename(snum)));
+				DEBUG(2, ("user '%s' (from session setup) not permitted to access this share (%s)\n", vuser->user.unix_name, lp_servicename(snum)));
 				conn_free(conn);
 				*status = NT_STATUS_ACCESS_DENIED;
 				return NULL;
-- 
cgit 


From 231f7375590110046ed67b7b337ac2e12d257736 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 19 Feb 2003 11:30:52 +0000
Subject: After a talloc_zero(), we don't need to ZERO_STRUCTP too.. (This used
 to be commit 4fe8066394143c64c79c052c00f0d747e872103a)

---
 source3/libsmb/ntlmssp.c | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'source3')

diff --git a/source3/libsmb/ntlmssp.c b/source3/libsmb/ntlmssp.c
index e4398dad17..e1509f6b63 100644
--- a/source3/libsmb/ntlmssp.c
+++ b/source3/libsmb/ntlmssp.c
@@ -307,8 +307,6 @@ NTSTATUS ntlmssp_server_start(NTLMSSP_STATE **ntlmssp_state)
 		return NT_STATUS_NO_MEMORY;
 	}
 
-	ZERO_STRUCTP(*ntlmssp_state);
-
 	(*ntlmssp_state)->mem_ctx = mem_ctx;
 	(*ntlmssp_state)->get_challenge = get_challenge;
 
@@ -552,8 +550,6 @@ NTSTATUS ntlmssp_client_start(NTLMSSP_CLIENT_STATE **ntlmssp_state)
 		return NT_STATUS_NO_MEMORY;
 	}
 
-	ZERO_STRUCTP(*ntlmssp_state);
-
 	(*ntlmssp_state)->mem_ctx = mem_ctx;
 
 	(*ntlmssp_state)->get_global_myname = global_myname;
-- 
cgit 


From 1f1125577c000ab72754af00cd83c57fadcc85f1 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 19 Feb 2003 11:33:35 +0000
Subject: Move to a in-memory ccache for winbind, and replace setenv()
 properly. (According to the manpages, you cannot put a stack variable into
 putenv()).

Yes, this leaks memory.

Andrew Bartlett
(This used to be commit 50bced1e26434ecc7474964062746e2831e5f433)
---
 source3/include/includes.h      |  4 ++++
 source3/lib/replace.c           | 18 ++++++++++++++++++
 source3/nsswitch/winbindd.h     | 14 --------------
 source3/nsswitch/winbindd_ads.c |  4 +---
 4 files changed, 23 insertions(+), 17 deletions(-)

(limited to 'source3')

diff --git a/source3/include/includes.h b/source3/include/includes.h
index bb78ae0780..731d94996c 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -966,6 +966,10 @@ size_t strnlen(const char *s, size_t n);
 unsigned long strtoul(const char *nptr, char **endptr, int base);
 #endif
 
+#ifndef HAVE_SETENV
+int setenv(const char *name, const char *value, int overwrite); 
+#endif
+
 #if (defined(USE_SETRESUID) && !defined(HAVE_SETRESUID_DECL))
 /* stupid glibc */
 int setresuid(uid_t ruid, uid_t euid, uid_t suid);
diff --git a/source3/lib/replace.c b/source3/lib/replace.c
index cd48b8d160..0c62ec9bfa 100644
--- a/source3/lib/replace.c
+++ b/source3/lib/replace.c
@@ -447,3 +447,21 @@ char *rep_inet_ntoa(struct in_addr ip)
 	return t;
 }
 #endif
+
+#ifndef HAVE_SETENV
+ int setenv(const char *name, const char *value, int overwrite) 
+{
+	char *p = NULL;
+	int ret = -1;
+
+	asprintf(&p, "%s=%s", name, value);
+
+	if (overwrite || getenv(name)) {
+		if (p) ret = putenv(p);
+	} else {
+		ret = 0;
+	}
+
+	return ret;	
+}
+#endif
diff --git a/source3/nsswitch/winbindd.h b/source3/nsswitch/winbindd.h
index e8bcf76bd3..164b7ffda7 100644
--- a/source3/nsswitch/winbindd.h
+++ b/source3/nsswitch/winbindd.h
@@ -205,18 +205,4 @@ typedef struct {
 
 #define DOM_SEQUENCE_NONE ((uint32)-1)
 
-/* SETENV */
-#if HAVE_SETENV
-#define SETENV(name, value, overwrite) setenv(name,value,overwrite)
-#elif HAVE_PUTENV
-#define SETENV(name, value, overwrite)					 \
-{									 \
-	fstring envvar;							 \
-	slprintf(envvar, sizeof(fstring), "%s=%s", name, value);	 \
-	putenv(envvar);							 \
-}
-#else
-#define SETENV(name, value, overwrite) ;
-#endif
-
 #endif /* _WINBINDD_H */
diff --git a/source3/nsswitch/winbindd_ads.c b/source3/nsswitch/winbindd_ads.c
index 7cea4aa716..be4ed1c667 100644
--- a/source3/nsswitch/winbindd_ads.c
+++ b/source3/nsswitch/winbindd_ads.c
@@ -46,9 +46,7 @@ static ADS_STRUCT *ads_cached_connection(struct winbindd_domain *domain)
 	}
 
 	/* we don't want this to affect the users ccache */
-	ccache = lock_path("winbindd_ccache");
-	SETENV("KRB5CCNAME", ccache, 1);
-	unlink(ccache);
+	setenv("KRB5CCNAME", "MEMORY:winbind_ccache", 1);
 
 	ads = ads_init(domain->alt_name, domain->name, NULL);
 	if (!ads) {
-- 
cgit 


From 39daab943dbf2f24d3d74fba5a8d76ef58b7dabf Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 19 Feb 2003 11:35:02 +0000
Subject: Check return values of various join-related functions, and ensure we
 always compare push_* returns with (size_t)-1, not < 0.

Andrew Bartlett
(This used to be commit 63f5e92536c6bcac54b796d6e91b755e7d328f66)
---
 source3/libads/ldap.c | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

(limited to 'source3')

diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index c92e481078..b7cfc8d84c 100644
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -426,10 +426,10 @@ ADS_STATUS ads_do_paged_search(ADS_STRUCT *ads, const char *bind_path,
 		return ADS_ERROR(LDAP_NO_MEMORY);
 
 	/* 0 means the conversion worked but the result was empty 
-	   so we only fail if it's negative.  In any case, it always 
+	   so we only fail if it's -1.  In any case, it always 
 	   at least nulls out the dest */
-	if ((push_utf8_talloc(ctx, &utf8_exp, exp) < 0) ||
-	    (push_utf8_talloc(ctx, &utf8_path, bind_path) < 0)) {
+	if ((push_utf8_talloc(ctx, &utf8_exp, exp) == (size_t)-1) ||
+	    (push_utf8_talloc(ctx, &utf8_path, bind_path) == (size_t)-1)) {
 		rc = LDAP_NO_MEMORY;
 		goto done;
 	}
@@ -652,8 +652,8 @@ ADS_STATUS ads_do_search(ADS_STRUCT *ads, const char *bind_path, int scope,
 	/* 0 means the conversion worked but the result was empty 
 	   so we only fail if it's negative.  In any case, it always 
 	   at least nulls out the dest */
-	if ((push_utf8_talloc(ctx, &utf8_exp, exp) < 0) ||
-	    (push_utf8_talloc(ctx, &utf8_path, bind_path) < 0)) {
+	if ((push_utf8_talloc(ctx, &utf8_exp, exp) == (size_t)-1) ||
+	    (push_utf8_talloc(ctx, &utf8_path, bind_path) == (size_t)-1)) {
 		DEBUG(1,("ads_do_search: push_utf8_talloc() failed!"));
 		rc = LDAP_NO_MEMORY;
 		goto done;
@@ -1432,8 +1432,8 @@ ADS_STATUS ads_set_machine_sd(ADS_STRUCT *ads, const char *hostname, char *dn)
 	NTSTATUS    status;
 	ADS_STATUS  ret;
 	DOM_SID     sid;
-	SEC_DESC   *psd = 0;
-	TALLOC_CTX *ctx = 0;	
+	SEC_DESC   *psd = NULL;
+	TALLOC_CTX *ctx = NULL;	
 
 	/* Avoid segmentation fault in prs_mem_free if
 	 * we have to bail out before prs_init */
@@ -1464,7 +1464,11 @@ ADS_STATUS ads_set_machine_sd(ADS_STRUCT *ads, const char *hostname, char *dn)
 		goto ads_set_sd_error;
 	}
 
-	ads_pull_sid(ads, msg, attrs[1], &sid);	
+	if (!ads_pull_sid(ads, msg, attrs[1], &sid)) {
+		ret = ADS_ERROR_NT(NT_STATUS_INVALID_PARAMETER);
+		goto ads_set_sd_error;
+	}
+
 	if (!(ctx = talloc_init("sec_io_desc"))) {
 		ret =  ADS_ERROR(LDAP_NO_MEMORY);
 		goto ads_set_sd_error;
@@ -1482,7 +1486,10 @@ ADS_STATUS ads_set_machine_sd(ADS_STRUCT *ads, const char *hostname, char *dn)
 		goto ads_set_sd_error;
 	}
 
-	prs_init(&ps_wire, sd_size, ctx, MARSHALL);
+	if (!prs_init(&ps_wire, sd_size, ctx, MARSHALL)) {
+		ret = ADS_ERROR_NT(NT_STATUS_NO_MEMORY);
+	}
+
 	if (!sec_io_desc("sd_wire", &psd, &ps_wire, 1)) {
 		ret = ADS_ERROR(LDAP_NO_MEMORY);
 		goto ads_set_sd_error;
-- 
cgit 


From 51521fab16c9982200c3c5cd829629a541eb6e29 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 19 Feb 2003 12:05:21 +0000
Subject: Now we have setenv() in replace.c, we don't need a seperate copy
 here.

Andrew Bartlett
(This used to be commit c4834c46902380455d2ea1dd62661224e8d4eb11)
---
 source3/smbwrapper/smbsh.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'source3')

diff --git a/source3/smbwrapper/smbsh.c b/source3/smbwrapper/smbsh.c
index f9697223c4..d853aa1afc 100644
--- a/source3/smbwrapper/smbsh.c
+++ b/source3/smbwrapper/smbsh.c
@@ -92,7 +92,7 @@ int main(int argc, char *argv[])
 		smbw_setshared("PASSWORD", p);
 	}
 
-	smbw_setenv("PS1", "smbsh$ ");
+	setenv("PS1", "smbsh$ ");
 
 	sys_getwd(wd);
 
@@ -101,18 +101,18 @@ int main(int argc, char *argv[])
 	smbw_setshared(line, wd);
 
 	slprintf(line,sizeof(line)-1,"%s/smbwrapper.so", libd);
-	smbw_setenv("LD_PRELOAD", line);
+	etenv("LD_PRELOAD", line);
 
 	slprintf(line,sizeof(line)-1,"%s/smbwrapper.32.so", libd);
 
 	if (file_exist(line, NULL)) {
 		slprintf(line,sizeof(line)-1,"%s/smbwrapper.32.so:DEFAULT", libd);
-		smbw_setenv("_RLD_LIST", line);
+		setenv("_RLD_LIST", line);
 		slprintf(line,sizeof(line)-1,"%s/smbwrapper.so:DEFAULT", libd);
-		smbw_setenv("_RLDN32_LIST", line);
+		setenv("_RLDN32_LIST", line);
 	} else {
 		slprintf(line,sizeof(line)-1,"%s/smbwrapper.so:DEFAULT", libd);
-		smbw_setenv("_RLD_LIST", line);
+		setenv("_RLD_LIST", line);
 	}
 
 	{
-- 
cgit 


From 6540693fea3a61795801cfccd988b5552b8b307f Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 19 Feb 2003 12:19:52 +0000
Subject: Missed one use of SETENV.  (Compat macro no longer needed, as we have
 a replace.c function). (This used to be commit
 adad4c66fcfe756277de8c325ac9f8010f9d6f9c)

---
 source3/nsswitch/winbindd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/nsswitch/winbindd.c b/source3/nsswitch/winbindd.c
index ddda2d5f8b..09b89462ec 100644
--- a/source3/nsswitch/winbindd.c
+++ b/source3/nsswitch/winbindd.c
@@ -790,7 +790,7 @@ static void usage(void)
 	/* Set environment variable so we don't recursively call ourselves.
 	   This may also be useful interactively. */
 
-	SETENV(WINBINDD_DONT_ENV, "1", 1);
+	setenv(WINBINDD_DONT_ENV, "1", 1);
 
 	/* Initialise samba/rpc client stuff */
 
-- 
cgit 


From 02cb49bffae34d0f373f5d400077a7a8b7e809b2 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <ab@samba.org>
Date: Wed, 19 Feb 2003 13:24:06 +0000
Subject: Improve detection of iconv(3) for various platforms. M4 code is
 similar to what I use in Midgard for past few years, modified for Samba
 needs. (This used to be commit 747d2d70a9eb4d9222d7b63e5fcec269eda76672)

---
 source3/aclocal.m4         | 92 ++++++++++++++++++++++++++++++++++++++++++++++
 source3/configure.in       | 60 +++++++++++++++++++++---------
 source3/include/includes.h |  5 +++
 3 files changed, 140 insertions(+), 17 deletions(-)

(limited to 'source3')

diff --git a/source3/aclocal.m4 b/source3/aclocal.m4
index 5b1500106c..345be73aed 100644
--- a/source3/aclocal.m4
+++ b/source3/aclocal.m4
@@ -485,3 +485,95 @@ AC_DEFUN(LIB_REMOVE_USR_LIB,[
   done
   $1=[$]ac_new_flags
 ])
+
+dnl From Bruno Haible.
+
+AC_DEFUN(jm_ICONV,
+[
+  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
+  dnl those with the standalone portable libiconv installed).
+  AC_MSG_CHECKING(for iconv in $1)
+    jm_cv_func_iconv="no"
+    jm_cv_lib_iconv=no
+    jm_cv_giconv=no
+    AC_TRY_LINK([#include <stdlib.h>
+#include <giconv.h>],
+      [iconv_t cd = iconv_open("","");
+       iconv(cd,NULL,NULL,NULL,NULL);
+       iconv_close(cd);],
+      jm_cv_func_iconv=yes
+      jm_cv_giconv=yes)
+
+    if test "$jm_cv_func_iconv" != yes; then
+      AC_TRY_LINK([#include <stdlib.h>
+#include <iconv.h>],
+        [iconv_t cd = iconv_open("","");
+         iconv(cd,NULL,NULL,NULL,NULL);
+         iconv_close(cd);],
+        jm_cv_func_iconv=yes)
+
+        if test "$jm_cv_lib_iconv" != yes; then
+          jm_save_LIBS="$LIBS"
+          LIBS="$LIBS -lgiconv"
+          AC_TRY_LINK([#include <stdlib.h>
+#include <giconv.h>],
+            [iconv_t cd = iconv_open("","");
+             iconv(cd,NULL,NULL,NULL,NULL);
+             iconv_close(cd);],
+            jm_cv_lib_iconv=yes
+            jm_cv_func_iconv=yes
+            jm_cv_giconv=yes)
+          LIBS="$jm_save_LIBS"
+
+      if test "$jm_cv_func_iconv" != yes; then
+        jm_save_LIBS="$LIBS"
+        LIBS="$LIBS -liconv"
+        AC_TRY_LINK([#include <stdlib.h>
+#include <iconv.h>],
+          [iconv_t cd = iconv_open("","");
+           iconv(cd,NULL,NULL,NULL,NULL);
+           iconv_close(cd);],
+          jm_cv_lib_iconv=yes
+          jm_cv_func_iconv=yes)
+        LIBS="$jm_save_LIBS"
+        fi
+      fi
+    fi
+
+  if test "$jm_cv_func_iconv" = yes; then
+    if test "$jm_cv_giconv" = yes; then
+      AC_DEFINE(HAVE_GICONV, 1, [What header to include for iconv() function: giconv.h])
+      AC_MSG_RESULT(yes)
+      ICONV_FOUND=yes
+    else
+      AC_DEFINE(HAVE_ICONV, 1, [What header to include for iconv() function: iconv.h])
+      AC_MSG_RESULT(yes)
+      ICONV_FOUND=yes
+    fi
+  else
+    AC_MSG_RESULT(no)
+  fi
+  if test "$jm_cv_lib_iconv" = yes; then
+    if test "$jm_cv_giconv" = yes; then
+      LIBS="$LIBS -lgiconv"
+    else
+      LIBS="$LIBS -liconv"
+    fi
+  fi
+])
+
+dnl CFLAGS_ADD_DIR(CFLAGS, $INCDIR)
+dnl This function doesn't add -I/usr/include into CFLAGS
+AC_DEFUN(CFLAGS_ADD_DIR,[
+if test "$2" != "/usr/include" ; then
+    $1="$$1 -I$2"
+fi
+])
+
+dnl LIB_ADD_DIR(LDFLAGS, $LIBDIR)
+dnl This function doesn't add -L/usr/lib into LDFLAGS
+AC_DEFUN(LIB_ADD_DIR,[
+if test "$2" != "/usr/lib" ; then
+    $1="$$1 -L$2"
+fi
+])
diff --git a/source3/configure.in b/source3/configure.in
index b90d99bf3d..dfd97bc42f 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -1482,26 +1482,47 @@ if test x"$samba_cv_HAVE_UX_UT_SYSLEN" = x"yes"; then
 fi 
 
 
-#################################################
-# check for libiconv support
-AC_MSG_CHECKING(whether to use libiconv)
+ICONV_LOCATION=standard
+LOOK_DIRS="/usr /usr/local /sw"
 AC_ARG_WITH(libiconv,
 [  --with-libiconv=BASEDIR Use libiconv in BASEDIR/lib and BASEDIR/include (default=auto) ],
-[ case "$withval" in
-  no)
-    AC_MSG_RESULT(no)
-    ;;
-  *)
-    AC_MSG_RESULT(yes)
-    CFLAGS="$CFLAGS -I$withval/include"
-    LDFLAGS="$LDFLAGS -L$withval/lib"
-    AC_CHECK_LIB(iconv, iconv_open)
-    AC_DEFINE_UNQUOTED(WITH_LIBICONV, "${withval}",[Path to iconv])
-    ;;
-  esac ],
-  AC_MSG_RESULT(no)
-)
+[
+  if test "$withval" = "no" ; then
+    AC_MSG_ERROR(I won't take no for an answer)
+  else
+     if test "$withval" != "yes" ; then
+        LOOK_DIRS="$withval $LOOK_DIRS"
+     fi
+  fi
+])
 
+ICONV_FOUND="no"
+for i in $LOOK_DIRS ; do
+    save_LIBS=$LIBS
+    save_LDFLAGS=$LDFLAGS
+    save_CPPFLAGS=$CPPFLAGS
+    CPPFLAGS="-I$i/include"
+    LDFLAGS="-L$i/lib"
+    LIBS=
+    export LDFLAGS LIBS CPPFLAGS
+dnl Try to find iconv(3)
+    jm_ICONV($i)
+
+    CPPFLAGS=$save_CPPFLAGS
+    if test -n "$ICONV_FOUND" ; then
+        LDFLAGS=$save_LDFLAGS
+        LIB_ADD_DIR(LDFLAGS, "$i/lib")
+        CFLAGS_ADD_DIR(CPPFLAGS, "$i/include")
+        LIBS="$save_LIBS $LIBS"
+        ICONV_LOCATION=$i
+        export LDFLAGS LIBS CPPFLAGS
+        break
+    else
+	LDFLAGS=$save_LDFLAGS
+        LIBS=$save_LIBS
+        export LDFLAGS LIBS CPPFLAGS
+    fi
+done
 
 ############
 # check for iconv in libc
@@ -1519,6 +1540,11 @@ if test x"$samba_cv_HAVE_NATIVE_ICONV" = x"yes"; then
     AC_DEFINE(HAVE_NATIVE_ICONV,1,[Whether to use native iconv])
 fi
 
+if test x"$ICONV_FOUND" = x"no" -o x"$samba_cv_HAVE_NATIVE_ICONV" != x"yes" ; then
+    AC_MSG_WARN([Sufficient support for iconv function was not found. 
+    Install libiconv from http://freshmeat.net/projects/libiconv/ for better charset compatibility!])
+fi
+
 
 AC_CACHE_CHECK([for Linux kernel oplocks],samba_cv_HAVE_KERNEL_OPLOCKS_LINUX,[
 AC_TRY_RUN([
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 731d94996c..0d1c72cf1c 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -393,8 +393,13 @@
 #endif /* HAVE_SYS_SHM_H */
 
 #ifdef HAVE_NATIVE_ICONV
+#ifdef HAVE_ICONV
 #include <iconv.h>
 #endif
+#ifdef HAVE_GICONV
+#include <giconv.h>
+#endif
+#endif
 
 #if HAVE_KRB5_H
 #include <krb5.h>
-- 
cgit 


From ad03d0a4f885a87b5dbe7c88e507b302cf06ece2 Mon Sep 17 00:00:00 2001
From: Jim McDonough <jmcd@samba.org>
Date: Wed, 19 Feb 2003 15:03:04 +0000
Subject: Fix segv in net ads join...an extra & was the culprit (This used to
 be commit 9874b233d55a0b1aea7eb033848f4b63a531833b)

---
 source3/libads/ldap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index b7cfc8d84c..67669fc078 100644
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -1506,7 +1506,7 @@ ADS_STATUS ads_set_machine_sd(ADS_STRUCT *ads, const char *hostname, char *dn)
 		ret = ADS_ERROR(LDAP_NO_MEMORY);
 		goto ads_set_sd_error;
 	}
-	prs_copy_all_data_out((char *)&bval.bv_val, &ps_wire);
+	prs_copy_all_data_out(bval.bv_val, &ps_wire);
 
 	ads_mod_ber(ctx, &mods, attrs[0], &bval);
 	ret = ads_gen_mod(ads, dn, mods);
-- 
cgit 


From ffcee0c95e05f652f4eebf9b9d46bd51d059891b Mon Sep 17 00:00:00 2001
From: Jim McDonough <jmcd@samba.org>
Date: Wed, 19 Feb 2003 15:22:46 +0000
Subject: Correct way to keep fucntion from proto.h (This used to be commit
 762b072efb0d6801775a874494cb19ea3d61fa97)

---
 source3/include/includes.h |  2 +-
 source3/libsmb/clikrb5.c   | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

(limited to 'source3')

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 0d1c72cf1c..5b4c5a695f 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -1238,7 +1238,7 @@ void get_auth_data_from_tkt(DATA_BLOB *auth_data, krb5_ticket *tkt);
 krb5_const_principal get_principal_from_tkt(krb5_ticket *tkt);
 krb5_error_code krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, struct sockaddr **addr_pp, int *naddrs, int get_masters);
 krb5_error_code get_kerberos_allowed_etypes(krb5_context context, krb5_enctype **enctypes);
-krb5_error_code free_kerberos_etypes(krb5_context context, krb5_enctype *enctypes);
+void free_kerberos_etypes(krb5_context context, krb5_enctype *enctypes);
 #endif /* HAVE_KRB5 */
 
 #endif /* _INCLUDES_H */
diff --git a/source3/libsmb/clikrb5.c b/source3/libsmb/clikrb5.c
index 2e07dfdb66..da120622ea 100644
--- a/source3/libsmb/clikrb5.c
+++ b/source3/libsmb/clikrb5.c
@@ -127,17 +127,14 @@ krb5_error_code get_kerberos_allowed_etypes(krb5_context context,
  __ERROR_XX_UNKNOWN_GET_ENCTYPES_FUNCTIONS
 #endif
 
- /* the following is defined as krb5_error_code to keep it from
-    being sucked into proto.h */
-krb5_error_code free_kerberos_etypes(krb5_context context, 
-				     krb5_enctype *enctypes)
+ void free_kerberos_etypes(krb5_context context, 
+			   krb5_enctype *enctypes)
 {
 #if defined(HAVE_KRB5_FREE_KTYPES)
-	krb5_free_ktypes(context, enctypes);
+	return krb5_free_ktypes(context, enctypes);
 #else
-	SAFE_FREE(enctypes);
+	return SAFE_FREE(enctypes);
 #endif
-	return 0;
 }
 
 #if defined(HAVE_KRB5_AUTH_CON_SETKEY) && !defined(HAVE_KRB5_AUTH_CON_SETUSERUSERKEY)
-- 
cgit 


From f15ed71fbba9d3762f4e8a1382b65d6291a2a065 Mon Sep 17 00:00:00 2001
From: Jim McDonough <jmcd@samba.org>
Date: Wed, 19 Feb 2003 15:46:15 +0000
Subject: Can't return SAFE_FREE...put on its own line. (This used to be commit
 9f1a4809b503f050189d5f87a294b7d8675b1e95)

---
 source3/libsmb/clikrb5.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/libsmb/clikrb5.c b/source3/libsmb/clikrb5.c
index da120622ea..96e737166c 100644
--- a/source3/libsmb/clikrb5.c
+++ b/source3/libsmb/clikrb5.c
@@ -133,7 +133,8 @@ krb5_error_code get_kerberos_allowed_etypes(krb5_context context,
 #if defined(HAVE_KRB5_FREE_KTYPES)
 	return krb5_free_ktypes(context, enctypes);
 #else
-	return SAFE_FREE(enctypes);
+	SAFE_FREE(enctypes);
+	return;
 #endif
 }
 
-- 
cgit 


From de88e704ceb74e4811f14845556d65449f9d592b Mon Sep 17 00:00:00 2001
From: Jim McDonough <jmcd@samba.org>
Date: Wed, 19 Feb 2003 20:37:34 +0000
Subject: libads/krb5_setpw.c (This used to be commit
 4c52d7bd933f61bdba3d4159a204fe16db3d4f0f)

---
 source3/libads/krb5_setpw.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/libads/krb5_setpw.c b/source3/libads/krb5_setpw.c
index c3ec754e39..9d8fb8d24c 100644
--- a/source3/libads/krb5_setpw.c
+++ b/source3/libads/krb5_setpw.c
@@ -327,7 +327,8 @@ static krb5_error_code parse_setpw_reply(krb5_context context,
 				return KRB5KDC_ERR_BADOPTION;
 				break;
 			case KRB5_KPASSWD_INITIAL_FLAG_NEEDED:
-				return KV5M_ALT_METHOD;
+				return KRB5KDC_ERR_BADOPTION;
+				/* return KV5M_ALT_METHOD; MIT-only define */
 				break;
 			case KRB5_KPASSWD_ETYPE_NOSUPP:
 				return KRB5KDC_ERR_ETYPE_NOSUPP;
-- 
cgit 


From 29b94266df3df046bc545a466a9b505edd8b7ca8 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Wed, 19 Feb 2003 22:26:19 +0000
Subject: correct init for vfs.conn, thanks Stefan (This used to be commit
 162683d2b5c15016fe1423876589573b48b9f5a6)

---
 source3/torture/vfstest.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/torture/vfstest.c b/source3/torture/vfstest.c
index fef189844b..fd1f83109e 100644
--- a/source3/torture/vfstest.c
+++ b/source3/torture/vfstest.c
@@ -546,7 +546,8 @@ int main(int argc, char *argv[])
 	}
 
 	/* some basic initialization stuff */
-	vfs.conn = (struct connection_struct *)malloc(sizeof(struct connection_struct));
+	conn_init();
+	vfs.conn = conn_new();
 	vfs.conn->user = "vfstest";
 	for (i=0; i < 1024; i++)
 		vfs.files[i] = NULL;
-- 
cgit 


From 673cdea310f8447b138cd0c30b5c2313f5c9afe9 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Wed, 19 Feb 2003 22:30:57 +0000
Subject: Fix inspired by Stefan (metze) Metzmacher - cache the sidtype also.
 Jeremy. (This used to be commit 634f20dff63d255c317f9dcc9f4caf4e8e79123c)

---
 source3/smbd/uid.c | 46 +++++++++++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 19 deletions(-)

(limited to 'source3')

diff --git a/source3/smbd/uid.c b/source3/smbd/uid.c
index 4ebee75a15..6ac3528b1a 100644
--- a/source3/smbd/uid.c
+++ b/source3/smbd/uid.c
@@ -551,19 +551,21 @@ static struct uid_sid_cache {
 	struct uid_sid_cache *next, *prev;
 	uid_t uid;
 	DOM_SID sid;
+	enum SID_NAME_USE sidtype;
 } *uid_sid_cache_head;
 
 static struct gid_sid_cache {
 	struct gid_sid_cache *next, *prev;
 	gid_t gid;
 	DOM_SID sid;
+	enum SID_NAME_USE sidtype;
 } *gid_sid_cache_head;
 
 /*****************************************************************
   Find a SID given a uid.
 *****************************************************************/  
 
-static BOOL fetch_sid_from_uid_cache(DOM_SID *psid, uid_t uid)
+static BOOL fetch_sid_from_uid_cache(DOM_SID *psid, enum SID_NAME_USE *psidtype, uid_t uid)
 {
 	struct uid_sid_cache *pc;
 
@@ -571,6 +573,7 @@ static BOOL fetch_sid_from_uid_cache(DOM_SID *psid, uid_t uid)
 		if (pc->uid == uid) {
 			fstring sid;
 			*psid = pc->sid;
+			*psidtype = pc->sidtype;
 			DEBUG(3,("fetch sid from uid cache %u -> %s\n",
 				(unsigned int)uid, sid_to_string(sid, psid)));
 			DLIST_PROMOTE(uid_sid_cache_head, pc);
@@ -584,7 +587,7 @@ static BOOL fetch_sid_from_uid_cache(DOM_SID *psid, uid_t uid)
   Find a uid given a SID.
 *****************************************************************/  
 
-static BOOL fetch_uid_from_cache(uid_t *puid, const DOM_SID *psid)
+static BOOL fetch_uid_from_cache(uid_t *puid, const DOM_SID *psid, enum SID_NAME_USE sidtype)
 {
 	struct uid_sid_cache *pc;
 
@@ -605,7 +608,7 @@ static BOOL fetch_uid_from_cache(uid_t *puid, const DOM_SID *psid)
  Store uid to SID mapping in cache.
 *****************************************************************/  
 
-static void store_uid_sid_cache(const DOM_SID *psid, uid_t uid)
+static void store_uid_sid_cache(const DOM_SID *psid, const enum SID_NAME_USE sidtype, uid_t uid)
 {
 	struct uid_sid_cache *pc;
 
@@ -629,6 +632,7 @@ static void store_uid_sid_cache(const DOM_SID *psid, uid_t uid)
 		return;
 	pc->uid = uid;
 	sid_copy(&pc->sid, psid);
+	pc->sidtype = sidtype;
 	DLIST_ADD(uid_sid_cache_head, pc);
 	n_uid_sid_cache++;
 }
@@ -637,7 +641,7 @@ static void store_uid_sid_cache(const DOM_SID *psid, uid_t uid)
   Find a SID given a gid.
 *****************************************************************/  
 
-static BOOL fetch_sid_from_gid_cache(DOM_SID *psid, gid_t gid)
+static BOOL fetch_sid_from_gid_cache(DOM_SID *psid, enum SID_NAME_USE *psidtype, gid_t gid)
 {
 	struct gid_sid_cache *pc;
 
@@ -645,6 +649,7 @@ static BOOL fetch_sid_from_gid_cache(DOM_SID *psid, gid_t gid)
 		if (pc->gid == gid) {
 			fstring sid;
 			*psid = pc->sid;
+			*psidtype = pc->sidtype;
 			DEBUG(3,("fetch sid from gid cache %u -> %s\n",
 				(unsigned int)gid, sid_to_string(sid, psid)));
 			DLIST_PROMOTE(gid_sid_cache_head, pc);
@@ -658,7 +663,7 @@ static BOOL fetch_sid_from_gid_cache(DOM_SID *psid, gid_t gid)
   Find a gid given a SID.
 *****************************************************************/  
 
-static BOOL fetch_gid_from_cache(gid_t *pgid, const DOM_SID *psid)
+static BOOL fetch_gid_from_cache(gid_t *pgid, const DOM_SID *psid, enum SID_NAME_USE sidtype)
 {
 	struct gid_sid_cache *pc;
 
@@ -679,7 +684,7 @@ static BOOL fetch_gid_from_cache(gid_t *pgid, const DOM_SID *psid)
  Store gid to SID mapping in cache.
 *****************************************************************/  
 
-static void store_gid_sid_cache(const DOM_SID *psid, gid_t gid)
+static void store_gid_sid_cache(const DOM_SID *psid, const enum SID_NAME_USE sidtype, gid_t gid)
 {
 	struct gid_sid_cache *pc;
 
@@ -703,6 +708,7 @@ static void store_gid_sid_cache(const DOM_SID *psid, gid_t gid)
 		return;
 	pc->gid = gid;
 	sid_copy(&pc->sid, psid);
+	pc->sidtype = sidtype;
 	DLIST_ADD(gid_sid_cache_head, pc);
 	n_gid_sid_cache++;
 }
@@ -717,9 +723,10 @@ static void store_gid_sid_cache(const DOM_SID *psid, gid_t gid)
 DOM_SID *uid_to_sid(DOM_SID *psid, uid_t uid)
 {
 	uid_t low, high;
+	enum SID_NAME_USE sidtype;
 	fstring sid;
 
-	if (fetch_sid_from_uid_cache(psid, uid))
+	if (fetch_sid_from_uid_cache(psid, &sidtype, uid))
 		return psid;
 
 	if (lp_winbind_uid(&low, &high) && uid >= low && uid <= high) {
@@ -729,7 +736,7 @@ DOM_SID *uid_to_sid(DOM_SID *psid, uid_t uid)
 				(unsigned int)uid, sid_to_string(sid, psid)));
 
 			if (psid)
-				store_uid_sid_cache(psid, uid);
+				store_uid_sid_cache(psid, SID_NAME_USER, uid);
 			return psid;
 		}
 	}
@@ -741,7 +748,7 @@ DOM_SID *uid_to_sid(DOM_SID *psid, uid_t uid)
 
 	DEBUG(10,("uid_to_sid: local %u -> %s\n", (unsigned int)uid, sid_to_string(sid, psid)));
 	if (psid)
-		store_uid_sid_cache(psid, uid);
+		store_uid_sid_cache(psid, SID_NAME_USER, uid);
 
 	return psid;
 }
@@ -755,9 +762,10 @@ DOM_SID *uid_to_sid(DOM_SID *psid, uid_t uid)
 DOM_SID *gid_to_sid(DOM_SID *psid, gid_t gid)
 {
 	gid_t low, high;
+	enum SID_NAME_USE sidtype;
 	fstring sid;
 
-	if (fetch_sid_from_gid_cache(psid, gid))
+	if (fetch_sid_from_gid_cache(psid, &sidtype, gid))
 		return psid;
 
 	if (lp_winbind_gid(&low, &high) && gid >= low && gid <= high) {
@@ -767,7 +775,7 @@ DOM_SID *gid_to_sid(DOM_SID *psid, gid_t gid)
 				(unsigned int)gid, sid_to_string(sid, psid)));
                         
 			if (psid)
-				store_gid_sid_cache(psid, gid);
+				store_gid_sid_cache(psid, SID_NAME_DOM_GRP, gid);
 			return psid;
 		}
 	}
@@ -776,7 +784,7 @@ DOM_SID *gid_to_sid(DOM_SID *psid, gid_t gid)
 	psid = local_gid_to_sid(psid, gid);
 	DEBUG(10,("gid_to_sid: local %u -> %s\n", (unsigned int)gid, sid_to_string(sid, psid)));
 	if (psid)
-		store_gid_sid_cache(psid, gid);
+		store_gid_sid_cache(psid, SID_NAME_DOM_GRP, gid);
 
 	return psid;
 }
@@ -792,7 +800,7 @@ BOOL sid_to_uid(const DOM_SID *psid, uid_t *puid, enum SID_NAME_USE *sidtype)
 {
 	fstring sid_str;
 
-	if (fetch_uid_from_cache(puid, psid))
+	if (fetch_uid_from_cache(puid, psid, *sidtype))
 		return True;
 
 	/* if we know its local then don't try winbindd */
@@ -802,7 +810,7 @@ BOOL sid_to_uid(const DOM_SID *psid, uid_t *puid, enum SID_NAME_USE *sidtype)
 		result = local_sid_to_uid(puid, psid, sidtype);
 		unbecome_root();
 		if (result)
-			store_uid_sid_cache(psid, *puid);
+			store_uid_sid_cache(psid, *sidtype, *puid);
 		return result;
 	}
 
@@ -853,7 +861,7 @@ BOOL sid_to_uid(const DOM_SID *psid, uid_t *puid, enum SID_NAME_USE *sidtype)
 		result = local_sid_to_uid(puid, psid, sidtype);
 		unbecome_root();
 		if (result)
-			store_uid_sid_cache(psid, *puid);
+			store_uid_sid_cache(psid, *sidtype, *puid);
 		return result;
 	}
 
@@ -861,7 +869,7 @@ BOOL sid_to_uid(const DOM_SID *psid, uid_t *puid, enum SID_NAME_USE *sidtype)
 		sid_to_string(sid_str, psid),
 		(unsigned int)*puid ));
 
-	store_uid_sid_cache(psid, *puid);
+	store_uid_sid_cache(psid, *sidtype, *puid);
 	return True;
 }
 
@@ -879,7 +887,7 @@ BOOL sid_to_gid(const DOM_SID *psid, gid_t *pgid, enum SID_NAME_USE *sidtype)
 
 	*sidtype = SID_NAME_UNKNOWN;
 
-	if (fetch_gid_from_cache(pgid, psid))
+	if (fetch_gid_from_cache(pgid, psid, *sidtype))
 		return True;
 
 	/*
@@ -893,7 +901,7 @@ BOOL sid_to_gid(const DOM_SID *psid, gid_t *pgid, enum SID_NAME_USE *sidtype)
 		result = local_sid_to_gid(pgid, psid, sidtype);
 		unbecome_root();
 		if (result)
-			store_gid_sid_cache(psid, *pgid);
+			store_gid_sid_cache(psid, *sidtype, *pgid);
 		return result;
 	}
 
@@ -932,7 +940,7 @@ BOOL sid_to_gid(const DOM_SID *psid, gid_t *pgid, enum SID_NAME_USE *sidtype)
 		sid_to_string(sid_str, psid),
 		(unsigned int)*pgid ));
 
-	store_gid_sid_cache(psid, *pgid);
+	store_gid_sid_cache(psid, *sidtype, *pgid);
 	return True;
 }
 
-- 
cgit 


From 9061aae9b4bfed051b4c08b971561297710ef369 Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Thu, 20 Feb 2003 03:33:20 +0000
Subject: (Merge from APPLIANCE_HEAD)

CR1829: Fix memory leak when unpacking 'B' buffers in Python.

(PyList_Append creates a new reference to the added object, and so we
have to release the existing one.)
(This used to be commit 55e114f596e0edfdf176cabdbcfe7f01fae6f8aa)
---
 source3/python/py_tdbpack.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'source3')

diff --git a/source3/python/py_tdbpack.c b/source3/python/py_tdbpack.c
index 6181a4918e..8aa4ee316a 100644
--- a/source3/python/py_tdbpack.c
+++ b/source3/python/py_tdbpack.c
@@ -638,6 +638,9 @@ pytdbunpack_buffer(char **pbuf, int *plen, PyObject *val_list)
 	if (PyList_Append(val_list, str_obj) == -1)
 		goto failed;
 	
+	Py_DECREF(len_obj);
+	Py_DECREF(str_obj);
+	
 	return val_list;
 
   failed:
-- 
cgit 


From f8d9cf27266d9ce563011e44281483a4dfd0708f Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Thu, 20 Feb 2003 04:01:25 +0000
Subject: Doc (This used to be commit 5d7d400d6c49b195a1174ef40c7bf95065427fbd)

---
 source3/python/py_tdbpack.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/python/py_tdbpack.c b/source3/python/py_tdbpack.c
index 8aa4ee316a..243cb44683 100644
--- a/source3/python/py_tdbpack.c
+++ b/source3/python/py_tdbpack.c
@@ -1,7 +1,7 @@
 /* -*- c-file-style: "python"; indent-tabs-mode: nil; -*-
 	 
    Python wrapper for Samba tdb pack/unpack functions
-   Copyright (C) Martin Pool 2002
+   Copyright (C) Martin Pool 2002, 2003
 
 
    NOTE PYTHON STYLE GUIDE
-- 
cgit 


From 215ff67a039d3dea516d70d538083db8833f7b7e Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 20 Feb 2003 10:43:21 +0000
Subject: for some (very weird) reason, the domain I was testing aginst would
 not return a DN for the user.  Make sure we don't segfault.

Andrew Bartlett
(This used to be commit 9fdedeff6a3a9f8e8d048e6afd7001ad676c4e91)
---
 source3/nsswitch/winbindd_ads.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'source3')

diff --git a/source3/nsswitch/winbindd_ads.c b/source3/nsswitch/winbindd_ads.c
index be4ed1c667..9560a53fa0 100644
--- a/source3/nsswitch/winbindd_ads.c
+++ b/source3/nsswitch/winbindd_ads.c
@@ -490,6 +490,10 @@ static NTSTATUS lookup_usergroups(struct winbindd_domain *domain,
 	}
 
 	user_dn = ads_pull_string(ads, mem_ctx, msg, "distinguishedName");
+	if (!user_dn) {
+		DEBUG(1,("lookup_usergroups(rid=%d) ads_search did not return a a distinguishedName!\n", user_rid));
+		goto done;
+	}
 
 	if (msg) ads_msgfree(ads, msg);
 
-- 
cgit 


From 512405321ac60ae8b1d6dd80139ff9a50add8714 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 20 Feb 2003 10:50:09 +0000
Subject: Like for NTLM logins, lookup the 'winbind' user first, then the
 'local' user.

This needs to change, to be a SID->UID lookup from the PAC.

Andrew Bartlett
(This used to be commit 4071ed06a051f87f27e10510427a69fcdf45ddac)
---
 source3/smbd/sesssetup.c | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

(limited to 'source3')

diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index e408cc88e9..3a3209f172 100644
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -148,6 +148,7 @@ static int reply_spnego_kerberos(connection_struct *conn,
 	DATA_BLOB auth_data;
 	auth_serversupplied_info *server_info = NULL;
 	ADS_STRUCT *ads;
+	BOOL foreign = False;
 
 	if (!spnego_parse_krb5_wrap(*secblob, &ticket)) {
 		return ERROR_NT(NT_STATUS_LOGON_FAILURE);
@@ -185,12 +186,20 @@ static int reply_spnego_kerberos(connection_struct *conn,
 		if (!lp_allow_trusted_domains()) {
 			return ERROR_NT(NT_STATUS_LOGON_FAILURE);
 		}
-		/* this gives a fully qualified user name (ie. with full realm).
-		   that leads to very long usernames, but what else can we do? */
-		asprintf(&user, "%s%s%s", p+1, lp_winbind_separator(), client);
-	} else {
-		user = strdup(client);
+		foreign = True;
+	}
+
+	/* this gives a fully qualified user name (ie. with full realm).
+	   that leads to very long usernames, but what else can we do? */
+	asprintf(&user, "%s%s%s", p+1, lp_winbind_separator(), client);
+	
+	pw = Get_Pwnam(user);
+	if (!pw && !foreign) {
+		pw = Get_Pwnam(client);
+		SAFE_FREE(user);
+		user = smb_xstrdup(client);
 	}
+
 	ads_destroy(&ads);
 
 	/* setup the string used by %U */
@@ -198,19 +207,6 @@ static int reply_spnego_kerberos(connection_struct *conn,
 
 	reload_services(True);
 
-	/* the password is good - let them in */
-	pw = Get_Pwnam(user);
-	if (!pw && !strstr(user, lp_winbind_separator())) {
-		char *user2;
-		/* try it with a winbind domain prefix */
-		asprintf(&user2, "%s%s%s", lp_workgroup(), lp_winbind_separator(), user);
-		pw = Get_Pwnam(user2);
-		if (pw) {
-			free(user);
-			user = user2;
-		}
-	}
-
 	if (!pw) {
 		DEBUG(1,("Username %s is invalid on this system\n",user));
 		return ERROR_NT(NT_STATUS_NO_SUCH_USER);
-- 
cgit 


From d7b4f389e98e6b9cf32965e4ff41d39aa0d2cd4b Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 20 Feb 2003 12:01:39 +0000
Subject: For a number of months now, support for being a domain member without
 also running winbind has been broken.  This fixes that, by removing
 assumptions about being able to call sid_to_uid() at will.  This whole area
 needs revising when we get groups into the PDB.

Andrew Bartlett
(This used to be commit 980eda74b7df347c38b567ce976197826963324a)
---
 source3/auth/auth_util.c | 39 ++++++++++++++-------------------------
 1 file changed, 14 insertions(+), 25 deletions(-)

(limited to 'source3')

diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index 5218467dab..352d058f20 100644
--- a/source3/auth/auth_util.c
+++ b/source3/auth/auth_util.c
@@ -641,34 +641,25 @@ NT_USER_TOKEN *create_nt_token(uid_t uid, gid_t gid, int ngroups, gid_t *groups,
  * of groups.
  ******************************************************************************/
 
-static NTSTATUS get_user_groups_from_local_sam(const DOM_SID *user_sid, 
+static NTSTATUS get_user_groups_from_local_sam(SAM_ACCOUNT *sampass,
 					       int *n_groups, DOM_SID **groups,	gid_t **unix_groups)
 {
 	uid_t             uid;
-	enum SID_NAME_USE snu;
-	fstring           str;
+	gid_t             gid;
 	int               n_unix_groups;
 	int               i;
 	struct passwd    *usr;	
-	
+
 	*n_groups = 0;
 	*groups   = NULL;
-	
-	if (!sid_to_uid(user_sid,  &uid, &snu)) {
-		DEBUG(2, ("get_user_groups_from_local_sam: Failed to convert user SID %s to a uid!\n", 
-			  sid_to_string(str, user_sid)));
-		/* This might be a non-unix account */
-		return NT_STATUS_OK;
-	}
 
-	/*
-	 * This is _essential_ to prevent occasional segfaults when
-	 * winbind can't find uid -> username mapping
-	 */
-	if (!(usr = getpwuid_alloc(uid))) {
-		DEBUG(0, ("Couldn't find passdb structure for UID = %d ! Aborting.\n", uid));
+	if (!IS_SAM_UNIX_USER(sampass)) {
+		DEBUG(1, ("user %s does not have a unix identity!\n", pdb_get_username(sampass)));
 		return NT_STATUS_NO_SUCH_USER;
-	};
+	}
+
+	uid = pdb_get_uid(sampass);
+	gid = pdb_get_gid(sampass);
 	
 	n_unix_groups = groups_max();
 	if ((*unix_groups = malloc( sizeof(gid_t) * n_unix_groups ) ) == NULL) {
@@ -677,7 +668,7 @@ static NTSTATUS get_user_groups_from_local_sam(const DOM_SID *user_sid,
 		return NT_STATUS_NO_MEMORY;
 	}
 	
-	if (sys_getgrouplist(usr->pw_name, usr->pw_gid, *unix_groups, &n_unix_groups) == -1) {
+	if (sys_getgrouplist(pdb_get_username(sampass), gid, *unix_groups, &n_unix_groups) == -1) {
 		gid_t *groups_tmp;
 		groups_tmp = Realloc(*unix_groups, sizeof(gid_t) * n_unix_groups);
 		if (!groups_tmp) {
@@ -687,7 +678,7 @@ static NTSTATUS get_user_groups_from_local_sam(const DOM_SID *user_sid,
 		}
 		*unix_groups = groups_tmp;
 
-		if (sys_getgrouplist(usr->pw_name, usr->pw_gid, *unix_groups, &n_unix_groups) == -1) {
+		if (sys_getgrouplist(pdb_get_username(sampass), gid, *unix_groups, &n_unix_groups) == -1) {
 			DEBUG(0, ("get_user_groups_from_local_sam: failed to get the unix group list\n"));
 			SAFE_FREE(*unix_groups);
 			passwd_free(&usr);
@@ -695,9 +686,7 @@ static NTSTATUS get_user_groups_from_local_sam(const DOM_SID *user_sid,
 		}
 	}
 
-	debug_unix_user_token(DBGC_CLASS, 5, usr->pw_uid, usr->pw_gid, n_unix_groups, *unix_groups);
-
-	passwd_free(&usr);
+	debug_unix_user_token(DBGC_CLASS, 5, uid, gid, n_unix_groups, *unix_groups);
 	
 	if (n_unix_groups > 0) {
 		*groups   = malloc(sizeof(DOM_SID) * n_unix_groups);
@@ -763,7 +752,7 @@ NTSTATUS make_server_info_sam(auth_serversupplied_info **server_info,
 	}
 	
 	if (!NT_STATUS_IS_OK(nt_status 
-			     = get_user_groups_from_local_sam(pdb_get_user_sid(sampass), 
+			     = get_user_groups_from_local_sam(sampass, 
 		&n_groupSIDs, &groupSIDs, &unix_groups)))
 	{
 		DEBUG(4,("get_user_groups_from_local_sam failed\n"));
@@ -998,7 +987,7 @@ NTSTATUS make_server_info_info3(TALLOC_CTX *mem_ctx,
 	   returned to the caller. */
 	
 	if (!NT_STATUS_IS_OK(nt_status 
-			     = get_user_groups_from_local_sam(&user_sid, 
+			     = get_user_groups_from_local_sam(sam_account, 
 							      &n_lgroupSIDs, 
 							      &lgroupSIDs, 
 							      &unix_groups)))
-- 
cgit 


From 14401bb368464295936bd18fb011d551a36576ce Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Thu, 20 Feb 2003 18:54:12 +0000
Subject: Ensure tdb error code is set for corrupt and i/o errors before
 calling the log function. This allows the log function to take action.
 Jeremy. (This used to be commit 0fa310cbc3f7ced0b15be0ffaeb70dc82e1d5d12)

---
 source3/tdb/tdb.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'source3')

diff --git a/source3/tdb/tdb.c b/source3/tdb/tdb.c
index 8410538f01..097209ff7a 100644
--- a/source3/tdb/tdb.c
+++ b/source3/tdb/tdb.c
@@ -205,6 +205,11 @@ static int tdb_brlock(TDB_CONTEXT *tdb, tdb_off offset,
 
 	if (ret == -1) {
 		if (!probe && lck_type != F_SETLK) {
+			/* Ensure error code is set for log fun to examine. */
+			if (errno == EINTR && palarm_fired && *palarm_fired)
+				tdb->ecode = TDB_ERR_LOCK_TIMEOUT;
+			else
+				tdb->ecode = TDB_ERR_LOCK;
 			TDB_LOG((tdb, 5,"tdb_brlock failed (fd=%d) at offset %d rw_type=%d lck_type=%d\n", 
 				 tdb->fd, offset, rw_type, lck_type));
 		}
@@ -312,6 +317,8 @@ static int tdb_oob(TDB_CONTEXT *tdb, tdb_off len, int probe)
 		return 0;
 	if (tdb->flags & TDB_INTERNAL) {
 		if (!probe) {
+			/* Ensure ecode is set for log fn. */
+			tdb->ecode = TDB_ERR_IO;
 			TDB_LOG((tdb, 0,"tdb_oob len %d beyond internal malloc size %d\n",
 				 (int)len, (int)tdb->map_size));
 		}
@@ -323,6 +330,8 @@ static int tdb_oob(TDB_CONTEXT *tdb, tdb_off len, int probe)
 
 	if (st.st_size < (size_t)len) {
 		if (!probe) {
+			/* Ensure ecode is set for log fn. */
+			tdb->ecode = TDB_ERR_IO;
 			TDB_LOG((tdb, 0,"tdb_oob len %d beyond eof at %d\n",
 				 (int)len, (int)st.st_size));
 		}
@@ -351,6 +360,8 @@ static int tdb_write(TDB_CONTEXT *tdb, tdb_off off, void *buf, tdb_len len)
 	else if (lseek(tdb->fd, off, SEEK_SET) != off
 		 || write(tdb->fd, buf, len) != (ssize_t)len) {
 #endif
+		/* Ensure ecode is set for log fn. */
+		tdb->ecode = TDB_ERR_IO;
 		TDB_LOG((tdb, 0,"tdb_write failed at %d len=%d (%s)\n",
 			   off, len, strerror(errno)));
 		return TDB_ERRCODE(TDB_ERR_IO, -1);
@@ -372,6 +383,8 @@ static int tdb_read(TDB_CONTEXT *tdb,tdb_off off,void *buf,tdb_len len,int cv)
 	else if (lseek(tdb->fd, off, SEEK_SET) != off
 		 || read(tdb->fd, buf, len) != (ssize_t)len) {
 #endif
+		/* Ensure ecode is set for log fn. */
+		tdb->ecode = TDB_ERR_IO;
 		TDB_LOG((tdb, 0,"tdb_read failed at %d len=%d (%s)\n",
 			   off, len, strerror(errno)));
 		return TDB_ERRCODE(TDB_ERR_IO, -1);
@@ -387,6 +400,8 @@ static char *tdb_alloc_read(TDB_CONTEXT *tdb, tdb_off offset, tdb_len len)
 	char *buf;
 
 	if (!(buf = malloc(len))) {
+		/* Ensure ecode is set for log fn. */
+		tdb->ecode = TDB_ERR_OOM;
 		TDB_LOG((tdb, 0,"tdb_alloc_read malloc failed len=%d (%s)\n",
 			   len, strerror(errno)));
 		return TDB_ERRCODE(TDB_ERR_OOM, buf);
@@ -415,6 +430,8 @@ static int rec_read(TDB_CONTEXT *tdb, tdb_off offset, struct list_struct *rec)
 	if (tdb_read(tdb, offset, rec, sizeof(*rec),DOCONV()) == -1)
 		return -1;
 	if (TDB_BAD_MAGIC(rec)) {
+		/* Ensure ecode is set for log fn. */
+		tdb->ecode = TDB_ERR_CORRUPT;
 		TDB_LOG((tdb, 0,"rec_read bad magic 0x%x at offset=%d\n", rec->magic, offset));
 		return TDB_ERRCODE(TDB_ERR_CORRUPT, -1);
 	}
@@ -443,6 +460,8 @@ static int rec_free_read(TDB_CONTEXT *tdb, tdb_off off, struct list_struct *rec)
 	}
 
 	if (rec->magic != TDB_FREE_MAGIC) {
+		/* Ensure ecode is set for log fn. */
+		tdb->ecode = TDB_ERR_CORRUPT;
 		TDB_LOG((tdb, 0,"rec_free_read bad magic 0x%x at offset=%d\n", 
 			   rec->magic, off));
 		return TDB_ERRCODE(TDB_ERR_CORRUPT, -1);
-- 
cgit 


From 9d913a62ad8f4bac575a53c362d9d10fd6175c8c Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 20 Feb 2003 19:10:19 +0000
Subject: Remove obsolete files (This used to be commit
 f035cba2cf5764722318e9cd10dbe7bef56d0732)

---
 source3/rpcclient/display.c       | 1338 -------------------------------------
 source3/rpcclient/display_spool.c |  927 -------------------------
 source3/rpcclient/samsync.c       |  773 ---------------------
 3 files changed, 3038 deletions(-)
 delete mode 100644 source3/rpcclient/display.c
 delete mode 100644 source3/rpcclient/display_spool.c
 delete mode 100644 source3/rpcclient/samsync.c

(limited to 'source3')

diff --git a/source3/rpcclient/display.c b/source3/rpcclient/display.c
deleted file mode 100644
index d03465206e..0000000000
--- a/source3/rpcclient/display.c
+++ /dev/null
@@ -1,1338 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-   Samba utility functions
-   Copyright (C) Andrew Tridgell 1992-1998
-   Copyright (C) Luke Kenneth Casson Leighton 1996 - 1998
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include "includes.h"
-
-
-/****************************************************************************
-convert a share mode to a string
-****************************************************************************/
-char *get_file_mode_str(uint32 share_mode)
-{
-	static fstring mode;
-
-	switch (GET_DENY_MODE(share_mode))
-	{
-		case DENY_NONE : fstrcpy(mode, "DENY_NONE  "); break;
-		case DENY_ALL  : fstrcpy(mode, "DENY_ALL   "); break;
-		case DENY_DOS  : fstrcpy(mode, "DENY_DOS   "); break;
-		case DENY_READ : fstrcpy(mode, "DENY_READ  "); break;
-		case DENY_WRITE: fstrcpy(mode, "DENY_WRITE "); break;
-		case DENY_FCB:   fstrcpy(mode, "DENY_FCB "); break;
-		default        : fstrcpy(mode, "DENY_????  "); break;
-	}
-
-	switch (share_mode & 0xF)
-	{
-		case 0 : fstrcat(mode, "RDONLY"); break;
-		case 1 : fstrcat(mode, "WRONLY"); break;
-		case 2 : fstrcat(mode, "RDWR  "); break;
-		default: fstrcat(mode, "R??W??"); break;
-	}
-
-	return mode;
-}
-
-/****************************************************************************
-convert an oplock mode to a string
-****************************************************************************/
-char *get_file_oplock_str(uint32 op_type)
-{
-	static fstring oplock;
-	BOOL excl  = ((op_type & EXCLUSIVE_OPLOCK) != 0);
-	BOOL batch = ((op_type & BATCH_OPLOCK    ) != 0);
-
-	oplock[0] = 0;
-
-	if (excl           ) fstrcat(oplock, "EXCLUSIVE");
-	if (excl  &&  batch) fstrcat(oplock, "+");
-	if (          batch) fstrcat(oplock, "BATCH");
-	if (!excl && !batch) fstrcat(oplock, "NONE");
-
-	return oplock;
-}
-
-/****************************************************************************
-convert a share type enum to a string
-****************************************************************************/
-char *get_share_type_str(uint32 type)
-{
-	static fstring typestr;
-
-	switch (type)
-	{
-		case STYPE_DISKTREE: fstrcpy(typestr, "Disk"   ); break;
-		case STYPE_PRINTQ  : fstrcpy(typestr, "Printer"); break;	      
-		case STYPE_DEVICE  : fstrcpy(typestr, "Device" ); break;
-		case STYPE_IPC     : fstrcpy(typestr, "IPC"    ); break;      
-		default            : fstrcpy(typestr, "????"   ); break;      
-	}
-	return typestr;
-}
-
-/****************************************************************************
-convert a server type enum to a string
-****************************************************************************/
-char *get_server_type_str(uint32 type)
-{
-	static fstring typestr;
-
-	if (type == SV_TYPE_ALL)
-	{
-		fstrcpy(typestr, "All");
-	}
-	else
-	{
-		int i;
-		typestr[0] = 0;
-		for (i = 0; i < 32; i++)
-		{
-			if (type & (1 << i))
-			{
-				switch (((unsigned)1) << i)
-				{
-					case SV_TYPE_WORKSTATION      : fstrcat(typestr, "Wk " ); break;
-					case SV_TYPE_SERVER           : fstrcat(typestr, "Sv " ); break;
-					case SV_TYPE_SQLSERVER        : fstrcat(typestr, "Sql "); break;
-					case SV_TYPE_DOMAIN_CTRL      : fstrcat(typestr, "PDC "); break;
-					case SV_TYPE_DOMAIN_BAKCTRL   : fstrcat(typestr, "BDC "); break;
-					case SV_TYPE_TIME_SOURCE      : fstrcat(typestr, "Tim "); break;
-					case SV_TYPE_AFP              : fstrcat(typestr, "AFP "); break;
-					case SV_TYPE_NOVELL           : fstrcat(typestr, "Nov "); break;
-					case SV_TYPE_DOMAIN_MEMBER    : fstrcat(typestr, "Dom "); break;
-					case SV_TYPE_PRINTQ_SERVER    : fstrcat(typestr, "PrQ "); break;
-					case SV_TYPE_DIALIN_SERVER    : fstrcat(typestr, "Din "); break;
-					case SV_TYPE_SERVER_UNIX      : fstrcat(typestr, "Unx "); break;
-					case SV_TYPE_NT               : fstrcat(typestr, "NT " ); break;
-					case SV_TYPE_WFW              : fstrcat(typestr, "Wfw "); break;
-					case SV_TYPE_SERVER_MFPN      : fstrcat(typestr, "Mfp "); break;
-					case SV_TYPE_SERVER_NT        : fstrcat(typestr, "SNT "); break;
-					case SV_TYPE_POTENTIAL_BROWSER: fstrcat(typestr, "PtB "); break;
-					case SV_TYPE_BACKUP_BROWSER   : fstrcat(typestr, "BMB "); break;
-					case SV_TYPE_MASTER_BROWSER   : fstrcat(typestr, "LMB "); break;
-					case SV_TYPE_DOMAIN_MASTER    : fstrcat(typestr, "DMB "); break;
-					case SV_TYPE_SERVER_OSF       : fstrcat(typestr, "OSF "); break;
-					case SV_TYPE_SERVER_VMS       : fstrcat(typestr, "VMS "); break;
-					case SV_TYPE_WIN95_PLUS       : fstrcat(typestr, "W95 "); break;
-					case SV_TYPE_ALTERNATE_XPORT  : fstrcat(typestr, "Xpt "); break;
-					case SV_TYPE_LOCAL_LIST_ONLY  : fstrcat(typestr, "Dom "); break;
-					case SV_TYPE_DOMAIN_ENUM      : fstrcat(typestr, "Loc "); break;
-				}
-			}
-		}
-		i = strlen(typestr)-1;
-		if (typestr[i] == ' ') typestr[i] = 0;
-
-	}
-	return typestr;
-}
-
-/****************************************************************************
-server info level 101 display function
-****************************************************************************/
-void display_srv_info_101(FILE *out_hnd, enum action_type action,
-		SRV_INFO_101 *sv101)
-{
-	if (sv101 == NULL)
-	{
-		return;
-	}
-
-	switch (action)
-	{
-		case ACTION_HEADER:
-		{
-			fprintf(out_hnd, "Server Info Level 101:\n");
-
-			break;
-		}
-		case ACTION_ENUMERATE:
-		{
-			fstring name;
-			fstring comment;
-
-			rpcstr_pull(name, sv101->uni_name.buffer,  sizeof(name), sv101->uni_name.uni_str_len*2, 0);
-			rpcstr_pull(comment, sv101->uni_comment.buffer,  sizeof(comment), sv101->uni_comment.uni_str_len*2, 0);
-
-			display_server(out_hnd, action, name, sv101->srv_type, comment);
-
-			fprintf(out_hnd, "\tplatform_id     : %d\n"    , sv101->platform_id);
-			fprintf(out_hnd, "\tos version      : %d.%d\n" , sv101->ver_major, sv101->ver_minor);
-
-			break;
-		}
-		case ACTION_FOOTER:
-		{
-			break;
-		}
-	}
-
-}
-
-/****************************************************************************
-server info level 102 display function
-****************************************************************************/
-void display_srv_info_102(FILE *out_hnd, enum action_type action,SRV_INFO_102 *sv102)
-{
-	if (sv102 == NULL)
-	{
-		return;
-	}
-
-	switch (action)
-	{
-		case ACTION_HEADER:
-		{
-			fprintf(out_hnd, "Server Info Level 102:\n");
-
-			break;
-		}
-		case ACTION_ENUMERATE:
-		{
-			fstring name;
-			fstring comment;
-			fstring usr_path;
-
-			rpcstr_pull(name, sv102->uni_name.buffer,  sizeof(name), sv102->uni_name.uni_str_len*2, 0);
-			rpcstr_pull(comment, sv102->uni_comment.buffer,  sizeof(comment), sv102->uni_comment.uni_str_len*2, 0);
-			rpcstr_pull(usr_path, sv102->uni_usr_path.buffer,  sizeof(usr_path), sv102->uni_usr_path.uni_str_len*2, 0);
-
-			display_server(out_hnd, action, name, sv102->srv_type, comment);
-
-			fprintf(out_hnd, "\tplatform_id     : %d\n"    , sv102->platform_id);
-			fprintf(out_hnd, "\tos version      : %d.%d\n" , sv102->ver_major, sv102->ver_minor);
-
-			fprintf(out_hnd, "\tusers           : %x\n"    , sv102->users      );
-			fprintf(out_hnd, "\tdisc, hidden    : %x,%x\n" , sv102->disc     , sv102->hidden   );
-			fprintf(out_hnd, "\tannounce, delta : %d, %d\n", sv102->announce , sv102->ann_delta);
-			fprintf(out_hnd, "\tlicenses        : %d\n"    , sv102->licenses   );
-			fprintf(out_hnd, "\tuser path       : %s\n"    , usr_path);
-
-			break;
-		}
-		case ACTION_FOOTER:
-		{
-			break;
-		}
-	}
-}
-
-/****************************************************************************
-server info container display function
-****************************************************************************/
-void display_srv_info_ctr(FILE *out_hnd, enum action_type action,SRV_INFO_CTR *ctr)
-{
-	if (ctr == NULL || ctr->ptr_srv_ctr == 0)
-	{
-		fprintf(out_hnd, "Server Information: unavailable due to an error\n");
-		return;
-	}
-
-	switch (ctr->switch_value)
-	{
-		case 101:
-		{
-			display_srv_info_101(out_hnd, action, &(ctr->srv.sv101));
-			break;
-		}
-		case 102:
-		{
-			display_srv_info_102(out_hnd, action, &(ctr->srv.sv102));
-			break;
-		}
-		default:
-		{
-			fprintf(out_hnd, "Server Information: Unknown Info Level\n");
-			break;
-		}
-	}
-}
-
-/****************************************************************************
-connection info level 0 display function
-****************************************************************************/
-void display_conn_info_0(FILE *out_hnd, enum action_type action,
-		CONN_INFO_0 *info0)
-{
-	if (info0 == NULL)
-	{
-		return;
-	}
-
-	switch (action)
-	{
-		case ACTION_HEADER:
-		{
-			fprintf(out_hnd, "Connection Info Level 0:\n");
-
-			break;
-		}
-		case ACTION_ENUMERATE:
-		{
-			fprintf(out_hnd, "\tid: %d\n", info0->id);
-
-			break;
-		}
-		case ACTION_FOOTER:
-		{
-			fprintf(out_hnd, "\n");
-			break;
-		}
-	}
-
-}
-
-/****************************************************************************
-connection info level 1 display function
-****************************************************************************/
-void display_conn_info_1(FILE *out_hnd, enum action_type action,
-		CONN_INFO_1 *info1, CONN_INFO_1_STR *str1)
-{
-	if (info1 == NULL || str1 == NULL)
-	{
-		return;
-	}
-
-	switch (action)
-	{
-		case ACTION_HEADER:
-		{
-			fprintf(out_hnd, "Connection Info Level 1:\n");
-
-			break;
-		}
-		case ACTION_ENUMERATE:
-		{
-			fstring usr_name;
-			fstring net_name;
-
-			rpcstr_pull(usr_name, str1->uni_usr_name.buffer, sizeof(usr_name), str1->uni_usr_name.uni_str_len*2,0);
-			rpcstr_pull(net_name, str1->uni_net_name.buffer, sizeof(net_name), str1->uni_net_name.uni_str_len*2,0);
-
-			fprintf(out_hnd, "\tid       : %d\n", info1->id);
-			fprintf(out_hnd, "\ttype     : %s\n", get_share_type_str(info1->type));
-			fprintf(out_hnd, "\tnum_opens: %d\n", info1->num_opens);
-			fprintf(out_hnd, "\tnum_users: %d\n", info1->num_users);
-			fprintf(out_hnd, "\topen_time: %d\n", info1->open_time);
-
-			fprintf(out_hnd, "\tuser name: %s\n", usr_name);
-			fprintf(out_hnd, "\tnet  name: %s\n", net_name);
-
-			break;
-		}
-		case ACTION_FOOTER:
-		{
-			fprintf(out_hnd, "\n");
-			break;
-		}
-	}
-
-}
-
-/****************************************************************************
-connection info level 0 container display function
-****************************************************************************/
-void display_srv_conn_info_0_ctr(FILE *out_hnd, enum action_type action,
-				SRV_CONN_INFO_0 *ctr)
-{
-	if (ctr == NULL)
-	{
-		fprintf(out_hnd, "display_srv_conn_info_0_ctr: unavailable due to an internal error\n");
-		return;
-	}
-
-	switch (action)
-	{
-		case ACTION_HEADER:
-		{
-			break;
-		}
-		case ACTION_ENUMERATE:
-		{
-			int i;
-
-			for (i = 0; i < ctr->num_entries_read; i++)
-			{
-				display_conn_info_0(out_hnd, ACTION_HEADER   , &(ctr->info_0[i]));
-				display_conn_info_0(out_hnd, ACTION_ENUMERATE, &(ctr->info_0[i]));
-				display_conn_info_0(out_hnd, ACTION_FOOTER   , &(ctr->info_0[i]));
-			}
-			break;
-		}
-		case ACTION_FOOTER:
-		{
-			break;
-		}
-	}
-}
-
-/****************************************************************************
-connection info level 1 container display function
-****************************************************************************/
-void display_srv_conn_info_1_ctr(FILE *out_hnd, enum action_type action,
-				SRV_CONN_INFO_1 *ctr)
-{
-	if (ctr == NULL)
-	{
-		fprintf(out_hnd, "display_srv_conn_info_1_ctr: unavailable due to an internal error\n");
-		return;
-	}
-
-	switch (action)
-	{
-		case ACTION_HEADER:
-		{
-			break;
-		}
-		case ACTION_ENUMERATE:
-		{
-			int i;
-
-			for (i = 0; i < ctr->num_entries_read; i++)
-			{
-				display_conn_info_1(out_hnd, ACTION_HEADER   , &(ctr->info_1[i]), &(ctr->info_1_str[i]));
-				display_conn_info_1(out_hnd, ACTION_ENUMERATE, &(ctr->info_1[i]), &(ctr->info_1_str[i]));
-				display_conn_info_1(out_hnd, ACTION_FOOTER   , &(ctr->info_1[i]), &(ctr->info_1_str[i]));
-			}
-			break;
-		}
-		case ACTION_FOOTER:
-		{
-			break;
-		}
-	}
-}
-
-/****************************************************************************
-connection info container display function
-****************************************************************************/
-void display_srv_conn_info_ctr(FILE *out_hnd, enum action_type action,
-				SRV_CONN_INFO_CTR *ctr)
-{
-	if (ctr == NULL || ctr->ptr_conn_ctr == 0)
-	{
-		fprintf(out_hnd, "display_srv_conn_info_ctr: unavailable due to an internal error\n");
-		return;
-	}
-
-	switch (ctr->switch_value)
-	{
-		case 0:
-		{
-			display_srv_conn_info_0_ctr(out_hnd, action,
-			                   &(ctr->conn.info0));
-			break;
-		}
-		case 1:
-		{
-			display_srv_conn_info_1_ctr(out_hnd, action,
-			                   &(ctr->conn.info1));
-			break;
-		}
-		default:
-		{
-			fprintf(out_hnd, "display_srv_conn_info_ctr: Unknown Info Level\n");
-			break;
-		}
-	}
-}
-
-
-/****************************************************************************
-share info level 1 display function
-****************************************************************************/
-void display_share_info_1(FILE *out_hnd, enum action_type action,
-			  SRV_SHARE_INFO_1 *info1)
-{
-	if (info1 == NULL)
-	{
-		return;
-	}
-
-	switch (action)
-	{
-		case ACTION_HEADER:
-		{
-			fprintf(out_hnd, "Share Info Level 1:\n");
-
-			break;
-		}
-		case ACTION_ENUMERATE:
-		{
-			fstring remark  ;
-			fstring net_name;
-
-			rpcstr_pull(net_name, info1->info_1_str.uni_netname.buffer, sizeof(net_name), info1->info_1_str.uni_netname.uni_str_len*2, 0);
-			rpcstr_pull(remark, info1->info_1_str.uni_remark.buffer, sizeof(remark), info1->info_1_str.uni_remark.uni_str_len*2, 0);
-
-			display_share(out_hnd, action, net_name, info1->info_1.type, remark);
-
-			break;
-		}
-		case ACTION_FOOTER:
-		{
-			fprintf(out_hnd, "\n");
-			break;
-		}
-	}
-
-}
-
-/****************************************************************************
-share info level 2 display function
-****************************************************************************/
-void display_share_info_2(FILE *out_hnd, enum action_type action,
-			  SRV_SHARE_INFO_2 *info2)
-{
-	if (info2 == NULL)
-	{
-		return;
-	}
-
-	switch (action)
-	{
-		case ACTION_HEADER:
-		{
-			fprintf(out_hnd, "Share Info Level 2:\n");
-
-			break;
-		}
-		case ACTION_ENUMERATE:
-		{
-			fstring remark  ;
-			fstring net_name;
-			fstring path    ;
-			fstring passwd  ;
-
-			rpcstr_pull(net_name, info2->info_2_str.uni_netname.buffer, sizeof(net_name), info2->info_2_str.uni_netname.uni_str_len*2, 0);
-			rpcstr_pull(remark, info2->info_2_str.uni_remark.buffer, sizeof(remark), info2->info_2_str.uni_remark.uni_str_len*2, 0);
-			rpcstr_pull(path, info2->info_2_str.uni_path.buffer, sizeof(path), info2->info_2_str.uni_path.uni_str_len*2, 0);
-			rpcstr_pull(passwd, info2->info_2_str.uni_passwd.buffer, sizeof(passwd), info2->info_2_str.uni_passwd.uni_str_len*2, 0);
-
-			display_share2(out_hnd, action, net_name,
-			      info2->info_2.type, remark, info2->info_2.perms,
-			      info2->info_2.max_uses, info2->info_2.num_uses,
-			      path, passwd);
-
-			break;
-		}
-		case ACTION_FOOTER:
-		{
-			fprintf(out_hnd, "\n");
-			break;
-		}
-	}
-
-}
-
-/****************************************************************************
-share info container display function
-****************************************************************************/
-void display_srv_share_info_ctr(FILE *out_hnd, enum action_type action,
-				SRV_SHARE_INFO_CTR *ctr)
-{
-	if (ctr == NULL)
-	{
-		fprintf(out_hnd, "display_srv_share_info_ctr: unavailable due to an internal error\n");
-	return;
-	}
-
-	switch (action)
-	{
-		case ACTION_HEADER:
-		{
-			break;
-		}
-		case ACTION_ENUMERATE:
-		{
-			int i;
-
-			for (i = 0; i < ctr->num_entries; i++)
-			{
-				switch (ctr->info_level) {
-				case 1:
-					display_share_info_1(out_hnd, ACTION_HEADER   , &(ctr->share.info1[i]));
-					display_share_info_1(out_hnd, ACTION_ENUMERATE, &(ctr->share.info1[i]));
-					display_share_info_1(out_hnd, ACTION_FOOTER   , &(ctr->share.info1[i]));
-					break;
-				case 2:
-					display_share_info_2(out_hnd, ACTION_HEADER   , &(ctr->share.info2[i]));
-					display_share_info_2(out_hnd, ACTION_ENUMERATE, &(ctr->share.info2[i]));
-					display_share_info_2(out_hnd, ACTION_FOOTER   , &(ctr->share.info2[i]));
-					break;
-				default:
-					fprintf(out_hnd, "display_srv_share_info_ctr: Unknown Info Level\n");
-					break;
-				}
-			}
-			break;
-		}
-		case ACTION_FOOTER:
-		{
-			break;
-		}
-	}
-}
-
-/****************************************************************************
-file info level 3 display function
-****************************************************************************/
-void display_file_info_3(FILE *out_hnd, enum action_type action,
-		FILE_INFO_3 *info3, FILE_INFO_3_STR *str3)
-{
-	if (info3 == NULL || str3 == NULL)
-	{
-		return;
-	}
-
-	switch (action)
-	{
-		case ACTION_HEADER:
-		{
-			fprintf(out_hnd, "File Info Level 3:\n");
-
-			break;
-		}
-		case ACTION_ENUMERATE:
-		{
-			fstring path_name;
-			fstring user_name;
-
-			rpcstr_pull(path_name, str3->uni_path_name.buffer, sizeof(path_name), str3->uni_path_name.uni_str_len*2, 0);
-			rpcstr_pull(user_name, str3->uni_user_name.buffer, sizeof(user_name), str3->uni_user_name.uni_str_len*2, 0);
-
-			fprintf(out_hnd, "\tid       : %d\n", info3->id);
-			fprintf(out_hnd, "\tperms    : %s\n", get_file_mode_str(info3->perms));
-			fprintf(out_hnd, "\tnum_locks: %d\n", info3->num_locks);
-
-			fprintf(out_hnd, "\tpath name: %s\n", path_name);
-			fprintf(out_hnd, "\tuser name: %s\n", user_name);
-
-			break;
-		}
-		case ACTION_FOOTER:
-		{
-			fprintf(out_hnd, "\n");
-			break;
-		}
-	}
-
-}
-
-/****************************************************************************
-file info level 3 container display function
-****************************************************************************/
-void display_srv_file_info_3_ctr(FILE *out_hnd, enum action_type action,
-				SRV_FILE_INFO_3 *ctr)
-{
-	if (ctr == NULL)
-	{
-		fprintf(out_hnd, "display_srv_file_info_3_ctr: unavailable due to an internal error\n");
-		return;
-	}
-
-	switch (action)
-	{
-		case ACTION_HEADER:
-		{
-			break;
-		}
-		case ACTION_ENUMERATE:
-		{
-			int i;
-
-			for (i = 0; i < ctr->num_entries_read; i++)
-			{
-				display_file_info_3(out_hnd, ACTION_HEADER   , &(ctr->info_3[i]), &(ctr->info_3_str[i]));
-				display_file_info_3(out_hnd, ACTION_ENUMERATE, &(ctr->info_3[i]), &(ctr->info_3_str[i]));
-				display_file_info_3(out_hnd, ACTION_FOOTER   , &(ctr->info_3[i]), &(ctr->info_3_str[i]));
-			}
-			break;
-		}
-		case ACTION_FOOTER:
-		{
-			break;
-		}
-	}
-}
-
-/****************************************************************************
-file info container display function
-****************************************************************************/
-void display_srv_file_info_ctr(FILE *out_hnd, enum action_type action,
-				SRV_FILE_INFO_CTR *ctr)
-{
-	if (ctr == NULL || ctr->ptr_file_ctr == 0)
-	{
-		fprintf(out_hnd, "display_srv_file_info_ctr: unavailable due to an internal error\n");
-		return;
-	}
-
-	switch (ctr->switch_value)
-	{
-		case 3:
-		{
-			display_srv_file_info_3_ctr(out_hnd, action,
-			                   &(ctr->file.info3));
-			break;
-		}
-		default:
-		{
-			fprintf(out_hnd, "display_srv_file_info_ctr: Unknown Info Level\n");
-			break;
-		}
-	}
-}
-
-/****************************************************************************
- print browse connection on a host
- ****************************************************************************/
-void display_server(FILE *out_hnd, enum action_type action,
-				char *sname, uint32 type, char *comment)
-{
-	switch (action)
-	{
-		case ACTION_HEADER:
-		{
-			break;
-		}
-		case ACTION_ENUMERATE:
-		{
-			fprintf(out_hnd, "\t%-15.15s%-20s %s\n",
-			                 sname, get_server_type_str(type), comment);
-			break;
-		}
-		case ACTION_FOOTER:
-		{
-			break;
-		}
-	}
-}
-
-/****************************************************************************
-print shares on a host
-****************************************************************************/
-void display_share(FILE *out_hnd, enum action_type action,
-				char *sname, uint32 type, char *comment)
-{
-	switch (action)
-	{
-		case ACTION_HEADER:
-		{
-			break;
-		}
-		case ACTION_ENUMERATE:
-		{
-			fprintf(out_hnd, "\t%-15.15s%-10.10s%s\n",
-			                 sname, get_share_type_str(type), comment);
-			break;
-		}
-		case ACTION_FOOTER:
-		{
-			break;
-		}
-	}
-}
-
-
-/****************************************************************************
-print shares on a host, level 2
-****************************************************************************/
-void display_share2(FILE *out_hnd, enum action_type action,
-				char *sname, uint32 type, char *comment,
-				uint32 perms, uint32 max_uses, uint32 num_uses,
-				char *path, char *passwd)
-{
-	switch (action)
-	{
-		case ACTION_HEADER:
-		{
-			break;
-		}
-		case ACTION_ENUMERATE:
-		{
-			fprintf(out_hnd, "\t%-15.15s%-10.10s%s %x %x %x %s %s\n",
-			                 sname, get_share_type_str(type), comment,
-			                 perms, max_uses, num_uses, path, passwd);
-			break;
-		}
-		case ACTION_FOOTER:
-		{
-			break;
-		}
-	}
-}
-
-
-/****************************************************************************
-print name info
-****************************************************************************/
-void display_name(FILE *out_hnd, enum action_type action,
-				char *sname)
-{
-	switch (action)
-	{
-		case ACTION_HEADER:
-		{
-			break;
-		}
-		case ACTION_ENUMERATE:
-		{
-			fprintf(out_hnd, "\t%-21.21s\n", sname);
-			break;
-		}
-		case ACTION_FOOTER:
-		{
-			break;
-		}
-	}
-}
-
-
-/****************************************************************************
- display group rid info
- ****************************************************************************/
-void display_group_rid_info(FILE *out_hnd, enum action_type action,
-				uint32 num_gids, DOM_GID *gid)
-{
-	switch (action)
-	{
-		case ACTION_HEADER:
-		{
-			if (num_gids == 0)
-			{
-				fprintf(out_hnd, "\tNo Groups\n");
-			}
-			else
-			{
-				fprintf(out_hnd, "\tGroup Info\n");
-				fprintf(out_hnd, "\t----------\n");
-			}
-			break;
-		}
-		case ACTION_ENUMERATE:
-		{
-			int i;
-
-			for (i = 0; i < num_gids; i++)
-			{
-				fprintf(out_hnd, "\tGroup RID: %8x attr: %x\n",
-								  gid[i].g_rid, gid[i].attr);
-			}
-
-			break;
-		}
-		case ACTION_FOOTER:
-		{
-			fprintf(out_hnd, "\n");
-			break;
-		}
-	}
-}
-
-
-/****************************************************************************
- display alias name info
- ****************************************************************************/
-void display_alias_name_info(FILE *out_hnd, enum action_type action,
-				uint32 num_aliases, fstring *alias_name, uint32 *num_als_usrs)
-{
-	switch (action)
-	{
-		case ACTION_HEADER:
-		{
-			if (num_aliases == 0)
-			{
-				fprintf(out_hnd, "\tNo Aliases\n");
-			}
-			else
-			{
-				fprintf(out_hnd, "\tAlias Names\n");
-				fprintf(out_hnd, "\t----------- \n");
-			}
-			break;
-		}
-		case ACTION_ENUMERATE:
-		{
-			int i;
-
-			for (i = 0; i < num_aliases; i++)
-			{
-				fprintf(out_hnd, "\tAlias Name: %s Attributes: %3d\n",
-								  alias_name[i], num_als_usrs[i]);
-			}
-
-			break;
-		}
-		case ACTION_FOOTER:
-		{
-			fprintf(out_hnd, "\n");
-			break;
-		}
-	}
-}
-
-
-/****************************************************************************
- display sam_user_info_21 structure
- ****************************************************************************/
-void display_sam_user_info_21(FILE *out_hnd, enum action_type action, SAM_USER_INFO_21 *usr)
-{
-	switch (action)
-	{
-		case ACTION_HEADER:
-		{
-			fprintf(out_hnd, "\tUser Info, Level 0x15\n");
-			fprintf(out_hnd, "\t---------------------\n");
-
-			break;
-		}
-		case ACTION_ENUMERATE:
-		{
-			pstring tmp;
-			rpcstr_pull(tmp, usr->uni_user_name.buffer, sizeof(tmp),usr->uni_user_name.uni_str_len*2, 0);
-			fprintf(out_hnd, "\t\tUser Name   : %s\n", tmp); /* username unicode string */
-			rpcstr_pull(tmp, usr->uni_full_name.buffer, sizeof(tmp),usr->uni_full_name.uni_str_len*2, 0);
-			fprintf(out_hnd, "\t\tFull Name   : %s\n", tmp); /* user's full name unicode string */
-			rpcstr_pull(tmp, usr->uni_home_dir.buffer, sizeof(tmp),usr->uni_home_dir.uni_str_len*2, 0);
-			fprintf(out_hnd, "\t\tHome Drive  : %s\n", tmp); /* home directory unicode string */
-			rpcstr_pull(tmp, usr->uni_dir_drive.buffer, sizeof(tmp),usr->uni_dir_drive.uni_str_len*2, 0);
-			fprintf(out_hnd, "\t\tDir Drive   : %s\n", tmp); /* home directory drive unicode string */
-			rpcstr_pull(tmp, usr->uni_profile_path.buffer, sizeof(tmp),usr->uni_profile_path.uni_str_len*2, 0);
-			fprintf(out_hnd, "\t\tProfile Path: %s\n", tmp); /* profile path unicode string */
-			rpcstr_pull(tmp, usr->uni_logon_script.buffer, sizeof(tmp),usr->uni_logon_script.uni_str_len*2, 0);
-			fprintf(out_hnd, "\t\tLogon Script: %s\n", tmp); /* logon script unicode string */
-			rpcstr_pull(tmp, usr->uni_acct_desc.buffer, sizeof(tmp),usr->uni_acct_desc.uni_str_len*2, 0);
-			fprintf(out_hnd, "\t\tDescription : %s\n", tmp); /* user description unicode string */
-			rpcstr_pull(tmp, usr->uni_workstations.buffer, sizeof(tmp),usr->uni_workstations.uni_str_len*2, 0);
-			fprintf(out_hnd, "\t\tWorkstations: %s\n", tmp); /* workstaions unicode string */
-			rpcstr_pull(tmp, usr->uni_unknows_str.buffer, sizeof(tmp),usr->uni_unknown_str.uni_str_len*2, 0);
-			fprintf(out_hnd, "\t\tUnknown Str : %s\n", tmp); /* unknown string unicode string */
-			rpcstr_pull(tmp, usr->uni_munged_dial.buffer, sizeof(tmp),usr->uni_munged_dial.uni_str_len*2, 0);
-			fprintf(out_hnd, "\t\tRemote Dial : %s\n", tmp); /* munged remote access unicode string */
-
-			fprintf(out_hnd, "\t\tLogon Time               : %s\n", http_timestring(nt_time_to_unix(&(usr->logon_time           ))));
-			fprintf(out_hnd, "\t\tLogoff Time              : %s\n", http_timestring(nt_time_to_unix(&(usr->logoff_time          ))));
-			fprintf(out_hnd, "\t\tKickoff Time             : %s\n", http_timestring(nt_time_to_unix(&(usr->kickoff_time         ))));
-			fprintf(out_hnd, "\t\tPassword last set Time   : %s\n", http_timestring(nt_time_to_unix(&(usr->pass_last_set_time   ))));
-			fprintf(out_hnd, "\t\tPassword can change Time : %s\n", http_timestring(nt_time_to_unix(&(usr->pass_can_change_time ))));
-			fprintf(out_hnd, "\t\tPassword must change Time: %s\n", http_timestring(nt_time_to_unix(&(usr->pass_must_change_time))));
-			
-			fprintf(out_hnd, "\t\tunknown_2[0..31]...\n"); /* user passwords? */
-
-			fprintf(out_hnd, "\t\tuser_rid : %x\n"  , usr->user_rid ); /* User ID */
-			fprintf(out_hnd, "\t\tgroup_rid: %x\n"  , usr->group_rid); /* Group ID */
-			fprintf(out_hnd, "\t\tacb_info : %04x\n", usr->acb_info ); /* Account Control Info */
-
-			fprintf(out_hnd, "\t\tunknown_3: %08x\n", usr->unknown_3); /* 0x00ff ffff */
-			fprintf(out_hnd, "\t\tlogon_divs: %d\n", usr->logon_divs); /* 0x0000 00a8 which is 168 which is num hrs in a week */
-			fprintf(out_hnd, "\t\tunknown_5: %08x\n", usr->unknown_5); /* 0x0002 0000 */
-
-			fprintf(out_hnd, "\t\tpadding1[0..7]...\n");
-
-			if (usr->ptr_logon_hrs)
-			{
-				fprintf(out_hnd, "\t\tlogon_hrs[0..%d]...\n", usr->logon_hrs.len);
-			}
-
-			break;
-		}
-		case ACTION_FOOTER:
-		{
-			fprintf(out_hnd, "\n");
-			break;
-		}
-	}
-}
-
-
-/****************************************************************************
-convert a security permissions into a string
-****************************************************************************/
-char *get_sec_mask_str(uint32 type)
-{
-	static fstring typestr;
-	int i;
-
-	switch (type)
-	{
-		case SEC_RIGHTS_FULL_CONTROL:
-		{
-			fstrcpy(typestr, "Full Control");
-			return typestr;
-		}
-
-		case SEC_RIGHTS_READ:
-		{
-			fstrcpy(typestr, "Read");
-			return typestr;
-		}
-		default:
-		{
-			break;
-		}
-	}
-
-	typestr[0] = 0;
-	for (i = 0; i < 32; i++)
-	{
-		if (type & (1 << i))
-		{
-			switch (((unsigned)1) << i)
-			{
-				case SEC_RIGHTS_QUERY_VALUE    : fstrcat(typestr, "Query " ); break;
-				case SEC_RIGHTS_SET_VALUE      : fstrcat(typestr, "Set " ); break;
-				case SEC_RIGHTS_CREATE_SUBKEY  : fstrcat(typestr, "Create "); break;
-				case SEC_RIGHTS_ENUM_SUBKEYS   : fstrcat(typestr, "Enum "); break;
-				case SEC_RIGHTS_NOTIFY         : fstrcat(typestr, "Notify "); break;
-				case SEC_RIGHTS_CREATE_LINK    : fstrcat(typestr, "CreateLink "); break;
-				case SEC_RIGHTS_DELETE         : fstrcat(typestr, "Delete "); break;
-				case SEC_RIGHTS_READ_CONTROL   : fstrcat(typestr, "ReadControl "); break;
-				case SEC_RIGHTS_WRITE_DAC      : fstrcat(typestr, "WriteDAC "); break;
-				case SEC_RIGHTS_WRITE_OWNER    : fstrcat(typestr, "WriteOwner "); break;
-			}
-			type &= ~(1 << i);
-		}
-	}
-
-	/* remaining bits get added on as-is */
-	if (type != 0)
-	{
-		fstring tmp;
-		slprintf(tmp, sizeof(tmp)-1, "[%08x]", type);
-		fstrcat(typestr, tmp);
-	}
-
-	/* remove last space */
-	i = strlen(typestr)-1;
-	if (typestr[i] == ' ') typestr[i] = 0;
-
-	return typestr;
-}
-
-/****************************************************************************
- display sec_access structure
- ****************************************************************************/
-void display_sec_access(FILE *out_hnd, enum action_type action, SEC_ACCESS *info)
-{
-	switch (action)
-	{
-		case ACTION_HEADER:
-		{
-			break;
-		}
-		case ACTION_ENUMERATE:
-		{
-			fprintf(out_hnd, "\t\tPermissions: %s\n",
-			        get_sec_mask_str(info->mask));
-		}
-		case ACTION_FOOTER:
-		{
-			break;
-		}
-	}
-}
-
-/****************************************************************************
- display sec_ace structure
- ****************************************************************************/
-void display_sec_ace(FILE *out_hnd, enum action_type action, SEC_ACE *ace)
-{
-	switch (action)
-	{
-		case ACTION_HEADER:
-		{
-			fprintf(out_hnd, "\tACE\n");
-			break;
-		}
-		case ACTION_ENUMERATE:
-		{
-			fstring sid_str;
-
-			display_sec_access(out_hnd, ACTION_HEADER   , &ace->info);
-			display_sec_access(out_hnd, ACTION_ENUMERATE, &ace->info);
-			display_sec_access(out_hnd, ACTION_FOOTER   , &ace->info);
-
-			sid_to_string(sid_str, &ace->sid);
-			fprintf(out_hnd, "\t\tSID: %s\n", sid_str);
-		}
-		case ACTION_FOOTER:
-		{
-			break;
-		}
-	}
-}
-
-/****************************************************************************
- display sec_acl structure
- ****************************************************************************/
-void display_sec_acl(FILE *out_hnd, enum action_type action, SEC_ACL *sec_acl)
-{
-	switch (action)
-	{
-		case ACTION_HEADER:
-		{
-			fprintf(out_hnd, "\tACL\tNum ACEs:\t%d\trevision:\t%x\n",
-			                 sec_acl->num_aces, sec_acl->revision); 
-			fprintf(out_hnd, "\t---\n");
-
-			break;
-		}
-		case ACTION_ENUMERATE:
-		{
-			if (sec_acl->size != 0 && sec_acl->num_aces != 0)
-			{
-				int i;
-				for (i = 0; i < sec_acl->num_aces; i++)
-				{
-					display_sec_ace(out_hnd, ACTION_HEADER   , &sec_acl->ace[i]);
-					display_sec_ace(out_hnd, ACTION_ENUMERATE, &sec_acl->ace[i]);
-					display_sec_ace(out_hnd, ACTION_FOOTER   , &sec_acl->ace[i]);
-				}
-			}
-				
-			break;
-		}
-		case ACTION_FOOTER:
-		{
-			fprintf(out_hnd, "\n");
-			break;
-		}
-	}
-}
-
-/****************************************************************************
- display sec_desc structure
- ****************************************************************************/
-void display_sec_desc(FILE *out_hnd, enum action_type action, SEC_DESC *sec)
-{
-	switch (action)
-	{
-		case ACTION_HEADER:
-		{
-			fprintf(out_hnd, "\tSecurity Descriptor\trevision:\t%x\ttype:\t%x\n",
-			                 sec->revision, sec->type); 
-			fprintf(out_hnd, "\t-------------------\n");
-
-			break;
-		}
-		case ACTION_ENUMERATE:
-		{
-			fstring sid_str;
-
-			if (sec->off_sacl != 0)
-			{
-				display_sec_acl(out_hnd, ACTION_HEADER   , sec->sacl);
-				display_sec_acl(out_hnd, ACTION_ENUMERATE, sec->sacl);
-				display_sec_acl(out_hnd, ACTION_FOOTER   , sec->sacl);
-			}
-			if (sec->off_dacl != 0)
-			{
-				display_sec_acl(out_hnd, ACTION_HEADER   , sec->dacl);
-				display_sec_acl(out_hnd, ACTION_ENUMERATE, sec->dacl);
-				display_sec_acl(out_hnd, ACTION_FOOTER   , sec->dacl);
-			}
-			if (sec->off_owner_sid != 0)
-			{
-				sid_to_string(sid_str, sec->owner_sid);
-				fprintf(out_hnd, "\tOwner SID:\t%s\n", sid_str);
-			}
-			if (sec->off_grp_sid != 0)
-			{
-				sid_to_string(sid_str, sec->grp_sid);
-				fprintf(out_hnd, "\tParent SID:\t%s\n", sid_str);
-			}
-				
-			break;
-		}
-		case ACTION_FOOTER:
-		{
-			fprintf(out_hnd, "\n");
-			break;
-		}
-	}
-}
-
-/****************************************************************************
-convert a security permissions into a string
-****************************************************************************/
-char *get_reg_val_type_str(uint32 type)
-{
-	static fstring typestr;
-
-	switch (type)
-	{
-		case 0x01:
-		{
-			fstrcpy(typestr, "string");
-			return typestr;
-		}
-
-		case 0x03:
-		{
-			fstrcpy(typestr, "bytes");
-			return typestr;
-		}
-
-		case 0x04:
-		{
-			fstrcpy(typestr, "uint32");
-			return typestr;
-		}
-
-		case 0x07:
-		{
-			fstrcpy(typestr, "multi");
-			return typestr;
-		}
-		default:
-		{
-			break;
-		}
-	}
-	slprintf(typestr, sizeof(typestr)-1, "[%d]", type);
-	return typestr;
-}
-
-
-static void print_reg_value(FILE *out_hnd, char *val_name, uint32 val_type, BUFFER2 *value)
-{
-	fstring type;
-	pstring	intvalue;
-	fstrcpy(type, get_reg_val_type_str(val_type));
-
-	switch (val_type)
-	{
-		case 0x01: /* unistr */
-		{
-			rpcstr_pull(intvalue, value->buffer, sizeof(intvalue), value->buf_len, 0);	
-			/*fprintf(out_hnd,"\t%s:\t%s:\t%s\n", val_name, type, dos_buffer2_to_str(value));*/
-			fprintf(out_hnd,"\t%s:\t%s:\t%s\n", val_name, type, value);
-			break;
-		}
-
-		default: /* unknown */
-		case 0x03: /* bytes */
-		{
-			if (value->buf_len <= 8)
-			{
-				fprintf(out_hnd,"\t%s:\t%s:\t", val_name, type);
-				out_data(out_hnd, (char*)value->buffer, value->buf_len, 8);
-			}
-			else
-			{
-				fprintf(out_hnd,"\t%s:\t%s:\n", val_name, type);
-				out_data(out_hnd, (char*)value->buffer, value->buf_len, 16);
-			}
-			break;
-		}
-
-		case 0x04: /* uint32 */
-		{
-			fprintf(out_hnd,"\t%s:\t%s: 0x%08x\n", val_name, type, buffer2_to_uint32(value));
-			break;
-		}
-
-		case 0x07: /* multiunistr */
-		{
-			fprintf(out_hnd,"\t%s:\t%s:\t%s\n", val_name, type, dos_buffer2_to_multistr(value));
-			break;
-		}
-	}
-}
-
-/****************************************************************************
- display structure
- ****************************************************************************/
-void display_reg_value_info(FILE *out_hnd, enum action_type action,
-				char *val_name, uint32 val_type, BUFFER2 *value)
-{
-	switch (action)
-	{
-		case ACTION_HEADER:
-		{
-			break;
-		}
-		case ACTION_ENUMERATE:
-		{
-			print_reg_value(out_hnd, val_name, val_type, value);
-			break;
-		}
-		case ACTION_FOOTER:
-		{
-			break;
-		}
-	}
-}
-
-/****************************************************************************
- display structure
- ****************************************************************************/
-void display_reg_key_info(FILE *out_hnd, enum action_type action,
-				char *key_name, time_t key_mod_time)
-{
-	switch (action)
-	{
-		case ACTION_HEADER:
-		{
-			break;
-		}
-		case ACTION_ENUMERATE:
-		{
-			fprintf(out_hnd, "\t%s\t(%s)\n",
-			        key_name, http_timestring(key_mod_time));
-			break;
-		}
-		case ACTION_FOOTER:
-		{
-			break;
-		}
-	}
-}
-
-#if COPY_THIS_TEMPLATE
-/****************************************************************************
- display structure
- ****************************************************************************/
- void display_(FILE *out_hnd, enum action_type action, *)
-{
-	switch (action)
-	{
-		case ACTION_HEADER:
-		{
-			fprintf(out_hnd, "\t\n"); 
-			fprintf(out_hnd, "\t-------------------\n");
-
-			break;
-		}
-		case ACTION_ENUMERATE:
-		{
-			break;
-		}
-		case ACTION_FOOTER:
-		{
-			fprintf(out_hnd, "\n");
-			break;
-		}
-	}
-}
-
-#endif
diff --git a/source3/rpcclient/display_spool.c b/source3/rpcclient/display_spool.c
deleted file mode 100644
index b4baf570f1..0000000000
--- a/source3/rpcclient/display_spool.c
+++ /dev/null
@@ -1,927 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-   Samba utility functions
-   Copyright (C) Andrew Tridgell 1992-1999
-   Copyright (C) Luke Kenneth Casson Leighton 1996 - 1999
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful, 
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include "includes.h"
-
-/****************************************************************************
-printer info level 0 display function
-****************************************************************************/
-static void display_print_info_0(FILE *out_hnd, PRINTER_INFO_0 *i1)
-{
-	fstring name;
-	fstring server;
-	if (i1 == NULL)
-		return;
-
-	rpcstr_pull(name, i1->printername.buffer, sizeof(name), 0, STR_TERMINATE);
-	rpcstr_pull(server, i1->servername.buffer, sizeof(server), 0, STR_TERMINATE);
-
-	report(out_hnd, "\tprintername:[%s]\n", name);
-	report(out_hnd, "\tservername:[%s]\n", server);
-	report(out_hnd, "\tcjobs:[%x]\n", i1->cjobs);
-	report(out_hnd, "\ttotal_jobs:[%x]\n", i1->total_jobs);
-	
-	report(out_hnd, "\t:date: [%d]-[%d]-[%d] (%d)\n", i1->year, i1->month, i1->day, i1->dayofweek);
-	report(out_hnd, "\t:time: [%d]-[%d]-[%d]-[%d]\n", i1->hour, i1->minute, i1->second, i1->milliseconds);
-	
-	report(out_hnd, "\tglobal_counter:[%x]\n", i1->global_counter);
-	report(out_hnd, "\ttotal_pages:[%x]\n", i1->total_pages);
-	
-	report(out_hnd, "\tmajorversion:[%x]\n", i1->major_version);
-	report(out_hnd, "\tbuildversion:[%x]\n", i1->build_version);
-	
-	report(out_hnd, "\tunknown7:[%x]\n", i1->unknown7);
-	report(out_hnd, "\tunknown8:[%x]\n", i1->unknown8);
-	report(out_hnd, "\tunknown9:[%x]\n", i1->unknown9);
-	report(out_hnd, "\tsession_counter:[%x]\n", i1->session_counter);
-	report(out_hnd, "\tunknown11:[%x]\n", i1->unknown11);
-	report(out_hnd, "\tprinter_errors:[%x]\n", i1->printer_errors);
-	report(out_hnd, "\tunknown13:[%x]\n", i1->unknown13);
-	report(out_hnd, "\tunknown14:[%x]\n", i1->unknown14);
-	report(out_hnd, "\tunknown15:[%x]\n", i1->unknown15);
-	report(out_hnd, "\tunknown16:[%x]\n", i1->unknown16);
-	report(out_hnd, "\tchange_id:[%x]\n", i1->change_id);
-	report(out_hnd, "\tunknown18:[%x]\n", i1->unknown18);
-	report(out_hnd, "\tstatus:[%x]\n", i1->status);
-	report(out_hnd, "\tunknown20:[%x]\n", i1->unknown20);
-	report(out_hnd, "\tc_setprinter:[%x]\n", i1->c_setprinter);
-	report(out_hnd, "\tunknown22:[%x]\n", i1->unknown22);
-	report(out_hnd, "\tunknown23:[%x]\n", i1->unknown23);
-	report(out_hnd, "\tunknown24:[%x]\n", i1->unknown24);
-	report(out_hnd, "\tunknown25:[%x]\n", i1->unknown25);
-	report(out_hnd, "\tunknown26:[%x]\n", i1->unknown26);
-	report(out_hnd, "\tunknown27:[%x]\n", i1->unknown27);
-	report(out_hnd, "\tunknown28:[%x]\n", i1->unknown28);
-	report(out_hnd, "\tunknown29:[%x]\n", i1->unknown29);
-}
-
-/****************************************************************************
-printer info level 1 display function
-****************************************************************************/
-static void display_print_info_1(FILE *out_hnd, PRINTER_INFO_1 *i1)
-{
-	fstring desc;
-	fstring name;
-	fstring comm;
-	if (i1 == NULL)
-		return;
-
-	rpcstr_pull(name, i1->name.buffer, sizeof(name), 0, STR_TERMINATE);
-	rpcstr_pull(desc, i1->description.buffer, sizeof(desc), 0, STR_TERMINATE);
-	rpcstr_pull(comm, i1->comment.buffer, sizeof(comm), 0, STR_TERMINATE);
-
-	report(out_hnd, "\tflags:[%x]\n", i1->flags);
-	report(out_hnd, "\tname:[%s]\n", name);
-	report(out_hnd, "\tdescription:[%s]\n", desc);
-	report(out_hnd, "\tcomment:[%s]\n\n", comm);
-}
-
-/****************************************************************************
-printer info level 2 display function
-****************************************************************************/
-static void display_print_info_2(FILE *out_hnd, PRINTER_INFO_2 *i2)
-{
-	fstring servername;
-	fstring printername;
-	fstring sharename;
-	fstring portname;
-	fstring drivername;
-	fstring comment;
-	fstring location;
-	fstring sepfile;
-	fstring printprocessor;
-	fstring datatype;
-	fstring parameters;
-	
-	if (i2 == NULL)
-		return;
-
-	rpcstr_pull(servername, i2->servername.buffer,sizeof(servername), 0, STR_TERMINATE);
-	rpcstr_pull(printername, i2->printername.buffer,sizeof(printername), 0, STR_TERMINATE);
-	rpcstr_pull(sharename, i2->sharename.buffer,sizeof(sharename), 0, STR_TERMINATE);
-	rpcstr_pull(portname, i2->portname.buffer,sizeof(portname), 0, STR_TERMINATE);
-	rpcstr_pull(drivername, i2->drivername.buffer,sizeof(drivername), 0, STR_TERMINATE);
-	rpcstr_pull(comment, i2->comment.buffer,sizeof(comment), 0, STR_TERMINATE);
-	rpcstr_pull(location, i2->location.buffer,sizeof(location), 0, STR_TERMINATE);
-	rpcstr_pull(sepfile, i2->sepfile.buffer,sizeof(sepfile), 0, STR_TERMINATE);
-	rpcstr_pull(printprocessor, i2->printprocessor.buffer,sizeof(printprocessor), 0, STR_TERMINATE);
-	rpcstr_pull(datatype, i2->datatype.buffer,sizeof(datatype), 0, STR_TERMINATE);
-	rpcstr_pull(parameters, i2->parameters.buffer,sizeof(parameters), 0, STR_TERMINATE);
-	
-	report(out_hnd, "\tservername:[%s]\n", servername);
-	report(out_hnd, "\tprintername:[%s]\n", printername);
-	report(out_hnd, "\tsharename:[%s]\n", sharename);
-	report(out_hnd, "\tportname:[%s]\n", portname);
-	report(out_hnd, "\tdrivername:[%s]\n", drivername);
-	report(out_hnd, "\tcomment:[%s]\n", comment);
-	report(out_hnd, "\tlocation:[%s]\n", location);
-	report(out_hnd, "\tsepfile:[%s]\n", sepfile);
-	report(out_hnd, "\tprintprocessor:[%s]\n", printprocessor);
-	report(out_hnd, "\tdatatype:[%s]\n", datatype);
-	report(out_hnd, "\tparameters:[%s]\n", parameters);
-	report(out_hnd, "\tattributes:[%x]\n", i2->attributes);
-	report(out_hnd, "\tpriority:[%x]\n", i2->priority);
-	report(out_hnd, "\tdefaultpriority:[%x]\n", i2->defaultpriority);
-	report(out_hnd, "\tstarttime:[%x]\n", i2->starttime);
-	report(out_hnd, "\tuntiltime:[%x]\n", i2->untiltime);
-	report(out_hnd, "\tstatus:[%x]\n", i2->status);
-	report(out_hnd, "\tcjobs:[%x]\n", i2->cjobs);
-	report(out_hnd, "\taverageppm:[%x]\n\n", i2->averageppm);
-
-	if (i2->secdesc != NULL)
-	{
-		display_sec_desc(out_hnd, ACTION_HEADER   , i2->secdesc);
-		display_sec_desc(out_hnd, ACTION_ENUMERATE, i2->secdesc);
-		display_sec_desc(out_hnd, ACTION_FOOTER   , i2->secdesc);
-	}
-}
-
-/****************************************************************************
-printer info level 3 display function
-****************************************************************************/
-static void display_print_info_3(FILE *out_hnd, PRINTER_INFO_3 *i3)
-{
-	if (i3 == NULL)
-		return;
-
-	report(out_hnd, "\tflags:[%x]\n", i3->flags);
-
-	display_sec_desc(out_hnd, ACTION_HEADER   , i3->secdesc);
-	display_sec_desc(out_hnd, ACTION_ENUMERATE, i3->secdesc);
-	display_sec_desc(out_hnd, ACTION_FOOTER   , i3->secdesc);
-}
-
-/****************************************************************************
-connection info level 0 container display function
-****************************************************************************/
-static void display_printer_info_0_ctr(FILE *out_hnd, enum action_type action, uint32 count,  PRINTER_INFO_CTR ctr)
-{
-	int i;
-	PRINTER_INFO_0 *in;
-
-	switch (action)
-	{
-		case ACTION_HEADER:
-			report(out_hnd, "Printer Info Level 0:\n");
-			break;
-		case ACTION_ENUMERATE:
-			for (i = 0; i < count; i++) {
-				in=ctr.printers_0;
-				display_print_info_0(out_hnd, &(in[i]) );
-			}
-			break;
-		case ACTION_FOOTER:
-			report(out_hnd, "\n");
-			break;
-	}
-}
-
-/****************************************************************************
-connection info level 1 container display function
-****************************************************************************/
-static void display_printer_info_1_ctr(FILE *out_hnd, enum action_type action, uint32 count,  PRINTER_INFO_CTR ctr)
-{
-	int i;
-	PRINTER_INFO_1 *in;
-
-	switch (action)
-	{
-		case ACTION_HEADER:
-			report(out_hnd, "Printer Info Level 1:\n");
-			break;
-		case ACTION_ENUMERATE:
-			for (i = 0; i < count; i++) {
-				in=ctr.printers_1;
-				display_print_info_1(out_hnd, &(in[i]) );
-			}
-			break;
-		case ACTION_FOOTER:
-			report(out_hnd, "\n");
-			break;
-	}
-}
-
-/****************************************************************************
-connection info level 2 container display function
-****************************************************************************/
-static void display_printer_info_2_ctr(FILE *out_hnd, enum action_type action, uint32 count,  PRINTER_INFO_CTR ctr)
-{
-	int i;
-	PRINTER_INFO_2 *in;
-
-	switch (action)
-	{
-		case ACTION_HEADER:
-			report(out_hnd, "Printer Info Level 2:\n");
-			break;
-		case ACTION_ENUMERATE:
-			for (i = 0; i < count; i++) {
-				in=ctr.printers_2;
-				display_print_info_2(out_hnd, &(in[i]) );
-			}
-			break;
-		case ACTION_FOOTER:
-			report(out_hnd, "\n");
-			break;
-	}
-}
-
-/****************************************************************************
-connection info level 3 container display function
-****************************************************************************/
-static void display_printer_info_3_ctr(FILE *out_hnd, enum action_type action, uint32 count,  PRINTER_INFO_CTR ctr)
-{
-	int i;
-	PRINTER_INFO_3 *in;
-
-	switch (action)
-	{
-		case ACTION_HEADER:
-			report(out_hnd, "Printer Info Level 3:\n");
-			break;
-		case ACTION_ENUMERATE:
-			for (i = 0; i < count; i++) {
-				in=ctr.printers_3;
-				display_print_info_3(out_hnd, &(in[i]) );
-			}
-			break;
-		case ACTION_FOOTER:
-			report(out_hnd, "\n");
-			break;
-	}
-}
-
-/****************************************************************************
-connection info container display function
-****************************************************************************/
-void display_printer_info_ctr(FILE *out_hnd, enum action_type action, uint32 level,
-				uint32 count, PRINTER_INFO_CTR ctr)
-{
-	switch (level) {
-		case 0:
-			display_printer_info_0_ctr(out_hnd, action, count, ctr);
-			break;
-		case 1:
-			display_printer_info_1_ctr(out_hnd, action, count, ctr);
-			break;
-		case 2:
-			display_printer_info_2_ctr(out_hnd, action, count, ctr);
-			break;
-		case 3:
-			display_printer_info_3_ctr(out_hnd, action, count, ctr);
-			break;
-		default:
-			report(out_hnd, "display_printer_info_ctr: Unknown Info Level\n");
-			break;
-	}
-}
-
-/****************************************************************************
-connection info level 3 container display function
-****************************************************************************/
-static void display_port_info_1_ctr(FILE *out_hnd, enum action_type action, 
-				    uint32 count,  PORT_INFO_CTR *ctr)
-{
-	uint32	i = 0;
-	switch (action)
-	{
-		case ACTION_HEADER:
-			report(out_hnd, "Port Info Level 1:\n");
-			break;
-		case ACTION_ENUMERATE:
-			for (i=0; i<count; i++)
-				display_port_info_1(out_hnd, action, &ctr->port.info_1[i]);
-			break;
-		case ACTION_FOOTER:
-			report(out_hnd, "\n");
-			break;
-	}
-}
-
-/****************************************************************************
-connection info level 3 container display function
-****************************************************************************/
-static void display_port_info_2_ctr(FILE *out_hnd, enum action_type action, 
-				    uint32 count,  PORT_INFO_CTR *ctr)
-{
-	uint32	i = 0;
-	switch (action)
-	{
-		case ACTION_HEADER:
-			report(out_hnd, "Port Info Level 2:\n");
-			break;
-		case ACTION_ENUMERATE:
-			for (i=0; i<count; i++)
-				display_port_info_2(out_hnd, action, &ctr->port.info_2[i]);
-			break;
-		case ACTION_FOOTER:
-			report(out_hnd, "\n");
-			break;
-	}
-}
-
-/****************************************************************************
-connection info container display function
-****************************************************************************/
-void display_port_info_ctr(FILE *out_hnd, enum action_type action, uint32 level,
-				uint32 count, PORT_INFO_CTR *ctr)
-{
-	switch (level) {
-		case 1:
-			display_port_info_1_ctr(out_hnd, action, count, ctr);
-			break;
-		case 2:
-			display_port_info_2_ctr(out_hnd, action, count, ctr);
-			break;
-		default:
-			report(out_hnd, "display_port_info_ctr: Unknown Info Level\n");
-			break;
-	}
-}
-
-/****************************************************************************
-connection info container display function
-****************************************************************************/
-void display_port_info_1(FILE *out_hnd, enum action_type action, PORT_INFO_1 *i1)
-{
-	fstring buffer;
-	
-	switch (action)
-	{
-		case ACTION_HEADER:
-			report(out_hnd, "Port:\n");
-			break;
-		case ACTION_ENUMERATE:
-			rpcstr_pull(buffer, i1->port_name.buffer, sizeof(bufferi), 0, STR_TERMINATE);
-			fprintf (out_hnd, "\tPort Name:\t[%s]\n\n", buffer);
-			break;
-		case ACTION_FOOTER:
-			report(out_hnd, "\n");
-			break;
-	}
-}
-
-/****************************************************************************
-connection info container display function
-****************************************************************************/
-void display_port_info_2(FILE *out_hnd, enum action_type action, PORT_INFO_2 *i2)
-{
-	fstring buffer;
-	
-	switch (action)
-	{
-		case ACTION_HEADER:
-			report(out_hnd, "Port:\n");
-			break;
-		case ACTION_ENUMERATE:
-			rpcstr_pull(buffer, i2->port_name.buffer, sizeof(buffer), 0, STR_TERMINATE);
-			fprintf (out_hnd, "\tPort Name:\t[%s]\n", buffer);
-			rpcstr_pull(buffer, i2->monitor_name.buffer, sizeof(buffer), 0, STR_TERMINATE);
-
-			fprintf (out_hnd, "\tMonitor Name:\t[%s]\n", buffer);
-			rpcstr_pull(buffer, i2->description.buffer, sizeof(buffer), 0, STR_TERMINATE);
-			fprintf (out_hnd, "\tDescription:\t[%s]\n", buffer);
-			fprintf (out_hnd, "\tPort Type:\t[%d]\n", i2->port_type);
-			fprintf (out_hnd, "\tReserved:\t[%d]\n", i2->reserved);
-			fprintf (out_hnd, "\n");
-			break;
-		case ACTION_FOOTER:
-			report(out_hnd, "\n");
-			break;
-	}
-}
-
-/****************************************************************************
-connection info container display function
-****************************************************************************/
-void display_printer_enumdata(FILE *out_hnd, enum action_type action, uint32 idx, 
-				uint32 valuelen, uint16 *value, uint32 rvaluelen,
-				uint32 type, 
-				uint32 datalen, uint8 *data, uint32 rdatalen)
-{
-	fstring buffer;
-	
-	switch (action)
-	{
-		case ACTION_HEADER:
-			report(out_hnd, "Printer enum data:\n");
-			report(out_hnd, "index\tvaluelen\tvalue\t\trvaluelen");
-			report(out_hnd, "\ttype\tdatalen\tdata\trdatalen\n");
-			break;
-		case ACTION_ENUMERATE:
-			report(out_hnd, "[%d]", idx);
-			report(out_hnd, "\t[%d]", valuelen);
-			rpcstr_pull(buffer, value, sizeof(buffer), 0, STR_TERMINATE);
-			report(out_hnd, "\t[%s]", buffer);
-			report(out_hnd, "\t[%d]", rvaluelen);
-			report(out_hnd, "\t\t[%d]", type);
-			report(out_hnd, "\t[%d]", datalen);
-/*			report(out_hnd, "\t[%s]", data);*/
-			report(out_hnd, "\t[%d]\n", rdatalen);
-			break;
-		case ACTION_FOOTER:
-			report(out_hnd, "\n");
-			break;
-	}
-}
-
-/****************************************************************************
-job info level 2 display function
-****************************************************************************/
-void display_job_info_2(FILE *out_hnd, enum action_type action, 
-		JOB_INFO_2 *const i2)
-{
-	if (i2 == NULL)
-	{
-		return;
-	}
-
-	switch (action)
-	{
-		case ACTION_HEADER:
-		{
-			report(out_hnd, "Job Info Level 2:\n");
-
-			break;
-		}
-		case ACTION_ENUMERATE:
-		{
-			fstring tmp;
-
-			report(out_hnd, "\tjob id:\t%d\n", i2->jobid);
-			rpcstr_pull(tmp, i2->printername.buffer, sizeof(tmp), 0, STR_TERMINATE);
-			report(out_hnd, "\tprinter name:\t%s\n", tmp);
-			rpcstr_pull(tmp, i2->machinename.buffer, sizeof(tmp), 0, STR_TERMINATE);
-			report(out_hnd, "\tmachine name:\t%s\n", tmp);
-			rpcstr_pull(tmp, i2->username.buffer, sizeof(tmp), 0, STR_TERMINATE);
-			report(out_hnd, "\tusername:\t%s\n", tmp);
-			rpcstr_pull(tmp, i2->document.buffer, sizeof(tmp), 0, STR_TERMINATE);
-			report(out_hnd, "\tdocument:\t%s\n", tmp);
-			rpcstr_pull(tmp, i2->notifyname.buffer, sizeof(tmp), 0, STR_TERMINATE);
-			report(out_hnd, "\tnotify name:\t%s\n", tmp);
-			rpcstr_pull(tmp, i2->datatype.buffer, sizeof(tmp), 0, STR_TERMINATE);
-			report(out_hnd, "\tdata type:\t%s\n", tmp);
-			rpcstr_pull(tmp, i2->printprocessor.buffer, sizeof(tmp), 0, STR_TERMINATE);
-			report(out_hnd, "\tprint processor:\t%s\n", tmp);
-			rpcstr_pull(tmp, i2->parameters.buffer, sizeof(tmp), 0, STR_TERMINATE);
-			report(out_hnd, "\tparameters:\t%s\n", tmp);
-			rpcstr_pull(tmp, i2->drivername.buffer, sizeof(tmp), 0, STR_TERMINATE);
-			report(out_hnd, "\tdriver name:\t%s\n", tmp);
-			report(out_hnd, "\tDevice Mode:\tNOT DISPLAYED YET\n");
-
-			rpcstr_pull(tmp, i2->text_status.buffer, sizeof(tmp), 0, STR_TERMINATE);
-			report(out_hnd, "\ttext status:\t%s\n", tmp);
-		/*	SEC_DESC sec_desc;*/
-			report(out_hnd, "\tstatus:\t%d\n", i2->status);
-			report(out_hnd, "\tpriority:\t%d\n", i2->priority);
-			report(out_hnd, "\tposition:\t%d\n", i2->position);
-			report(out_hnd, "\tstarttime:\t%d\n", i2->starttime);
-			report(out_hnd, "\tuntiltime:\t%d\n", i2->untiltime);
-			report(out_hnd, "\ttotalpages:\t%d\n", i2->totalpages);
-			report(out_hnd, "\tsize:\t%d\n", i2->size);
-/*
-			SYSTEMTIME submitted;
-*/
-			report(out_hnd, "\tsubmitted:\tNOT DISPLAYED YET\n");
-			report(out_hnd, "\ttimeelapsed:\t%d\n", i2->timeelapsed);
-			report(out_hnd, "\tpagesprinted:\t%d\n", i2->pagesprinted);
-		}
-		case ACTION_FOOTER:
-		{
-			report(out_hnd, "\n");
-			break;
-		}
-	}
-
-}
-
-/****************************************************************************
-job info level 1 display function
-****************************************************************************/
-void display_job_info_1(FILE *out_hnd, enum action_type action, 
-		JOB_INFO_1 *const i1)
-{
-	if (i1 == NULL)
-	{
-		return;
-	}
-
-	switch (action)
-	{
-		case ACTION_HEADER:
-		{
-			report(out_hnd, "Job Info Level 1:\n");
-
-			break;
-		}
-		case ACTION_ENUMERATE:
-		{
-			fstring tmp;
-
-			report(out_hnd, "\tjob id:\t%d\n", i1->jobid);
-			rpcstr_pull(tmp, i1->printername.buffer, sizeof(tmp), 0, STR_TERMINATE);
-			report(out_hnd, "\tprinter name:\t%s\n", tmp);
-			rpcstr_pull(tmp, i1->machinename.buffer, sizeof(tmp), 0, STR_TERMINATE);
-			report(out_hnd, "\tmachine name:\t%s\n", tmp);
-			rpcstr_pull(tmp, i1->username.buffer, sizeof(tmp), 0, STR_TERMINATE);
-			report(out_hnd, "\tusername:\t%s\n", tmp);
-			rpcstr_pull(tmp, i1->document.buffer, sizeof(tmp), 0, STR_TERMINATE);
-			report(out_hnd, "\tdocument:\t%s\n", tmp);
-			rpcstr_pull(tmp, i1->datatype.buffer, sizeof(tmp), 0, STR_TERMINATE);
-			report(out_hnd, "\tdata type:\t%s\n", tmp);
-			rpcstr_pull(tmp, i1->text_status.buffer, sizeof(tmp), 0, STR_TERMINATE);
-			report(out_hnd, "\ttext status:\t%s\n", tmp);
-			report(out_hnd, "\tstatus:\t%d\n", i1->status);
-			report(out_hnd, "\tpriority:\t%d\n", i1->priority);
-			report(out_hnd, "\tposition:\t%d\n", i1->position);
-			report(out_hnd, "\ttotalpages:\t%d\n", i1->totalpages);
-/*
-			SYSTEMTIME submitted;
-*/
-			report(out_hnd, "\tsubmitted:\tNOT DISPLAYED YET\n");
-			report(out_hnd, "\tpagesprinted:\t%d\n", i1->pagesprinted);
-
-			break;
-		}
-		case ACTION_FOOTER:
-		{
-			report(out_hnd, "\n");
-			break;
-		}
-	}
-
-}
-
-/****************************************************************************
-connection info level 2 container display function
-****************************************************************************/
-void display_job_info_2_ctr(FILE *out_hnd, enum action_type action, 
-				uint32 count, JOB_INFO_2 *const *const ctr)
-{
-	if (ctr == NULL)
-	{
-		report(out_hnd, "display_job_info_2_ctr: unavailable due to an internal error\n");
-		return;
-	}
-
-	switch (action)
-	{
-		case ACTION_HEADER:
-		{
-			break;
-		}
-		case ACTION_ENUMERATE:
-		{
-			int i;
-
-			for (i = 0; i < count; i++)
-			{
-				display_job_info_2(out_hnd, ACTION_HEADER   , ctr[i]);
-				display_job_info_2(out_hnd, ACTION_ENUMERATE, ctr[i]);
-				display_job_info_2(out_hnd, ACTION_FOOTER   , ctr[i]);
-			}
-			break;
-		}
-		case ACTION_FOOTER:
-		{
-			break;
-		}
-	}
-}
-
-/****************************************************************************
-connection info level 1 container display function
-****************************************************************************/
-void display_job_info_1_ctr(FILE *out_hnd, enum action_type action, 
-				uint32 count, JOB_INFO_1 *const *const ctr)
-{
-	if (ctr == NULL)
-	{
-		report(out_hnd, "display_job_info_1_ctr: unavailable due to an internal error\n");
-		return;
-	}
-
-	switch (action)
-	{
-		case ACTION_HEADER:
-		{
-			break;
-		}
-		case ACTION_ENUMERATE:
-		{
-			int i;
-
-			for (i = 0; i < count; i++)
-			{
-				display_job_info_1(out_hnd, ACTION_HEADER   , ctr[i]);
-				display_job_info_1(out_hnd, ACTION_ENUMERATE, ctr[i]);
-				display_job_info_1(out_hnd, ACTION_FOOTER   , ctr[i]);
-			}
-			break;
-		}
-		case ACTION_FOOTER:
-		{
-			break;
-		}
-	}
-}
-
-/****************************************************************************
-connection info container display function
-****************************************************************************/
-void display_job_info_ctr(FILE *out_hnd, enum action_type action, 
-				uint32 level, uint32 count,
-				void *const *const ctr)
-{
-	if (ctr == NULL)
-	{
-		report(out_hnd, "display_job_info_ctr: unavailable due to an internal error\n");
-		return;
-	}
-
-	switch (level)
-	{
-		case 1:
-		{
-			display_job_info_1_ctr(out_hnd, action, 
-			                   count, (JOB_INFO_1*const*const)ctr);
-			break;
-		}
-		case 2:
-		{
-			display_job_info_2_ctr(out_hnd, action, 
-			                   count, (JOB_INFO_2*const*const)ctr);
-			break;
-		}
-		default:
-		{
-			report(out_hnd, "display_job_info_ctr: Unknown Info Level\n");
-			break;
-		}
-	}
-}
-
-/****************************************************************************
-printer info level 0 display function
-****************************************************************************/
-static void display_print_driver_1(FILE *out_hnd, DRIVER_INFO_1 *i1)
-{
-	fstring name;
-	if (i1 == NULL)
-		return;
-
-	rpcstr_pull(name, i1->name.buffer, sizeof(name), 0, STR_TERMINATE);
-
-	report(out_hnd, "\tname:[%s]\n", name);
-}
-
-/****************************************************************************
-printer info level 1 display function
-****************************************************************************/
-static void display_print_driver_2(FILE *out_hnd, DRIVER_INFO_2 *i1)
-{
-	fstring name;
-	fstring architecture;
-	fstring driverpath;
-	fstring datafile;
-	fstring configfile;
-	if (i1 == NULL)
-		return;
-
-	rpcstr_pull(name, i1->name.buffer, sizeof(name), 0, STR_TERMINATE);
-	rpcstr_pull(architecture, i1->architecture.buffer, sizeof(architecture), 0, STR_TERMINATE);
-	rpcstr_pull(driverpath, i1->driverpath.buffer, sizeof(driverpath), 0, STR_TERMINATE);
-	rpcstr_pull(datafile, i1->datafile.buffer, sizeof(datafile), 0, STR_TERMINATE);
-	rpcstr_pull(configfile, i1->conigfile.buffer, sizeof(configfile), 0, STR_TERMINATE);
-
-	report(out_hnd, "\tversion:[%x]\n", i1->version);
-	report(out_hnd, "\tname:[%s]\n", name);
-	report(out_hnd, "\tarchitecture:[%s]\n", architecture);
-	report(out_hnd, "\tdriverpath:[%s]\n", driverpath);
-	report(out_hnd, "\tdatafile:[%s]\n", datafile);
-	report(out_hnd, "\tconfigfile:[%s]\n", configfile);
-}
-
-/****************************************************************************
-printer info level 2 display function
-****************************************************************************/
-static void display_print_driver_3(FILE *out_hnd, DRIVER_INFO_3 *i1)
-{
-	fstring name;
-	fstring architecture;
-	fstring driverpath;
-	fstring datafile;
-	fstring configfile;
-	fstring helpfile;
-	fstring dependentfiles;
-	fstring monitorname;
-	fstring defaultdatatype;
-	
-	int length=0;
-	BOOL valid = True;
-	
-	if (i1 == NULL)
-		return;
-
-	rpcstr_pull(name, i1->name.buffer, sizeof(name), 0, STR_TERMINATE);
-	rpcstr_pull(architecture, i1->architecture.buffer, sizeof(architecture), 0, STR_TERMINATE);
-	rpcstr_pull(driverpath, i1->driverpath.buffer, sizeof(driverpath), 0, STR_TERMINATE);
-	rpcstr_pull(datafile, i1->datafile.buffer, sizeof(datafile), 0, STR_TERMINATE);
-	rpcstr_pull(configfile, i1->configfile.buffer, sizeof(configfile), 0, STR_TERMINATE);
-	rpcstr_pull(helpfile, i1->helpfile.buffer, sizeof(helpfile), 0, STR_TERMINATE);
-	rpcstr_pull(monitorname, i1->monitorname.buffer, sizeof(monitorname), 0, STR_TERMINATE);
-	rpcstr_pull(defaultdatatype, i1->defaultdatatype.buffer, sizeof(defaultdatatype), 0, STR_TERMINATE);
-
-	report(out_hnd, "\tversion:[%x]\n", i1->version);
-	report(out_hnd, "\tname:[%s]\n",name);
-	report(out_hnd, "\tarchitecture:[%s]\n", architecture);
-	report(out_hnd, "\tdriverpath:[%s]\n", driverpath);
-	report(out_hnd, "\tdatafile:[%s]\n", datafile);
-	report(out_hnd, "\tconfigfile:[%s]\n", configfile);
-	report(out_hnd, "\thelpfile:[%s]\n\n", helpfile);
-
-	while (valid)
-	{
-		rpcstr_pull(dependentfiles, i1->dependentfiles+length, sizeof(dependentfiles), 0, STR_TERMINATE);
-		length+=strlen(dependentfiles)+1;
-		
-		if (strlen(dependentfiles) > 0)
-		{
-			report(out_hnd, "\tdependentfiles:[%s]\n", dependentfiles);
-		}
-		else
-		{
-			valid = False;
-		}
-	}
-	
-	report(out_hnd, "\n\tmonitorname:[%s]\n", monitorname);
-	report(out_hnd, "\tdefaultdatatype:[%s]\n", defaultdatatype);
-	
-}
-
-/****************************************************************************
-connection info level 1 container display function
-****************************************************************************/
-static void display_printer_driver_1_ctr(FILE *out_hnd, enum action_type action, uint32 count,  PRINTER_DRIVER_CTR ctr)
-{
-	int i;
-	DRIVER_INFO_1 *in;
-
-	switch (action)
-	{
-		case ACTION_HEADER:
-			report(out_hnd, "Printer driver Level 1:\n");
-			break;
-		case ACTION_ENUMERATE:
-			for (i = 0; i < count; i++) {
-				in=ctr.info1;
-				display_print_driver_1(out_hnd, &(in[i]) );
-			}
-			break;
-		case ACTION_FOOTER:
-			report(out_hnd, "\n");
-			break;
-	}
-}
-
-/****************************************************************************
-connection info level 2 container display function
-****************************************************************************/
-static void display_printer_driver_2_ctr(FILE *out_hnd, enum action_type action, uint32 count,  PRINTER_DRIVER_CTR ctr)
-{
-	int i;
-	DRIVER_INFO_2 *in;
-
-	switch (action)
-	{
-		case ACTION_HEADER:
-			report(out_hnd, "Printer driver Level 2:\n");
-			break;
-		case ACTION_ENUMERATE:
-			for (i = 0; i < count; i++) {
-				in=ctr.info2;
-				display_print_driver_2(out_hnd, &(in[i]) );
-			}
-			break;
-		case ACTION_FOOTER:
-			report(out_hnd, "\n");
-			break;
-	}
-}
-
-/****************************************************************************
-connection info level 3 container display function
-****************************************************************************/
-static void display_printer_driver_3_ctr(FILE *out_hnd, enum action_type action, uint32 count,  PRINTER_DRIVER_CTR ctr)
-{
-	int i;
-	DRIVER_INFO_3 *in;
-
-	switch (action)
-	{
-		case ACTION_HEADER:
-			report(out_hnd, "Printer driver Level 3:\n");
-			break;
-		case ACTION_ENUMERATE:
-			for (i = 0; i < count; i++) {
-				in=ctr.info3;
-				display_print_driver_3(out_hnd, &(in[i]) );
-			}
-			break;
-		case ACTION_FOOTER:
-			report(out_hnd, "\n");
-			break;
-	}
-}
-
-/****************************************************************************
-connection info container display function
-****************************************************************************/
-void display_printer_driver_ctr(FILE *out_hnd, enum action_type action, uint32 level,
-				uint32 count, PRINTER_DRIVER_CTR ctr)
-{
-	switch (level) {
-		case 1:
-			display_printer_driver_1_ctr(out_hnd, action, count, ctr);
-			break;
-		case 2:
-			display_printer_driver_2_ctr(out_hnd, action, count, ctr);
-			break;
-		case 3:
-			display_printer_driver_3_ctr(out_hnd, action, count, ctr);
-			break;
-		default:
-			report(out_hnd, "display_printer_driver_ctr: Unknown Info Level\n");
-			break;
-	}
-}
-
-
-/****************************************************************************
-printer info level 1 display function
-****************************************************************************/
-static void display_printdriverdir_info_1(FILE *out_hnd, DRIVER_DIRECTORY_1 *i1)
-{
-	fstring name;
-	if (i1 == NULL)
-		return;
-
-	rpcstr_pull(name, i1->name.buffer, sizeof(name), 0, STR_TERMINATE);
-
-	report(out_hnd, "\tname:[%s]\n", name);
-}
-
-/****************************************************************************
-connection info level 1 container display function
-****************************************************************************/
-static void display_printerdriverdir_info_1_ctr(FILE *out_hnd, enum action_type action, DRIVER_DIRECTORY_CTR ctr)
-{
-
-	switch (action)
-	{
-		case ACTION_HEADER:
-			report(out_hnd, "Printer driver dir Info Level 1:\n");
-			break;
-		case ACTION_ENUMERATE:
-				display_printdriverdir_info_1(out_hnd, &(ctr.driver.info_1) );
-			break;
-		case ACTION_FOOTER:
-			report(out_hnd, "\n");
-			break;
-	}
-}
-
-/****************************************************************************
-connection info container display function
-****************************************************************************/
-void display_printerdriverdir_info_ctr(FILE *out_hnd, enum action_type action, uint32 level,
-				DRIVER_DIRECTORY_CTR ctr)
-{
-	switch (level) {
-		case 1:
-			display_printerdriverdir_info_1_ctr(out_hnd, action, ctr);
-			break;
-		default:
-			report(out_hnd, "display_printerdriverdir_info_ctr: Unknown Info Level\n");
-			break;
-	}
-}
diff --git a/source3/rpcclient/samsync.c b/source3/rpcclient/samsync.c
deleted file mode 100644
index a4061d2a87..0000000000
--- a/source3/rpcclient/samsync.c
+++ /dev/null
@@ -1,773 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-   SAM synchronisation and replication
-
-   Copyright (C) Tim Potter 2001,2002
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include "includes.h"
-
-DOM_SID domain_sid;
-
-static void decode_domain_info(SAM_DOMAIN_INFO *a)
-{
-	fstring temp;
-	printf("Domain Information\n");
-	printf("------------------\n");
-
-	unistr2_to_ascii(temp, &a->uni_dom_name, sizeof(temp)-1);
-	printf("\tDomain              :%s\n", temp);
-	printf("\tMin password len    :%d\n", a->min_pwd_len);
-	printf("\tpassword history len:%d\n", a->pwd_history_len);
-	printf("\tcreation time       :%s\n", http_timestring(nt_time_to_unix(&a->creation_time)));
-}
-
-static void decode_sam_group_info(SAM_GROUP_INFO *a)
-{
-	fstring temp;
-	printf("\nDomain Group Information\n");
-	printf("------------------------\n");
-
-	unistr2_to_ascii(temp, &a->uni_grp_name, sizeof(temp)-1);
-	printf("\tGroup name          :%s\n", temp);
-	unistr2_to_ascii(temp, &a->uni_grp_desc, sizeof(temp)-1);
-	printf("\tGroup description   :%s\n", temp);
-	printf("\trid                 :%d\n", a->gid.g_rid);
-	printf("\tattribute           :%d\n", a->gid.attr);
-}
-
-static void decode_sam_account_info(SAM_ACCOUNT_INFO *a)
-{
-	fstring temp;
-	printf("\nUser Information\n");
-	printf("----------------\n");
-
-	unistr2_to_ascii(temp, &a->uni_acct_name, sizeof(temp)-1);
-	printf("\tUser name          :%s\n", temp);
-	printf("\tuser's rid         :%d\n", a->user_rid);
-	printf("\tuser's primary gid :%d\n", a->group_rid);
-	unistr2_to_ascii(temp, &a->uni_full_name, sizeof(temp)-1);
-	printf("\tfull name          :%s\n", temp);
-	unistr2_to_ascii(temp, &a->uni_home_dir, sizeof(temp)-1);
-	printf("\thome directory     :%s\n", temp);
-	unistr2_to_ascii(temp, &a->uni_dir_drive, sizeof(temp)-1);
-	printf("\tdrive              :%s\n", temp);
-	unistr2_to_ascii(temp, &a->uni_logon_script, sizeof(temp)-1);
-	printf("\tlogon script       :%s\n", temp);
-	unistr2_to_ascii(temp, &a->uni_acct_desc, sizeof(temp)-1);
-	printf("\tdescription        :%s\n", temp);
-	unistr2_to_ascii(temp, &a->uni_workstations, sizeof(temp)-1);
-	printf("\tworkstations       :%s\n", temp);
-}
-
-static void decode_sam_grp_mem_info(SAM_GROUP_MEM_INFO *a)
-{
-	int i;
-	printf("\nGroup members information\n");
-	printf("-------------------------\n");
-	printf("\tnum members        :%d\n", a->num_members);
-
-	for (i=0; i<a->num_members; i++) {
-		printf("\trid, attr:%d, %d\n", a->rids[i], a->attribs[i]);
-	}
-}
-
-static void decode_sam_alias_info(SAM_ALIAS_INFO *a)
-{
-	fstring temp;
-	printf("\nAlias Information\n");
-	printf("-----------------\n");
-
-	unistr2_to_ascii(temp, &a->uni_als_name, sizeof(temp)-1);
-	printf("\tname               :%s\n", temp);
-	unistr2_to_ascii(temp, &a->uni_als_desc, sizeof(temp)-1);
-	printf("\tdescription        :%s\n", temp);
-	printf("\trid                :%d\n", a->als_rid);
-}
-
-static void decode_sam_als_mem_info(SAM_ALIAS_MEM_INFO *a)
-{
-	int i;
-	fstring temp;
-	printf("\nAlias members Information\n");
-	printf("-------------------------\n");
-	printf("\tnum members        :%d\n", a->num_members);
-	printf("\tnum sids           :%d\n", a->num_sids);
-	for (i=0; i<a->num_sids; i++) {
-		printf("\tsid                :%s\n", sid_to_string(temp, &a->sids[i].sid));
-	}
-
-
-}
-
-static void decode_sam_dom_info(SAM_DELTA_DOM *a)
-{
-	fstring temp;
-	printf("\nDomain information\n");
-	printf("------------------\n");
-
-	unistr2_to_ascii(temp, &a->domain_name, sizeof(temp)-1);
-	printf("\tdomain name        :%s\n", temp);
-	printf("\tsid                :%s\n", sid_to_string(temp, &a->domain_sid.sid));
-}
-
-static void decode_sam_unk0e_info(SAM_DELTA_UNK0E *a)
-{
-	fstring temp;
-	printf("\nTrust information\n");
-	printf("-----------------\n");
-
-	unistr2_to_ascii(temp, &a->domain, sizeof(temp)-1);
-	printf("\tdomain name        :%s\n", temp);
-	printf("\tsid                :%s\n", sid_to_string(temp, &a->sid.sid));
-	display_sec_desc(a->sec_desc);
-}
-
-static void decode_sam_privs_info(SAM_DELTA_PRIVS *a)
-{
-	int i;
-	fstring temp;
-	printf("\nSID and privileges information\n");
-	printf("------------------------------\n");
-	printf("\tsid                :%s\n", sid_to_string(temp, &a->sid.sid));
-	display_sec_desc(a->sec_desc);
-	printf("\tprivileges count   :%d\n", a->privlist_count);
-	for (i=0; i<a->privlist_count; i++) {
-		unistr2_to_ascii(temp, &a->uni_privslist[i], sizeof(temp)-1);
-		printf("\tprivilege name     :%s\n", temp);
-		printf("\tattribute          :%d\n", a->attributes[i]);
-	}
-}
-
-static void decode_sam_unk12_info(SAM_DELTA_UNK12 *a)
-{
-	fstring temp;
-	printf("\nTrusted information\n");
-	printf("-------------------\n");
-
-	unistr2_to_ascii(temp, &a->secret, sizeof(temp)-1);
-	printf("\tsecret name        :%s\n", temp);
-	display_sec_desc(a->sec_desc);
-	
-	printf("\ttime 1             :%s\n", http_timestring(nt_time_to_unix(&a->time1)));
-	printf("\ttime 2             :%s\n", http_timestring(nt_time_to_unix(&a->time2)));
-
-	display_sec_desc(a->sec_desc2);
-}
-
-static void decode_sam_stamp(SAM_DELTA_STAMP *a)
-{
-	printf("\nStamp information\n");
-	printf("-----------------\n");
-	printf("\tsequence number    :%d\n", a->seqnum);
-}
-
-static void decode_sam_deltas(uint32 num_deltas, SAM_DELTA_HDR *hdr_deltas, SAM_DELTA_CTR *deltas)
-{
-	int i;
-        for (i = 0; i < num_deltas; i++) {
-		switch (hdr_deltas[i].type) {
-			case SAM_DELTA_DOMAIN_INFO: {
-                		SAM_DOMAIN_INFO *a;
-				a = &deltas[i].domain_info;
-				decode_domain_info(a);
-				break;
-			}
-			case SAM_DELTA_GROUP_INFO:  {
-                		SAM_GROUP_INFO *a;
-				a = &deltas[i].group_info;
-				decode_sam_group_info(a);
-				break;
-			}
-			case SAM_DELTA_ACCOUNT_INFO: {
-                		SAM_ACCOUNT_INFO *a;
-				a = &deltas[i].account_info;
-				decode_sam_account_info(a);
-				break;
-			}
-			case SAM_DELTA_GROUP_MEM: {
-                		SAM_GROUP_MEM_INFO *a;
-				a = &deltas[i].grp_mem_info;
-				decode_sam_grp_mem_info(a);
-				break;
-			}
-			case SAM_DELTA_ALIAS_INFO: {
-                		SAM_ALIAS_INFO *a;
-				a = &deltas[i].alias_info;
-				decode_sam_alias_info(a);
-				break;
-			}
-			case SAM_DELTA_ALIAS_MEM: {
-                		SAM_ALIAS_MEM_INFO *a;
-				a = &deltas[i].als_mem_info;
-				decode_sam_als_mem_info(a);
-				break;
-			}
-			case SAM_DELTA_POLICY_INFO: {
-                		SAM_DELTA_POLICY *a;
-				a = &deltas[i].dom_info;
-				decode_sam_dom_info(a);
-				break;
-			}
-			case SAM_DELTA_UNK0E_INFO: {
-                		SAM_DELTA_UNK0E *a;
-				a = &deltas[i].unk0e_info;
-				decode_sam_unk0e_info(a);
-				break;
-			}
-			case SAM_DELTA_PRIVS_INFO: {
-                		SAM_DELTA_PRIVS *a;
-				a = &deltas[i].privs_info;
-				decode_sam_privs_info(a);
-				break;
-			}
-			case SAM_DELTA_UNK12_INFO: {
-                		SAM_DELTA_UNK12 *a;
-				a = &deltas[i].unk12_info;
-				decode_sam_unk12_info(a);
-				break;
-			}
-			case SAM_DELTA_SAM_STAMP: {
-                		SAM_DELTA_STAMP *a;
-				a = &deltas[i].stamp;
-				decode_sam_stamp(a);
-				break;
-			}
-			default:
-				DEBUG(0,("unknown delta type: %d\n", hdr_deltas[i].type));
-				break;	
-		}
-	}
-}
-
-/* Convert a SAM_ACCOUNT_DELTA to a SAM_ACCOUNT. */
-
-static void sam_account_from_delta(SAM_ACCOUNT *account,
-				   SAM_ACCOUNT_INFO *delta)
-{
-	DOM_SID sid;
-	fstring s;
-
-	/* Username, fullname, home dir, dir drive, logon script, acct
-	   desc, workstations, profile. */
-
-	unistr2_to_ascii(s, &delta->uni_acct_name, sizeof(s) - 1);
-	pdb_set_nt_username(account, s);
-
-	/* Unix username is the same - for sainity */
-	pdb_set_username(account, s);
-
-	unistr2_to_ascii(s, &delta->uni_full_name, sizeof(s) - 1);
-	pdb_set_fullname(account, s);
-
-	unistr2_to_ascii(s, &delta->uni_home_dir, sizeof(s) - 1);
-	pdb_set_homedir(account, s, True);
-
-	unistr2_to_ascii(s, &delta->uni_dir_drive, sizeof(s) - 1);
-	pdb_set_dir_drive(account, s, True);
-
-	unistr2_to_ascii(s, &delta->uni_logon_script, sizeof(s) - 1);
-	pdb_set_logon_script(account, s, True);
-
-	unistr2_to_ascii(s, &delta->uni_acct_desc, sizeof(s) - 1);
-	pdb_set_acct_desc(account, s);
-
-	unistr2_to_ascii(s, &delta->uni_workstations, sizeof(s) - 1);
-	pdb_set_workstations(account, s);
-
-	unistr2_to_ascii(s, &delta->uni_profile, sizeof(s) - 1);
-	pdb_set_profile_path(account, s, True);
-
-	/* User and group sid */
-
-	sid_copy(&sid, &domain_sid);
-	sid_append_rid(&sid, delta->user_rid);
-	pdb_set_user_sid(account, &sid);
-
-	sid_copy(&sid, &domain_sid);
-	sid_append_rid(&sid, delta->group_rid);
-	pdb_set_group_sid(account, &sid);
-
-	/* Logon and password information */
-
-	pdb_set_logon_time(account, nt_time_to_unix(&delta->logon_time), True);
-	pdb_set_logoff_time(account, nt_time_to_unix(&delta->logoff_time), 
-			    True);
-
-	pdb_set_logon_divs(account, delta->logon_divs);
-
-	/* TODO: logon hours */
-	/* TODO: bad password count */
-	/* TODO: logon count */
-
-	pdb_set_pass_last_set_time(
-		account, nt_time_to_unix(&delta->pwd_last_set_time));
-
-	/* TODO: account expiry time */
-
-	pdb_set_acct_ctrl(account, delta->acb_info);
-}
-
-static void apply_account_info(SAM_ACCOUNT_INFO *sam_acct_delta)
-{
-	SAM_ACCOUNT *sam_acct;
-	BOOL result;
-
-	if (!NT_STATUS_IS_OK(pdb_init_sam(&sam_acct))) {
-		return;
-	}
-
-	sam_account_from_delta(sam_acct, sam_acct_delta);
-	result = pdb_add_sam_account(sam_acct);
-}
-
-/* Apply an array of deltas to the SAM database */
-
-static void apply_deltas(uint32 num_deltas, SAM_DELTA_HDR *hdr_deltas,
-			 SAM_DELTA_CTR *deltas)
-{
-	uint32 i;
-
-	for (i = 0; i < num_deltas; i++) {
-		switch(hdr_deltas[i].type) {
-		case SAM_DELTA_ACCOUNT_INFO:
-			apply_account_info(&deltas[i].account_info);
-			break;
-		}
-	}
-}
-
-/* Synchronise sam database */
-
-static NTSTATUS sam_sync(struct cli_state *cli, unsigned char trust_passwd[16],
-                         BOOL do_smbpasswd_output, BOOL verbose)
-{
-        TALLOC_CTX *mem_ctx;
-        SAM_DELTA_HDR *hdr_deltas_0, *hdr_deltas_2;
-        SAM_DELTA_CTR *deltas_0, *deltas_2;
-        uint32 num_deltas_0, num_deltas_2;
-        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-	struct pdb_context *in;
-	uint32 neg_flags = 0x000001ff;
-
-	DOM_CRED ret_creds;
-
-        /* Initialise */
-
-	if (!NT_STATUS_IS_OK(make_pdb_context_list(&in, lp_passdb_backend()))){
-		DEBUG(0, ("Can't initialize passdb backend.\n"));
-		      return result;
-	}
-
-	if (!(mem_ctx = talloc_init("sam_sync"))) {
-		DEBUG(0,("talloc_init failed\n"));
-		return result;
-	}
-
-	if (!cli_nt_session_open (cli, PI_NETLOGON)) {
-		DEBUG(0, ("Could not initialize netlogon pipe!\n"));
-		goto done;
-	}
-
-        /* Request a challenge */
-
-        if (!NT_STATUS_IS_OK(cli_nt_setup_creds(cli, SEC_CHAN_BDC, trust_passwd, &neg_flags, 2))) {
-                DEBUG(0, ("Error initialising session creds\n"));
-                goto done;
-        }
-
-	/* on first call the returnAuthenticator is empty */
-	memset(&ret_creds, 0, sizeof(ret_creds));
-
-        /* Do sam synchronisation on the SAM database*/
-
-	result = cli_netlogon_sam_sync(cli, mem_ctx, &ret_creds, 0, 0,
-				       &num_deltas_0, &hdr_deltas_0, 
-				       &deltas_0);
-        
-        if (!NT_STATUS_IS_OK(result))
-		goto done;
-
-	
-        /* Update sam */
-
-	apply_deltas(num_deltas_0, hdr_deltas_0, deltas_0);
-
-
-	/* 
-	 * we can't yet do several sam_sync in a raw, it's a credential problem 
-	 * we must chain the credentials
-	 */
-
-#if 1
-        /* Do sam synchronisation on the LSA database */
-
-	result = cli_netlogon_sam_sync(cli, mem_ctx, &ret_creds, 2, 0, &num_deltas_2, &hdr_deltas_2, &deltas_2);
-        
-        if (!NT_STATUS_IS_OK(result))
-		goto done;
-
-	/* verbose mode */
-	if (verbose)
-		decode_sam_deltas(num_deltas_2, hdr_deltas_2, deltas_2);
-#endif
-
-        /* Produce smbpasswd output - good for migrating from NT! */
-
-        if (do_smbpasswd_output) {
-                int i;
-
-                for (i = 0; i < num_deltas_0; i++) {
-                        SAM_ACCOUNT_INFO *a;
-                        fstring acct_name, hex_nt_passwd, hex_lm_passwd;
-                        uchar lm_passwd[16], nt_passwd[16];
-
-                        /* Skip non-user accounts */
-
-                        if (hdr_deltas_0[i].type != SAM_DELTA_ACCOUNT_INFO)
-                                continue;
-
-                        a = &deltas_0[i].account_info;
-
-                        unistr2_to_ascii(acct_name, &a->uni_acct_name,
-                                         sizeof(acct_name) - 1);
-
-                        /* Decode hashes from password hash */
-
-                        sam_pwd_hash(a->user_rid, a->pass.buf_lm_pwd, 
-                                     lm_passwd, 0);
-                        sam_pwd_hash(a->user_rid, a->pass.buf_nt_pwd, 
-                                     nt_passwd, 0);
-
-                        /* Encode as strings */
-
-                        smbpasswd_sethexpwd(hex_lm_passwd, lm_passwd,
-                                            a->acb_info);
-                        smbpasswd_sethexpwd(hex_nt_passwd, nt_passwd,
-                                            a->acb_info);
-
-                        /* Display user info */
-
-                        printf("%s:%d:%s:%s:%s:LCT-0\n", acct_name,
-                               a->user_rid, hex_lm_passwd, hex_nt_passwd,
-                               smbpasswd_encode_acb_info(a->acb_info));
-                }
-                               
-                goto done;
-        }
-
- done:
-	cli_nt_session_close(cli);
-	talloc_destroy(mem_ctx);
-        
-        return result;
-}
-
-/* Replicate sam deltas */
-
-static NTSTATUS sam_repl(struct cli_state *cli, unsigned char trust_passwde[16],
-                         uint32 low_serial)
-{
-        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-
-        return result;
-}
-
-/* Connect to primary domain controller */
-
-static struct cli_state *init_connection(struct cli_state **cli,
-                                         char *username, char *domain,
-                                         char *password)
-{
-        extern pstring global_myname;
-        struct in_addr pdc_ip;
-        fstring dest_host;
-
-	/* Initialise myname */
-
-	if (!global_myname[0]) {
-		char *p;
-
-		fstrcpy(global_myname, myhostname());
-		p = strchr(global_myname, '.');
-		if (p)
-			*p = 0;
-	}
-
-        /* Look up name of PDC controller */
-
-        if (!get_pdc_ip(lp_workgroup(), &pdc_ip)) {
-                DEBUG(0, ("Cannot find domain controller for domain %s\n",
-                          lp_workgroup()));
-                return NULL;
-        }
-
-        if (!lookup_dc_name(global_myname, lp_workgroup(), pdc_ip, 
-			    dest_host)) {
-                DEBUG(0, ("Could not lookup up PDC name for domain %s\n",
-                          lp_workgroup()));
-                return NULL;
-        }
-
-	if (NT_STATUS_IS_OK(cli_full_connection(cli, global_myname, dest_host,
-						pdc_ip, 0,
-						"IPC$", "IPC",  
-						username, domain,
-						password, 0))) {
-		return *cli;
-	}
-
-	return NULL;
-}
-
-/* Main function */
-
-static fstring popt_username, popt_domain, popt_password;
-static BOOL popt_got_pass;
-
-static void user_callback(poptContext con, 
-			  enum poptCallbackReason reason,
-			  const struct poptOption *opt,
-			  const char *arg, const void *data)
-{
-	const char *p, *ch;
-
-	if (!arg)
-		return;
-
-	switch(opt->val) {
-
-		/* Check for [DOMAIN\\]username[%password]*/
-
-	case 'U':
-
-		p = arg;
-
-		if ((ch = strchr(p, '\\'))) {
-			fstrcpy(popt_domain, p); 
-			popt_domain[ch - p] = 0;
-		}
-
-		fstrcpy(popt_username, p);
-
-		if ((ch = strchr(p, '%'))) {
-			popt_username[ch - p] = 0;
-			fstrcpy(popt_password, ch + 1);
-			popt_got_pass = True;
-		}
-
-		break;
-		
-	case 'W':
-		fstrcpy(popt_domain, arg);
-		break;
-	}
-}
-
-/* Return domain, username and password passed in from cmd line */
-
-void popt_common_get_auth_info(char **domain, char **username, char **password,
-			       BOOL *got_pass)
-{
-	*domain = popt_domain;
-	*username = popt_username;
-	*password = popt_password;
-	*got_pass = popt_got_pass;
-}
-
-struct poptOption popt_common_auth_info[] = {
-	{ NULL, 0, POPT_ARG_CALLBACK, user_callback },
-	{ "user", 'U', POPT_ARG_STRING, NULL, 'U', "Set username",
-	  "[DOMAIN\\]username[%password]" },
-	{ "domain", 'W', POPT_ARG_STRING, NULL, 'W', "Set domain name", 
-	  "DOMAIN"},
-	{ 0 }
-};
-
-static BOOL popt_interactive;
-
-BOOL popt_common_is_interactive(void)
-{
-	return popt_interactive;
-}
-
-struct poptOption popt_common_interactive[] = {
-	{ "interactive", 'i', POPT_ARG_NONE, &popt_interactive, 'i',
-	  "Log to stdout" },
-	{ 0 }
-};
-
- int main(int argc, char **argv)
-{
-        BOOL do_sam_sync = False, do_sam_repl = False;
-        struct cli_state *cli;
-        NTSTATUS result;
-        pstring logfile;
-        BOOL do_smbpasswd_output = False;
-        BOOL verbose = True, got_pass = False;
-        uint32 serial = 0;
-        unsigned char trust_passwd[16];
-        char *username, *domain, *password;
-	poptContext pc;
-	char c;
-
-	struct poptOption popt_samsync_opts[] = {
-		{ "synchronise", 'S', POPT_ARG_NONE, &do_sam_sync, 'S', 
-		  "Perform full SAM synchronisation" },
-		{ "replicate", 'R', POPT_ARG_NONE, &do_sam_repl, 'R',
-		  "Replicate SAM changes" },
-		{ "serial", 0, POPT_ARG_INT, &serial, 0, "SAM serial number" },
-		{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_debug },
-		{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version},
-		{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_auth_info },
-		{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_interactive },
-		POPT_AUTOHELP
-		{ 0 }
-	};
-
-	/* Read command line options */
-
-	pc = poptGetContext("samsync", argc, (const char **)argv,
-			    popt_samsync_opts, 0);
-
-	if (argc == 1) {
-		poptPrintUsage(pc, stdout, 0);
-		return 1;
-	}
-
-	while ((c = poptGetNextOpt(pc)) != -1) {
-
-		/* Argument processing error */
-
-		if (c < -1) {
-			fprintf(stderr, "samsync: %s: %s\n",
-				poptBadOption(pc, POPT_BADOPTION_NOALIAS),
-				poptStrerror(c));
-			return 1;
-		}
-
-		/* Handle arguments */
-
-		switch (c) {
-		case 'h':
-			poptPrintHelp(pc, stdout, 0);
-			return 1;
-		case 'u':
-			poptPrintUsage(pc, stdout, 0);
-			return 1;
-		}
-	}
-
-	/* Bail out if any extra args were passed */
-
-	if (poptPeekArg(pc)) {
-		fprintf(stderr, "samsync: invalid argument %s\n",
-			poptPeekArg(pc));
-		poptPrintUsage(pc, stdout, 0);
-		return 1;
-	}
-
-	poptFreeContext(pc);
-
-	/* Setup logging */
-
-	dbf = x_stdout;
-
-	if (!lp_load(dyn_CONFIGFILE, True, False, False)) {
-		d_fprintf(stderr, "samsync: error opening config file %s. "
-			  "Error was %s\n", dyn_CONFIGFILE, strerror(errno));
-		return 1;
-	}
-
-	slprintf(logfile, sizeof(logfile) - 1, "%s/log.%s", dyn_LOGFILEBASE, 
-                 "samsync");
-
-	lp_set_logfile(logfile);
-
-        setup_logging("samsync", popt_common_is_interactive());
-
-        if (!popt_common_is_interactive())
-                reopen_logs();
-
-	load_interfaces();
-
-        /* Check arguments make sense */
-
-        if (do_sam_sync && do_sam_repl) {
-                DEBUG(0, ("cannot specify both -S and -R\n"));
-                return 1;
-
-        }
-
-        if (!do_sam_sync && !do_sam_repl) {
-                DEBUG(0, ("samsync: you must either --synchronise or "
-			  "--replicate the SAM database\n"));
-                return 1;
-        }
-
-        if (do_sam_repl && serial == 0) {
-                DEBUG(0, ("samsync: must specify serial number\n"));
-                return 1;
-        }
-
-	if (do_sam_sync && serial != 0) {
-		DEBUG(0, ("samsync: you can't specify a serial number when "
-			  "synchonising the SAM database\n"));
-		return 1;
-	}
-
-        /* BDC operations require the machine account password */
-
-        if (!secrets_init()) {
-                DEBUG(0, ("samsync: unable to initialise secrets database\n"));
-                return 1;
-        }
-
-	if (!secrets_fetch_trust_account_password(lp_workgroup(), 
-                                                  trust_passwd, NULL)) {
-		DEBUG(0, ("samsync: could not fetch trust account password\n"));
-		return 1;
-	}        
-
-	/* I wish the domain sid wasn't stored in secrets.tdb */
-
-	if (!secrets_fetch_domain_sid(lp_workgroup(), &domain_sid)) {
-		DEBUG(0, ("samsync: could not retrieve domain sid\n"));
-		return 1;
-	}
-
-        /* Perform sync or replication */
-
-	popt_common_get_auth_info(&domain, &username, &password, &got_pass);
-
-        if (!init_connection(&cli, username, domain, password))
-                return 1;
-
-        if (do_sam_sync)
-                result = sam_sync(cli, trust_passwd, do_smbpasswd_output, 
-				  verbose);
-
-        if (do_sam_repl)
-                result = sam_repl(cli, trust_passwd, serial);
-
-        if (!NT_STATUS_IS_OK(result)) {
-                DEBUG(0, ("%s\n", nt_errstr(result)));
-                return 1;
-        }
-
-	return 0;
-}
-- 
cgit 


From 1009ef3e37c82682e9c2c4c63bc7407420f20af8 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Thu, 20 Feb 2003 22:09:57 +0000
Subject: Added Volkers "print server role" patch. Jeremy. (This used to be
 commit e81d72ac221023ded9e0932be7dd303ad5280665)

---
 source3/utils/testparm.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'source3')

diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index 36b2bdfc6d..0fafd1b83d 100644
--- a/source3/utils/testparm.c
+++ b/source3/utils/testparm.c
@@ -283,6 +283,28 @@ int main(int argc, const char *argv[])
 		}
 	}
 
+
+	if (!silent_mode) {
+		printf("Server role: ");
+		switch(lp_server_role()) {
+			case ROLE_STANDALONE:
+				printf("ROLE_STANDALONE\n");
+				break;
+			case ROLE_DOMAIN_MEMBER:
+				printf("ROLE_DOMAIN_MEMBER\n");
+				break;
+			case ROLE_DOMAIN_BDC:
+				printf("ROLE_DOMAIN_BDC\n");
+				break;
+			case ROLE_DOMAIN_PDC:
+				printf("ROLE_DOMAIN_PDC\n");
+				break;
+			default:
+				printf("Unknown -- internal error?\n");
+				break;
+		}
+	}
+
 	if (!cname) {
 		if (!silent_mode) {
 			printf("Press enter to see a dump of your service definitions\n");
-- 
cgit 


From 8d8a8c9633ea04d269d70b1fa8f4393cc73f7bbd Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 20 Feb 2003 22:26:28 +0000
Subject: Make init_module() and thus smb_load_module() return an int.
 modules/developer.c: init_module() should return an int (This used to be
 commit 7f59703550378ff2333e3c851bf1a77037510abd)

---
 source3/include/smb.h         |  2 +-
 source3/lib/module.c          | 18 +++++++++---------
 source3/modules/developer.c   |  2 +-
 source3/rpc_server/srv_pipe.c |  8 ++++----
 4 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'source3')

diff --git a/source3/include/smb.h b/source3/include/smb.h
index f96a19954a..71051e341e 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1721,6 +1721,6 @@ extern struct poptOption popt_common_netbios_name[];
 extern struct poptOption popt_common_log_base[];
 
 /* Module support */
-typedef NTSTATUS (init_module_function) (void);
+typedef int (init_module_function) (void);
 
 #endif /* _SMB_H */
diff --git a/source3/lib/module.c b/source3/lib/module.c
index 6febe8a9f1..dd94f79950 100644
--- a/source3/lib/module.c
+++ b/source3/lib/module.c
@@ -22,11 +22,11 @@
 #include "includes.h"
 
 #ifdef HAVE_DLOPEN
-NTSTATUS smb_load_module(const char *module_name)
+int smb_load_module(const char *module_name)
 {
 	void *handle;
 	init_module_function *init;
-	NTSTATUS nt_status;
+	int status;
 	const char *error;
 
 	/* Always try to use LAZY symbol resolving; if the plugin has 
@@ -37,7 +37,7 @@ NTSTATUS smb_load_module(const char *module_name)
 
 	if(!handle) {
 		DEBUG(0, ("Error loading module '%s': %s\n", module_name, sys_dlerror()));
-		return NT_STATUS_UNSUCCESSFUL;
+		return False;
 	}
 
 	init = sys_dlsym(handle, "init_module");
@@ -47,14 +47,14 @@ NTSTATUS smb_load_module(const char *module_name)
 	error = sys_dlerror();
 	if (error) {
 		DEBUG(0, ("Error trying to resolve symbol 'init_module' in %s: %s\n", module_name, error));
-		return NT_STATUS_UNSUCCESSFUL;
+		return False;
 	}
 
-	nt_status = init();
+	status = init();
 
 	DEBUG(2, ("Module '%s' loaded\n", module_name));
 
-	return nt_status;
+	return status;
 }
 
 /* Load all modules in list and return number of 
@@ -65,7 +65,7 @@ int smb_load_modules(const char **modules)
 	int success = 0;
 
 	for(i = 0; modules[i]; i++){
-		if(NT_STATUS_IS_OK(smb_load_module(modules[i]))) {
+		if(smb_load_module(modules[i])) {
 			success++;
 		}
 	}
@@ -77,10 +77,10 @@ int smb_load_modules(const char **modules)
 
 #else /* HAVE_DLOPEN */
 
-NTSTATUS smb_load_module(const char *module_name)
+int smb_load_module(const char *module_name)
 {
 	DEBUG(0,("This samba executable has not been build with plugin support"));
-	return NT_STATUS_NOT_SUPPORTED;
+	return False;
 }
 
 int smb_load_modules(const char **modules)
diff --git a/source3/modules/developer.c b/source3/modules/developer.c
index c12bbc562a..a697abcd22 100644
--- a/source3/modules/developer.c
+++ b/source3/modules/developer.c
@@ -128,5 +128,5 @@ struct charset_functions weird_functions = {"WEIRD", weird_pull, weird_push};
 int init_module(void)
 {
 	smb_register_charset(&weird_functions);
-	return 0;
+	return 1;
 }
diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
index 0b8b7b229a..f6deac68f8 100644
--- a/source3/rpc_server/srv_pipe.c
+++ b/source3/rpc_server/srv_pipe.c
@@ -794,10 +794,10 @@ int rpc_pipe_register_commands(const char *clnt, const char *srv, const struct a
 /*******************************************************************
  Register commands to an RPC pipe
 *******************************************************************/
-NTSTATUS rpc_load_module(const char *module)
+int rpc_load_module(const char *module)
 {
         pstring full_path;
-		NTSTATUS status;
+		int status;
         
         pstrcpy(full_path, lib_path("rpc"));
         pstrcat(full_path, "/librpc_");
@@ -805,7 +805,7 @@ NTSTATUS rpc_load_module(const char *module)
         pstrcat(full_path, ".");
         pstrcat(full_path, shlib_ext());
 		
-		if (!NT_STATUS_IS_OK(status = smb_load_module(full_path)))  {
+		if (!(status = smb_load_module(full_path)))  {
                 DEBUG(0, ("Could not load requested pipe %s as %s\n", 
                     module, full_path));
         }
@@ -858,7 +858,7 @@ BOOL api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p)
                        }
                 }
 
-                if (!api_fd_commands[i].name && !NT_STATUS_IS_OK(rpc_load_module(p->name))) {
+                if (!api_fd_commands[i].name && !rpc_load_module(p->name)) {
                        DEBUG(3,("api_pipe_bind_req: Unknown pipe name %s in bind request.\n",
                                 p->name ));
                        if(!setup_bind_nak(p))
-- 
cgit 


From 5bec7f5fcac1a3e5a48b04f140b96f03b88f0965 Mon Sep 17 00:00:00 2001
From: Jim McDonough <jmcd@samba.org>
Date: Thu, 20 Feb 2003 22:46:37 +0000
Subject: From aliguori@us.ibm.com: This patch adds the architecture for an
 IDMAP backend system including a new smb.conf parameter "winbind backend". 
 Right now, the only valid value is "tdb" but I'm currently working on an LDAP
 backend. (This used to be commit 35e4448dcb2deb0d5d34d9e974a49f2fb31f1356)

---
 source3/Makefile.in                   |   1 +
 source3/nsswitch/winbindd.h           |  25 ++
 source3/nsswitch/winbindd_idmap.c     | 625 ++++++++++------------------------
 source3/nsswitch/winbindd_idmap_tdb.c | 519 ++++++++++++++++++++++++++++
 source3/param/loadparm.c              |   6 +
 5 files changed, 738 insertions(+), 438 deletions(-)
 create mode 100644 source3/nsswitch/winbindd_idmap_tdb.c

(limited to 'source3')

diff --git a/source3/Makefile.in b/source3/Makefile.in
index e04550cf21..efc3b935b4 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -579,6 +579,7 @@ WINBINDD_OBJ1 = \
 		nsswitch/winbindd_user.o  \
 		nsswitch/winbindd_group.o \
 		nsswitch/winbindd_idmap.o \
+		nsswitch/winbindd_idmap_tdb.o \
 		nsswitch/winbindd_util.o  \
 		nsswitch/winbindd_cache.o \
 		nsswitch/winbindd_pam.o   \
diff --git a/source3/nsswitch/winbindd.h b/source3/nsswitch/winbindd.h
index 164b7ffda7..a498b76626 100644
--- a/source3/nsswitch/winbindd.h
+++ b/source3/nsswitch/winbindd.h
@@ -4,6 +4,7 @@
    Winbind daemon for ntdom nss module
 
    Copyright (C) Tim Potter 2000
+   Copyright (C) Anthony Liguori 2003
    
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ -195,6 +196,30 @@ typedef struct {
 	POLICY_HND pol;
 } CLI_POLICY_HND;
 
+/* Filled out by IDMAP backends */
+struct idmap_methods {
+  /* Called when backend is first loaded */
+  BOOL (*init)(void);
+
+  BOOL (*get_sid_from_uid)(uid_t uid, DOM_SID *sid);
+  BOOL (*get_sid_from_gid)(gid_t gid, DOM_SID *sid);
+
+  BOOL (*get_uid_from_sid)(DOM_SID *sid, uid_t *uid);
+  BOOL (*get_gid_from_sid)(DOM_SID *sid, gid_t *gid);
+
+  BOOL (*get_rid_from_uid)(uid_t uid, uint32 *user_rid, 
+                           struct winbindd_domain **domain);
+  BOOL (*get_rid_from_gid)(gid_t gid, uint32 *group_rid,
+                           struct winbindd_domain **domain);
+  BOOL (*get_uid_from_rid)(const char *dom_name, uint32 rid, uid_t *uid);
+  BOOL (*get_gid_from_rid)(const char *dom_name, uint32 rid, gid_t *gid);
+
+  /* Called when backend is unloaded */
+  BOOL (*close)(void);
+  /* Called to dump backend status */
+  void (*status)(void);
+};
+
 #include "winbindd_proto.h"
 
 #include "rpc_parse.h"
diff --git a/source3/nsswitch/winbindd_idmap.c b/source3/nsswitch/winbindd_idmap.c
index 6d184fec5f..d9448ef859 100644
--- a/source3/nsswitch/winbindd_idmap.c
+++ b/source3/nsswitch/winbindd_idmap.c
@@ -1,20 +1,19 @@
 /* 
    Unix SMB/CIFS implementation.
-
-   Winbind daemon - user related function
-
+   Winbind ID Mapping
    Copyright (C) Tim Potter 2000
-   
+   Copyright (C) Anthony Liguori <aliguor@us.ibm.com>	2003
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
@@ -22,508 +21,258 @@
 
 #include "winbindd.h"
 
-#undef DBGC_CLASS
-#define DBGC_CLASS DBGC_WINBIND
-
-/* High water mark keys */
-
-#define HWM_GROUP  "GROUP HWM"
-#define HWM_USER   "USER HWM"
-
-/* idmap version determines auto-conversion */
-#define IDMAP_VERSION 2
-
-/* Globals */
-
-static TDB_CONTEXT *idmap_tdb;
-
-/* Allocate either a user or group id from the pool */
-
-static BOOL allocate_id(uid_t *id, BOOL isgroup)
+static struct {
+  const char *name;
+  /* Function to create a member of the idmap_methods list */
+  BOOL (*reg_meth)(struct idmap_methods **methods);
+  struct idmap_methods *methods;
+} builtin_idmap_functions[] = {
+  { "tdb", winbind_idmap_reg_tdb, NULL },
+  /*  { "ldap", winbind_idmap_reg_ldap, NULL },*/
+  { NULL, NULL, NULL }
+};
+
+/* singleton pattern: uberlazy evaluation */
+static struct idmap_methods *impl;
+
+static struct idmap_methods *get_impl(const char *name)
 {
-    int hwm;
-
-    /* Get current high water mark */
-
-    if ((hwm = tdb_fetch_int32(idmap_tdb, 
-                             isgroup ? HWM_GROUP : HWM_USER)) == -1) {
-        return False;
-    }
-
-    /* Return next available uid in list */
+  int i = 0;
+  struct idmap_methods *ret = NULL;
 
-    if ((isgroup && (hwm > server_state.gid_high)) ||
-        (!isgroup && (hwm > server_state.uid_high))) {
-        DEBUG(0, ("winbind %sid range full!\n", isgroup ? "g" : "u"));
-        return False;
-    }
+  while (builtin_idmap_functions[i].name && 
+         strcmp(builtin_idmap_functions[i].name, name)) {
+    i++;
+  }
 
-    if (id) {
-        *id = hwm;
+  if (builtin_idmap_functions[i].name) {
+    if (!builtin_idmap_functions[i].methods) {
+      builtin_idmap_functions[i].reg_meth(&builtin_idmap_functions[i].methods);
     }
 
-    hwm++;
+    ret = builtin_idmap_functions[i].methods;
+  }
 
-    /* Store new high water mark */
-
-    tdb_store_int32(idmap_tdb, isgroup ? HWM_GROUP : HWM_USER, hwm);
-
-    return True;
+  return ret;
 }
 
-/* Get an id from a rid */
-static BOOL get_id_from_sid(DOM_SID *sid, uid_t *id, BOOL isgroup)
+/* Initialize backend */
+BOOL winbindd_idmap_init(void)
 {
-    TDB_DATA data, key;
-    fstring keystr;
-    BOOL result = False;
-
-    /* Check if sid is present in database */
-    sid_to_string(keystr, sid);
-    
-    key.dptr = keystr;
-    key.dsize = strlen(keystr) + 1;
-
-    data = tdb_fetch(idmap_tdb, key);
+  BOOL ret = False;
 
-    if (data.dptr) {
-        fstring scanstr;
-        int the_id;
+  DEBUG(3, ("winbindd_idmap_init: using '%s' as backend\n", 
+            lp_winbind_backend()));
 
-        /* Parse and return existing uid */
-        fstrcpy(scanstr, isgroup ? "GID" : "UID");
-        fstrcat(scanstr, " %d");
-
-        if (sscanf(data.dptr, scanstr, &the_id) == 1) {
-            /* Store uid */
-            if (id) {
-		    *id = the_id;
-            }
-
-            result = True;
-        }
-
-        SAFE_FREE(data.dptr);
-    } else {
-
-        /* Allocate a new id for this sid */
+  if (!impl) {
+    impl = get_impl(lp_winbind_backend());
+    if (!impl) {
+      DEBUG(0, ("winbindd_idmap_init: could not load backend '%s'\n",
+                lp_winbind_backend()));
+    }
+  }
 
-        if (id && allocate_id(id, isgroup)) {
-            fstring keystr2;
+  if (impl) {
+    ret = impl->init();
+  }
 
-            /* Store new id */
-            
-            slprintf(keystr2, sizeof(keystr2), "%s %d", isgroup ? "GID" : "UID", *id);
+  DEBUG(3, ("winbind_idmap_init: returning %s\n", ret ? "true" : "false"));
 
-            data.dptr = keystr2;
-            data.dsize = strlen(keystr2) + 1;
+  return ret;
+}
 
-            tdb_store(idmap_tdb, key, data, TDB_REPLACE);
-            tdb_store(idmap_tdb, data, key, TDB_REPLACE);
+/* Get UID from SID */
+BOOL winbindd_idmap_get_uid_from_sid(DOM_SID *sid, uid_t *uid)
+{
+  BOOL ret = False;
 
-            result = True;
-        }
+  if (!impl) {
+    impl = get_impl(lp_winbind_backend());
+    if (!impl) {
+      DEBUG(0, ("winbindd_idmap_init: could not load backend '%s'\n",
+                lp_winbind_backend()));
     }
+  }
 
-    return result;
-}
+  if (impl) {
+    ret = impl->get_uid_from_sid(sid, uid);
+  }
 
-/* Get a uid from a user sid */
-BOOL winbindd_idmap_get_uid_from_sid(DOM_SID *sid, uid_t *uid)
-{
-    return get_id_from_sid(sid, uid, False);
+  return ret;
 }
 
-/* Get a gid from a group sid */
+/* Get GID from SID */
 BOOL winbindd_idmap_get_gid_from_sid(DOM_SID *sid, gid_t *gid)
 {
-    return get_id_from_sid(sid, gid, True);
-}
-
-/* Get a uid from a user rid */
-BOOL winbindd_idmap_get_uid_from_rid(const char *dom_name, uint32 rid, uid_t *uid)
-{
-	struct winbindd_domain *domain;
-	DOM_SID sid;
+  BOOL ret = False;
 
-	if (!(domain = find_domain_from_name(dom_name))) {
-		return False;
-	}
+  if (!impl) {
+    impl = get_impl(lp_winbind_backend());
+    if (!impl) {
+      DEBUG(0, ("winbindd_idmap_init: could not load backend '%s'\n",
+                lp_winbind_backend()));
+    }
+  }
 
-	sid_copy(&sid, &domain->sid);
-	sid_append_rid(&sid, rid);
+  if (impl) {
+    ret = impl->get_gid_from_sid(sid, gid);
+  }
 
-	return get_id_from_sid(&sid, uid, False);
+  return ret;
 }
 
-/* Get a gid from a group rid */
-BOOL winbindd_idmap_get_gid_from_rid(const char *dom_name, uint32 rid, gid_t *gid)
+/* Get UID from RID */
+BOOL winbindd_idmap_get_uid_from_rid(const char *dom_name, uint32 rid, 
+                                     uid_t *uid)
 {
-	struct winbindd_domain *domain;
-	DOM_SID sid;
+  BOOL ret = False;
 
-	if (!(domain = find_domain_from_name(dom_name))) {
-		return False;
-	}
+  if (!impl) {
+    impl = get_impl(lp_winbind_backend());
+    if (!impl) {
+      DEBUG(0, ("winbindd_idmap_init: could not load backend '%s'\n",
+                lp_winbind_backend()));
+    }
+  }
 
-	sid_copy(&sid, &domain->sid);
-	sid_append_rid(&sid, rid);
+  if (impl) {
+    ret = impl->get_uid_from_rid(dom_name, rid, uid);
+  }
 
-	return get_id_from_sid(&sid, gid, True);
+  return ret;
 }
 
-
-BOOL get_sid_from_id(int id, DOM_SID *sid, BOOL isgroup)
+/* Get GID From RID */
+BOOL winbindd_idmap_get_gid_from_rid(const char *dom_name, uint32 rid, 
+                                     gid_t *gid)
 {
-    TDB_DATA key, data;
-    fstring keystr;
-    BOOL result = False;
-
-    slprintf(keystr, sizeof(keystr), "%s %d", isgroup ? "GID" : "UID", id);
-
-    key.dptr = keystr;
-    key.dsize = strlen(keystr) + 1;
+  BOOL ret = False;
 
-    data = tdb_fetch(idmap_tdb, key);
-
-    if (data.dptr) {
-	    result = string_to_sid(sid, data.dptr);
-	    SAFE_FREE(data.dptr);
+  if (!impl) {
+    impl = get_impl(lp_winbind_backend());
+    if (!impl) {
+      DEBUG(0, ("winbindd_idmap_init: could not load backend '%s'\n",
+                lp_winbind_backend()));
     }
+  }
+
+  if (impl) {
+    ret = impl->get_gid_from_rid(dom_name, rid, gid);
+  }
 
-    return result;
+  return ret;
 }
 
-/* Get a sid from a uid */
+/* Get SID from UID */
 BOOL winbindd_idmap_get_sid_from_uid(uid_t uid, DOM_SID *sid)
 {
-	return get_sid_from_id((int)uid, sid, False);
-}
+  BOOL ret = False;
 
-/* Get a sid from a gid */
-BOOL winbindd_idmap_get_sid_from_gid(gid_t gid, DOM_SID *sid)
-{
-	return get_sid_from_id((int)gid, sid, True);
+  if (!impl) {
+    impl = get_impl(lp_winbind_backend());
+    if (!impl) {
+      DEBUG(0, ("winbindd_idmap_init: could not load backend '%s'\n",
+                lp_winbind_backend()));
+    }
+  }
+
+  if (impl) {
+    ret = impl->get_sid_from_uid(uid, sid);
+  }
+
+  return ret;
 }
 
-/* Get a user rid from a uid */
-BOOL winbindd_idmap_get_rid_from_uid(uid_t uid, uint32 *user_rid,
-                                     struct winbindd_domain **domain)
+/* Get SID from GID */
+BOOL winbindd_idmap_get_sid_from_gid(gid_t gid, DOM_SID *sid)
 {
-	DOM_SID sid;
+  BOOL ret = False;
 
-	if (!get_sid_from_id((int)uid, &sid, False)) {
-		return False;
-	}
+  if (!impl) {
+    impl = get_impl(lp_winbind_backend());
+  }
 
-	*domain = find_domain_from_sid(&sid);
-	if (! *domain) return False;
+  if (impl) {
+    ret = impl->get_sid_from_gid(gid, sid);
+  } else {
+    DEBUG(0, ("winbindd_idmap_init: could not load backend '%s'\n",
+              lp_winbind_backend()));
+  }
 
-	sid_split_rid(&sid, user_rid);
-
-	return True;
+  return ret;
 }
 
-/* Get a group rid from a gid */
-
-BOOL winbindd_idmap_get_rid_from_gid(gid_t gid, uint32 *group_rid, 
+/* Get RID From UID */
+BOOL winbindd_idmap_get_rid_from_uid(uid_t uid, uint32 *user_rid,
                                      struct winbindd_domain **domain)
 {
-	DOM_SID sid;
-
-	if (!get_sid_from_id((int)gid, &sid, True)) {
-		return False;
-	}
+  BOOL ret = False;
 
-	*domain = find_domain_from_sid(&sid);
-	if (! *domain) return False;
+  if (!impl) {
+    impl = get_impl(lp_winbind_backend());
+  }
 
-	sid_split_rid(&sid, group_rid);
+  if (impl) {
+    ret = impl->get_rid_from_uid(uid, user_rid, domain);
+  } else {
+    DEBUG(0, ("winbindd_idmap_init: could not load backend '%s'\n",
+              lp_winbind_backend()));
+  }
 
-	return True;
+  return ret;
 }
 
-/* convert one record to the new format */
-static int convert_fn(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA data, void *ignored)
+/* Get RID from GID */
+BOOL winbindd_idmap_get_rid_from_gid(gid_t gid, uint32 *group_rid, 
+                                     struct winbindd_domain **domain)
 {
-	struct winbindd_domain *domain;
-	char *p;
-	DOM_SID sid;
-	uint32 rid;
-	fstring keystr;
-	fstring dom_name;
-	TDB_DATA key2;
-
-	p = strchr(key.dptr, '/');
-	if (!p)
-		return 0;
-
-	*p = 0;
-	fstrcpy(dom_name, key.dptr);
-	*p++ = '/';
-
-	domain = find_domain_from_name(dom_name);
-	if (!domain) {
-		/* We must delete the old record. */
-		DEBUG(0,("winbindd: convert_fn : Unable to find domain %s\n", dom_name ));
-		DEBUG(0,("winbindd: convert_fn : deleting record %s\n", key.dptr ));
-		tdb_delete(idmap_tdb, key);
-		return 0;
-	}
-
-	rid = atoi(p);
-
-	sid_copy(&sid, &domain->sid);
-	sid_append_rid(&sid, rid);
-
-	sid_to_string(keystr, &sid);
-	key2.dptr = keystr;
-	key2.dsize = strlen(keystr) + 1;
-
-	if (tdb_store(idmap_tdb, key2, data, TDB_INSERT) != 0) {
-		/* not good! */
-		DEBUG(0,("winbindd: convert_fn : Unable to update record %s\n", key2.dptr ));
-		DEBUG(0,("winbindd: convert_fn : conversion failed - idmap corrupt ?\n"));
-		return -1;
-	}
-
-	if (tdb_store(idmap_tdb, data, key2, TDB_REPLACE) != 0) {
-		/* not good! */
-		DEBUG(0,("winbindd: convert_fn : Unable to update record %s\n", data.dptr ));
-		DEBUG(0,("winbindd: convert_fn : conversion failed - idmap corrupt ?\n"));
-		return -1;
-	}
-
-	tdb_delete(idmap_tdb, key);
-
-	return 0;
-}
+  BOOL ret = False;
 
-#if 0
-/*****************************************************************************
- Make a backup copy of the old idmap just to be safe.... JRA.
-*****************************************************************************/
+  if (!impl) {
+    impl = get_impl(lp_winbind_backend());
+  }
 
-static BOOL backup_old_idmap(const char *idmap_name)
-{
-	pstring new_name;
-	int outfd = -1;
-	SMB_OFF_T size;
-	struct stat st;
-
-	pstrcpy(new_name, idmap_name);
-	pstrcat(new_name, ".bak");
-
-	DEBUG(10,("backup_old_idmap: backing up %s to %s before upgrade.\n",
-			idmap_name, new_name ));
-
-	if (tdb_lockall(idmap_tdb) == -1) {
-		DEBUG(10,("backup_old_idmap: failed to lock %s. Error %s\n",
-			idmap_name, tdb_errorstr(idmap_tdb) ));
-		return False;
-	}
-	if ((outfd = open(new_name, O_CREAT|O_EXCL|O_RDWR, 0600)) == -1) {
-		DEBUG(10,("backup_old_idmap: failed to open %s. Error %s\n",
-			new_name, strerror(errno) ));
-		goto fail;
-	}
-
-	if (fstat(idmap_tdb->fd, &st) == -1) {
-		DEBUG(10,("backup_old_idmap: failed to fstat %s. Error %s\n",
-			idmap_name, strerror(errno) ));
-		goto fail;
-	}
-
-	size = (SMB_OFF_T)st.st_size;
-
-	if (transfer_file(idmap_tdb->fd, outfd, size) != size ) {
-		DEBUG(10,("backup_old_idmap: failed to copy %s. Error %s\n",
-			idmap_name, strerror(errno) ));
-		goto fail;
-	}
-
-	if (close(outfd) == -1) {
-		DEBUG(10,("backup_old_idmap: failed to close %s. Error %s\n",
-			idmap_name, strerror(errno) ));
-		outfd = -1;
-		goto fail;
-	}
-	tdb_unlockall(idmap_tdb);
-	return True;
-
-fail:
-
-	if (outfd != -1)
-		close(outfd);
-	tdb_unlockall(idmap_tdb);
-	return False;
-}
-#endif
-
-/*****************************************************************************
- Convert the idmap database from an older version.
-*****************************************************************************/
+  if (impl) {
+    ret = impl->get_rid_from_gid(gid, group_rid, domain);
+  } else {
+    DEBUG(0, ("winbindd_idmap_init: could not load backend '%s'\n",
+              lp_winbind_backend()));
+  }
 
-static BOOL idmap_convert(const char *idmap_name)
-{
-	int32 vers = tdb_fetch_int32(idmap_tdb, "IDMAP_VERSION");
-	BOOL bigendianheader = (idmap_tdb->flags & TDB_BIGENDIAN) ? True : False;
-
-	if (vers == IDMAP_VERSION)
-		return True;
-
-#if 0
-	/* Make a backup copy before doing anything else.... */
-	if (!backup_old_idmap(idmap_name))
-		return False;
-#endif
-
-	if (((vers == -1) && bigendianheader) || (IREV(vers) == IDMAP_VERSION)) {
-		/* Arrggghh ! Bytereversed or old big-endian - make order independent ! */
-		/*
-		 * high and low records were created on a
-		 * big endian machine and will need byte-reversing.
-		 */
-
-		int32 wm;
-
-		wm = tdb_fetch_int32(idmap_tdb, HWM_USER);
-
-		if (wm != -1) {
-			wm = IREV(wm);
-		}  else
-			wm = server_state.uid_low;
-
-		if (tdb_store_int32(idmap_tdb, HWM_USER, wm) == -1) {
-			DEBUG(0, ("idmap_convert: Unable to byteswap user hwm in idmap database\n"));
-			return False;
-		}
-
-		wm = tdb_fetch_int32(idmap_tdb, HWM_GROUP);
-		if (wm != -1) {
-			wm = IREV(wm);
-		} else
-			wm = server_state.gid_low;
-
-		if (tdb_store_int32(idmap_tdb, HWM_GROUP, wm) == -1) {
-			DEBUG(0, ("idmap_convert: Unable to byteswap group hwm in idmap database\n"));
-			return False;
-		}
-	}
-
-	/* the old format stored as DOMAIN/rid - now we store the SID direct */
-	tdb_traverse(idmap_tdb, convert_fn, NULL);
-
-	if (tdb_store_int32(idmap_tdb, "IDMAP_VERSION", IDMAP_VERSION) == -1) {
-		DEBUG(0, ("idmap_convert: Unable to byteswap group hwm in idmap database\n"));
-		return False;
-	}
-
-	return True;
-}
-
-/*****************************************************************************
- Initialise idmap database. 
-*****************************************************************************/
-
-BOOL winbindd_idmap_init(void)
-{
-	/* Open tdb cache */
-
-	if (!(idmap_tdb = tdb_open_log(lock_path("winbindd_idmap.tdb"), 0,
-				TDB_DEFAULT, O_RDWR | O_CREAT, 0600))) {
-		DEBUG(0, ("winbindd_idmap_init: Unable to open idmap database\n"));
-		return False;
-	}
-
-	/* possibly convert from an earlier version */
-	if (!idmap_convert(lock_path("winbindd_idmap.tdb"))) {
-		DEBUG(0, ("winbindd_idmap_init: Unable to open idmap database\n"));
-		return False;
-	}
-
-	/* Create high water marks for group and user id */
-
-	if (tdb_fetch_int32(idmap_tdb, HWM_USER) == -1) {
-		if (tdb_store_int32(idmap_tdb, HWM_USER, server_state.uid_low) == -1) {
-			DEBUG(0, ("winbindd_idmap_init: Unable to initialise user hwm in idmap database\n"));
-			return False;
-		}
-	}
-
-	if (tdb_fetch_int32(idmap_tdb, HWM_GROUP) == -1) {
-		if (tdb_store_int32(idmap_tdb, HWM_GROUP, server_state.gid_low) == -1) {
-			DEBUG(0, ("winbindd_idmap_init: Unable to initialise group hwm in idmap database\n"));
-			return False;
-		}
-	}
-
-	return True;   
+  return ret;
 }
 
+/* Close backend */
 BOOL winbindd_idmap_close(void)
 {
-	if (idmap_tdb)
-		return (tdb_close(idmap_tdb) == 0);
-	return True;
-}
+  BOOL ret = False;
 
-/* Dump status information to log file.  Display different stuff based on
-   the debug level:
+  if (!impl) {
+    impl = get_impl(lp_winbind_backend());
+  }
 
-   Debug Level        Information Displayed
-   =================================================================
-   0                  Percentage of [ug]id range allocated
-   0                  High water marks (next allocated ids)
-*/
+  if (impl) {
+    ret = impl->close();
+  } else {
+    DEBUG(0, ("winbindd_idmap_init: could not load backend '%s'\n",
+              lp_winbind_backend()));
+  }
 
-#define DUMP_INFO 0
+  return ret;
+}
 
+/* Dump backend status */
 void winbindd_idmap_status(void)
 {
-	int user_hwm, group_hwm;
-
-	DEBUG(0, ("winbindd idmap status:\n"));
-
-	/* Get current high water marks */
-
-	if ((user_hwm = tdb_fetch_int32(idmap_tdb, HWM_USER)) == -1) {
-		DEBUG(DUMP_INFO, ("\tCould not get userid high water mark!\n"));
-	}
-
-	if ((group_hwm = tdb_fetch_int32(idmap_tdb, HWM_GROUP)) == -1) {
-		DEBUG(DUMP_INFO, ("\tCould not get groupid high water mark!\n"));
-	}
-
-	/* Display next ids to allocate */
-
-	if (user_hwm != -1) {
-		DEBUG(DUMP_INFO, ("\tNext userid to allocate is %d\n", user_hwm));
-	}
-
-	if (group_hwm != -1) {
-		DEBUG(DUMP_INFO, ("\tNext groupid to allocate is %d\n", group_hwm));
-	}
-
-	/* Display percentage of id range already allocated. */
-
-	if (user_hwm != -1) {
-		int num_users = user_hwm - server_state.uid_low;
-		int total_users = server_state.uid_high - server_state.uid_low;
-
-		DEBUG(DUMP_INFO, ("\tUser id range is %d%% full (%d of %d)\n", 
-				num_users * 100 / total_users, num_users,
-				total_users));
-	}
-
-	if (group_hwm != -1) {
-		int num_groups = group_hwm - server_state.gid_low;
-		int total_groups = server_state.gid_high - server_state.gid_low;
-
-		DEBUG(DUMP_INFO, ("\tGroup id range is %d%% full (%d of %d)\n",
-				num_groups * 100 / total_groups, num_groups,
-				total_groups));
-	}
-
-	/* Display complete mapping of users and groups to rids */
+  if (!impl) {
+    impl = get_impl(lp_winbind_backend());
+  }
+
+  if (impl) {
+    impl->status();
+  } else {
+    DEBUG(0, ("winbindd_idmap_init: could not load backend '%s'\n",
+              lp_winbind_backend()));
+  }
 }
+
diff --git a/source3/nsswitch/winbindd_idmap_tdb.c b/source3/nsswitch/winbindd_idmap_tdb.c
new file mode 100644
index 0000000000..f27c3c1b5f
--- /dev/null
+++ b/source3/nsswitch/winbindd_idmap_tdb.c
@@ -0,0 +1,519 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   Winbind daemon - user related function
+
+   Copyright (C) Tim Potter 2000
+   Copyright (C) Anthony Liguori 2003
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "winbindd.h"
+
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_WINBIND
+
+/* High water mark keys */
+#define HWM_GROUP  "GROUP HWM"
+#define HWM_USER   "USER HWM"
+
+/* idmap version determines auto-conversion */
+#define IDMAP_VERSION 2
+
+/* Globals */
+static TDB_CONTEXT *idmap_tdb;
+
+/* convert one record to the new format */
+static int tdb_convert_fn(TDB_CONTEXT * tdb, TDB_DATA key, TDB_DATA data,
+			  void *ignored)
+{
+	struct winbindd_domain *domain;
+	char *p;
+	DOM_SID sid;
+	uint32 rid;
+	fstring keystr;
+	fstring dom_name;
+	TDB_DATA key2;
+
+	p = strchr(key.dptr, '/');
+	if (!p)
+		return 0;
+
+	*p = 0;
+	fstrcpy(dom_name, key.dptr);
+	*p++ = '/';
+
+	domain = find_domain_from_name(dom_name);
+	if (!domain) {
+		/* We must delete the old record. */
+		DEBUG(0,
+		      ("winbindd: tdb_convert_fn : Unable to find domain %s\n",
+		       dom_name));
+		DEBUG(0,
+		      ("winbindd: tdb_convert_fn : deleting record %s\n",
+		       key.dptr));
+		tdb_delete(idmap_tdb, key);
+		return 0;
+	}
+
+	rid = atoi(p);
+
+	sid_copy(&sid, &domain->sid);
+	sid_append_rid(&sid, rid);
+
+	sid_to_string(keystr, &sid);
+	key2.dptr = keystr;
+	key2.dsize = strlen(keystr) + 1;
+
+	if (tdb_store(idmap_tdb, key2, data, TDB_INSERT) != 0) {
+		/* not good! */
+		DEBUG(0,
+		      ("winbindd: tdb_convert_fn : Unable to update record %s\n",
+		       key2.dptr));
+		DEBUG(0,
+		      ("winbindd: tdb_convert_fn : conversion failed - idmap corrupt ?\n"));
+		return -1;
+	}
+
+	if (tdb_store(idmap_tdb, data, key2, TDB_REPLACE) != 0) {
+		/* not good! */
+		DEBUG(0,
+		      ("winbindd: tdb_convert_fn : Unable to update record %s\n",
+		       data.dptr));
+		DEBUG(0,
+		      ("winbindd: tdb_convert_fn : conversion failed - idmap corrupt ?\n"));
+		return -1;
+	}
+
+	tdb_delete(idmap_tdb, key);
+
+	return 0;
+}
+
+/*****************************************************************************
+ Convert the idmap database from an older version.
+*****************************************************************************/
+static BOOL tdb_idmap_convert(const char *idmap_name)
+{
+	int32 vers = tdb_fetch_int32(idmap_tdb, "IDMAP_VERSION");
+	BOOL bigendianheader =
+	    (idmap_tdb->flags & TDB_BIGENDIAN) ? True : False;
+
+	if (vers == IDMAP_VERSION)
+		return True;
+
+	if (((vers == -1) && bigendianheader)
+	    || (IREV(vers) == IDMAP_VERSION)) {
+		/* Arrggghh ! Bytereversed or old big-endian - make order independent ! */
+		/*
+		 * high and low records were created on a
+		 * big endian machine and will need byte-reversing.
+		 */
+
+		int32 wm;
+
+		wm = tdb_fetch_int32(idmap_tdb, HWM_USER);
+
+		if (wm != -1) {
+			wm = IREV(wm);
+		} else
+			wm = server_state.uid_low;
+
+		if (tdb_store_int32(idmap_tdb, HWM_USER, wm) == -1) {
+			DEBUG(0,
+			      ("tdb_idmap_convert: Unable to byteswap user hwm in idmap database\n"));
+			return False;
+		}
+
+		wm = tdb_fetch_int32(idmap_tdb, HWM_GROUP);
+		if (wm != -1) {
+			wm = IREV(wm);
+		} else
+			wm = server_state.gid_low;
+
+		if (tdb_store_int32(idmap_tdb, HWM_GROUP, wm) == -1) {
+			DEBUG(0,
+			      ("tdb_idmap_convert: Unable to byteswap group hwm in idmap database\n"));
+			return False;
+		}
+	}
+
+	/* the old format stored as DOMAIN/rid - now we store the SID direct */
+	tdb_traverse(idmap_tdb, tdb_convert_fn, NULL);
+
+	if (tdb_store_int32(idmap_tdb, "IDMAP_VERSION", IDMAP_VERSION) ==
+	    -1) {
+		DEBUG(0,
+		      ("tdb_idmap_convert: Unable to byteswap group hwm in idmap database\n"));
+		return False;
+	}
+
+	return True;
+}
+
+/* Allocate either a user or group id from the pool */
+static BOOL tdb_allocate_id(uid_t * id, BOOL isgroup)
+{
+	int hwm;
+
+	/* Get current high water mark */
+	if ((hwm = tdb_fetch_int32(idmap_tdb,
+				   isgroup ? HWM_GROUP : HWM_USER)) ==
+	    -1) {
+		return False;
+	}
+
+	/* Return next available uid in list */
+	if ((isgroup && (hwm > server_state.gid_high)) ||
+	    (!isgroup && (hwm > server_state.uid_high))) {
+		DEBUG(0,
+		      ("winbind %sid range full!\n", isgroup ? "g" : "u"));
+		return False;
+	}
+
+	if (id) {
+		*id = hwm;
+	}
+
+	hwm++;
+
+	/* Store new high water mark */
+	tdb_store_int32(idmap_tdb, isgroup ? HWM_GROUP : HWM_USER, hwm);
+
+	return True;
+}
+
+/* Get a sid from an id */
+static BOOL tdb_get_sid_from_id(int id, DOM_SID * sid, BOOL isgroup)
+{
+	TDB_DATA key, data;
+	fstring keystr;
+	BOOL result = False;
+
+	slprintf(keystr, sizeof(keystr), "%s %d", isgroup ? "GID" : "UID",
+		 id);
+
+	key.dptr = keystr;
+	key.dsize = strlen(keystr) + 1;
+
+	data = tdb_fetch(idmap_tdb, key);
+
+	if (data.dptr) {
+		result = string_to_sid(sid, data.dptr);
+		SAFE_FREE(data.dptr);
+	}
+
+	return result;
+}
+
+/* Get an id from a sid */
+static BOOL tdb_get_id_from_sid(DOM_SID * sid, uid_t * id, BOOL isgroup)
+{
+	TDB_DATA data, key;
+	fstring keystr;
+	BOOL result = False;
+
+	/* Check if sid is present in database */
+	sid_to_string(keystr, sid);
+
+	key.dptr = keystr;
+	key.dsize = strlen(keystr) + 1;
+
+	data = tdb_fetch(idmap_tdb, key);
+
+	if (data.dptr) {
+		fstring scanstr;
+		int the_id;
+
+		/* Parse and return existing uid */
+		fstrcpy(scanstr, isgroup ? "GID" : "UID");
+		fstrcat(scanstr, " %d");
+
+		if (sscanf(data.dptr, scanstr, &the_id) == 1) {
+			/* Store uid */
+			if (id) {
+				*id = the_id;
+			}
+
+			result = True;
+		}
+
+		SAFE_FREE(data.dptr);
+	} else {
+
+		/* Allocate a new id for this sid */
+		if (id && tdb_allocate_id(id, isgroup)) {
+			fstring keystr2;
+
+			/* Store new id */
+			slprintf(keystr2, sizeof(keystr2), "%s %d",
+				 isgroup ? "GID" : "UID", *id);
+
+			data.dptr = keystr2;
+			data.dsize = strlen(keystr2) + 1;
+
+			tdb_store(idmap_tdb, key, data, TDB_REPLACE);
+			tdb_store(idmap_tdb, data, key, TDB_REPLACE);
+
+			result = True;
+		}
+	}
+
+	return result;
+}
+
+/*****************************************************************************
+ Initialise idmap database. 
+*****************************************************************************/
+static BOOL tdb_idmap_init(void)
+{
+	/* Open tdb cache */
+	if (!(idmap_tdb = tdb_open_log(lock_path("winbindd_idmap.tdb"), 0,
+				       TDB_DEFAULT, O_RDWR | O_CREAT,
+				       0600))) {
+		DEBUG(0,
+		      ("winbindd_idmap_init: Unable to open idmap database\n"));
+		return False;
+	}
+
+	/* possibly convert from an earlier version */
+	if (!tdb_idmap_convert(lock_path("winbindd_idmap.tdb"))) {
+		DEBUG(0,
+		      ("winbindd_idmap_init: Unable to open idmap database\n"));
+		return False;
+	}
+
+	/* Create high water marks for group and user id */
+	if (tdb_fetch_int32(idmap_tdb, HWM_USER) == -1) {
+		if (tdb_store_int32
+		    (idmap_tdb, HWM_USER, server_state.uid_low) == -1) {
+			DEBUG(0,
+			      ("winbindd_idmap_init: Unable to initialise user hwm in idmap database\n"));
+			return False;
+		}
+	}
+
+	if (tdb_fetch_int32(idmap_tdb, HWM_GROUP) == -1) {
+		if (tdb_store_int32
+		    (idmap_tdb, HWM_GROUP, server_state.gid_low) == -1) {
+			DEBUG(0,
+			      ("winbindd_idmap_init: Unable to initialise group hwm in idmap database\n"));
+			return False;
+		}
+	}
+
+	return True;
+}
+
+/* Get a sid from a uid */
+static BOOL tdb_get_sid_from_uid(uid_t uid, DOM_SID * sid)
+{
+	return tdb_get_sid_from_id((int) uid, sid, False);
+}
+
+/* Get a sid from a gid */
+static BOOL tdb_get_sid_from_gid(gid_t gid, DOM_SID * sid)
+{
+	return tdb_get_sid_from_id((int) gid, sid, True);
+}
+
+/* Get a uid from a sid */
+static BOOL tdb_get_uid_from_sid(DOM_SID * sid, uid_t * uid)
+{
+	return tdb_get_id_from_sid(sid, uid, False);
+}
+
+/* Get a gid from a group sid */
+static BOOL tdb_get_gid_from_sid(DOM_SID * sid, gid_t * gid)
+{
+	return tdb_get_id_from_sid(sid, gid, True);
+}
+
+/* Get a uid from a user rid */
+static BOOL tdb_get_uid_from_rid(const char *dom_name, uint32 rid,
+				 uid_t * uid)
+{
+	struct winbindd_domain *domain;
+	DOM_SID sid;
+
+	if (!(domain = find_domain_from_name(dom_name))) {
+		return False;
+	}
+
+	sid_copy(&sid, &domain->sid);
+	sid_append_rid(&sid, rid);
+
+	return tdb_get_id_from_sid(&sid, uid, False);
+}
+
+/* Get a gid from a group rid */
+static BOOL tdb_get_gid_from_rid(const char *dom_name, uint32 rid,
+				 gid_t * gid)
+{
+	struct winbindd_domain *domain;
+	DOM_SID sid;
+
+	if (!(domain = find_domain_from_name(dom_name))) {
+		return False;
+	}
+
+	sid_copy(&sid, &domain->sid);
+	sid_append_rid(&sid, rid);
+
+	return tdb_get_id_from_sid(&sid, gid, True);
+}
+
+/* Get a user rid from a uid */
+static BOOL tdb_get_rid_from_uid(uid_t uid, uint32 * user_rid,
+				 struct winbindd_domain **domain)
+{
+	DOM_SID sid;
+
+	if (!tdb_get_sid_from_id((int) uid, &sid, False)) {
+		return False;
+	}
+
+	*domain = find_domain_from_sid(&sid);
+	if (!*domain)
+		return False;
+
+	sid_split_rid(&sid, user_rid);
+
+	return True;
+}
+
+/* Get a group rid from a gid */
+static BOOL tdb_get_rid_from_gid(gid_t gid, uint32 * group_rid,
+				 struct winbindd_domain **domain)
+{
+	DOM_SID sid;
+
+	if (!tdb_get_sid_from_id((int) gid, &sid, True)) {
+		return False;
+	}
+
+	*domain = find_domain_from_sid(&sid);
+	if (!*domain)
+		return False;
+
+	sid_split_rid(&sid, group_rid);
+
+	return True;
+}
+
+/* Close the tdb */
+static BOOL tdb_idmap_close(void)
+{
+	if (idmap_tdb)
+		return (tdb_close(idmap_tdb) == 0);
+	return True;
+}
+
+
+/* Dump status information to log file.  Display different stuff based on
+   the debug level:
+
+   Debug Level        Information Displayed
+   =================================================================
+   0                  Percentage of [ug]id range allocated
+   0                  High water marks (next allocated ids)
+*/
+
+#define DUMP_INFO 0
+
+static void tdb_idmap_status(void)
+{
+	int user_hwm, group_hwm;
+
+	DEBUG(0, ("winbindd idmap status:\n"));
+
+	/* Get current high water marks */
+
+	if ((user_hwm = tdb_fetch_int32(idmap_tdb, HWM_USER)) == -1) {
+		DEBUG(DUMP_INFO,
+		      ("\tCould not get userid high water mark!\n"));
+	}
+
+	if ((group_hwm = tdb_fetch_int32(idmap_tdb, HWM_GROUP)) == -1) {
+		DEBUG(DUMP_INFO,
+		      ("\tCould not get groupid high water mark!\n"));
+	}
+
+	/* Display next ids to allocate */
+
+	if (user_hwm != -1) {
+		DEBUG(DUMP_INFO,
+		      ("\tNext userid to allocate is %d\n", user_hwm));
+	}
+
+	if (group_hwm != -1) {
+		DEBUG(DUMP_INFO,
+		      ("\tNext groupid to allocate is %d\n", group_hwm));
+	}
+
+	/* Display percentage of id range already allocated. */
+
+	if (user_hwm != -1) {
+		int num_users = user_hwm - server_state.uid_low;
+		int total_users =
+		    server_state.uid_high - server_state.uid_low;
+
+		DEBUG(DUMP_INFO,
+		      ("\tUser id range is %d%% full (%d of %d)\n",
+		       num_users * 100 / total_users, num_users,
+		       total_users));
+	}
+
+	if (group_hwm != -1) {
+		int num_groups = group_hwm - server_state.gid_low;
+		int total_groups =
+		    server_state.gid_high - server_state.gid_low;
+
+		DEBUG(DUMP_INFO,
+		      ("\tGroup id range is %d%% full (%d of %d)\n",
+		       num_groups * 100 / total_groups, num_groups,
+		       total_groups));
+	}
+
+	/* Display complete mapping of users and groups to rids */
+}
+
+struct idmap_methods tdb_idmap_methods = {
+	tdb_idmap_init,
+
+	tdb_get_sid_from_uid,
+	tdb_get_sid_from_gid,
+
+	tdb_get_uid_from_sid,
+	tdb_get_gid_from_sid,
+
+	tdb_get_rid_from_uid,
+	tdb_get_rid_from_gid,
+
+	tdb_get_uid_from_rid,
+	tdb_get_gid_from_rid,
+
+	tdb_idmap_close,
+
+	tdb_idmap_status
+};
+
+BOOL winbind_idmap_reg_tdb(struct idmap_methods **meth)
+{
+	*meth = &tdb_idmap_methods;
+
+	return True;
+}
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 398ae88b97..01b6980c8f 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -8,6 +8,7 @@
    Copyright (C) Simo Sorce 2001
    Copyright (C) Alexander Bokovoy 2002
    Copyright (C) Stefan (metze) Metzmacher 2002
+   Copyright (C) Anthony Liguori 2003
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -171,6 +172,7 @@ typedef struct
 	BOOL bWinbindEnumUsers;
 	BOOL bWinbindEnumGroups;
 	BOOL bWinbindUseDefaultDomain;
+	char *szWinbindBackend;
 	char *szAddShareCommand;
 	char *szChangeShareCommand;
 	char *szDeleteShareCommand;
@@ -1118,6 +1120,7 @@ static struct parm_struct parm_table[] = {
 	{"winbind enum users", P_BOOL, P_GLOBAL, &Globals.bWinbindEnumUsers, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
 	{"winbind enum groups", P_BOOL, P_GLOBAL, &Globals.bWinbindEnumGroups, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
 	{"winbind use default domain", P_BOOL, P_GLOBAL, &Globals.bWinbindUseDefaultDomain, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
+	{"winbind backend", P_STRING, P_GLOBAL, &Globals.szWinbindBackend, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
 
 	{NULL, P_BOOL, P_NONE, NULL, NULL, NULL, 0}
 };
@@ -1458,6 +1461,8 @@ static void init_globals(void)
 	Globals.bWinbindEnumGroups = True;
 	Globals.bWinbindUseDefaultDomain = False;
 
+	string_set(&Globals.szWinbindBackend, "tdb");
+
 	Globals.name_cache_timeout = 660; /* In seconds */
 
 	Globals.bUseSpnego = True;
@@ -1630,6 +1635,7 @@ FN_GLOBAL_STRING(lp_acl_compatibility, &Globals.szAclCompat)
 FN_GLOBAL_BOOL(lp_winbind_enum_users, &Globals.bWinbindEnumUsers)
 FN_GLOBAL_BOOL(lp_winbind_enum_groups, &Globals.bWinbindEnumGroups)
 FN_GLOBAL_BOOL(lp_winbind_use_default_domain, &Globals.bWinbindUseDefaultDomain)
+FN_GLOBAL_STRING(lp_winbind_backend, &Globals.szWinbindBackend)
 
 #ifdef WITH_LDAP_SAMCONFIG
 FN_GLOBAL_STRING(lp_ldap_server, &Globals.szLdapServer)
-- 
cgit 


From 1fc2976e14f8b79c85514d7947744bc495513670 Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Fri, 21 Feb 2003 03:05:55 +0000
Subject: Doxygen janitor (This used to be commit
 367997562998adb3f80602596c770d9ac319065b)

---
 source3/lib/util_unistr.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'source3')

diff --git a/source3/lib/util_unistr.c b/source3/lib/util_unistr.c
index 5c9b4c783b..522ab7eb40 100644
--- a/source3/lib/util_unistr.c
+++ b/source3/lib/util_unistr.c
@@ -95,9 +95,14 @@ static int check_dos_char(smb_ucs2_t c)
 	return (c == c2);
 }
 
-/*******************************************************************
-load the valid character map table
-********************************************************************/
+/**
+ * Load the valid character map table from <tt>valid.dat</tt> or
+ * create from the configured codepage.
+ *
+ * This function is called whenever the configuration is reloaded.
+ * However, the valid character table is not changed if it's loaded
+ * from a file, because we can't unmap files.
+ **/
 void init_valid_table(void)
 {
 	static int initialised;
@@ -114,6 +119,7 @@ void init_valid_table(void)
 		return;
 	}
 
+	/* Otherwise, using a dynamically loaded one. */
 	if (valid_table) free(valid_table);
 
 	DEBUG(2,("creating default valid table\n"));
@@ -128,6 +134,7 @@ void init_valid_table(void)
 }
 
 
+
 /*******************************************************************
  Write a string in (little-endian) unicode format. src is in
  the current DOS codepage. len is the length in bytes of the
-- 
cgit 


From 4834c61ebcc16397b496a8b37d5078021041b1c1 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Fri, 21 Feb 2003 04:25:04 +0000
Subject: Fix for only specifying one command with -c (This used to be commit
 7418351427071edccb2e825ddbbf31fce8ef381e)

---
 source3/rpcclient/rpcclient.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c
index 37ce597d4e..7a9c464cf6 100644
--- a/source3/rpcclient/rpcclient.c
+++ b/source3/rpcclient/rpcclient.c
@@ -170,7 +170,10 @@ static char* next_command (char** cmdstr)
 	if (p)
 		*p = '\0';
 	pstrcpy(command, *cmdstr);
-	*cmdstr = p + 1;
+	if (p)
+		*cmdstr = p + 1;
+	else
+		*cmdstr = NULL;
 	
 	return command;
 }
-- 
cgit 


From ae8d3538c762af4d2b5672cc3c9dd11f1c2db59b Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Fri, 21 Feb 2003 04:26:58 +0000
Subject: Exit path cleanup for cli_samr_enum_dom_users() (This used to be
 commit 0bc1dfc68b0d411801a4209c9681c735cd7a73cc)

---
 source3/rpc_client/cli_samr.c | 52 +++++++++++++++----------------------------
 1 file changed, 18 insertions(+), 34 deletions(-)

(limited to 'source3')

diff --git a/source3/rpc_client/cli_samr.c b/source3/rpc_client/cli_samr.c
index f0035ca22e..08c68b7632 100644
--- a/source3/rpc_client/cli_samr.c
+++ b/source3/rpc_client/cli_samr.c
@@ -561,8 +561,8 @@ NTSTATUS cli_samr_enum_dom_users(struct cli_state *cli, TALLOC_CTX *mem_ctx,
                                  uint32 size, char ***dom_users, uint32 **rids,
                                  uint32 *num_dom_users)
 {
-	prs_struct qdata;
-	prs_struct rdata;
+	prs_struct qbuf;
+	prs_struct rbuf;
 	SAMR_Q_ENUM_DOM_USERS q;
 	SAMR_R_ENUM_DOM_USERS r;
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
@@ -571,40 +571,24 @@ NTSTATUS cli_samr_enum_dom_users(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 	ZERO_STRUCT(q);
 	ZERO_STRUCT(r);
 	
-	if (cli == NULL || pol == NULL)
-		return result;
-	
-	/* initialise parse structures */
-	prs_init(&qdata, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
-	prs_init(&rdata, 0, mem_ctx, UNMARSHALL);
-	
-	DEBUG(4, ("SAMR Enum Domain Users. start_idx: %d, acb: %d, size: %d\n",
-			*start_idx, acb_mask, size));
+	/* Initialise parse structures */
+
+	prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
+	prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
 	
-	/* fill query structure with parameters */
+	/* Fill query structure with parameters */
+
 	init_samr_q_enum_dom_users(&q, pol, *start_idx, acb_mask, 0, size);
 	
-	/* prepare query stream */
-	if (!samr_io_q_enum_dom_users("", &q, &qdata, 0)) {
-		prs_mem_free(&qdata);
-		prs_mem_free(&rdata);
-		return result;
-	}
-	
-	/* send rpc call over the pipe */
-	if (!rpc_api_pipe_req(cli, SAMR_ENUM_DOM_USERS, &qdata, &rdata)) {
-		prs_mem_free(&qdata);
-		prs_mem_free(&rdata);
-		return result;
+	if (!samr_io_q_enum_dom_users("", &q, &qbuf, 0) ||
+	    !rpc_api_pipe_req(cli, SAMR_ENUM_DOM_USERS, &qbuf, &rbuf)) {
+		goto done;
 	}
-		
+
 	/* unpack received stream */
-	if(!samr_io_r_enum_dom_users("", &r, &rdata, 0)) {
-		prs_mem_free(&qdata);
-		prs_mem_free(&rdata);
-		result = r.status;
-		return result;
-	}
+
+	if(!samr_io_r_enum_dom_users("", &r, &rbuf, 0))
+		goto done;
 	
 	/* return the data obtained in response */
 	if (!NT_STATUS_IS_OK(r.status) &&
@@ -641,13 +625,13 @@ NTSTATUS cli_samr_enum_dom_users(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 		}
 	}
 	
-	prs_mem_free(&qdata);
-	prs_mem_free(&rdata);
+done:
+	prs_mem_free(&qbuf);
+	prs_mem_free(&rbuf);
 	
 	return result;
 };
 
-
 /* Enumerate domain groups */
 
 NTSTATUS cli_samr_enum_dom_groups(struct cli_state *cli, TALLOC_CTX *mem_ctx, 
-- 
cgit 


From 696895d5b1c7749e7efa512330a970bbda74edab Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Fri, 21 Feb 2003 04:28:32 +0000
Subject: Added enumdomusers command. (This used to be commit
 30353da3e94f732e9f1b258e62da906f628e09d0)

---
 source3/rpcclient/cmd_samr.c | 75 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)

(limited to 'source3')

diff --git a/source3/rpcclient/cmd_samr.c b/source3/rpcclient/cmd_samr.c
index 9e8d105c46..85aface7be 100644
--- a/source3/rpcclient/cmd_samr.c
+++ b/source3/rpcclient/cmd_samr.c
@@ -626,6 +626,80 @@ static NTSTATUS cmd_samr_query_groupmem(struct cli_state *cli,
 	return result;
 }
 
+/* Enumerate domain users */
+
+static NTSTATUS cmd_samr_enum_dom_users(struct cli_state *cli, 
+					TALLOC_CTX *mem_ctx,
+					int argc, char **argv) 
+{
+	POLICY_HND connect_pol, domain_pol;
+	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+	uint32 start_idx, size, num_dom_users, i;
+	char **dom_users;
+	uint32 *dom_rids;
+	uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
+	uint16 acb_mask = ACB_NORMAL;
+	BOOL got_connect_pol = False, got_domain_pol = False;
+
+	if ((argc < 1) || (argc > 2)) {
+		printf("Usage: %s [access_mask]\n", argv[0]);
+		return NT_STATUS_OK;
+	}
+	
+	if (argc > 1)
+		sscanf(argv[1], "%x", &access_mask);
+
+	/* Get sam policy handle */
+
+	result = try_samr_connects(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
+				   &connect_pol);
+
+	if (!NT_STATUS_IS_OK(result))
+		goto done;
+
+	got_connect_pol = True;
+
+	/* Get domain policy handle */
+
+	result = cli_samr_open_domain(cli, mem_ctx, &connect_pol,
+				      access_mask,
+				      &domain_sid, &domain_pol);
+
+	if (!NT_STATUS_IS_OK(result))
+		goto done;
+
+	got_domain_pol = True;
+
+	/* Enumerate domain users */
+
+	start_idx = 0;
+	size = 0xffff;
+
+	do {
+		result = cli_samr_enum_dom_users(
+			cli, mem_ctx, &domain_pol, &start_idx, acb_mask,
+			size, &dom_users, &dom_rids, &num_dom_users);
+
+		if (NT_STATUS_IS_OK(result) ||
+		    NT_STATUS_V(result) == NT_STATUS_V(STATUS_MORE_ENTRIES)) {
+
+			for (i = 0; i < num_dom_users; i++)
+				printf("group:[%s] rid:[0x%x]\n", 
+				       dom_users[i], dom_rids[i]);
+		}
+
+	} while (NT_STATUS_V(result) == NT_STATUS_V(STATUS_MORE_ENTRIES));
+
+ done:
+	if (got_domain_pol)
+		cli_samr_close(cli, mem_ctx, &domain_pol);
+
+	if (got_connect_pol)
+		cli_samr_close(cli, mem_ctx, &connect_pol);
+
+	return result;
+}
+
 /* Enumerate domain groups */
 
 static NTSTATUS cmd_samr_enum_dom_groups(struct cli_state *cli, 
@@ -1428,6 +1502,7 @@ struct cmd_set samr_commands[] = {
 	{ "queryaliasmem", 	cmd_samr_query_aliasmem, 	PI_SAMR,	"Query alias membership",  "" },
 	{ "querydispinfo", 	cmd_samr_query_dispinfo, 	PI_SAMR,	"Query display info",      "" },
 	{ "querydominfo", 	cmd_samr_query_dominfo, 	PI_SAMR,	"Query domain info",       "" },
+	{ "enumdomusers",      cmd_samr_enum_dom_users,       PI_SAMR,	"Enumerate domain users", "" },
 	{ "enumdomgroups",      cmd_samr_enum_dom_groups,       PI_SAMR,	"Enumerate domain groups", "" },
 	{ "enumalsgroups",      cmd_samr_enum_als_groups,       PI_SAMR,	"Enumerate alias groups",  "" },
 
-- 
cgit 


From 9383d61f6c61ba8600ec73d22bd6f048c55a5261 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Fri, 21 Feb 2003 04:47:24 +0000
Subject: Fixed compiler warning. (This used to be commit
 b3f9cf8c1c293e905a536dfa5bb6a827627b7024)

---
 source3/rpc_server/srv_lsa_nt.c | 2 +-
 source3/smbd/sesssetup.c        | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'source3')

diff --git a/source3/rpc_server/srv_lsa_nt.c b/source3/rpc_server/srv_lsa_nt.c
index b230381d62..1b42c5f141 100644
--- a/source3/rpc_server/srv_lsa_nt.c
+++ b/source3/rpc_server/srv_lsa_nt.c
@@ -1280,7 +1280,7 @@ NTSTATUS _lsa_enum_acct_rights(pipes_struct *p, LSA_Q_ENUM_ACCT_RIGHTS *q_u, LSA
 
 	r_u->status = privilege_enum_account_rights(&q_u->sid.sid, &num_rights, &rights);
 
-	init_r_enum_acct_rights(r_u, num_rights, rights);
+	init_r_enum_acct_rights(r_u, num_rights, (const char **)rights);
 
 	for (i=0;i<num_rights;i++) {
 		free(rights[i]);
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index 3a3209f172..eafe805aba 100644
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -463,7 +463,6 @@ int reply_sesssetup_and_X(connection_struct *conn, char *inbuf,char *outbuf,
 	extern BOOL global_encrypted_passwords_negotiated;
 	extern BOOL global_spnego_negotiated;
 	extern int Protocol;
-	extern userdom_struct current_user_info;
 	extern int max_send;
 
 	auth_usersupplied_info *user_info = NULL;
-- 
cgit 


From 38cb0a122f00a7a979b7c1c2642c8d647ae58a9b Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Fri, 21 Feb 2003 04:53:39 +0000
Subject: Fixed another compiler warning. (This used to be commit
 d15b7425d408f17505c4f3a91ec68bcfc4472c16)

---
 source3/utils/net_ads.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index d508320423..75bb29f213 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -110,7 +110,7 @@ static int net_ads_info(int argc, const char **argv)
 	return 0;
 }
 
-static void use_in_memory_ccache() {
+static void use_in_memory_ccache(void) {
 	/* Use in-memory credentials cache so we do not interfere with
 	 * existing credentials */
 	setenv(KRB5_ENV_CCNAME, "MEMORY:net_ads", 1);
-- 
cgit 


From 7eff9dd5eff7656aa4b41ac0c413c28776b81b9e Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Fri, 21 Feb 2003 05:06:49 +0000
Subject: Fix another compiler warning. (This used to be commit
 1ea27d7987d2c0f67977371a99efec3ded13c872)

---
 source3/nsswitch/winbindd_ads.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'source3')

diff --git a/source3/nsswitch/winbindd_ads.c b/source3/nsswitch/winbindd_ads.c
index 9560a53fa0..9fd391870b 100644
--- a/source3/nsswitch/winbindd_ads.c
+++ b/source3/nsswitch/winbindd_ads.c
@@ -39,7 +39,6 @@ static ADS_STRUCT *ads_cached_connection(struct winbindd_domain *domain)
 {
 	ADS_STRUCT *ads;
 	ADS_STATUS status;
-	char *ccache;
 
 	if (domain->private) {
 		return (ADS_STRUCT *)domain->private;
-- 
cgit 


From e1c987abf2c716e26d2484a89e23507d1d2a9c5e Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Fri, 21 Feb 2003 05:07:51 +0000
Subject: Doesn't anyone run ./configure.developer anymore? (This used to be
 commit 09be123c6c1b67621eaf6c8ffb3016eccd375e5b)

---
 source3/libsmb/cliconnect.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index c57f92eea9..901daf4b09 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -453,7 +453,7 @@ static DATA_BLOB cli_session_setup_blob(struct cli_state *cli, DATA_BLOB blob)
 /****************************************************************************
  Use in-memory credentials cache
 ****************************************************************************/
-static void use_in_memory_ccache() {
+static void use_in_memory_ccache(void) {
 	setenv(KRB5_ENV_CCNAME, "MEMORY:cliconnect", 1);
 }
 
-- 
cgit 


From 6a46281dbb9c1f1f3278f199e812ba71bd0b45b8 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Fri, 21 Feb 2003 05:51:10 +0000
Subject: Ignore errors on python_clean target. (This used to be commit
 3805a9c5d5e98e089e1cd9e794f7204fc354a311)

---
 source3/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/Makefile.in b/source3/Makefile.in
index efc3b935b4..cbd8418a48 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1085,7 +1085,7 @@ python_install: $(PYTHON_OBJS)
 		$(PYTHON) python/setup.py install
 
 python_clean:
-	@if test -n "$(PYTHON)"; then $(PYTHON) python/setup.py clean; fi
+	@-if test -n "$(PYTHON)"; then $(PYTHON) python/setup.py clean; fi
 
 # revert to the previously installed version
 revert:
-- 
cgit 


From 2935d153763ca3f40de974418c479c4ef6cd4ec0 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Fri, 21 Feb 2003 06:25:39 +0000
Subject: Added comments to make it clearer when we're assigning a pointer that
 it must not be freed afterwards. Jeremy. (This used to be commit
 80bad908c0235a57446c70b9632d3415c9d2fcf5)

---
 source3/smbd/posix_acls.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'source3')

diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index a40fb4042f..93a57925f1 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -1000,8 +1000,16 @@ Deny entry after Allow entry. Failing to set on file %s.\n", fsp->fsp_name ));
 						return False;
 					}
 
+					/*
+					 * We must not free current_ace here as its
+					 * pointer is now owned by the dir_ace list.
+					 */
 					current_ace = dup_ace;
 				} else {
+					/*
+					 * We must not free current_ace here as its
+					 * pointer is now owned by the dir_ace list.
+					 */
 					current_ace = NULL;
 				}
 			}
@@ -1036,6 +1044,10 @@ Deny entry after Allow entry. Failing to set on file %s.\n", fsp->fsp_name ));
 				print_canon_ace( current_ace, 0);
 			}
 			all_aces_are_inherit_only = False;
+			/*
+			 * We must not free current_ace here as its
+			 * pointer is now owned by the file_ace list.
+			 */
 			current_ace = NULL;
 		}
 
-- 
cgit 


From db721d24c5ed337e2fd69860d0a4011a6c1f3e2d Mon Sep 17 00:00:00 2001
From: Jim McDonough <jmcd@samba.org>
Date: Fri, 21 Feb 2003 13:25:10 +0000
Subject: rename 'winbind backend' to 'idmap backend'.  Put paramter in
 security section...does this make sense? (This used to be commit
 822083f73e8ba4e096c53ff0f7578f47bc21b7b5)

---
 source3/nsswitch/winbindd_idmap.c | 46 +++++++++++++++++++--------------------
 source3/param/loadparm.c          |  8 +++----
 2 files changed, 27 insertions(+), 27 deletions(-)

(limited to 'source3')

diff --git a/source3/nsswitch/winbindd_idmap.c b/source3/nsswitch/winbindd_idmap.c
index d9448ef859..0a17fcd87f 100644
--- a/source3/nsswitch/winbindd_idmap.c
+++ b/source3/nsswitch/winbindd_idmap.c
@@ -62,13 +62,13 @@ BOOL winbindd_idmap_init(void)
   BOOL ret = False;
 
   DEBUG(3, ("winbindd_idmap_init: using '%s' as backend\n", 
-            lp_winbind_backend()));
+            lp_idmap_backend()));
 
   if (!impl) {
-    impl = get_impl(lp_winbind_backend());
+    impl = get_impl(lp_idmap_backend());
     if (!impl) {
       DEBUG(0, ("winbindd_idmap_init: could not load backend '%s'\n",
-                lp_winbind_backend()));
+                lp_idmap_backend()));
     }
   }
 
@@ -87,10 +87,10 @@ BOOL winbindd_idmap_get_uid_from_sid(DOM_SID *sid, uid_t *uid)
   BOOL ret = False;
 
   if (!impl) {
-    impl = get_impl(lp_winbind_backend());
+    impl = get_impl(lp_idmap_backend());
     if (!impl) {
       DEBUG(0, ("winbindd_idmap_init: could not load backend '%s'\n",
-                lp_winbind_backend()));
+                lp_idmap_backend()));
     }
   }
 
@@ -107,10 +107,10 @@ BOOL winbindd_idmap_get_gid_from_sid(DOM_SID *sid, gid_t *gid)
   BOOL ret = False;
 
   if (!impl) {
-    impl = get_impl(lp_winbind_backend());
+    impl = get_impl(lp_idmap_backend());
     if (!impl) {
       DEBUG(0, ("winbindd_idmap_init: could not load backend '%s'\n",
-                lp_winbind_backend()));
+                lp_idmap_backend()));
     }
   }
 
@@ -128,10 +128,10 @@ BOOL winbindd_idmap_get_uid_from_rid(const char *dom_name, uint32 rid,
   BOOL ret = False;
 
   if (!impl) {
-    impl = get_impl(lp_winbind_backend());
+    impl = get_impl(lp_idmap_backend());
     if (!impl) {
       DEBUG(0, ("winbindd_idmap_init: could not load backend '%s'\n",
-                lp_winbind_backend()));
+                lp_idmap_backend()));
     }
   }
 
@@ -149,10 +149,10 @@ BOOL winbindd_idmap_get_gid_from_rid(const char *dom_name, uint32 rid,
   BOOL ret = False;
 
   if (!impl) {
-    impl = get_impl(lp_winbind_backend());
+    impl = get_impl(lp_idmap_backend());
     if (!impl) {
       DEBUG(0, ("winbindd_idmap_init: could not load backend '%s'\n",
-                lp_winbind_backend()));
+                lp_idmap_backend()));
     }
   }
 
@@ -169,10 +169,10 @@ BOOL winbindd_idmap_get_sid_from_uid(uid_t uid, DOM_SID *sid)
   BOOL ret = False;
 
   if (!impl) {
-    impl = get_impl(lp_winbind_backend());
+    impl = get_impl(lp_idmap_backend());
     if (!impl) {
       DEBUG(0, ("winbindd_idmap_init: could not load backend '%s'\n",
-                lp_winbind_backend()));
+                lp_idmap_backend()));
     }
   }
 
@@ -189,14 +189,14 @@ BOOL winbindd_idmap_get_sid_from_gid(gid_t gid, DOM_SID *sid)
   BOOL ret = False;
 
   if (!impl) {
-    impl = get_impl(lp_winbind_backend());
+    impl = get_impl(lp_idmap_backend());
   }
 
   if (impl) {
     ret = impl->get_sid_from_gid(gid, sid);
   } else {
     DEBUG(0, ("winbindd_idmap_init: could not load backend '%s'\n",
-              lp_winbind_backend()));
+              lp_idmap_backend()));
   }
 
   return ret;
@@ -209,14 +209,14 @@ BOOL winbindd_idmap_get_rid_from_uid(uid_t uid, uint32 *user_rid,
   BOOL ret = False;
 
   if (!impl) {
-    impl = get_impl(lp_winbind_backend());
+    impl = get_impl(lp_idmap_backend());
   }
 
   if (impl) {
     ret = impl->get_rid_from_uid(uid, user_rid, domain);
   } else {
     DEBUG(0, ("winbindd_idmap_init: could not load backend '%s'\n",
-              lp_winbind_backend()));
+              lp_idmap_backend()));
   }
 
   return ret;
@@ -229,14 +229,14 @@ BOOL winbindd_idmap_get_rid_from_gid(gid_t gid, uint32 *group_rid,
   BOOL ret = False;
 
   if (!impl) {
-    impl = get_impl(lp_winbind_backend());
+    impl = get_impl(lp_idmap_backend());
   }
 
   if (impl) {
     ret = impl->get_rid_from_gid(gid, group_rid, domain);
   } else {
     DEBUG(0, ("winbindd_idmap_init: could not load backend '%s'\n",
-              lp_winbind_backend()));
+              lp_idmap_backend()));
   }
 
   return ret;
@@ -248,14 +248,14 @@ BOOL winbindd_idmap_close(void)
   BOOL ret = False;
 
   if (!impl) {
-    impl = get_impl(lp_winbind_backend());
+    impl = get_impl(lp_idmap_backend());
   }
 
   if (impl) {
     ret = impl->close();
   } else {
     DEBUG(0, ("winbindd_idmap_init: could not load backend '%s'\n",
-              lp_winbind_backend()));
+              lp_idmap_backend()));
   }
 
   return ret;
@@ -265,14 +265,14 @@ BOOL winbindd_idmap_close(void)
 void winbindd_idmap_status(void)
 {
   if (!impl) {
-    impl = get_impl(lp_winbind_backend());
+    impl = get_impl(lp_idmap_backend());
   }
 
   if (impl) {
     impl->status();
   } else {
     DEBUG(0, ("winbindd_idmap_init: could not load backend '%s'\n",
-              lp_winbind_backend()));
+              lp_idmap_backend()));
   }
 }
 
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 01b6980c8f..7aaae439b1 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -172,7 +172,7 @@ typedef struct
 	BOOL bWinbindEnumUsers;
 	BOOL bWinbindEnumGroups;
 	BOOL bWinbindUseDefaultDomain;
-	char *szWinbindBackend;
+	char *szIDMapBackend;
 	char *szAddShareCommand;
 	char *szChangeShareCommand;
 	char *szDeleteShareCommand;
@@ -749,6 +749,7 @@ static struct parm_struct parm_table[] = {
 	{"update encrypted", P_BOOL, P_GLOBAL, &Globals.bUpdateEncrypt, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_DEVELOPER},
 	{"allow trusted domains", P_BOOL, P_GLOBAL, &Globals.bAllowTrustedDomains, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
 	{"hosts equiv", P_STRING, P_GLOBAL, &Globals.szHostsEquiv, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
+	{"idmap backend", P_STRING, P_GLOBAL, &Globals.szIDMapBackend, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
 	{"min passwd length", P_INTEGER, P_GLOBAL, &Globals.min_passwd_length, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
 	{"min password length", P_INTEGER, P_GLOBAL, &Globals.min_passwd_length, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
 	{"map to guest", P_ENUM, P_GLOBAL, &Globals.map_to_guest, NULL, enum_map_to_guest, FLAG_ADVANCED | FLAG_DEVELOPER},
@@ -1120,7 +1121,6 @@ static struct parm_struct parm_table[] = {
 	{"winbind enum users", P_BOOL, P_GLOBAL, &Globals.bWinbindEnumUsers, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
 	{"winbind enum groups", P_BOOL, P_GLOBAL, &Globals.bWinbindEnumGroups, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
 	{"winbind use default domain", P_BOOL, P_GLOBAL, &Globals.bWinbindUseDefaultDomain, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-	{"winbind backend", P_STRING, P_GLOBAL, &Globals.szWinbindBackend, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
 
 	{NULL, P_BOOL, P_NONE, NULL, NULL, NULL, 0}
 };
@@ -1461,7 +1461,7 @@ static void init_globals(void)
 	Globals.bWinbindEnumGroups = True;
 	Globals.bWinbindUseDefaultDomain = False;
 
-	string_set(&Globals.szWinbindBackend, "tdb");
+	string_set(&Globals.szIDMapBackend, "tdb");
 
 	Globals.name_cache_timeout = 660; /* In seconds */
 
@@ -1635,7 +1635,7 @@ FN_GLOBAL_STRING(lp_acl_compatibility, &Globals.szAclCompat)
 FN_GLOBAL_BOOL(lp_winbind_enum_users, &Globals.bWinbindEnumUsers)
 FN_GLOBAL_BOOL(lp_winbind_enum_groups, &Globals.bWinbindEnumGroups)
 FN_GLOBAL_BOOL(lp_winbind_use_default_domain, &Globals.bWinbindUseDefaultDomain)
-FN_GLOBAL_STRING(lp_winbind_backend, &Globals.szWinbindBackend)
+FN_GLOBAL_STRING(lp_idmap_backend, &Globals.szIDMapBackend)
 
 #ifdef WITH_LDAP_SAMCONFIG
 FN_GLOBAL_STRING(lp_ldap_server, &Globals.szLdapServer)
-- 
cgit 


From 23553b48e6bd21481ca32c4b3ee54fc1aded4174 Mon Sep 17 00:00:00 2001
From: Jim McDonough <jmcd@samba.org>
Date: Fri, 21 Feb 2003 14:35:02 +0000
Subject: Fix IRIX build...void fn can't return another void fn (This used to
 be commit df3c7c9cbb275e9c35356b4f1cab1a741de6f500)

---
 source3/libsmb/clikrb5.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/libsmb/clikrb5.c b/source3/libsmb/clikrb5.c
index 96e737166c..bef6998a49 100644
--- a/source3/libsmb/clikrb5.c
+++ b/source3/libsmb/clikrb5.c
@@ -131,7 +131,8 @@ krb5_error_code get_kerberos_allowed_etypes(krb5_context context,
 			   krb5_enctype *enctypes)
 {
 #if defined(HAVE_KRB5_FREE_KTYPES)
-	return krb5_free_ktypes(context, enctypes);
+	krb5_free_ktypes(context, enctypes);
+	return;
 #else
 	SAFE_FREE(enctypes);
 	return;
-- 
cgit 


From 193f9200aa4ea692e9126f3df68a5cb83e3a4056 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Fri, 21 Feb 2003 16:15:30 +0000
Subject: patch from Hal Roberts check for a valid [f]chmod_acl function
 pointer before calling it.  Fixes seg fault in audit VFS module (This used to
 be commit 5e115d43812021f9a16111fc7c05d750026cca1e)

---
 source3/modules/vfs_audit.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'source3')

diff --git a/source3/modules/vfs_audit.c b/source3/modules/vfs_audit.c
index 92b78c1c32..1944c98e53 100644
--- a/source3/modules/vfs_audit.c
+++ b/source3/modules/vfs_audit.c
@@ -233,7 +233,12 @@ static int audit_chmod(struct connection_struct *conn, const char *path, mode_t
 
 static int audit_chmod_acl(struct connection_struct *conn, const char *path, mode_t mode)
 {
-	int result = default_vfs_ops.chmod_acl(conn, path, mode);
+	int result;
+
+	if ( !default_vfs_ops.chmod_acl )
+		return 0;
+
+	result = default_vfs_ops.chmod_acl(conn, path, mode);
 
 	syslog(SYSLOG_PRIORITY, "chmod_acl %s mode 0x%x %s%s\n",
 	       path, mode,
@@ -257,7 +262,12 @@ static int audit_fchmod(struct files_struct *fsp, int fd, mode_t mode)
 
 static int audit_fchmod_acl(struct files_struct *fsp, int fd, mode_t mode)
 {
-	int result = default_vfs_ops.fchmod_acl(fsp, fd, mode);
+	int result;
+
+	if ( !default_vfs_ops.fchmod_acl )
+		return 0;
+
+	result = default_vfs_ops.fchmod_acl(fsp, fd, mode);
 
 	syslog(SYSLOG_PRIORITY, "fchmod_acl %s mode 0x%x %s%s\n",
 	       fsp->fsp_name, mode,
-- 
cgit 


From ab985b983f45a284b2ee9fdd08801989574edf4b Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Fri, 21 Feb 2003 17:08:43 +0000
Subject: couple of merges from APP_HEAD   * performance optimization in
 enumprinterdataex() when keyname is empty   * fix a few typos in comments   *
 reload services after addprinter_command()

dump registry data in ascii when the key is REG_SZ or REG_MULTI_SZ
(This used to be commit fde6ef7cc62c58d512dc8053b214f0a3c59a78ab)
---
 source3/rpc_parse/parse_spoolss.c   |  2 +-
 source3/rpc_server/srv_spoolss_nt.c | 27 ++++++++++++++++++++++++---
 2 files changed, 25 insertions(+), 4 deletions(-)

(limited to 'source3')

diff --git a/source3/rpc_parse/parse_spoolss.c b/source3/rpc_parse/parse_spoolss.c
index cb3b2efd9d..fb2aaf71ec 100644
--- a/source3/rpc_parse/parse_spoolss.c
+++ b/source3/rpc_parse/parse_spoolss.c
@@ -1372,7 +1372,7 @@ BOOL spoolss_io_r_getprinterdata(const char *desc, SPOOL_R_GETPRINTERDATA *r_u,
 			return False;
 	}
 
-	if (!prs_uint8s(False,"data", ps, depth, r_u->data, r_u->size))
+	if (!prs_uint8s( r_u->type&(REG_SZ|REG_MULTI_SZ), "data", ps, depth, r_u->data, r_u->size ))
 		return False;
 		
 	if (!prs_align(ps))
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index d94bebf4c1..4c87d0f73d 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -615,7 +615,7 @@ static BOOL is_monitoring_event(Printer_entry *p, uint16 notify_type,
 
 	/* 
 	 * Flags should always be zero when the change notify
-	 * is registered by the cliebnt's spooler.  A user Win32 app
+	 * is registered by the client's spooler.  A user Win32 app
 	 * might use the flags though instead of the NOTIFY_OPTION_INFO 
 	 * --jerry
 	 */
@@ -5936,6 +5936,13 @@ static WERROR update_printer(pipes_struct *p, POLICY_HND *handle, uint32 level,
 			result = WERR_ACCESS_DENIED;
 			goto done;
 		}
+
+		/* 
+		 * make sure we actually reload the services after 
+		 * this as smb.conf could have a new section in it 
+		 * .... shouldn't .... but could
+		 */
+		reload_services(False);	
 	}
 	
 	/*
@@ -8871,11 +8878,24 @@ WERROR _spoolss_enumprinterdataex(pipes_struct *p, SPOOL_Q_ENUMPRINTERDATAEX *q_
 	DEBUG(4,("_spoolss_enumprinterdataex\n"));
 
 	if (!Printer) {
-		DEBUG(2,("_spoolss_enumprinterdata: Invalid handle (%s:%u:%u1<).\n", OUR_HANDLE(handle)));
+		DEBUG(2,("_spoolss_enumprinterdataex: Invalid handle (%s:%u:%u1<).\n", OUR_HANDLE(handle)));
 		return WERR_BADFID;
 	}
 
-	/* first get the printer off of disk */
+	/* 
+	 * first check for a keyname of NULL or "".  Win2k seems to send 
+	 * this a lot and we should send back WERR_INVALID_PARAM
+	 * no need to spend time looking up the printer in this case.
+	 * --jerry
+	 */
+	 
+	unistr2_to_dos(key, &q_u->key, sizeof(key) - 1);
+	if ( !strlen(key) ) {
+		result = WERR_INVALID_PARAM;
+		goto done;
+	}
+
+	/* get the printer off of disk */
 	
 	if (!get_printer_snum(p,handle, &snum))
 		return WERR_BADFID;
@@ -8971,6 +8991,7 @@ WERROR _spoolss_enumprinterdataex(pipes_struct *p, SPOOL_Q_ENUMPRINTERDATAEX *q_
 	
 		
 done:	
+	if ( printer )
 	free_a_printer(&printer, 2);
 
 	return result;
-- 
cgit 


From 3d730f89cf3c30d8b17f0d35d2cdf28db53296e2 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Fri, 21 Feb 2003 20:00:46 +0000
Subject: i patched the wrong branch! s/unistr2_to_dos/unistr2_to_ascii/ (This
 used to be commit 513fb2ddd85a74de7684a6cb09d57011af69161f)

---
 source3/rpc_server/srv_spoolss_nt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 4c87d0f73d..93566c2bb7 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -8889,7 +8889,7 @@ WERROR _spoolss_enumprinterdataex(pipes_struct *p, SPOOL_Q_ENUMPRINTERDATAEX *q_
 	 * --jerry
 	 */
 	 
-	unistr2_to_dos(key, &q_u->key, sizeof(key) - 1);
+	unistr2_to_ascii(key, &q_u->key, sizeof(key) - 1);
 	if ( !strlen(key) ) {
 		result = WERR_INVALID_PARAM;
 		goto done;
-- 
cgit 


From 301ebd6324138b9628638c0020597227d0cbf959 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 22 Feb 2003 00:54:08 +0000
Subject: Fix a DEBUG() formatting, add some more debug to our SID pulling code
 and inline the call to prs_copy_all_data_out() so that we can know we are not
 overrunning our buffer.

Also check more return values.

Andrew Bartlett
(This used to be commit e3b73d5d658584428c81c9ef3ccf024687a56e2f)
---
 source3/libads/ldap.c             | 51 +++++++++++++++++++++++++--------------
 source3/nsswitch/winbindd_group.c |  2 +-
 2 files changed, 34 insertions(+), 19 deletions(-)

(limited to 'source3')

diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index 67669fc078..bc90e90ea0 100644
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -816,18 +816,18 @@ static ADS_STATUS ads_modlist_add(TALLOC_CTX *ctx, ADS_MODLIST *mods,
 {
 	int curmod;
 	LDAPMod **modlist = (LDAPMod **) *mods;
-	void **values;
+	struct berval **ber_values;
+	char **char_values;
 
 	if (!invals) {
-		values = NULL;
 		mod_op = LDAP_MOD_DELETE;
 	} else {
 		if (mod_op & LDAP_MOD_BVALUES)
-			values = (void **) ads_dup_values(ctx, 
-					   (const struct berval **)invals);
+			ber_values = ads_dup_values(ctx, 
+						(const struct berval **)invals);
 		else
-			values = (void **) ads_push_strvals(ctx, 
-						   (const char **) invals);
+			char_values = ads_push_strvals(ctx, 
+						  (const char **) invals);
 	}
 
 	/* find the first empty slot */
@@ -846,10 +846,14 @@ static ADS_STATUS ads_modlist_add(TALLOC_CTX *ctx, ADS_MODLIST *mods,
 	if (!(modlist[curmod] = talloc_zero(ctx, sizeof(LDAPMod))))
 		return ADS_ERROR(LDAP_NO_MEMORY);
 	modlist[curmod]->mod_type = talloc_strdup(ctx, name);
-	if (mod_op & LDAP_MOD_BVALUES)
-		modlist[curmod]->mod_bvalues = (struct berval **) values;
-	else
-		modlist[curmod]->mod_values = (char **) values;
+	if (mod_op & LDAP_MOD_BVALUES) {
+		modlist[curmod]->mod_bvalues = ber_values;
+	} else if (mod_op & LDAP_MOD_DELETE) {
+		modlist[curmod]->mod_values = NULL;
+	} else {
+		modlist[curmod]->mod_values = char_values;
+	}
+
 	modlist[curmod]->mod_op = mod_op;
 	return ADS_ERROR(LDAP_SUCCESS);
 }
@@ -1500,16 +1504,24 @@ ADS_STATUS ads_set_machine_sd(ADS_STRUCT *ads, const char *hostname, char *dn)
 #endif
 	if (!(mods = ads_init_mods(ctx))) return ADS_ERROR(LDAP_NO_MEMORY);
 
-	bval.bv_len = sd_size;
-	bval.bv_val = talloc(ctx, sd_size);
+	bval.bv_len = prs_offset(&ps_wire);
+	bval.bv_val = talloc(ctx, bval.bv_len);
 	if (!bval.bv_val) {
 		ret = ADS_ERROR(LDAP_NO_MEMORY);
 		goto ads_set_sd_error;
 	}
-	prs_copy_all_data_out(bval.bv_val, &ps_wire);
 
-	ads_mod_ber(ctx, &mods, attrs[0], &bval);
-	ret = ads_gen_mod(ads, dn, mods);
+	prs_set_offset(&ps_wire, 0);
+
+	if (!prs_copy_data_out(bval.bv_val, &ps_wire, bval.bv_len)) {
+		ret = ADS_ERROR(LDAP_NO_MEMORY);
+		goto ads_set_sd_error;		
+	}
+
+	ret = ads_mod_ber(ctx, &mods, attrs[0], &bval);
+	if (ADS_ERR_OK(ret)) {
+		ret = ads_gen_mod(ads, dn, mods);
+	}
 
 ads_set_sd_error:
 	ads_msgfree(ads, res);
@@ -1554,7 +1566,7 @@ char *ads_pull_string(ADS_STRUCT *ads,
 	char **values;
 	char *ret = NULL;
 	char *ux_string;
-	int rc;
+	size_t rc;
 
 	values = ldap_get_values(ads->ld, msg, field);
 	if (!values)
@@ -1563,7 +1575,7 @@ char *ads_pull_string(ADS_STRUCT *ads,
 	if (values[0]) {
 		rc = pull_utf8_talloc(mem_ctx, &ux_string, 
 				      values[0]);
-		if (rc != -1)
+		if (rc != (size_t)-1)
 			ret = ux_string;
 		
 	}
@@ -1725,8 +1737,11 @@ int ads_pull_sids(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx,
 	count = 0;
 	for (i=0; values[i]; i++) {
 		ret = sid_parse(values[i]->bv_val, values[i]->bv_len, &(*sids)[count]);
-		if (ret)
+		if (ret) {
+			fstring sid;
+			DEBUG(10, ("pulling SID: %s\n", sid_to_string(sid, &(*sids)[count])));
 			count++;
+		}
 	}
 	
 	ldap_value_free_len(values);
diff --git a/source3/nsswitch/winbindd_group.c b/source3/nsswitch/winbindd_group.c
index 6b2f05f436..94a826fbbc 100644
--- a/source3/nsswitch/winbindd_group.c
+++ b/source3/nsswitch/winbindd_group.c
@@ -434,7 +434,7 @@ static BOOL get_sam_group_entries(struct getent_state *ent)
 	status = domain->methods->enum_dom_groups(domain, mem_ctx, &num_entries, &sam_grp_entries);
 	
 	if (!NT_STATUS_IS_OK(status)) {
-		DEBUG(3, ("get_sam_group_entries: could not enumerate domain groups! Error: %s", nt_errstr(status)));
+		DEBUG(3, ("get_sam_group_entries: could not enumerate domain groups! Error: %s\n", nt_errstr(status)));
 		result = False;
 		goto done;
 	}
-- 
cgit 


From ca2e9955764fa0bec3ace1fc049f13bb8e2961ac Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Sat, 22 Feb 2003 01:08:19 +0000
Subject: New locktest7 code based on patch from "Srikanta Shivanna"
 <sshivanna@pillardata.com> Jeremy. (This used to be commit
 caf298c3808cbdd683e884b32b7a0538505a3066)

---
 source3/torture/torture.c | 134 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 134 insertions(+)

(limited to 'source3')

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 97e864de96..fe53baae7e 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -1569,6 +1569,139 @@ static BOOL run_locktest6(int dummy)
 	return True;
 }
 
+static BOOL run_locktest7(int dummy)
+{
+	static struct cli_state cli1;
+	const char *fname = "\\lockt7.lck";
+	int fnum1;
+	char buf[200];
+	BOOL correct = False;
+
+	if (!torture_open_connection(&cli1)) {
+		return False;
+	}
+
+	cli_sockopt(&cli1, sockops);
+
+	printf("starting locktest7\n");
+
+	cli_unlink(&cli1, fname);
+
+	fnum1 = cli_open(&cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
+
+	memset(buf, 0, sizeof(buf));
+
+	if (cli_write(&cli1, fnum1, 0, buf, 0, sizeof(buf)) != sizeof(buf)) {
+		printf("Failed to create file\n");
+		goto fail;
+	}
+
+	cli_setpid(&cli1, 1);
+
+	if (!cli_lock(&cli1, fnum1, 130, 4, 0, READ_LOCK)) {
+		printf("Unable to apply read lock on range 130:4, error was %s\n", cli_errstr(&cli1));
+		goto fail;
+	} else {
+		printf("pid1 successfully locked range 130:4 for READ\n");
+	}
+
+	if (cli_read(&cli1, fnum1, buf, 130, 4) != 4) {
+		printf("pid1 unable to read the range 130:4, error was %s\n", cli_errstr(&cli1));
+		goto fail;
+	} else {
+		printf("pid1 successfully read the range 130:4\n");
+	}
+
+	if (cli_write(&cli1, fnum1, 0, buf, 130, 4) != 4) {
+		printf("pid1 unable to write to the range 130:4, error was %s\n", cli_errstr(&cli1));
+		if (NT_STATUS_V(cli_nt_error(&cli1)) != NT_STATUS_V(NT_STATUS_FILE_LOCK_CONFLICT)) {
+			printf("Incorrect error (should be NT_STATUS_FILE_LOCK_CONFLICT)\n");
+			goto fail;
+		}
+	} else {
+		printf("pid1 successfully wrote to the range 130:4 (should be denied)\n");
+		goto fail;
+	}
+
+	cli_setpid(&cli1, 2);
+
+	if (cli_read(&cli1, fnum1, buf, 130, 4) != 4) {
+		printf("pid2 unable to read the range 130:4, error was %s\n", cli_errstr(&cli1));
+	} else {
+		printf("pid2 successfully read the range 130:4\n");
+	}
+
+	if (cli_write(&cli1, fnum1, 0, buf, 130, 4) != 4) {
+		printf("pid2 unable to write to the range 130:4, error was %s\n", cli_errstr(&cli1));
+		if (NT_STATUS_V(cli_nt_error(&cli1)) != NT_STATUS_V(NT_STATUS_FILE_LOCK_CONFLICT)) {
+			printf("Incorrect error (should be NT_STATUS_FILE_LOCK_CONFLICT)\n");
+			goto fail;
+		}
+	} else {
+		printf("pid2 successfully wrote to the range 130:4 (should be denied)\n");
+		goto fail;
+	}
+
+	cli_setpid(&cli1, 1);
+	cli_unlock(&cli1, fnum1, 130, 4);
+
+	if (!cli_lock(&cli1, fnum1, 130, 4, 0, WRITE_LOCK)) {
+		printf("Unable to apply write lock on range 130:4, error was %s\n", cli_errstr(&cli1));
+		goto fail;
+	} else {
+		printf("pid1 successfully locked range 130:4 for WRITE\n");
+	}
+
+	if (cli_read(&cli1, fnum1, buf, 130, 4) != 4) {
+		printf("pid1 unable to read the range 130:4, error was %s\n", cli_errstr(&cli1));
+		goto fail;
+	} else {
+		printf("pid1 successfully read the range 130:4\n");
+	}
+
+	if (cli_write(&cli1, fnum1, 0, buf, 130, 4) != 4) {
+		printf("pid1 unable to write to the range 130:4, error was %s\n", cli_errstr(&cli1));
+		goto fail;
+	} else {
+		printf("pid1 successfully wrote to the range 130:4\n");
+	}
+
+	cli_setpid(&cli1, 2);
+
+	if (cli_read(&cli1, fnum1, buf, 130, 4) != 4) {
+		printf("pid2 unable to read the range 130:4, error was %s\n", cli_errstr(&cli1));
+		if (NT_STATUS_V(cli_nt_error(&cli1)) != NT_STATUS_V(NT_STATUS_FILE_LOCK_CONFLICT)) {
+			printf("Incorrect error (should be NT_STATUS_FILE_LOCK_CONFLICT)\n");
+			goto fail;
+		}
+	} else {
+		printf("pid2 successfully read the range 130:4 (should be denied)\n");
+		goto fail;
+	}
+
+	if (cli_write(&cli1, fnum1, 0, buf, 130, 4) != 4) {
+		printf("pid2 unable to write to the range 130:4, error was %s\n", cli_errstr(&cli1));
+		if (NT_STATUS_V(cli_nt_error(&cli1)) != NT_STATUS_V(NT_STATUS_FILE_LOCK_CONFLICT)) {
+			printf("Incorrect error (should be NT_STATUS_FILE_LOCK_CONFLICT)\n");
+			goto fail;
+		}
+	} else {
+		printf("pid2 successfully wrote to the range 130:4 (should be denied)\n");
+		goto fail;
+	}
+
+	cli_unlock(&cli1, fnum1, 130, 0);
+	correct = True;
+
+fail:
+	cli_close(&cli1, fnum1);
+	cli_unlink(&cli1, fname);
+	torture_close_connection(&cli1);
+
+	printf("finished locktest7\n");
+	return correct;
+}
+
 /*
 test whether fnums and tids open on one VC are available on another (a major
 security hole)
@@ -3956,6 +4089,7 @@ static struct {
 	{"LOCK4",  run_locktest4,  0},
 	{"LOCK5",  run_locktest5,  0},
 	{"LOCK6",  run_locktest6,  0},
+	{"LOCK7",  run_locktest7,  0},
 	{"UNLINK", run_unlinktest, 0},
 	{"BROWSE", run_browsetest, 0},
 	{"ATTR",   run_attrtest,   0},
-- 
cgit 


From 4fdb86eb3b9b7eb01a90e3f3a846fb9f223d7208 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Sat, 22 Feb 2003 01:09:42 +0000
Subject: When checking is_locked() new WRITE locks conflict with existing READ
 locks even if the context is the same. See LOCKTEST7 in smbtorture. Jeremy.
 (This used to be commit b362cc241b829f585a96b5d285ed12db50b21e2e)

---
 source3/locking/brlock.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'source3')

diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index 8c22f7d7ab..9902c7bbd7 100644
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -151,9 +151,16 @@ static BOOL brl_conflict_other(struct lock_struct *lck1, struct lock_struct *lck
 	if (lck1->lock_type == READ_LOCK && lck2->lock_type == READ_LOCK) 
 		return False;
 
-	if (brl_same_context(&lck1->context, &lck2->context) &&
-				lck1->fnum == lck2->fnum)
-		return False;
+	/*
+	 * Incoming WRITE locks conflict with existing READ locks even
+	 * if the context is the same. JRA. See LOCKTEST7 in smbtorture.
+	 */
+
+	if (!(lck2->lock_type == WRITE_LOCK && lck1->lock_type == READ_LOCK)) {
+		if (brl_same_context(&lck1->context, &lck2->context) &&
+					lck1->fnum == lck2->fnum)
+			return False;
+	}
 
 	if (lck1->start >= (lck2->start + lck2->size) ||
 	    lck2->start >= (lck1->start + lck1->size)) return False;
-- 
cgit 


From ab43a25b2893506d5de305626dfbbf98966f1f78 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 22 Feb 2003 11:34:04 +0000
Subject: First check if the user is in the passdb, then check Get_Pwnam().

We check passdb becouse the user might have things like a logon script set,
but we have to check the passdb becouse the user might not be in smbpasswd at
all.

This is in preperation for the removal of unixsam as an assuption.

Andrew Bartlett
(This used to be commit 61e3e2695860c58f9b0e8d1856972318666682c8)
---
 source3/auth/auth_rhosts.c | 62 +++++++++++++++++++++++-----------------------
 source3/auth/auth_util.c   | 30 ++++++++++++++++++++++
 2 files changed, 61 insertions(+), 31 deletions(-)

(limited to 'source3')

diff --git a/source3/auth/auth_rhosts.c b/source3/auth/auth_rhosts.c
index 4ed0e6bbc4..d8e1b01942 100644
--- a/source3/auth/auth_rhosts.c
+++ b/source3/auth/auth_rhosts.c
@@ -129,23 +129,19 @@ static BOOL check_user_equiv(const char *user, const char *remote, const char *e
   return False;
 }
 
-
 /****************************************************************************
 check for a possible hosts equiv or rhosts entry for the user
 ****************************************************************************/
 
-static BOOL check_hosts_equiv(struct passwd *pass)
+static BOOL check_hosts_equiv(SAM_ACCOUNT *account)
 {
   char *fname = NULL;
 
-  if (!pass) 
-    return(False);
-
   fname = lp_hosts_equiv();
 
   /* note: don't allow hosts.equiv on root */
-  if (fname && *fname && (pass->pw_uid != 0)) {
-	  if (check_user_equiv(pass->pw_name,client_name(),fname))
+  if (IS_SAM_UNIX_USER(account) && fname && *fname && (pdb_get_uid(account) != 0)) {
+	  if (check_user_equiv(pdb_get_username(account),client_name(),fname))
 		  return(True);
   }
   
@@ -164,15 +160,15 @@ static NTSTATUS check_hostsequiv_security(const struct auth_context *auth_contex
 					  auth_serversupplied_info **server_info)
 {
 	NTSTATUS nt_status = NT_STATUS_LOGON_FAILURE;
-	struct passwd *pass = Get_Pwnam(user_info->internal_username.str);
-	
-	if (pass) {
-		if (check_hosts_equiv(pass)) {
-			nt_status = NT_STATUS_OK;
-			make_server_info_pw(server_info, pass);
-		}
-	} else {
-		nt_status = NT_STATUS_NO_SUCH_USER;
+	SAM_ACCOUNT *account = NULL;
+	if (!NT_STATUS_IS_OK(nt_status = 
+			     auth_get_sam_account(user_info->internal_username.str, 
+						  &account))) {
+		return nt_status;
+	}
+
+	if (check_hosts_equiv(account)) {
+		nt_status = make_server_info_sam(server_info, account);
 	}
 
 	return nt_status;
@@ -186,6 +182,7 @@ NTSTATUS auth_init_hostsequiv(struct auth_context *auth_context, const char* par
 	}
 
 	(*auth_method)->auth = check_hostsequiv_security;
+	(*auth_method)->name = "hostsequiv";
 	return NT_STATUS_OK;
 }
 
@@ -201,24 +198,26 @@ static NTSTATUS check_rhosts_security(const struct auth_context *auth_context,
 				      auth_serversupplied_info **server_info)
 {
 	NTSTATUS nt_status = NT_STATUS_LOGON_FAILURE;
-	struct passwd *pass = Get_Pwnam(user_info->internal_username.str);
-	pstring rhostsfile;
+	SAM_ACCOUNT *account = NULL;
 	
-	if (pass) {
-		char *home = pass->pw_dir;
-		if (home) {
-			slprintf(rhostsfile, sizeof(rhostsfile)-1, "%s/.rhosts", home);
-			become_root();
-			if (check_user_equiv(pass->pw_name,client_name(),rhostsfile)) {
-				nt_status = NT_STATUS_OK;
-				make_server_info_pw(server_info, pass);
-			}
-			unbecome_root();
-		} 
-	} else {
-		nt_status = NT_STATUS_NO_SUCH_USER;
+	if (!NT_STATUS_IS_OK(nt_status = 
+			     auth_get_sam_account(user_info->internal_username.str, 
+						  &account))) {
+		return nt_status;
 	}
 
+	pstring rhostsfile;
+	
+	char *home = pdb_get_unix_homedir(account);
+	if (home) {
+		slprintf(rhostsfile, sizeof(rhostsfile)-1, "%s/.rhosts", home);
+		become_root();
+		if (check_user_equiv(pdb_get_username(account),client_name(),rhostsfile)) {
+			nt_status = make_server_info_sam(server_info, account);
+		}
+		unbecome_root();
+	} 
+
 	return nt_status;
 }
 
@@ -230,5 +229,6 @@ NTSTATUS auth_init_rhosts(struct auth_context *auth_context, const char *param,
 	}
 
 	(*auth_method)->auth = check_rhosts_security;
+	(*auth_method)->name = "rhosts";
 	return NT_STATUS_OK;
 }
diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index 352d058f20..7d85153bd0 100644
--- a/source3/auth/auth_util.c
+++ b/source3/auth/auth_util.c
@@ -77,6 +77,36 @@ void smb_user_control(const auth_usersupplied_info *user_info, auth_serversuppli
 	}
 }
 
+/****************************************************************************
+ Create a SAM_ACCOUNT - either by looking in the pdb, or by faking it up from
+ unix info.
+****************************************************************************/
+
+NTSTATUS auth_get_sam_account(const char *user, SAM_ACCOUNT **account) 
+{
+	BOOL pdb_ret;
+	NTSTATUS nt_status;
+	if (!NT_STATUS_IS_OK(nt_status = pdb_init_sam(account))) {
+		return nt_status;
+	}
+	
+	become_root();
+	pdb_ret = pdb_getsampwnam(*account, user);
+	unbecome_root();
+
+	if (!pdb_ret) {
+		
+		struct passwd *pass = Get_Pwnam(user);
+		if (!pass) 
+			return NT_STATUS_NO_SUCH_USER;
+
+		if (!NT_STATUS_IS_OK(nt_status = pdb_fill_sam_pw(*account, pass))) {
+			return nt_status;
+		}
+	}
+	return NT_STATUS_OK;
+}
+
 /****************************************************************************
  Create an auth_usersupplied_data structure
 ****************************************************************************/
-- 
cgit 


From 3e19eda335057ec47483c8567395b43d316485db Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 22 Feb 2003 12:01:05 +0000
Subject: Remove 'unixsam' from the default passdb backends.

The intention is to remove the muliple passdb backends, but we need the
'guest' account to always be there.  If the admin adds the guest account to
(say) LDAP, there will only be one backend required for operation.

This helps remove some nasty behaviours with adding accounts to the system
for both the RPC 'create user' and the SAMSYNC code.  Users 'added' with
an 'add user/machine' script won't magicly appear, and machine accounts
'pre-added' to unix, but not the smbpasswd file will not cause mayhem.

This commit also implements somthing tridge discussed with me, the concept
of 'default' passdb operation pointers - so that each backend does not
need it's own stub funcitons wrapping the default tdb privilages/group
mapping code.

This also removes an implicit 'sid->name' and 'name->sid' mapping from our
own local SID space, to winbind usernames.  When adding mapping for NIS/LDAP
non-sam users in future, we need to be careful.

Andrew Bartlett
(This used to be commit 6f32fa234961a525760a05418a08ec48d22d7617)
---
 source3/Makefile.in            |   5 +-
 source3/groupdb/mapping.c      |  55 ++++++++++++++++++
 source3/param/loadparm.c       |   4 +-
 source3/passdb/passdb.c        |   6 +-
 source3/passdb/pdb_guest.c     | 123 +++++++++++++++++++++++++++++++++++++++++
 source3/passdb/pdb_interface.c |  63 +++++++++++++++++++++
 source3/passdb/pdb_ldap.c      |  59 --------------------
 source3/passdb/pdb_smbpasswd.c |  85 +++++-----------------------
 source3/passdb/pdb_tdb.c       |  59 --------------------
 source3/passdb/pdb_unix.c      |  88 -----------------------------
 10 files changed, 264 insertions(+), 283 deletions(-)
 create mode 100644 source3/passdb/pdb_guest.c

(limited to 'source3')

diff --git a/source3/Makefile.in b/source3/Makefile.in
index cbd8418a48..7de4b0ae8f 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -286,8 +286,9 @@ PASSDB_GET_SET_OBJ = passdb/pdb_get_set.o
 PASSDB_OBJ = $(PASSDB_GET_SET_OBJ) passdb/passdb.o passdb/pdb_interface.o \
 		passdb/machine_sid.o passdb/pdb_smbpasswd.o \
 		passdb/pdb_tdb.o passdb/pdb_ldap.o \
-		passdb/pdb_unix.o passdb/util_sam_sid.o \
-		passdb/pdb_compat.o passdb/pdb_nisplus.o passdb/privileges.o
+		passdb/pdb_unix.o passdb/pdb_guest.o passdb/util_sam_sid.o \
+		passdb/pdb_compat.o passdb/pdb_nisplus.o \
+		passdb/privileges.o 
 
 XML_OBJ = modules/xml.o
 MYSQL_OBJ = modules/mysql.o
diff --git a/source3/groupdb/mapping.c b/source3/groupdb/mapping.c
index 272783608c..02fc23418f 100644
--- a/source3/groupdb/mapping.c
+++ b/source3/groupdb/mapping.c
@@ -841,6 +841,7 @@ BOOL enum_group_mapping(enum SID_NAME_USE sid_name_use, GROUP_MAP **rmap,
 	}
 
 	*num_entries=entries;
+
 	return True;
 }
 
@@ -1276,3 +1277,57 @@ int smb_delete_user_group(const char *unix_group, const char *unix_user)
 	DEBUG(3,("smb_delete_user_group: Running the command `%s' gave %d\n",del_script,ret));
 	return ret;
 }
+
+
+NTSTATUS pdb_default_getgrsid(struct pdb_methods *methods, GROUP_MAP *map,
+				 DOM_SID sid, BOOL with_priv)
+{
+	return get_group_map_from_sid(sid, map, with_priv) ?
+		NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+}
+
+NTSTATUS pdb_default_getgrgid(struct pdb_methods *methods, GROUP_MAP *map,
+				 gid_t gid, BOOL with_priv)
+{
+	return get_group_map_from_gid(gid, map, with_priv) ?
+		NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+}
+
+NTSTATUS pdb_default_getgrnam(struct pdb_methods *methods, GROUP_MAP *map,
+				 char *name, BOOL with_priv)
+{
+	return get_group_map_from_ntname(name, map, with_priv) ?
+		NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+}
+
+NTSTATUS pdb_default_add_group_mapping_entry(struct pdb_methods *methods,
+						GROUP_MAP *map)
+{
+	return add_mapping_entry(map, TDB_INSERT) ?
+		NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+}
+
+NTSTATUS pdb_default_update_group_mapping_entry(struct pdb_methods *methods,
+						   GROUP_MAP *map)
+{
+	return add_mapping_entry(map, TDB_REPLACE) ?
+		NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+}
+
+NTSTATUS pdb_default_delete_group_mapping_entry(struct pdb_methods *methods,
+						   DOM_SID sid)
+{
+	return group_map_remove(sid) ?
+		NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+}
+
+NTSTATUS pdb_default_enum_group_mapping(struct pdb_methods *methods,
+					   enum SID_NAME_USE sid_name_use,
+					   GROUP_MAP **rmap, int *num_entries,
+					   BOOL unix_only, BOOL with_priv)
+{
+	return enum_group_mapping(sid_name_use, rmap, num_entries, unix_only,
+				  with_priv) ?
+		NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+}
+
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 7aaae439b1..b57b169adc 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -1408,9 +1408,9 @@ static void init_globals(void)
 #ifdef WITH_LDAP_SAMCONFIG
 	string_set(&Globals.szLdapServer, "localhost");
 	Globals.ldap_port = 636;
-	Globals.szPassdbBackend = str_list_make("ldapsam unixsam", NULL);
+	Globals.szPassdbBackend = str_list_make("ldapsam guest", NULL);
 #else
-	Globals.szPassdbBackend = str_list_make("smbpasswd unixsam", NULL);
+	Globals.szPassdbBackend = str_list_make("smbpasswd guest", NULL);
 #endif /* WITH_LDAP_SAMCONFIG */
 
 	string_set(&Globals.szLdapSuffix, "");
diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c
index 71a880d295..eff1ef4bcc 100644
--- a/source3/passdb/passdb.c
+++ b/source3/passdb/passdb.c
@@ -283,7 +283,7 @@ NTSTATUS pdb_init_sam_pw(SAM_ACCOUNT **new_sam_acct, const struct passwd *pwd)
 
 	if (!pwd) {
 		new_sam_acct = NULL;
-		return NT_STATUS_UNSUCCESSFUL;
+		return NT_STATUS_INVALID_PARAMETER;
 	}
 
 	if (!NT_STATUS_IS_OK(nt_status = pdb_init_sam(new_sam_acct))) {
@@ -661,7 +661,7 @@ BOOL local_lookup_sid(DOM_SID *sid, char *name, enum SID_NAME_USE *psid_name_use
 	pdb_free_sam(&sam_account);
 		
 	if (pdb_getgrsid(&map, *sid, MAPPING_WITHOUT_PRIV)) {
-		if (map.gid!=-1) {
+		if (map.gid!=(gid_t)-1) {
 			DEBUG(5,("local_lookup_sid: mapped group %s to gid %u\n", map.nt_name, (unsigned int)map.gid));
 		} else {
 			DEBUG(5,("local_lookup_sid: mapped group %s to no unix gid.  Returning name.\n", map.nt_name));
@@ -950,7 +950,7 @@ BOOL local_sid_to_gid(gid_t *pgid, const DOM_SID *psid, enum SID_NAME_USE *name_
 	if (pdb_getgrsid(&map, *psid, MAPPING_WITHOUT_PRIV)) {
 		
 		/* the SID is in the mapping table but not mapped */
-		if (map.gid==-1)
+		if (map.gid==(gid_t)-1)
 			return False;
 
 		*pgid = map.gid;
diff --git a/source3/passdb/pdb_guest.c b/source3/passdb/pdb_guest.c
new file mode 100644
index 0000000000..3f0f06d18d
--- /dev/null
+++ b/source3/passdb/pdb_guest.c
@@ -0,0 +1,123 @@
+/*
+ * 'Guest' password backend for samba
+ * Copyright (C) Jelmer Vernooij 2002
+ * Copyright (C) Andrew Bartlett 2003
+ * 
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ * 
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 675
+ * Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "includes.h"
+
+/******************************************************************
+  Lookup a name in the SAM database
+ ******************************************************************/
+
+static NTSTATUS guestsam_getsampwnam (struct pdb_methods *methods, SAM_ACCOUNT *user, const char *sname)
+{
+	NTSTATUS nt_status;
+	struct passwd *pass;
+	const char *guest_account = lp_guestaccount();
+	if (!(guest_account && *guest_account)) {
+		DEBUG(1, ("NULL guest account!?!?\n"));
+		return NT_STATUS_UNSUCCESSFUL;
+	}
+
+	if (!methods) {
+		DEBUG(0,("invalid methods\n"));
+		return NT_STATUS_UNSUCCESSFUL;
+	}
+	if (!sname) {
+		DEBUG(0,("invalid name specified"));
+		return NT_STATUS_UNSUCCESSFUL;
+	}
+
+	if (!strequal(guest_account, sname)) {
+		return NT_STATUS_NO_SUCH_USER;
+	}
+		
+	pass = getpwnam_alloc(guest_account);
+
+	nt_status = pdb_fill_sam_pw(user, pass);
+
+	passwd_free(&pass);
+	return nt_status;
+}
+
+
+/***************************************************************************
+  Search by rid
+ **************************************************************************/
+
+static NTSTATUS guestsam_getsampwrid (struct pdb_methods *methods, 
+				 SAM_ACCOUNT *user, uint32 rid)
+{
+	NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
+	struct passwd *pass = NULL;
+	const char *guest_account = lp_guestaccount();
+	if (!(guest_account && *guest_account)) {
+		DEBUG(1, ("NULL guest account!?!?\n"));
+		return nt_status;
+	}
+
+	if (!methods) {
+		DEBUG(0,("invalid methods\n"));
+		return nt_status;
+	}
+	
+	if (rid == DOMAIN_USER_RID_GUEST) {
+		pass = getpwnam_alloc(guest_account);
+		if (!pass) {
+			DEBUG(1, ("guest account %s does not seem to exist...\n", guest_account));
+			return NT_STATUS_NO_SUCH_USER;
+		}
+	} else {
+		return NT_STATUS_NO_SUCH_USER;
+	}
+
+	nt_status = pdb_fill_sam_pw(user, pass);
+	passwd_free(&pass);
+
+	return nt_status;
+}
+
+static NTSTATUS guestsam_getsampwsid(struct pdb_methods *my_methods, SAM_ACCOUNT * user, const DOM_SID *sid)
+{
+	uint32 rid;
+	if (!sid_peek_check_rid(get_global_sam_sid(), sid, &rid))
+		return NT_STATUS_NO_SUCH_USER;
+	return guestsam_getsampwrid(my_methods, user, rid);
+}
+
+NTSTATUS pdb_init_guestsam(PDB_CONTEXT *pdb_context, PDB_METHODS **pdb_method, const char *location)
+{
+	NTSTATUS nt_status;
+	
+	if (!pdb_context) {
+		DEBUG(0, ("invalid pdb_context specified\n"));
+		return NT_STATUS_UNSUCCESSFUL;
+	}
+
+	if (!NT_STATUS_IS_OK(nt_status = make_pdb_methods(pdb_context->mem_ctx, pdb_method))) {
+		return nt_status;
+	}
+	
+	(*pdb_method)->name = "guestsam";
+	
+	(*pdb_method)->getsampwnam = guestsam_getsampwnam;
+	(*pdb_method)->getsampwsid = guestsam_getsampwsid;
+	
+	/* There's not very much to initialise here */
+	return NT_STATUS_OK;
+}
diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c
index 778cb9425c..d465439dda 100644
--- a/source3/passdb/pdb_interface.c
+++ b/source3/passdb/pdb_interface.c
@@ -37,6 +37,7 @@ static const struct {
 	{ "ldapsam", pdb_init_ldapsam },
 	{ "ldapsam_nua", pdb_init_ldapsam_nua },
 	{ "unixsam", pdb_init_unixsam },
+	{ "guest", pdb_init_guestsam },
 	{ "nisplussam", pdb_init_nisplussam },
 	{ NULL, NULL}
 };
@@ -763,6 +764,51 @@ BOOL initialize_password_db(BOOL reload)
 }
 
 
+/***************************************************************************
+  Default implementations of some functions.
+ ****************************************************************************/
+
+static NTSTATUS pdb_default_getsampwnam (struct pdb_methods *methods, SAM_ACCOUNT *user, const char *sname)
+{
+	return NT_STATUS_NO_SUCH_USER;
+}
+
+static NTSTATUS pdb_default_getsampwsid(struct pdb_methods *my_methods, SAM_ACCOUNT * user, const DOM_SID *sid)
+{
+	return NT_STATUS_NO_SUCH_USER;
+}
+
+static NTSTATUS pdb_default_add_sam_account (struct pdb_methods *methods, SAM_ACCOUNT *newpwd)
+{
+	DEBUG(0,("this backend (%s) should not be listed as the first passdb backend! You can't add users to it.\n", methods->name));
+	return NT_STATUS_NOT_IMPLEMENTED;
+}
+
+static NTSTATUS pdb_default_update_sam_account (struct pdb_methods *methods, SAM_ACCOUNT *newpwd)
+{
+	return NT_STATUS_NOT_IMPLEMENTED;
+}
+
+static NTSTATUS pdb_default_delete_sam_account (struct pdb_methods *methods, SAM_ACCOUNT *pwd)
+{
+	return NT_STATUS_NOT_IMPLEMENTED;
+}
+
+static NTSTATUS pdb_default_setsampwent(struct pdb_methods *methods, BOOL update)
+{
+	return NT_STATUS_NOT_IMPLEMENTED;
+}
+
+static NTSTATUS pdb_default_getsampwent(struct pdb_methods *methods, SAM_ACCOUNT *user)
+{
+	return NT_STATUS_NOT_IMPLEMENTED;
+}
+
+static void pdb_default_endsampwent(struct pdb_methods *methods)
+{
+	return; /* NT_STATUS_NOT_IMPLEMENTED; */
+}
+
 NTSTATUS make_pdb_methods(TALLOC_CTX *mem_ctx, PDB_METHODS **methods) 
 {
 	*methods = talloc(mem_ctx, sizeof(struct pdb_methods));
@@ -773,5 +819,22 @@ NTSTATUS make_pdb_methods(TALLOC_CTX *mem_ctx, PDB_METHODS **methods)
 
 	ZERO_STRUCTP(*methods);
 
+	(*methods)->setsampwent = pdb_default_setsampwent;
+	(*methods)->endsampwent = pdb_default_endsampwent;
+	(*methods)->getsampwent = pdb_default_getsampwent;
+	(*methods)->getsampwnam = pdb_default_getsampwnam;
+	(*methods)->getsampwsid = pdb_default_getsampwsid;
+	(*methods)->add_sam_account = pdb_default_add_sam_account;
+	(*methods)->update_sam_account = pdb_default_update_sam_account;
+	(*methods)->delete_sam_account = pdb_default_delete_sam_account;
+
+	(*methods)->getgrsid = pdb_default_getgrsid;
+	(*methods)->getgrgid = pdb_default_getgrgid;
+	(*methods)->getgrnam = pdb_default_getgrnam;
+	(*methods)->add_group_mapping_entry = pdb_default_add_group_mapping_entry;
+	(*methods)->update_group_mapping_entry = pdb_default_update_group_mapping_entry;
+	(*methods)->delete_group_mapping_entry = pdb_default_delete_group_mapping_entry;
+	(*methods)->enum_group_mapping = pdb_default_enum_group_mapping;
+
 	return NT_STATUS_OK;
 }
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index e058d2d108..548d7bc60d 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -1965,58 +1965,6 @@ static NTSTATUS ldapsam_add_sam_account(struct pdb_methods *my_methods, SAM_ACCO
 	return NT_STATUS_OK;
 }
 
-static NTSTATUS ldapsam_getgrsid(struct pdb_methods *methods, GROUP_MAP *map,
-				 DOM_SID sid, BOOL with_priv)
-{
-	return get_group_map_from_sid(sid, map, with_priv) ?
-		NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
-}
-
-static NTSTATUS ldapsam_getgrgid(struct pdb_methods *methods, GROUP_MAP *map,
-				 gid_t gid, BOOL with_priv)
-{
-	return get_group_map_from_gid(gid, map, with_priv) ?
-		NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
-}
-
-static NTSTATUS ldapsam_getgrnam(struct pdb_methods *methods, GROUP_MAP *map,
-				 char *name, BOOL with_priv)
-{
-	return get_group_map_from_ntname(name, map, with_priv) ?
-		NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
-}
-
-static NTSTATUS ldapsam_add_group_mapping_entry(struct pdb_methods *methods,
-						GROUP_MAP *map)
-{
-	return add_mapping_entry(map, TDB_INSERT) ?
-		NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
-}
-
-static NTSTATUS ldapsam_update_group_mapping_entry(struct pdb_methods *methods,
-						   GROUP_MAP *map)
-{
-	return add_mapping_entry(map, TDB_REPLACE) ?
-		NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
-}
-
-static NTSTATUS ldapsam_delete_group_mapping_entry(struct pdb_methods *methods,
-						   DOM_SID sid)
-{
-	return group_map_remove(sid) ?
-		NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
-}
-
-static NTSTATUS ldapsam_enum_group_mapping(struct pdb_methods *methods,
-					   enum SID_NAME_USE sid_name_use,
-					   GROUP_MAP **rmap, int *num_entries,
-					   BOOL unix_only, BOOL with_priv)
-{
-	return enum_group_mapping(sid_name_use, rmap, num_entries, unix_only,
-				  with_priv) ?
-		NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
-}
-
 static void free_private_data(void **vp) 
 {
 	struct ldapsam_privates **ldap_state = (struct ldapsam_privates **)vp;
@@ -2056,13 +2004,6 @@ NTSTATUS pdb_init_ldapsam(PDB_CONTEXT *pdb_context, PDB_METHODS **pdb_method, co
 	(*pdb_method)->add_sam_account = ldapsam_add_sam_account;
 	(*pdb_method)->update_sam_account = ldapsam_update_sam_account;
 	(*pdb_method)->delete_sam_account = ldapsam_delete_sam_account;
-	(*pdb_method)->getgrsid = ldapsam_getgrsid;
-	(*pdb_method)->getgrgid = ldapsam_getgrgid;
-	(*pdb_method)->getgrnam = ldapsam_getgrnam;
-	(*pdb_method)->add_group_mapping_entry = ldapsam_add_group_mapping_entry;
-	(*pdb_method)->update_group_mapping_entry = ldapsam_update_group_mapping_entry;
-	(*pdb_method)->delete_group_mapping_entry = ldapsam_delete_group_mapping_entry;
-	(*pdb_method)->enum_group_mapping = ldapsam_enum_group_mapping;
 
 	/* TODO: Setup private data and free */
 
diff --git a/source3/passdb/pdb_smbpasswd.c b/source3/passdb/pdb_smbpasswd.c
index 5fd6a828bf..b5a2bbbfe7 100644
--- a/source3/passdb/pdb_smbpasswd.c
+++ b/source3/passdb/pdb_smbpasswd.c
@@ -1222,7 +1222,6 @@ static BOOL build_sam_account(struct smbpasswd_privates *smbpasswd_state,
 			return False;
 		}
 	} else {
-		
 		if (!NT_STATUS_IS_OK(pdb_fill_sam_pw(sam_pass, pwfile))) {
 			return False;
 		}
@@ -1380,14 +1379,19 @@ static NTSTATUS smbpasswd_getsampwnam(struct pdb_methods *my_methods,
 	return NT_STATUS_OK;
 }
 
-static NTSTATUS smbpasswd_getsampwrid(struct pdb_methods *my_methods, SAM_ACCOUNT *sam_acct,uint32 rid)
+static NTSTATUS smbpasswd_getsampwsid(struct pdb_methods *my_methods, SAM_ACCOUNT *sam_acct, const DOM_SID *sid)
 {
 	NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
 	struct smbpasswd_privates *smbpasswd_state = (struct smbpasswd_privates*)my_methods->private_data;
 	struct smb_passwd *smb_pw;
 	void *fp = NULL;
+	fstring sid_str;
+	uint32 rid;
+	
+	DEBUG(10, ("smbpasswd_getsampwrid: search by sid: %s\n", sid_to_string(sid_str, sid)));
 
-	DEBUG(10, ("smbpasswd_getsampwrid: search by rid: %d\n", rid));
+	if (!sid_peek_check_rid(get_global_sam_sid(), sid, &rid))
+		return NT_STATUS_UNSUCCESSFUL;
 
 	/* More special case 'guest account' hacks... */
 	if (rid == DOMAIN_USER_RID_GUEST) {
@@ -1431,18 +1435,18 @@ static NTSTATUS smbpasswd_getsampwrid(struct pdb_methods *my_methods, SAM_ACCOUN
 	if (!build_sam_account (smbpasswd_state, sam_acct, smb_pw))
 		return nt_status;
 
+	/* build_sam_account might change the SID on us, if the name was for the guest account */
+	if (NT_STATUS_IS_OK(nt_status) && !sid_equal(pdb_get_user_sid(sam_acct), sid)) {
+		fstring sid_string1, sid_string2;
+		DEBUG(1, ("looking for user with sid %s instead returned %s for account %s!?!\n",
+			  sid_to_string(sid_string1, sid), sid_to_string(sid_string2, pdb_get_user_sid(sam_acct)), pdb_get_username(sam_acct)));
+		return NT_STATUS_NO_SUCH_USER;
+	}
+
 	/* success */
 	return NT_STATUS_OK;
 }
 
-static NTSTATUS smbpasswd_getsampwsid(struct pdb_methods *my_methods, SAM_ACCOUNT * user, const DOM_SID *sid)
-{
-	uint32 rid;
-	if (!sid_peek_check_rid(get_global_sam_sid(), sid, &rid))
-		return NT_STATUS_UNSUCCESSFUL;
-	return smbpasswd_getsampwrid(my_methods, user, rid);
-}
-
 static NTSTATUS smbpasswd_add_sam_account(struct pdb_methods *my_methods, SAM_ACCOUNT *sampass)
 {
 	struct smbpasswd_privates *smbpasswd_state = (struct smbpasswd_privates*)my_methods->private_data;
@@ -1493,58 +1497,6 @@ static NTSTATUS smbpasswd_delete_sam_account (struct pdb_methods *my_methods, SA
 	return NT_STATUS_UNSUCCESSFUL;
 }
 
-static NTSTATUS smbpasswd_getgrsid(struct pdb_methods *methods, GROUP_MAP *map,
-				 DOM_SID sid, BOOL with_priv)
-{
-	return get_group_map_from_sid(sid, map, with_priv) ?
-		NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
-}
-
-static NTSTATUS smbpasswd_getgrgid(struct pdb_methods *methods, GROUP_MAP *map,
-				 gid_t gid, BOOL with_priv)
-{
-	return get_group_map_from_gid(gid, map, with_priv) ?
-		NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
-}
-
-static NTSTATUS smbpasswd_getgrnam(struct pdb_methods *methods, GROUP_MAP *map,
-				 char *name, BOOL with_priv)
-{
-	return get_group_map_from_ntname(name, map, with_priv) ?
-		NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
-}
-
-static NTSTATUS smbpasswd_add_group_mapping_entry(struct pdb_methods *methods,
-						GROUP_MAP *map)
-{
-	return add_mapping_entry(map, TDB_INSERT) ?
-		NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
-}
-
-static NTSTATUS smbpasswd_update_group_mapping_entry(struct pdb_methods *methods,
-						   GROUP_MAP *map)
-{
-	return add_mapping_entry(map, TDB_REPLACE) ?
-		NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
-}
-
-static NTSTATUS smbpasswd_delete_group_mapping_entry(struct pdb_methods *methods,
-						   DOM_SID sid)
-{
-	return group_map_remove(sid) ?
-		NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
-}
-
-static NTSTATUS smbpasswd_enum_group_mapping(struct pdb_methods *methods,
-					   enum SID_NAME_USE sid_name_use,
-					   GROUP_MAP **rmap, int *num_entries,
-					   BOOL unix_only, BOOL with_priv)
-{
-	return enum_group_mapping(sid_name_use, rmap, num_entries, unix_only,
-				  with_priv) ?
-		NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
-}
-
 static void free_private_data(void **vp) 
 {
 	struct smbpasswd_privates **privates = (struct smbpasswd_privates**)vp;
@@ -1575,13 +1527,6 @@ NTSTATUS pdb_init_smbpasswd(PDB_CONTEXT *pdb_context, PDB_METHODS **pdb_method,
 	(*pdb_method)->add_sam_account = smbpasswd_add_sam_account;
 	(*pdb_method)->update_sam_account = smbpasswd_update_sam_account;
 	(*pdb_method)->delete_sam_account = smbpasswd_delete_sam_account;
-	(*pdb_method)->getgrsid = smbpasswd_getgrsid;
-	(*pdb_method)->getgrgid = smbpasswd_getgrgid;
-	(*pdb_method)->getgrnam = smbpasswd_getgrnam;
-	(*pdb_method)->add_group_mapping_entry = smbpasswd_add_group_mapping_entry;
-	(*pdb_method)->update_group_mapping_entry = smbpasswd_update_group_mapping_entry;
-	(*pdb_method)->delete_group_mapping_entry = smbpasswd_delete_group_mapping_entry;
-	(*pdb_method)->enum_group_mapping = smbpasswd_enum_group_mapping;
 
 	/* Setup private data and free function */
 
diff --git a/source3/passdb/pdb_tdb.c b/source3/passdb/pdb_tdb.c
index a1f786c8cd..c48c9567b1 100644
--- a/source3/passdb/pdb_tdb.c
+++ b/source3/passdb/pdb_tdb.c
@@ -896,58 +896,6 @@ static NTSTATUS tdbsam_add_sam_account (struct pdb_methods *my_methods, SAM_ACCO
 		return NT_STATUS_UNSUCCESSFUL;
 }
 
-static NTSTATUS tdbsam_getgrsid(struct pdb_methods *methods, GROUP_MAP *map,
-				DOM_SID sid, BOOL with_priv)
-{
-	return get_group_map_from_sid(sid, map, with_priv) ?
-		NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
-}
-
-static NTSTATUS tdbsam_getgrgid(struct pdb_methods *methods, GROUP_MAP *map,
-				gid_t gid, BOOL with_priv)
-{
-	return get_group_map_from_gid(gid, map, with_priv) ?
-		NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
-}
-
-static NTSTATUS tdbsam_getgrnam(struct pdb_methods *methods, GROUP_MAP *map,
-				char *name, BOOL with_priv)
-{
-	return get_group_map_from_ntname(name, map, with_priv) ?
-		NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
-}
-
-static NTSTATUS tdbsam_add_group_mapping_entry(struct pdb_methods *methods,
-					       GROUP_MAP *map)
-{
-	return add_mapping_entry(map, TDB_INSERT) ?
-		NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
-}
-
-static NTSTATUS tdbsam_update_group_mapping_entry(struct pdb_methods *methods,
-						  GROUP_MAP *map)
-{
-	return add_mapping_entry(map, TDB_REPLACE) ?
-		NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
-}
-
-static NTSTATUS tdbsam_delete_group_mapping_entry(struct pdb_methods *methods,
-						  DOM_SID sid)
-{
-	return group_map_remove(sid) ?
-		NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
-}
-
-static NTSTATUS tdbsam_enum_group_mapping(struct pdb_methods *methods,
-					  enum SID_NAME_USE sid_name_use,
-					  GROUP_MAP **rmap, int *num_entries,
-					  BOOL unix_only, BOOL with_priv)
-{
-	return enum_group_mapping(sid_name_use, rmap, num_entries, unix_only,
-				  with_priv) ?
-		NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
-}
-
 static void free_private_data(void **vp) 
 {
 	struct tdbsam_privates **tdb_state = (struct tdbsam_privates **)vp;
@@ -985,13 +933,6 @@ NTSTATUS pdb_init_tdbsam(PDB_CONTEXT *pdb_context, PDB_METHODS **pdb_method, con
 	(*pdb_method)->add_sam_account = tdbsam_add_sam_account;
 	(*pdb_method)->update_sam_account = tdbsam_update_sam_account;
 	(*pdb_method)->delete_sam_account = tdbsam_delete_sam_account;
-	(*pdb_method)->getgrsid = tdbsam_getgrsid;
-	(*pdb_method)->getgrgid = tdbsam_getgrgid;
-	(*pdb_method)->getgrnam = tdbsam_getgrnam;
-	(*pdb_method)->add_group_mapping_entry = tdbsam_add_group_mapping_entry;
-	(*pdb_method)->update_group_mapping_entry = tdbsam_update_group_mapping_entry;
-	(*pdb_method)->delete_group_mapping_entry = tdbsam_delete_group_mapping_entry;
-	(*pdb_method)->enum_group_mapping = tdbsam_enum_group_mapping;
 
 	tdb_state = talloc_zero(pdb_context->mem_ctx, sizeof(struct tdbsam_privates));
 
diff --git a/source3/passdb/pdb_unix.c b/source3/passdb/pdb_unix.c
index 8acc29b7a4..07acd08a4e 100644
--- a/source3/passdb/pdb_unix.c
+++ b/source3/passdb/pdb_unix.c
@@ -88,16 +88,6 @@ static NTSTATUS unixsam_getsampwsid(struct pdb_methods *my_methods, SAM_ACCOUNT
 	return unixsam_getsampwrid(my_methods, user, rid);
 }
 
-/***************************************************************************
-  Adds an existing SAM_ACCOUNT
- ****************************************************************************/
-
-static NTSTATUS unixsam_add_sam_account (struct pdb_methods *methods, SAM_ACCOUNT *newpwd)
-{
-	DEBUG(0,("pdb_unix should not be listed as the first passdb backend! You can't add users to it.\n"));
-	return NT_STATUS_NOT_IMPLEMENTED;
-}
-
 /***************************************************************************
   Updates a SAM_ACCOUNT
 
@@ -113,70 +103,6 @@ static NTSTATUS unixsam_update_sam_account (struct pdb_methods *methods, SAM_ACC
 	return methods->parent->pdb_add_sam_account(methods->parent, newpwd);
 }
 
-static NTSTATUS unixsam_delete_sam_account (struct pdb_methods *methods, SAM_ACCOUNT *pwd)
-{
-	return NT_STATUS_NOT_IMPLEMENTED;
-}
-
-static NTSTATUS unixsam_setsampwent(struct pdb_methods *methods, BOOL update)
-{
-	return NT_STATUS_NOT_IMPLEMENTED;
-}
-
-static NTSTATUS unixsam_getsampwent(struct pdb_methods *methods, SAM_ACCOUNT *user)
-{
-	return NT_STATUS_NOT_IMPLEMENTED;
-}
-
-static void unixsam_endsampwent(struct pdb_methods *methods)
-{
-	return; /* NT_STATUS_NOT_IMPLEMENTED; */
-}
-
-static NTSTATUS unixsam_getgrsid(struct pdb_methods *methods, GROUP_MAP *map,
-				 DOM_SID sid, BOOL with_priv)
-{
-	return NT_STATUS_NOT_IMPLEMENTED;
-}
-
-static NTSTATUS unixsam_getgrgid(struct pdb_methods *methods, GROUP_MAP *map,
-				 gid_t gid, BOOL with_priv)
-{
-	return NT_STATUS_NOT_IMPLEMENTED;
-}
-
-static NTSTATUS unixsam_getgrnam(struct pdb_methods *methods, GROUP_MAP *map,
-				 char *name, BOOL with_priv)
-{
-	return NT_STATUS_NOT_IMPLEMENTED;
-}
-
-static NTSTATUS unixsam_add_group_mapping_entry(struct pdb_methods *methods,
-						GROUP_MAP *map)
-{
-	return NT_STATUS_NOT_IMPLEMENTED;
-}
-
-static NTSTATUS unixsam_update_group_mapping_entry(struct pdb_methods *methods,
-						   GROUP_MAP *map)
-{
-	return NT_STATUS_NOT_IMPLEMENTED;
-}
-
-static NTSTATUS unixsam_delete_group_mapping_entry(struct pdb_methods *methods,
-						   DOM_SID sid)
-{
-	return NT_STATUS_NOT_IMPLEMENTED;
-}
-
-static NTSTATUS unixsam_enum_group_mapping(struct pdb_methods *methods,
-					   enum SID_NAME_USE sid_name_use,
-					   GROUP_MAP **rmap, int *num_entries,
-					   BOOL unix_only, BOOL with_priv)
-{
-	return NT_STATUS_NOT_IMPLEMENTED;
-}
-
 NTSTATUS pdb_init_unixsam(PDB_CONTEXT *pdb_context, PDB_METHODS **pdb_method, const char *location)
 {
 	NTSTATUS nt_status;
@@ -191,22 +117,8 @@ NTSTATUS pdb_init_unixsam(PDB_CONTEXT *pdb_context, PDB_METHODS **pdb_method, co
 	}
 	
 	(*pdb_method)->name = "unixsam";
-	
-	(*pdb_method)->setsampwent = unixsam_setsampwent;
-	(*pdb_method)->endsampwent = unixsam_endsampwent;
-	(*pdb_method)->getsampwent = unixsam_getsampwent;
 	(*pdb_method)->getsampwnam = unixsam_getsampwnam;
 	(*pdb_method)->getsampwsid = unixsam_getsampwsid;
-	(*pdb_method)->add_sam_account = unixsam_add_sam_account;
-	(*pdb_method)->update_sam_account = unixsam_update_sam_account;
-	(*pdb_method)->delete_sam_account = unixsam_delete_sam_account;
-	(*pdb_method)->getgrsid = unixsam_getgrsid;
-	(*pdb_method)->getgrgid = unixsam_getgrgid;
-	(*pdb_method)->getgrnam = unixsam_getgrnam;
-	(*pdb_method)->add_group_mapping_entry = unixsam_add_group_mapping_entry;
-	(*pdb_method)->update_group_mapping_entry = unixsam_update_group_mapping_entry;
-	(*pdb_method)->delete_group_mapping_entry = unixsam_delete_group_mapping_entry;
-	(*pdb_method)->enum_group_mapping = unixsam_enum_group_mapping;
 	
 	/* There's not very much to initialise here */
 	return NT_STATUS_OK;
-- 
cgit 


From e22a1915fee466c2266361a7b956d1225ad86f56 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 22 Feb 2003 12:14:08 +0000
Subject: With assuptions about unixsam gone, we can forget about looking up
 the user a second time now.

Andrew Bartlett
(This used to be commit a1e27a02f52315df0dd05ab8a94ae5a2bf398655)
---
 source3/utils/net_rpc_samsync.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'source3')

diff --git a/source3/utils/net_rpc_samsync.c b/source3/utils/net_rpc_samsync.c
index ac3b78fc7a..7d5c8681ad 100644
--- a/source3/utils/net_rpc_samsync.c
+++ b/source3/utils/net_rpc_samsync.c
@@ -317,10 +317,7 @@ fetch_account_info(uint32 rid, SAM_ACCOUNT_INFO *delta)
 				 "gave %d\n", add_script, add_ret));
 		}
 
-		if (!pdb_getsampwnam(sam_account, account)) {
-			try_add = True;
-			/* still not there, hope the backend likes NUAs */
-		}
+		try_add = True;
 	}
 
 	sam_account_from_delta(sam_account, delta);
-- 
cgit 


From ae2f064dc65762e32db10de1362e2cef782eb304 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 22 Feb 2003 12:16:17 +0000
Subject: Add static (This used to be commit
 d0365f20c242bcfc4f5d8286c6c5654e310a9d45)

---
 source3/torture/masktest.c |  2 +-
 source3/utils/profiles.c   | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'source3')

diff --git a/source3/torture/masktest.c b/source3/torture/masktest.c
index df0a047aff..7d751fb789 100644
--- a/source3/torture/masktest.c
+++ b/source3/torture/masktest.c
@@ -254,7 +254,7 @@ struct cli_state *connect_one(char *share)
 static char *resultp;
 static file_info *f_info;
 
-void listfn(file_info *f, const char *s, void *state)
+static void listfn(file_info *f, const char *s, void *state)
 {
 	if (strcmp(f->name,".") == 0) {
 		resultp[0] = '+';
diff --git a/source3/utils/profiles.c b/source3/utils/profiles.c
index 2ed102b677..b4087cf6cf 100644
--- a/source3/utils/profiles.c
+++ b/source3/utils/profiles.c
@@ -398,7 +398,7 @@ DOM_SID old_sid, new_sid;
 int change = 0, new = 0;
 
 /* Compare two SIDs for equality */
-int my_sid_equal(DOM_SID *s1, DOM_SID *s2)
+static int my_sid_equal(DOM_SID *s1, DOM_SID *s2)
 {
   int sa1, sa2;
 
@@ -417,7 +417,7 @@ int my_sid_equal(DOM_SID *s1, DOM_SID *s2)
  * Quick and dirty to read a SID in S-1-5-21-x-y-z-rid format and 
  * construct a DOM_SID
  */
-int get_sid(DOM_SID *sid, char *sid_str)
+static int get_sid(DOM_SID *sid, char *sid_str)
 {
   int i = 0, auth;
   char *lstr; 
@@ -460,7 +460,7 @@ int get_sid(DOM_SID *sid, char *sid_str)
  * This routine does not need to deal with endianism as 
  * long as the incoming SIDs are both in the same (LE) format.
  */
-void change_sid(DOM_SID *s1, DOM_SID *s2)
+static void change_sid(DOM_SID *s1, DOM_SID *s2)
 {
   int i;
   
@@ -469,7 +469,7 @@ void change_sid(DOM_SID *s1, DOM_SID *s2)
   }
 }
 
-void print_sid(DOM_SID *sid)
+static void print_sid(DOM_SID *sid)
 {
   int i, comps = sid->num_auths;
   fprintf(stdout, "S-%u-%u", sid->sid_rev_num, sid->id_auth[5]);
@@ -482,7 +482,7 @@ void print_sid(DOM_SID *sid)
   fprintf(stdout, "\n");
 }
 
-void process_sid(DOM_SID *sid, DOM_SID *o_sid, DOM_SID *n_sid) 
+static void process_sid(DOM_SID *sid, DOM_SID *o_sid, DOM_SID *n_sid) 
 {
   int i;
   if (my_sid_equal(sid, o_sid)) {
@@ -496,7 +496,7 @@ void process_sid(DOM_SID *sid, DOM_SID *o_sid, DOM_SID *n_sid)
 
 }
 
-void process_acl(ACL *acl, const char *prefix)
+static void process_acl(ACL *acl, const char *prefix)
 {
   int ace_cnt, i;
   ACE *ace;
@@ -514,7 +514,7 @@ void process_acl(ACL *acl, const char *prefix)
   }
 } 
 
-void usage(void)
+static void usage(void)
 {
   fprintf(stderr, "usage: profiles [-c <OLD-SID> -n <NEW-SID>] <profilefile>\n");
   fprintf(stderr, "Version: %s\n", VERSION);
-- 
cgit 


From db94beaa41d6c2c82ee9351a171f2a73a9e358da Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 22 Feb 2003 12:17:02 +0000
Subject: Fix comment - the other bits of code don't call this any more. (This
 used to be commit 523d1429b1072c999d376d2b4e13a1c08349990a)

---
 source3/passdb/passdb.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'source3')

diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c
index eff1ef4bcc..5e6466ff0a 100644
--- a/source3/passdb/passdb.c
+++ b/source3/passdb/passdb.c
@@ -992,10 +992,7 @@ BOOL local_sid_to_gid(gid_t *pgid, const DOM_SID *psid, enum SID_NAME_USE *name_
 /*************************************************************
  Change a password entry in the local smbpasswd file.
 
- FIXME!!  The function needs to be abstracted into the
- passdb interface or something.  It is currently being called
- by _api_samr_create_user() in rpc_server/srv_samr.c,
- in SWAT and by smbpasswd/pdbedit.
+It is currently being called by SWAT and by smbpasswd.
  
  --jerry
  *************************************************************/
-- 
cgit 


From 0dde23a7b24edf1cbf4d7d7e5afea485e37498e5 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 22 Feb 2003 12:19:18 +0000
Subject: Fixes from Paul Green and vorlon@debian.org for building shared
 libraries (make it possible to build both shared and static) and -lcrypt
 handling. (This used to be commit 30510f50077fd157664c127ac0182ce26843d43f)

---
 source3/aclocal.m4   | 64 +++++++++++++++++++++++++++++++++++++++++++++++++
 source3/configure.in | 67 +++++++++++++++++++++++++++-------------------------
 2 files changed, 99 insertions(+), 32 deletions(-)

(limited to 'source3')

diff --git a/source3/aclocal.m4 b/source3/aclocal.m4
index 345be73aed..7bec88dd87 100644
--- a/source3/aclocal.m4
+++ b/source3/aclocal.m4
@@ -577,3 +577,67 @@ if test "$2" != "/usr/lib" ; then
     $1="$$1 -L$2"
 fi
 ])
+
+dnl AC_ENABLE_SHARED - implement the --enable-shared flag
+dnl Usage: AC_ENABLE_SHARED[(DEFAULT)]
+dnl   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
+dnl   `yes'.
+AC_DEFUN([AC_ENABLE_SHARED],
+[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE(shared,
+changequote(<<, >>)dnl
+<<  --enable-shared[=PKGS]    build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
+changequote([, ])dnl
+[p=${PACKAGE-default}
+case $enableval in
+yes) enable_shared=yes ;;
+no) enable_shared=no ;;
+*)
+  enable_shared=no
+  # Look at the argument we got.  We use all the common list separators.
+  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+  for pkg in $enableval; do
+    if test "X$pkg" = "X$p"; then
+      enable_shared=yes
+    fi
+
+  done
+  IFS="$ac_save_ifs"
+  ;;
+esac],
+enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
+])
+
+dnl AC_ENABLE_STATIC - implement the --enable-static flag
+dnl Usage: AC_ENABLE_STATIC[(DEFAULT)]
+dnl   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
+dnl   `yes'.
+AC_DEFUN([AC_ENABLE_STATIC],
+[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE(static,
+changequote(<<, >>)dnl
+<<  --enable-static[=PKGS]    build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
+changequote([, ])dnl
+[p=${PACKAGE-default}
+case $enableval in
+yes) enable_static=yes ;;
+no) enable_static=no ;;
+*)
+  enable_static=no
+  # Look at the argument we got.  We use all the common list separators.
+  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+  for pkg in $enableval; do
+    if test "X$pkg" = "X$p"; then
+      enable_static=yes
+    fi
+  done
+  IFS="$ac_save_ifs"
+  ;;
+esac],
+enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
+])
+
+dnl AC_DISABLE_STATIC - set the default static flag to --disable-static
+AC_DEFUN([AC_DISABLE_STATIC],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_STATIC(no)])
diff --git a/source3/configure.in b/source3/configure.in
index dfd97bc42f..66bdf5edf1 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6,6 +6,9 @@ AC_PREREQ(2.53)
 AC_INIT(include/includes.h)
 AC_CONFIG_HEADER(include/config.h)
 
+AC_DISABLE_STATIC
+AC_ENABLE_SHARED
+
 #################################################
 # Directory handling stuff to support both the
 # legacy SAMBA directories and FHS compliant
@@ -726,11 +729,6 @@ fi
 
 AC_FUNC_MEMCMP
 
-###############################################
-# test for where we get crypt() from
-AC_SEARCH_LIBS(crypt, [crypt], [AUTHLIBS="$AUTHLIBS -lcrypt";
-	AC_DEFINE(HAVE_CRYPT,1,[Whether the system has the crypt() function])])
-
 ###############################################
 # Readline included by default unless explicitly asked not to
 test "${with_readline+set}" != "set" && with_readline=yes
@@ -952,9 +950,8 @@ AC_LIBTESTFUNC(sec, bigcrypt)
 AC_LIBTESTFUNC(security, getprpwnam)
 AC_LIBTESTFUNC(sec, getprpwnam)
 
-# this bit needs to be modified for each OS that is suported by
-# smbwrapper. You need to specify how to created a shared library and
-# how to compile C code to produce PIC object files
+# Assume non-shared by default and override below
+BLDSHARED="false"
 
 # these are the defaults, good for lots of systems
 HOST_OS="$host_os"
@@ -965,12 +962,16 @@ PICFLAG=""
 PICSUFFIX="po"
 POBAD_CC="#"
 SHLIBEXT="so"
-# Assume non-shared by default and override below
-BLDSHARED="false"
-AC_MSG_CHECKING([ability to build shared libraries])
 
-# and these are for particular systems
-case "$host_os" in
+if test "$enable_shared" = "yes"; then
+  # this bit needs to be modified for each OS that is suported by
+  # smbwrapper. You need to specify how to created a shared library and
+  # how to compile C code to produce PIC object files
+
+  AC_MSG_CHECKING([ability to build shared libraries])
+
+  # and these are for particular systems
+  case "$host_os" in
 		*linux*)   AC_DEFINE(LINUX,1,[Whether the host os is linux])
 			BLDSHARED="true"
 			LDSHFLAGS="-shared" 
@@ -1114,13 +1115,14 @@ case "$host_os" in
 		*)
 			AC_DEFINE(STAT_ST_BLOCKSIZE,512)
 			;;
-esac
-AC_SUBST(DYNEXP)
-AC_MSG_RESULT($BLDSHARED)
-AC_MSG_CHECKING([linker flags for shared libraries])
-AC_MSG_RESULT([$LDSHFLAGS])
-AC_MSG_CHECKING([compiler flags for position-independent code])
-AC_MSG_RESULT([$PICFLAGS])
+  esac
+  AC_SUBST(DYNEXP)
+  AC_MSG_RESULT($BLDSHARED)
+  AC_MSG_CHECKING([linker flags for shared libraries])
+  AC_MSG_RESULT([$LDSHFLAGS])
+  AC_MSG_CHECKING([compiler flags for position-independent code])
+  AC_MSG_RESULT([$PICFLAGS])
+fi
 
 #######################################################
 # test whether building a shared library actually works
@@ -2408,15 +2410,10 @@ AC_ARG_WITH(pam_smbpass,
 
 
 ###############################################
-# test for where we get crypt() from, but only
-# if not using PAM
-if test x"$with_pam_for_crypt" = x"no"; then
-AC_CHECK_FUNCS(crypt)
-if test x"$ac_cv_func_crypt" = x"no"; then
-    AC_CHECK_LIB(crypt, crypt, [AUTHLIBS="$AUTHLIBS -lcrypt";
-	AC_DEFINE(HAVE_CRYPT,1,[Whether crypt() is available])])
-fi
-fi
+# test for where we get crypt() from
+AC_SEARCH_LIBS(crypt, [crypt],
+  [test "$ac_cv_search_crypt" = "none required" || AUTHLIBS="-lcrypt $AUTHLIBS"
+  AC_DEFINE(HAVE_CRYPT,1,[Whether the system has the crypt() function])])
 
 ##
 ## moved after the check for -lcrypt in order to
@@ -2673,9 +2670,12 @@ AC_ARG_WITH(libsmbclient,
         LIBSMBCLIENT=libsmbclient
         AC_MSG_RESULT(yes)
      else
+	enable_static=yes
+        AC_MSG_RESULT(no shared library support -- will supply static library)
+     fi
+     if test $enable_static = yes; then
         INSTALLCLIENTCMD_A="\$(INSTALLCMD)"
         LIBSMBCLIENT=libsmbclient
-        AC_MSG_RESULT(no shared library support -- will supply static library)
      fi
      ;;
   esac ],
@@ -2686,10 +2686,13 @@ AC_ARG_WITH(libsmbclient,
      LIBSMBCLIENT_SHARED=bin/libsmbclient.$SHLIBEXT
      LIBSMBCLIENT=libsmbclient
      AC_MSG_RESULT(yes)
-  else
+   else
+     enable_static=yes
+     AC_MSG_RESULT(no shared library support -- will supply static library)
+   fi
+   if test $enable_static = yes; then
      INSTALLCLIENTCMD_A="\$(INSTALLCMD)"
      LIBSMBCLIENT=libsmbclient
-     AC_MSG_RESULT(no shared library support -- will supply static library)
   fi]
 )
 
-- 
cgit 


From 7e110f782a55d4dca1fb3fedd95bf059c9ec0638 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 22 Feb 2003 12:22:06 +0000
Subject: More signed/unsigned fixes (yes, I run with funny compiler options)
 and make x_fwrite() match fwrite() in returning a size_t.

Andrew Bartlett
(This used to be commit 2943c695787b742e9a96b2eefe2d75f681bacf7c)
---
 source3/include/hash.h      |  4 ++--
 source3/lib/hash.c          | 10 +++++-----
 source3/lib/pidfile.c       |  2 +-
 source3/lib/time.c          |  2 +-
 source3/lib/util_file.c     |  2 +-
 source3/lib/util_seaccess.c |  2 +-
 source3/lib/xfile.c         |  7 ++++---
 source3/smbd/dosmode.c      |  2 +-
 source3/smbd/mangle_hash2.c |  8 ++++----
 9 files changed, 20 insertions(+), 19 deletions(-)

(limited to 'source3')

diff --git a/source3/include/hash.h b/source3/include/hash.h
index c327c971ab..40cc8b7cab 100644
--- a/source3/include/hash.h
+++ b/source3/include/hash.h
@@ -66,8 +66,8 @@ typedef struct hash_element {
 typedef struct hash_table {
         ubi_dlList      *buckets;
         ubi_dlList      lru_chain;     
-        int     num_elements;	
-        int     size;
+        unsigned     num_elements;	
+        unsigned     size;
         compare_function        comp_func; 
 } hash_table;
 
diff --git a/source3/lib/hash.c b/source3/lib/hash.c
index 6b7a8476b1..95af485707 100644
--- a/source3/lib/hash.c
+++ b/source3/lib/hash.c
@@ -28,7 +28,7 @@
 #include "includes.h"
 
 static BOOL enlarge_hash_table(hash_table *table);
-static int primes[] = 
+static unsigned primes[] = 
         {17, 37, 67, 131, 257, 521, 1031, 2053, 4099, 8209, 16411};
 
 /****************************************************************************
@@ -47,9 +47,9 @@ static int primes[] =
  ****************************************************************************
  */
 
-BOOL hash_table_init(hash_table *table, int num_buckets, compare_function compare_func)
+BOOL hash_table_init(hash_table *table, unsigned num_buckets, compare_function compare_func)
 {
-	int 	i;
+	unsigned 	i;
 	ubi_dlList 	*bucket;
 
 	table->num_elements = 0;
@@ -118,7 +118,7 @@ static hash_element *hash_chain_find(hash_table *table, ubi_dlList *hash_chain,
 {
 	hash_element *hash_elem;
 	ubi_dlNodePtr lru_item;
-	int	i = 0;
+	unsigned int	i = 0;
 
 	for (hash_elem = (hash_element *)(ubi_dlFirst(hash_chain)); i < hash_chain->count; 
 		i++, hash_elem = (hash_element *)(ubi_dlNext(hash_elem))) {
@@ -299,7 +299,7 @@ static BOOL enlarge_hash_table(hash_table *table)
 
 void hash_clear(hash_table *table)
 {
-	int i;
+	unsigned int i;
 	ubi_dlList	*bucket = table->buckets;
 	hash_element    *hash_elem;
 	for (i = 0; i < table->size; bucket++, i++) {
diff --git a/source3/lib/pidfile.c b/source3/lib/pidfile.c
index 16a12656b3..1a462bf128 100644
--- a/source3/lib/pidfile.c
+++ b/source3/lib/pidfile.c
@@ -100,7 +100,7 @@ void pidfile_create(const char *name)
 
 	memset(buf, 0, sizeof(buf));
 	slprintf(buf, sizeof(buf) - 1, "%u\n", (unsigned int) sys_getpid());
-	if (write(fd, buf, strlen(buf)) != strlen(buf)) {
+	if (write(fd, buf, strlen(buf)) != (ssize_t)strlen(buf)) {
 		DEBUG(0,("ERROR: can't write to file %s: %s\n", 
 			 pidFile, strerror(errno)));
 		exit(1);
diff --git a/source3/lib/time.c b/source3/lib/time.c
index ea5c6837bf..f76a1bdc0d 100644
--- a/source3/lib/time.c
+++ b/source3/lib/time.c
@@ -479,7 +479,7 @@ check if it's a null mtime
 ****************************************************************************/
 BOOL null_mtime(time_t mtime)
 {
-  if (mtime == 0 || mtime == 0xFFFFFFFF || mtime == (time_t)-1)
+  if (mtime == 0 || mtime == (time_t)0xFFFFFFFF || mtime == (time_t)-1)
     return(True);
   return(False);
 }
diff --git a/source3/lib/util_file.c b/source3/lib/util_file.c
index 4babab8931..02acbd4d7e 100644
--- a/source3/lib/util_file.c
+++ b/source3/lib/util_file.c
@@ -593,7 +593,7 @@ BOOL file_save(const char *fname, void *packet, size_t length)
 	if (fd == -1) {
 		return False;
 	}
-	if (write(fd, packet, length) != length) {
+	if (write(fd, packet, length) != (size_t)length) {
 		return False;
 	}
 	close(fd);
diff --git a/source3/lib/util_seaccess.c b/source3/lib/util_seaccess.c
index 21d7fe8599..eba8cab7fb 100644
--- a/source3/lib/util_seaccess.c
+++ b/source3/lib/util_seaccess.c
@@ -343,7 +343,7 @@ SEC_DESC_BUF *se_create_child_secdesc(TALLOC_CTX *ctx, SEC_DESC *parent_ctr,
 	SEC_DESC *sd;
 	SEC_ACL *new_dacl, *the_acl;
 	SEC_ACE *new_ace_list = NULL;
-	int new_ace_list_ndx = 0, i;
+	unsigned int new_ace_list_ndx = 0, i;
 	size_t size;
 
 	/* Currently we only process the dacl when creating the child.  The
diff --git a/source3/lib/xfile.c b/source3/lib/xfile.c
index 57f3e27638..1534dd855e 100644
--- a/source3/lib/xfile.c
+++ b/source3/lib/xfile.c
@@ -140,9 +140,10 @@ int x_fclose(XFILE *f)
 }
 
 /* simulate fwrite() */
-int x_fwrite(const void *p, size_t size, size_t nmemb, XFILE *f)
+size_t x_fwrite(const void *p, size_t size, size_t nmemb, XFILE *f)
 {
-	int ret, total=0;
+	ssize_t ret;
+	size_t total=0;
 
 	/* we might be writing unbuffered */
 	if (f->buftype == X_IONBF || 
@@ -154,7 +155,7 @@ int x_fwrite(const void *p, size_t size, size_t nmemb, XFILE *f)
 
 
 	while (total < size*nmemb) {
-		int n = f->bufsize - f->bufused;
+		size_t n = f->bufsize - f->bufused;
 		n = MIN(n, (size*nmemb)-total);
 
 		if (n == 0) {
diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c
index 77d8c9cc92..6c21dc04d0 100644
--- a/source3/smbd/dosmode.c
+++ b/source3/smbd/dosmode.c
@@ -181,7 +181,7 @@ uint32 dos_mode(connection_struct *conn,char *path,SMB_STRUCT_STAT *sbuf)
 /*******************************************************************
 chmod a file - but preserve some bits
 ********************************************************************/
-int file_chmod(connection_struct *conn,char *fname,int dosmode,SMB_STRUCT_STAT *st)
+int file_chmod(connection_struct *conn,char *fname, uint32 dosmode,SMB_STRUCT_STAT *st)
 {
 	SMB_STRUCT_STAT st1;
 	int mask=0;
diff --git a/source3/smbd/mangle_hash2.c b/source3/smbd/mangle_hash2.c
index bbc9020eab..eda509214d 100644
--- a/source3/smbd/mangle_hash2.c
+++ b/source3/smbd/mangle_hash2.c
@@ -203,7 +203,7 @@ static const char *cache_lookup(u32 hash)
  */
 static BOOL is_mangled_component(const char *name)
 {
-	int len, i;
+	unsigned int len, i;
 
 	M_DEBUG(10,("is_mangled_component %s ?\n", name));
 
@@ -368,7 +368,7 @@ static void mangle_reset(void)
 static BOOL check_cache(char *name)
 {
 	u32 hash, multiplier;
-	int i;
+	unsigned int i;
 	const char *prefix;
 	char extension[4];
 
@@ -489,8 +489,8 @@ static void name_map(char *name, BOOL need83, BOOL cache83)
 	char *dot_p;
 	char lead_chars[7];
 	char extension[4];
-	int extension_length, i;
-	int prefix_len;
+	unsigned int extension_length, i;
+	unsigned int prefix_len;
 	u32 hash, v;
 	char new_name[13];
 
-- 
cgit 


From fa26737f40607baa084f2fcc481894473add69d4 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 22 Feb 2003 20:01:00 +0000
Subject: See if I can make this look slightly like C.  It compiled locally,
 honest...

Andrew Bartlett
(This used to be commit cfc4cc776899da92a5c9a17f0ea36c7cb65d7a80)
---
 source3/auth/auth_rhosts.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'source3')

diff --git a/source3/auth/auth_rhosts.c b/source3/auth/auth_rhosts.c
index d8e1b01942..8915acaecd 100644
--- a/source3/auth/auth_rhosts.c
+++ b/source3/auth/auth_rhosts.c
@@ -199,6 +199,8 @@ static NTSTATUS check_rhosts_security(const struct auth_context *auth_context,
 {
 	NTSTATUS nt_status = NT_STATUS_LOGON_FAILURE;
 	SAM_ACCOUNT *account = NULL;
+	pstring rhostsfile;
+	const char *home;
 	
 	if (!NT_STATUS_IS_OK(nt_status = 
 			     auth_get_sam_account(user_info->internal_username.str, 
@@ -206,9 +208,8 @@ static NTSTATUS check_rhosts_security(const struct auth_context *auth_context,
 		return nt_status;
 	}
 
-	pstring rhostsfile;
-	
-	char *home = pdb_get_unix_homedir(account);
+	home = pdb_get_unix_homedir(account);
+
 	if (home) {
 		slprintf(rhostsfile, sizeof(rhostsfile)-1, "%s/.rhosts", home);
 		become_root();
-- 
cgit 


From 1d1ad2db2e1f78ed16bd7c62b4d062aa128bb27d Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 22 Feb 2003 20:11:29 +0000
Subject: Make sure we set the error code to indicate failure...

Andrew Bartlett
(This used to be commit 5a472e2a3cffe175ac4341e19c153a931505a2e8)
---
 source3/auth/auth_rhosts.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'source3')

diff --git a/source3/auth/auth_rhosts.c b/source3/auth/auth_rhosts.c
index 8915acaecd..5451f7d930 100644
--- a/source3/auth/auth_rhosts.c
+++ b/source3/auth/auth_rhosts.c
@@ -169,6 +169,9 @@ static NTSTATUS check_hostsequiv_security(const struct auth_context *auth_contex
 
 	if (check_hosts_equiv(account)) {
 		nt_status = make_server_info_sam(server_info, account);
+	} else {
+		pdb_free_sam(&account);
+		nt_status = NT_STATUS_LOGON_FAILURE;
 	}
 
 	return nt_status;
@@ -215,10 +218,16 @@ static NTSTATUS check_rhosts_security(const struct auth_context *auth_context,
 		become_root();
 		if (check_user_equiv(pdb_get_username(account),client_name(),rhostsfile)) {
 			nt_status = make_server_info_sam(server_info, account);
+		} else {
+			pdb_free_sam(&account);
+			nt_status = NT_STATUS_LOGON_FAILURE;
 		}
 		unbecome_root();
-	} 
-
+	} else {
+		pdb_free_sam(&account);
+		nt_status = NT_STATUS_LOGON_FAILURE;
+	}
+	
 	return nt_status;
 }
 
-- 
cgit 


From bfc5f0ba8e7fed1f95f83cb1ee43631e307927fb Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Sun, 23 Feb 2003 17:40:43 +0000
Subject: move genparser to use talloc contexts instead of [m|c|re]alloc() and
 free()s (This used to be commit 70fce680c01fa1baa65fb3cbc83dfaf822fdadd7)

---
 source3/lib/genparser.c       | 233 ++++++++++++++++++++++--------------------
 source3/lib/genparser_samba.c |  82 +++++++--------
 2 files changed, 163 insertions(+), 152 deletions(-)

(limited to 'source3')

diff --git a/source3/lib/genparser.c b/source3/lib/genparser.c
index 9fa9dbd33b..233050b432 100644
--- a/source3/lib/genparser.c
+++ b/source3/lib/genparser.c
@@ -34,12 +34,12 @@ static int all_zero(const char *ptr, unsigned size)
 }
 
 /* encode a buffer of bytes into a escaped string */
-static char *encode_bytes(const char *ptr, unsigned len)
+static char *encode_bytes(TALLOC_CTX *mem_ctx, const char *ptr, unsigned len)
 {
 	const char *hexdig = "0123456789abcdef";
 	char *ret, *p;
 	unsigned i;
-	ret = malloc(len*3 + 1); /* worst case size */
+	ret = talloc(mem_ctx, len*3 + 1); /* worst case size */
 	if (!ret) return NULL;
 	for (p=ret,i=0;i<len;i++) {
 		if (isalnum(ptr[i]) || isspace(ptr[i]) ||
@@ -61,11 +61,16 @@ static char *encode_bytes(const char *ptr, unsigned len)
 }
 
 /* decode an escaped string from encode_bytes() into a buffer */
-static char *decode_bytes(const char *s, unsigned *len) 
+static char *decode_bytes(TALLOC_CTX *mem_ctx, const char *s, unsigned *len) 
 {
 	char *ret, *p;
 	unsigned i;
-	ret = calloc(1, strlen(s)+1); /* worst case length */
+	int slen = strlen(s) + 1;
+
+	ret = talloc(mem_ctx, slen); /* worst case length */
+	if (!ret)
+		return NULL;
+	memset(ret, 0, slen);
 
 	if (*s == '{') s++;
 
@@ -75,7 +80,6 @@ static char *decode_bytes(const char *s, unsigned *len)
 		} else if (s[i] == '\\') {
 			unsigned v;
 			if (sscanf(&s[i+1], "%02x", &v) != 1 || v > 255) {
-				free(ret);
 				return NULL;
 			}
 			*(unsigned char *)p = v;
@@ -96,11 +100,11 @@ static char *decode_bytes(const char *s, unsigned *len)
    parse_string */
 
 /* allocate more space if needed */
-static int addgen_alloc(struct parse_string *p, int n)
+static int addgen_alloc(TALLOC_CTX *mem_ctx, struct parse_string *p, int n)
 {
 	if (p->length + n <= p->allocated) return 0;
 	p->allocated = p->length + n + 200;
-	p->s = realloc(p->s, p->allocated);
+	p->s = talloc_realloc(mem_ctx, p->s, p->allocated);
 	if (!p->s) {
 		errno = ENOMEM;
 		return -1;
@@ -109,9 +113,9 @@ static int addgen_alloc(struct parse_string *p, int n)
 }
 
 /* add a character to the buffer */
-static int addchar(struct parse_string *p, char c)
+static int addchar(TALLOC_CTX *mem_ctx, struct parse_string *p, char c)
 {
-	if (addgen_alloc(p, 2) != 0) {
+	if (addgen_alloc(mem_ctx, p, 2) != 0) {
 		return -1;
 	}
 	p->s[p->length++] = c;
@@ -120,10 +124,10 @@ static int addchar(struct parse_string *p, char c)
 }
 
 /* add a string to the buffer */
-int addstr(struct parse_string *p, const char *s)
+int addstr(TALLOC_CTX *mem_ctx, struct parse_string *p, const char *s)
 {
 	int len = strlen(s);
-	if (addgen_alloc(p, len+1) != 0) {
+	if (addgen_alloc(mem_ctx, p, len+1) != 0) {
 		return -1;
 	}
 	memcpy(p->s + p->length, s, len+1);
@@ -132,10 +136,10 @@ int addstr(struct parse_string *p, const char *s)
 }
 
 /* add a string to the buffer with a tab prefix */
-static int addtabbed(struct parse_string *p, const char *s, unsigned indent)
+static int addtabbed(TALLOC_CTX *mem_ctx, struct parse_string *p, const char *s, unsigned indent)
 {
 	int len = strlen(s);
-	if (addgen_alloc(p, indent+len+1) != 0) {
+	if (addgen_alloc(mem_ctx, p, indent+len+1) != 0) {
 		return -1;
 	}
 	while (indent--) {
@@ -147,7 +151,7 @@ static int addtabbed(struct parse_string *p, const char *s, unsigned indent)
 }
 
 /* note! this can only be used for results up to 60 chars wide! */
-int addshort(struct parse_string *p, const char *fmt, ...)
+int addshort(TALLOC_CTX *mem_ctx, struct parse_string *p, const char *fmt, ...)
 {
 	char buf[60];
 	int n;
@@ -155,7 +159,7 @@ int addshort(struct parse_string *p, const char *fmt, ...)
 	va_start(ap, fmt);
 	n = vsnprintf(buf, sizeof(buf), fmt, ap);
 	va_end(ap);
-	if (addgen_alloc(p, n + 1) != 0) {
+	if (addgen_alloc(mem_ctx, p, n + 1) != 0) {
 		return -1;
 	}
 	if (n != 0) {
@@ -170,7 +174,7 @@ int addshort(struct parse_string *p, const char *fmt, ...)
    this is here to make it easier for people to write dump functions 
    for their own types
  */
-int gen_addgen(struct parse_string *p, const char *fmt, ...)
+int gen_addgen(TALLOC_CTX *mem_ctx, struct parse_string *p, const char *fmt, ...)
 {
 	char *buf = NULL;
 	int n;
@@ -178,7 +182,7 @@ int gen_addgen(struct parse_string *p, const char *fmt, ...)
 	va_start(ap, fmt);
 	n = vasprintf(&buf, fmt, ap);
 	va_end(ap);
-	if (addgen_alloc(p, n + 1) != 0) {
+	if (addgen_alloc(mem_ctx, p, n + 1) != 0) {
 		if (buf) free(buf);
 		return -1;
 	}
@@ -192,7 +196,8 @@ int gen_addgen(struct parse_string *p, const char *fmt, ...)
 }
 
 /* dump a enumerated type */
-int gen_dump_enum(const struct enum_struct *einfo,
+int gen_dump_enum(TALLOC_CTX *mem_ctx,
+		  const struct enum_struct *einfo,
 		  struct parse_string *p, 
 		  const char *ptr,
 		  unsigned indent)
@@ -201,36 +206,37 @@ int gen_dump_enum(const struct enum_struct *einfo,
 	int i;
 	for (i=0;einfo[i].name;i++) {
 		if (v == einfo[i].value) {
-			addstr(p, einfo[i].name);
+			addstr(mem_ctx, p, einfo[i].name);
 			return 0;
 		}
 	}
 	/* hmm, maybe we should just fail? */
-	return gen_dump_unsigned(p, ptr, indent);
+	return gen_dump_unsigned(mem_ctx, p, ptr, indent);
 }
 
 /* dump a single non-array element, hanlding struct and enum */
-static int gen_dump_one(struct parse_string *p, 
-			 const struct parse_struct *pinfo,
-			 const char *ptr,
-			 unsigned indent)
+static int gen_dump_one(TALLOC_CTX *mem_ctx,
+			struct parse_string *p, 
+			const struct parse_struct *pinfo,
+			const char *ptr,
+			unsigned indent)
 {
 	if (pinfo->dump_fn == gen_dump_char && pinfo->ptr_count == 1) {
-		char *s = encode_bytes(ptr, strlen(ptr));
-		if (addchar(p,'{') ||
-		    addstr(p, s) ||
-		    addstr(p, "}")) {
-			free(s);
+		char *s = encode_bytes(mem_ctx, ptr, strlen(ptr));
+		if (addchar(mem_ctx, p,'{') ||
+		    addstr(mem_ctx, p, s) ||
+		    addstr(mem_ctx, p, "}")) {
 			return -1;
 		}
 		return 0;
 	}
 
-	return pinfo->dump_fn(p, ptr, indent);
+	return pinfo->dump_fn(mem_ctx, p, ptr, indent);
 }
 
 /* handle dumping of an array of arbitrary type */
-static int gen_dump_array(struct parse_string *p,
+static int gen_dump_array(TALLOC_CTX *mem_ctx,
+			  struct parse_string *p,
 			  const struct parse_struct *pinfo, 
 			  const char *ptr,
 			  int array_len,
@@ -242,13 +248,12 @@ static int gen_dump_array(struct parse_string *p,
 	if (array_len != 0 && 
 	    pinfo->ptr_count == 0 &&
 	    pinfo->dump_fn == gen_dump_char) {
-		char *s = encode_bytes(ptr, array_len);
+		char *s = encode_bytes(mem_ctx, ptr, array_len);
 		if (!s) return -1;
-		if (addtabbed(p, pinfo->name, indent) ||
-		    addstr(p, " = {") ||
-		    addstr(p, s) ||
-		    addstr(p, "}\n")) {
-			free(s);
+		if (addtabbed(mem_ctx, p, pinfo->name, indent) ||
+		    addstr(mem_ctx, p, " = {") ||
+		    addstr(mem_ctx, p, s) ||
+		    addstr(mem_ctx, p, "}\n")) {
 			return -1;
 		}
 		free(s);
@@ -272,23 +277,23 @@ static int gen_dump_array(struct parse_string *p,
 			continue;
 		}
 		if (count == 0) {
-			if (addtabbed(p, pinfo->name, indent) ||
-			    addshort(p, " = %u:", i)) {
+			if (addtabbed(mem_ctx, p, pinfo->name, indent) ||
+			    addshort(mem_ctx, p, " = %u:", i)) {
 				return -1;
 			}
 		} else {
-			if (addshort(p, ", %u:", i) != 0) {
+			if (addshort(mem_ctx, p, ", %u:", i) != 0) {
 				return -1;
 			}
 		}
-		if (gen_dump_one(p, pinfo, p2, indent) != 0) {
+		if (gen_dump_one(mem_ctx, p, pinfo, p2, indent) != 0) {
 			return -1;
 		}
 		ptr += size;
 		count++;
 	}
 	if (count) {
-		return addstr(p, "\n");
+		return addstr(mem_ctx, p, "\n");
 	}
 	return 0;
 }
@@ -325,36 +330,35 @@ static int find_var(const struct parse_struct *pinfo,
 }
 
 
-int gen_dump_struct(const struct parse_struct *pinfo,
+int gen_dump_struct(TALLOC_CTX *mem_ctx,
+		    const struct parse_struct *pinfo,
 		    struct parse_string *p, 
 		    const char *ptr, 
 		    unsigned indent)
 {
-	char *s = gen_dump(pinfo, ptr, indent+1);
+	char *s = gen_dump(mem_ctx, pinfo, ptr, indent+1);
 	if (!s) return -1;
-	if (addstr(p, "{\n") || 
-	    addstr(p,s) || 
-	    addtabbed(p,"}", indent)) {
-		free(s);
+	if (addstr(mem_ctx, p, "{\n") || 
+	    addstr(mem_ctx, p, s) || 
+	    addtabbed(mem_ctx, p, "}", indent)) {
 		return -1;
 	}
-	free(s);
 	return 0;
 }
 
-static int gen_dump_string(struct parse_string *p,
+static int gen_dump_string(TALLOC_CTX *mem_ctx,
+			   struct parse_string *p,
 			   const struct parse_struct *pinfo, 
 			   const char *data, 
 			   unsigned indent)
 {
 	const char *ptr = *(char **)data;
-	char *s = encode_bytes(ptr, strlen(ptr));
-	if (addtabbed(p, pinfo->name, indent) ||
-	    addstr(p, " = ") ||
-	    addchar(p,'{') ||
-	    addstr(p, s) ||
-	    addstr(p, "}\n")) {
-		free(s);
+	char *s = encode_bytes(mem_ctx, ptr, strlen(ptr));
+	if (addtabbed(mem_ctx, p, pinfo->name, indent) ||
+	    addstr(mem_ctx, p, " = ") ||
+	    addchar(mem_ctx, p, '{') ||
+	    addstr(mem_ctx, p, s) ||
+	    addstr(mem_ctx, p, "}\n")) {
 		return -1;
 	}
 	return 0;
@@ -370,7 +374,7 @@ static int len_nullterm(const char *ptr, int size, int array_len)
 	if (size == 1) {
 		len = strnlen(ptr, array_len);
 	} else {
-		for (len=0;len<array_len;len++) {
+		for (len=0; len < array_len; len++) {
 			if (all_zero(ptr+len*size, size)) break;
 		}
 	}
@@ -383,7 +387,8 @@ static int len_nullterm(const char *ptr, int size, int array_len)
 
 /* the generic dump routine. Scans the parse information for this structure
    and processes it recursively */
-char *gen_dump(const struct parse_struct *pinfo, 
+char *gen_dump(TALLOC_CTX *mem_ctx,
+	       const struct parse_struct *pinfo, 
 	       const char *data, 
 	       unsigned indent)
 {
@@ -394,7 +399,7 @@ char *gen_dump(const struct parse_struct *pinfo,
 	p.allocated = 0;
 	p.s = NULL;
 
-	if (addstr(&p, "") != 0) {
+	if (addstr(mem_ctx, &p, "") != 0) {
 		return NULL;
 	}
 	
@@ -412,7 +417,7 @@ char *gen_dump(const struct parse_struct *pinfo,
 			if (pinfo[i].flags & FLAG_NULLTERM) {
 				len = len_nullterm(ptr, size, len);
 			}
-			if (gen_dump_array(&p, &pinfo[i], ptr, 
+			if (gen_dump_array(mem_ctx, &p, &pinfo[i], ptr, 
 					   len, indent)) {
 				goto failed;
 			}
@@ -433,7 +438,8 @@ char *gen_dump(const struct parse_struct *pinfo,
 				}
 				p2.ptr_count--;
 				p2.dynamic_len = NULL;
-				if (gen_dump_array(&p, &p2, *(char **)ptr, 
+				if (gen_dump_array(mem_ctx, &p, &p2,
+						   *(char **)ptr, 
 						   len, indent) != 0) {
 					goto failed;
 				}
@@ -447,7 +453,7 @@ char *gen_dump(const struct parse_struct *pinfo,
 		/* assume char* is a null terminated string */
 		if (pinfo[i].size == 1 && pinfo[i].ptr_count == 1 &&
 		    pinfo[i].dump_fn == gen_dump_char) {
-			if (gen_dump_string(&p, &pinfo[i], ptr, indent) != 0) {
+			if (gen_dump_string(mem_ctx, &p, &pinfo[i], ptr, indent) != 0) {
 				goto failed;
 			}
 			continue;
@@ -458,17 +464,16 @@ char *gen_dump(const struct parse_struct *pinfo,
 			ptr = *(const char **)ptr;
 		}
 
-		if (addtabbed(&p, pinfo[i].name, indent) ||
-		    addstr(&p, " = ") ||
-		    gen_dump_one(&p, &pinfo[i], ptr, indent) ||
-		    addstr(&p, "\n")) {
+		if (addtabbed(mem_ctx, &p, pinfo[i].name, indent) ||
+		    addstr(mem_ctx, &p, " = ") ||
+		    gen_dump_one(mem_ctx, &p, &pinfo[i], ptr, indent) ||
+		    addstr(mem_ctx, &p, "\n")) {
 			goto failed;
 		}
 	}
 	return p.s;
 
 failed:
-	free(p.s);
 	return NULL;
 }
 
@@ -495,7 +500,8 @@ static char *match_braces(char *s, char c)
 }
 
 /* parse routine for enumerated types */
-int gen_parse_enum(const struct enum_struct *einfo, 
+int gen_parse_enum(TALLOC_CTX *mem_ctx,
+		   const struct enum_struct *einfo, 
 		   char *ptr, 
 		   const char *str)
 {
@@ -524,37 +530,41 @@ int gen_parse_enum(const struct enum_struct *einfo,
 
 
 /* parse all base types */
-static int gen_parse_base(const struct parse_struct *pinfo, 
+static int gen_parse_base(TALLOC_CTX *mem_ctx,
+			  const struct parse_struct *pinfo, 
 			  char *ptr, 
 			  const char *str)
 {
 	if (pinfo->parse_fn == gen_parse_char && pinfo->ptr_count==1) {
 		unsigned len;
-		char *s = decode_bytes(str, &len);
+		char *s = decode_bytes(mem_ctx, str, &len);
 		if (!s) return -1;
 		*(char **)ptr = s;
 		return 0;
 	}
 
 	if (pinfo->ptr_count) {
+		unsigned size = pinfo->ptr_count>1?sizeof(void *):pinfo->size;
 		struct parse_struct p2 = *pinfo;
-		*(void **)ptr = calloc(1, pinfo->ptr_count>1?sizeof(void *):pinfo->size);
+		*(void **)ptr = talloc(mem_ctx, size);
 		if (! *(void **)ptr) {
 			return -1;
 		}
+		memset(*(void **)ptr, 0, size);
 		ptr = *(char **)ptr;
 		p2.ptr_count--;
-		return gen_parse_base(&p2, ptr, str);
+		return gen_parse_base(mem_ctx, &p2, ptr, str);
 	}
 
-	return pinfo->parse_fn(ptr, str);
+	return pinfo->parse_fn(mem_ctx, ptr, str);
 }
 
 /* parse a generic array */
-static int gen_parse_array(const struct parse_struct *pinfo, 
-			    char *ptr, 
-			    const char *str,
-			    int array_len)
+static int gen_parse_array(TALLOC_CTX *mem_ctx,
+			   const struct parse_struct *pinfo, 
+			   char *ptr, 
+			   const char *str,
+			   int array_len)
 {
 	char *p, *p2;
 	unsigned size = pinfo->size;
@@ -564,11 +574,10 @@ static int gen_parse_array(const struct parse_struct *pinfo,
 	    pinfo->ptr_count == 0 &&
 	    pinfo->dump_fn == gen_dump_char) {
 		unsigned len = 0;
-		char *s = decode_bytes(str, &len);
-		if (!s) return -1;
+		char *s = decode_bytes(mem_ctx, str, &len);
+		if (!s || (len > array_len)) return -1;
 		memset(ptr, 0, array_len);
 		memcpy(ptr, s, len);
-		free(s);
 		return 0;
 	}
 
@@ -593,7 +602,7 @@ static int gen_parse_array(const struct parse_struct *pinfo,
 			p[strlen(p)-1] = 0;
 		}
 
-		if (gen_parse_base(pinfo, ptr + idx*size, p) != 0) {
+		if (gen_parse_base(mem_ctx, pinfo, ptr + idx*size, p) != 0) {
 			return -1;
 		}
 
@@ -605,7 +614,8 @@ static int gen_parse_array(const struct parse_struct *pinfo,
 }
 
 /* parse one element, hanlding dynamic and static arrays */
-static int gen_parse_one(const struct parse_struct *pinfo, 
+static int gen_parse_one(TALLOC_CTX *mem_ctx,
+			 const struct parse_struct *pinfo, 
 			 const char *name, 
 			 char *data, 
 			 const char *str)
@@ -621,7 +631,8 @@ static int gen_parse_one(const struct parse_struct *pinfo,
 	}
 
 	if (pinfo[i].array_len) {
-		return gen_parse_array(&pinfo[i], data+pinfo[i].offset, 
+		return gen_parse_array(mem_ctx, &pinfo[i],
+				       data+pinfo[i].offset, 
 				       str, pinfo[i].array_len);
 	}
 
@@ -632,33 +643,33 @@ static int gen_parse_one(const struct parse_struct *pinfo,
 			return -1;
 		}
 		if (len > 0) {
-			unsigned size;
 			struct parse_struct p2 = pinfo[i];
 			char *ptr;
-			size = pinfo[i].ptr_count>1?sizeof(void*):pinfo[i].size;
-			ptr = calloc(len, size);
+			unsigned size = pinfo[i].ptr_count>1?sizeof(void*):pinfo[i].size;
+			ptr = talloc(mem_ctx, len*size);
 			if (!ptr) {
 				errno = ENOMEM;
 				return -1;
 			}
+			memset(ptr, 0, len*size);
 			*((char **)(data + pinfo[i].offset)) = ptr;
 			p2.ptr_count--;
 			p2.dynamic_len = NULL;
-			return gen_parse_array(&p2, ptr, str, len);
+			return gen_parse_array(mem_ctx, &p2, ptr, str, len);
 		}
 		return 0;
 	}
 
-	return gen_parse_base(&pinfo[i], data + pinfo[i].offset, str);
+	return gen_parse_base(mem_ctx, &pinfo[i], data + pinfo[i].offset, str);
 }
 
-int gen_parse_struct(const struct parse_struct *pinfo, char *ptr, const char *str)
+int gen_parse_struct(TALLOC_CTX * mem_ctx, const struct parse_struct *pinfo, char *ptr, const char *str)
 {
-	return gen_parse(pinfo, ptr, str);
+	return gen_parse(mem_ctx, pinfo, ptr, str);
 }
 
 /* the main parse routine */
-int gen_parse(const struct parse_struct *pinfo, char *data, const char *s)
+int gen_parse(TALLOC_CTX *mem_ctx, const struct parse_struct *pinfo, char *data, const char *s)
 {
 	char *str, *s0;
 	
@@ -694,7 +705,7 @@ int gen_parse(const struct parse_struct *pinfo, char *data, const char *s)
 
 		*str++ = 0;
 		
-		if (gen_parse_one(pinfo, name, data, value) != 0) {
+		if (gen_parse_one(mem_ctx, pinfo, name, data, value) != 0) {
 			free(s0);
 			return -1;
 		}
@@ -708,68 +719,68 @@ int gen_parse(const struct parse_struct *pinfo, char *data, const char *s)
 
 /* for convenience supply some standard dumpers and parsers here */
 
-int gen_parse_char(char *ptr, const char *str)
+int gen_parse_char(TALLOC_CTX *mem_ctx, char *ptr, const char *str)
 {
 	*(unsigned char *)ptr = atoi(str);
 	return 0;
 }
 
-int gen_parse_int(char *ptr, const char *str)
+int gen_parse_int(TALLOC_CTX *mem_ctx, char *ptr, const char *str)
 {
 	*(int *)ptr = atoi(str);
 	return 0;
 }
 
-int gen_parse_unsigned(char *ptr, const char *str)
+int gen_parse_unsigned(TALLOC_CTX *mem_ctx, char *ptr, const char *str)
 {
 	*(unsigned *)ptr = strtoul(str, NULL, 10);
 	return 0;
 }
 
-int gen_parse_time_t(char *ptr, const char *str)
+int gen_parse_time_t(TALLOC_CTX *mem_ctx, char *ptr, const char *str)
 {
 	*(time_t *)ptr = strtoul(str, NULL, 10);
 	return 0;
 }
 
-int gen_parse_double(char *ptr, const char *str)
+int gen_parse_double(TALLOC_CTX *mem_ctx, char *ptr, const char *str)
 {
 	*(double *)ptr = atof(str);
 	return 0;
 }
 
-int gen_parse_float(char *ptr, const char *str)
+int gen_parse_float(TALLOC_CTX *mem_ctx, char *ptr, const char *str)
 {
 	*(float *)ptr = atof(str);
 	return 0;
 }
 
-int gen_dump_char(struct parse_string *p, const char *ptr, unsigned indent)
+int gen_dump_char(TALLOC_CTX *mem_ctx, struct parse_string *p, const char *ptr, unsigned indent)
 {
-	return addshort(p, "%u", *(unsigned char *)(ptr));
+	return addshort(mem_ctx, p, "%u", *(unsigned char *)(ptr));
 }
 
-int gen_dump_int(struct parse_string *p, const char *ptr, unsigned indent)
+int gen_dump_int(TALLOC_CTX *mem_ctx, struct parse_string *p, const char *ptr, unsigned indent)
 {
-	return addshort(p, "%d", *(int *)(ptr));
+	return addshort(mem_ctx, p, "%d", *(int *)(ptr));
 }
 
-int gen_dump_unsigned(struct parse_string *p, const char *ptr, unsigned indent)
+int gen_dump_unsigned(TALLOC_CTX *mem_ctx, struct parse_string *p, const char *ptr, unsigned indent)
 {
-	return addshort(p, "%u", *(unsigned *)(ptr));
+	return addshort(mem_ctx, p, "%u", *(unsigned *)(ptr));
 }
 
-int gen_dump_time_t(struct parse_string *p, const char *ptr, unsigned indent)
+int gen_dump_time_t(TALLOC_CTX *mem_ctx, struct parse_string *p, const char *ptr, unsigned indent)
 {
-	return addshort(p, "%u", *(time_t *)(ptr));
+	return addshort(mem_ctx, p, "%u", *(time_t *)(ptr));
 }
 
-int gen_dump_double(struct parse_string *p, const char *ptr, unsigned indent)
+int gen_dump_double(TALLOC_CTX *mem_ctx, struct parse_string *p, const char *ptr, unsigned indent)
 {
-	return addshort(p, "%lg", *(double *)(ptr));
+	return addshort(mem_ctx, p, "%lg", *(double *)(ptr));
 }
 
-int gen_dump_float(struct parse_string *p, const char *ptr, unsigned indent)
+int gen_dump_float(TALLOC_CTX *mem_ctx, struct parse_string *p, const char *ptr, unsigned indent)
 {
-	return addshort(p, "%g", *(float *)(ptr));
+	return addshort(mem_ctx, p, "%g", *(float *)(ptr));
 }
diff --git a/source3/lib/genparser_samba.c b/source3/lib/genparser_samba.c
index 6c700d1094..bece587747 100644
--- a/source3/lib/genparser_samba.c
+++ b/source3/lib/genparser_samba.c
@@ -22,25 +22,25 @@
 
 /* PARSE functions */
 
-int gen_parse_uint8(char *ptr, const char *str)
+int gen_parse_uint8(TALLOC_CTX *mem_ctx, char *ptr, const char *str)
 {
 	*(uint8 *)ptr = atoi(str);
 	return 0;
 }
 
-int gen_parse_uint16(char *ptr, const char *str)
+int gen_parse_uint16(TALLOC_CTX *mem_ctx, char *ptr, const char *str)
 {
 	*(uint16 *)ptr = atoi(str);
 	return 0;
 }
 
-int gen_parse_uint32(char *ptr, const char *str)
+int gen_parse_uint32(TALLOC_CTX *mem_ctx, char *ptr, const char *str)
 {
 	*(uint32 *)ptr = strtoul(str, NULL, 10);
 	return 0;
 }
 
-int gen_parse_NTTIME(char *ptr, const char *str)
+int gen_parse_NTTIME(TALLOC_CTX *mem_ctx, char *ptr, const char *str)
 {
 	if(sscanf(str, "%u,%u", &(((NTTIME *)(ptr))->high), &(((NTTIME *)(ptr))->low)) != 2) {
 		errno = EINVAL;
@@ -49,19 +49,19 @@ int gen_parse_NTTIME(char *ptr, const char *str)
 	return 0;
 }
 
-int gen_parse_DOM_SID(char *ptr, const char *str)
+int gen_parse_DOM_SID(TALLOC_CTX *mem_ctx, char *ptr, const char *str)
 {
 	if(!string_to_sid((DOM_SID *)ptr, str)) return -1;
 	return 0;
 }
 
-int gen_parse_SEC_ACCESS(char *ptr, const char *str)
+int gen_parse_SEC_ACCESS(TALLOC_CTX *mem_ctx, char *ptr, const char *str)
 {
 	((SEC_ACCESS *)ptr)->mask = strtoul(str, NULL, 10);
 	return 0;
 }
 
-int gen_parse_GUID(char *ptr, const char *str)
+int gen_parse_GUID(TALLOC_CTX *mem_ctx, char *ptr, const char *str)
 {
 	int info[GUID_SIZE];
 	int i;
@@ -89,27 +89,27 @@ int gen_parse_GUID(char *ptr, const char *str)
 	return 0;
 }
 
-int gen_parse_SEC_ACE(char *ptr, const char *str)
+int gen_parse_SEC_ACE(TALLOC_CTX *mem_ctx, char *ptr, const char *str)
 {
-	return gen_parse_struct(pinfo_security_ace_info, ptr, str);
+	return gen_parse_struct(mem_ctx, pinfo_security_ace_info, ptr, str);
 }
 
-int gen_parse_SEC_ACL(char *ptr, const char *str)
+int gen_parse_SEC_ACL(TALLOC_CTX *mem_ctx, char *ptr, const char *str)
 {
-	return gen_parse_struct(pinfo_security_acl_info, ptr, str);
+	return gen_parse_struct(mem_ctx, pinfo_security_acl_info, ptr, str);
 }
 
-int gen_parse_SEC_DESC(char *ptr, const char *str)
+int gen_parse_SEC_DESC(TALLOC_CTX *mem_ctx, char *ptr, const char *str)
 {
-	return gen_parse_struct(pinfo_security_descriptor_info, ptr, str);
+	return gen_parse_struct(mem_ctx, pinfo_security_descriptor_info, ptr, str);
 }
 
-int gen_parse_LUID_ATTR(char *ptr, const char *str)
+int gen_parse_LUID_ATTR(TALLOC_CTX *mem_ctx, char *ptr, const char *str)
 {
-	return gen_parse_struct(pinfo_luid_attr_info, ptr, str);
+	return gen_parse_struct(mem_ctx, pinfo_luid_attr_info, ptr, str);
 }
 
-int gen_parse_LUID(char *ptr, const char *str)
+int gen_parse_LUID(TALLOC_CTX *mem_ctx, char *ptr, const char *str)
 {
 	if(sscanf(str, "%u,%u", &(((LUID *)(ptr))->high), &(((LUID *)(ptr))->low)) != 2) {
 		errno = EINVAL;
@@ -122,79 +122,79 @@ int gen_parse_LUID(char *ptr, const char *str)
 
 /* DUMP functions */
 
-int gen_dump_uint8(struct parse_string *p, const char *ptr, unsigned indent)
+int gen_dump_uint8(TALLOC_CTX *mem_ctx, struct parse_string *p, const char *ptr, unsigned indent)
 {
-	return addshort(p, "%u", *(uint8 *)(ptr));
+	return addshort(mem_ctx, p, "%u", *(uint8 *)(ptr));
 }
 
-int gen_dump_uint16(struct parse_string *p, const char *ptr, unsigned indent)
+int gen_dump_uint16(TALLOC_CTX *mem_ctx, struct parse_string *p, const char *ptr, unsigned indent)
 {
-	return addshort(p, "%u", *(uint16 *)(ptr));
+	return addshort(mem_ctx, p, "%u", *(uint16 *)(ptr));
 }
 
-int gen_dump_uint32(struct parse_string *p, const char *ptr, unsigned indent)
+int gen_dump_uint32(TALLOC_CTX *mem_ctx, struct parse_string *p, const char *ptr, unsigned indent)
 {
-	return addshort(p, "%u", *(uint32 *)(ptr));
+	return addshort(mem_ctx, p, "%u", *(uint32 *)(ptr));
 }
 
-int gen_dump_NTTIME(struct parse_string *p, const char *ptr, unsigned indent)
+int gen_dump_NTTIME(TALLOC_CTX *mem_ctx, struct parse_string *p, const char *ptr, unsigned indent)
 {
 	uint32 low, high;
 
 	high = ((NTTIME *)(ptr))->high;
 	low = ((NTTIME *)(ptr))->low;
-	return addshort(p, "%u,%u", high, low);
+	return addshort(mem_ctx, p, "%u,%u", high, low);
 }
 
-int gen_dump_DOM_SID(struct parse_string *p, const char *ptr, unsigned indent)
+int gen_dump_DOM_SID(TALLOC_CTX *mem_ctx, struct parse_string *p, const char *ptr, unsigned indent)
 {
 	fstring sidstr;
 
 	sid_to_string(sidstr, (DOM_SID *)ptr);
-	return addstr(p, sidstr);
+	return addstr(mem_ctx, p, sidstr);
 }
 
-int gen_dump_SEC_ACCESS(struct parse_string *p, const char *ptr, unsigned indent)
+int gen_dump_SEC_ACCESS(TALLOC_CTX *mem_ctx, struct parse_string *p, const char *ptr, unsigned indent)
 {
-	return addshort(p, "%u", ((SEC_ACCESS *)ptr)->mask);
+	return addshort(mem_ctx, p, "%u", ((SEC_ACCESS *)ptr)->mask);
 }
 
-int gen_dump_GUID(struct parse_string *p, const char *ptr, unsigned indent)
+int gen_dump_GUID(TALLOC_CTX *mem_ctx, struct parse_string *p, const char *ptr, unsigned indent)
 {
 	int i, r;
 
 	for (i = 0; i < (GUID_SIZE - 1); i++) {
-		if (!(r = addshort(p, "%d,", ((GUID *)ptr)->info[i]))) return r;
+		if (!(r = addshort(mem_ctx, p, "%d,", ((GUID *)ptr)->info[i]))) return r;
 	}
-	return addshort(p, "%d", ((GUID *)ptr)->info[i]);
+	return addshort(mem_ctx, p, "%d", ((GUID *)ptr)->info[i]);
 }
 
-int gen_dump_SEC_ACE(struct parse_string *p, const char *ptr, unsigned indent)
+int gen_dump_SEC_ACE(TALLOC_CTX *mem_ctx, struct parse_string *p, const char *ptr, unsigned indent)
 {
-	return gen_dump_struct(pinfo_security_ace_info, p, ptr, indent);
+	return gen_dump_struct(mem_ctx, pinfo_security_ace_info, p, ptr, indent);
 }
 
-int gen_dump_SEC_ACL(struct parse_string *p, const char *ptr, unsigned indent)
+int gen_dump_SEC_ACL(TALLOC_CTX *mem_ctx, struct parse_string *p, const char *ptr, unsigned indent)
 {
-	return gen_dump_struct(pinfo_security_acl_info, p, ptr, indent);
+	return gen_dump_struct(mem_ctx, pinfo_security_acl_info, p, ptr, indent);
 }
 
-int gen_dump_SEC_DESC(struct parse_string *p, const char *ptr, unsigned indent)
+int gen_dump_SEC_DESC(TALLOC_CTX *mem_ctx, struct parse_string *p, const char *ptr, unsigned indent)
 {
-	return gen_dump_struct(pinfo_security_descriptor_info, p, ptr, indent);
+	return gen_dump_struct(mem_ctx, pinfo_security_descriptor_info, p, ptr, indent);
 }
 
-int gen_dump_LUID_ATTR(struct parse_string *p, const char *ptr, unsigned indent)
+int gen_dump_LUID_ATTR(TALLOC_CTX *mem_ctx, struct parse_string *p, const char *ptr, unsigned indent)
 {
-	return gen_dump_struct(pinfo_luid_attr_info, p, ptr, indent);
+	return gen_dump_struct(mem_ctx, pinfo_luid_attr_info, p, ptr, indent);
 }
 
-int gen_dump_LUID(struct parse_string *p, const char *ptr, unsigned indent)
+int gen_dump_LUID(TALLOC_CTX *mem_ctx, struct parse_string *p, const char *ptr, unsigned indent)
 {
 	uint32 low, high;
 
 	high = ((LUID *)(ptr))->high;
 	low = ((LUID *)(ptr))->low;
-	return addshort(p, "%u,%u", high, low);
+	return addshort(mem_ctx, p, "%u,%u", high, low);
 }
 
-- 
cgit 


From bd0bbde1bba4ad4e6e95f269912943d9d583dce4 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Sun, 23 Feb 2003 18:08:07 +0000
Subject: forgot the altered include file (This used to be commit
 f3be08472b8b34d8921ff23c52dd2ba030c96f25)

---
 source3/include/genparser.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'source3')

diff --git a/source3/include/genparser.h b/source3/include/genparser.h
index 002d79f8f9..f28cd78249 100644
--- a/source3/include/genparser.h
+++ b/source3/include/genparser.h
@@ -46,8 +46,8 @@ struct parse_string {
 	char *s;
 };
 
-typedef int (*gen_dump_fn)(struct parse_string *, const char *ptr, unsigned indent);
-typedef int (*gen_parse_fn)(char *ptr, const char *str);
+typedef int (*gen_dump_fn)(TALLOC_CTX *, struct parse_string *, const char *ptr, unsigned indent);
+typedef int (*gen_parse_fn)(TALLOC_CTX *, char *ptr, const char *str);
 
 /* genstruct.pl generates arrays of these */
 struct parse_struct {
@@ -63,8 +63,8 @@ struct parse_struct {
 };
 
 #define DUMP_PARSE_DECL(type) \
-  int gen_dump_ ## type(struct parse_string *, const char *, unsigned); \
-  int gen_parse_ ## type(char *, const char *);
+  int gen_dump_ ## type(TALLOC_CTX *, struct parse_string *, const char *, unsigned); \
+  int gen_parse_ ## type(TALLOC_CTX *, char *, const char *);
 
 DUMP_PARSE_DECL(char)
 DUMP_PARSE_DECL(int)
-- 
cgit 


From e68684aa65b579081163c175d681b7867a0828bf Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 24 Feb 2003 01:13:31 +0000
Subject: Fix 2 off-by-one bugs in the use of malloc()ed strings and
 safe_strcpy().

safe_strcpy() isn't particularly safe (this has been noted before) as it does
not take the size of the buffer, but instead the size of the buffer *minus 1*

The locking.c fix was causing segfaults on machines running with
--enable-developer, and was tracked down thanks to the fact that vance's build
farm machine runs with such an option, and smbtorture's DIR1 test hits this
bug very well.

(The --enable-developer code writes to the last byte of the string, to check
for incorrect use of safe_strcpy()).

Andrew Bartlett
(This used to be commit e908fd164d1b11b6f76a6fdffb22e139813cb3c0)
---
 source3/lib/hash.c        | 6 ++++--
 source3/locking/locking.c | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'source3')

diff --git a/source3/lib/hash.c b/source3/lib/hash.c
index 95af485707..c7b1493b4c 100644
--- a/source3/lib/hash.c
+++ b/source3/lib/hash.c
@@ -171,6 +171,7 @@ hash_element *hash_insert(hash_table *table, char *value, char *key)
 	hash_element	*hash_elem;
 	ubi_dlNodePtr lru_item;
 	ubi_dlList *bucket; 
+	size_t string_length;
 
 	/* 
 	 * If the hash table size has not reached the MAX_HASH_TABLE_SIZE,
@@ -204,12 +205,13 @@ hash_element *hash_insert(hash_table *table, char *value, char *key)
 	 * string.
 	 */
 
-	if(!(hash_elem = (hash_element *) malloc(sizeof(hash_element) + strlen(key)))) {
+	string_length = strlen(key);
+	if(!(hash_elem = (hash_element *) malloc(sizeof(hash_element) + string_length))) {
 		DEBUG(0,("hash_insert: malloc fail !\n"));
 		return (hash_element *)NULL;
 	}
 
-	safe_strcpy((char *) hash_elem->key, key, strlen(key)+1);
+	safe_strcpy((char *) hash_elem->key, key, string_length);
 
 	hash_elem->value = (char *)value;
 	hash_elem->bucket = bucket;
diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index d4794560f6..fdfd4d661c 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -630,7 +630,7 @@ BOOL set_share_mode(files_struct *fsp, uint16 port, uint16 op_type)
 			fsp->fsp_name ));
 
 		offset = sizeof(*data) + sizeof(share_mode_entry);
-		safe_strcpy(p + offset, fname, size - offset);
+		safe_strcpy(p + offset, fname, size - offset - 1);
 		fill_share_mode(p + sizeof(*data), fsp, port, op_type);
 		dbuf.dptr = p;
 		dbuf.dsize = size;
-- 
cgit 


From ded88da1ea1fdcd6da017de2e1378578971f7645 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 24 Feb 2003 02:11:32 +0000
Subject: Add const (This used to be commit
 ffaa608be01d72075942ca3aff2325c6364e0556)

---
 source3/lib/util.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'source3')

diff --git a/source3/lib/util.c b/source3/lib/util.c
index 13f5b17781..3958600cbd 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -309,9 +309,9 @@ BOOL in_group(gid_t group, gid_t current_gid, int ngroups, const gid_t *groups)
  Like atoi but gets the value up to the separator character.
 ****************************************************************************/
 
-static char *Atoic(char *p, int *n, char *c)
+static const char *Atoic(const char *p, int *n, const char *c)
 {
-	if (!isdigit((int)*p)) {
+	if (!isdigit((const int)*p)) {
 		DEBUG(5, ("Atoic: malformed number\n"));
 		return NULL;
 	}
@@ -333,7 +333,7 @@ static char *Atoic(char *p, int *n, char *c)
  Reads a list of numbers.
  *************************************************************************/
 
-char *get_numlist(char *p, uint32 **num, int *count)
+const char *get_numlist(const char *p, uint32 **num, int *count)
 {
 	int val;
 
@@ -2400,7 +2400,7 @@ static BOOL unix_do_match(char *regexp, char *str)
  Simple case insensitive interface to a UNIX wildcard matcher.
 *******************************************************************/
 
-BOOL unix_wild_match(char *pattern, char *string)
+BOOL unix_wild_match(const char *pattern, const char *string)
 {
 	pstring p2, s2;
 	char *p;
-- 
cgit 


From e25aa22a8ff46b3c29fc373a585d8a5e5cc37296 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Mon, 24 Feb 2003 02:12:39 +0000
Subject: Merge:

> Exit path cleanup for cli_samr_enum_dom_users()
(This used to be commit 655c1e03519d4fa174a85534c165bdd1ce163ae8)
---
 source3/rpc_client/cli_samr.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'source3')

diff --git a/source3/rpc_client/cli_samr.c b/source3/rpc_client/cli_samr.c
index 08c68b7632..c451ee2e42 100644
--- a/source3/rpc_client/cli_samr.c
+++ b/source3/rpc_client/cli_samr.c
@@ -590,16 +590,14 @@ NTSTATUS cli_samr_enum_dom_users(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 	if(!samr_io_r_enum_dom_users("", &r, &rbuf, 0))
 		goto done;
 	
-	/* return the data obtained in response */
-	if (!NT_STATUS_IS_OK(r.status) &&
-		(NT_STATUS_EQUAL(r.status, STATUS_MORE_ENTRIES) ||
-		NT_STATUS_EQUAL(r.status, NT_STATUS_NO_MORE_ENTRIES))) {
-		return r.status;
-	}
+	result = r.status;
+
+	if (!NT_STATUS_IS_OK(result) &&
+	    NT_STATUS_V(result) != NT_STATUS_V(STATUS_MORE_ENTRIES))
+		goto done;
 	
 	*start_idx = r.next_idx;
 	*num_dom_users = r.num_entries2;
-	result = r.status;
 
 	if (r.num_entries2) {
 		/* allocate memory needed to return received data */	
-- 
cgit 


From 12f2ebf7f006369477824d9b4b917847d63a68af Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 24 Feb 2003 03:45:02 +0000
Subject: Always initialise (This used to be commit
 ff2b5b2f85f2d9dade67077cea1b68719cf65352)

---
 source3/libads/ldap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3')

diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index bc90e90ea0..29f44672f4 100644
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -816,8 +816,8 @@ static ADS_STATUS ads_modlist_add(TALLOC_CTX *ctx, ADS_MODLIST *mods,
 {
 	int curmod;
 	LDAPMod **modlist = (LDAPMod **) *mods;
-	struct berval **ber_values;
-	char **char_values;
+	struct berval **ber_values = NULL;
+	char **char_values = NULL;
 
 	if (!invals) {
 		mod_op = LDAP_MOD_DELETE;
-- 
cgit 


From 5b5453e6c799cbf3fa7638950825e3b1c276cdc2 Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Mon, 24 Feb 2003 04:42:24 +0000
Subject: Merge documentation from 3_0. (This used to be commit
 5002555a9719987ccdc887ffff64ea8d02c9881d)

---
 source3/lib/charcnv.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'source3')

diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c
index bffa2a378c..a8df003f8b 100644
--- a/source3/lib/charcnv.c
+++ b/source3/lib/charcnv.c
@@ -22,17 +22,24 @@
 */
 #include "includes.h"
 
-static pstring cvtbuf;
-
-static smb_iconv_t conv_handles[NUM_CHARSETS][NUM_CHARSETS];
-
 /**
  * @file
  *
- * Character set conversion routines.
+ * @brief Character-set conversion routines built on our iconv.
+ * 
+ * @note Samba's internal character set (at least in the 3.0 series)
+ * is always the same as the one for the Unix filesystem.  It is
+ * <b>not</b> necessarily UTF-8 and may be different on machines that
+ * need i18n filenames to be compatible with Unix software.  It does
+ * have to be a superset of ASCII.  All multibyte sequences must start
+ * with a byte with the high bit set.
  *
  * @sa lib/iconv.c
- **/
+ */
+
+static pstring cvtbuf;
+
+static smb_iconv_t conv_handles[NUM_CHARSETS][NUM_CHARSETS];
 
 
 /**
-- 
cgit 


From 6fa6b607c9f97dca9850e2d5c5dc175497fbebd8 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Mon, 24 Feb 2003 04:59:15 +0000
Subject: Quieten compiler warning. (This used to be commit
 eb5d1a72dc9dc35997d39f8778ee98163b8cce32)

---
 source3/python/py_tdbpack.c | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'source3')

diff --git a/source3/python/py_tdbpack.c b/source3/python/py_tdbpack.c
index 243cb44683..f0718b717e 100644
--- a/source3/python/py_tdbpack.c
+++ b/source3/python/py_tdbpack.c
@@ -25,6 +25,13 @@
 
 #include "Python.h"
 
+/* This symbol is used in both config.h and Python.h which causes an
+   annoying compiler warning. */
+
+#ifdef HAVE_FSTAT
+#undef HAVE_FSTAT
+#endif
+
 /* This module is supposed to be standalone, however for portability
    it would be good to use the FUNCTION_MACRO preprocessor define. */
 
-- 
cgit 


From 2295c0cf296090ed48d7e9bf47c4358de30eaec0 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 24 Feb 2003 09:10:41 +0000
Subject: Fix off-by-one bugs, and move to strdup() rather than
 malloc()/strcpy().

Andrew Bartlett
(This used to be commit aa486355e282b891b299d63cc07431f32213b1b8)
---
 source3/modules/vfs_recycle.c | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

(limited to 'source3')

diff --git a/source3/modules/vfs_recycle.c b/source3/modules/vfs_recycle.c
index dcd83b7acd..a99a593caf 100644
--- a/source3/modules/vfs_recycle.c
+++ b/source3/modules/vfs_recycle.c
@@ -472,25 +472,21 @@ static void recycle_touch(connection_struct *conn, const char *fname)
 /**
  * Check if file should be recycled
  **/
-static int recycle_unlink(connection_struct *conn, const char *inname)
+static int recycle_unlink(connection_struct *conn, const char *file_name)
 {
 	recycle_bin_private_data *recdata;
 	recycle_bin_connections *recconn;
 	recycle_bin_struct *recbin;
-	char *file_name = NULL;
 	char *path_name = NULL;
        	char *temp_name = NULL;
 	char *final_name = NULL;
-	char *base;
+	const char *base;
 	int i;
 /*	SMB_BIG_UINT dfree, dsize, bsize;	*/
 	SMB_OFF_T file_size; /* space_avail;	*/
 	BOOL exist;
 	int rc = -1;
 
-	file_name = strdup(inname);
-	ALLOC_CHECK(file_name, done);
-
 	recbin = NULL;
 	if (recycle_bin_private_handle) {
 		recdata = (recycle_bin_private_data *)(recycle_bin_private_handle->data);
@@ -560,14 +556,13 @@ static int recycle_unlink(connection_struct *conn, const char *inname)
 	path_name = (char *)malloc(PATH_MAX);
 	ALLOC_CHECK(path_name, done);
 	*path_name = '\0';
-	safe_strcpy(path_name, file_name, PATH_MAX);
+	safe_strcpy(path_name, file_name, PATH_MAX - 1);
 	base = strrchr(path_name, '/');
 	if (base == NULL) {
 		base = file_name;
-		safe_strcpy(path_name, "/", PATH_MAX);
+		safe_strcpy(path_name, "/", PATH_MAX - 1);
 	}
 	else {
-		*base = '\0';
 		base++;
 	}
 
@@ -591,14 +586,13 @@ static int recycle_unlink(connection_struct *conn, const char *inname)
 		goto done;
 	}
 
-	temp_name = (char *)malloc(PATH_MAX);
+	temp_name = (char *)strdup(recbin->repository);
 	ALLOC_CHECK(temp_name, done);
-	safe_strcpy(temp_name, recbin->repository, PATH_MAX);
 
 	/* see if we need to recreate the original directory structure in the recycle bin */
 	if (recbin->keep_dir_tree == True) {
-		safe_strcat(temp_name, "/", PATH_MAX);
-		safe_strcat(temp_name, path_name, PATH_MAX);
+		safe_strcat(temp_name, "/", PATH_MAX - 1);
+		safe_strcat(temp_name, path_name, PATH_MAX - 1);
 	}
 
 	exist = recycle_directory_exist(conn, temp_name);
@@ -613,9 +607,9 @@ static int recycle_unlink(connection_struct *conn, const char *inname)
 		}
 	}
 
-	final_name = (char *)malloc(PATH_MAX);
+	final_name = NULL;
+	asprintf(&final_name, "%s/%s", temp_name, base);
 	ALLOC_CHECK(final_name, done);
-	snprintf(final_name, PATH_MAX, "%s/%s", temp_name, base);
 	DEBUG(10, ("recycle.bin: recycled file name%s\n", temp_name));		/* new filename with path */
 
 	/* check if we should delete file from recycle bin */
@@ -647,7 +641,6 @@ static int recycle_unlink(connection_struct *conn, const char *inname)
 		recycle_touch(conn, final_name);
 
 done:
-	SAFE_FREE(file_name);
 	SAFE_FREE(path_name);
 	SAFE_FREE(temp_name);
 	SAFE_FREE(final_name);
-- 
cgit 


From 9c6d78c54c7f420903767f17659e9ce8d7002dbf Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 24 Feb 2003 09:46:01 +0000
Subject: If it's a pstring, use pstrcpy(). (This used to be commit
 34fb5f0b1a6281b3aa7782edb3fcb82cc4ec4877)

---
 source3/msdfs/msdfs.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3')

diff --git a/source3/msdfs/msdfs.c b/source3/msdfs/msdfs.c
index 4df3145009..bf3b3cc213 100644
--- a/source3/msdfs/msdfs.c
+++ b/source3/msdfs/msdfs.c
@@ -266,7 +266,7 @@ static BOOL resolve_dfs_path(char* dfspath, struct dfs_path* dp,
 			if (consumedcntp) {
 				char *q;
 				pstring buf;
-				safe_strcpy(buf, dfspath, sizeof(buf));
+				pstrcpy(buf, dfspath);
 				trim_string(buf, NULL, "\\");
 				q = strrchr(buf, '\\');
 				if (q) 
@@ -633,7 +633,7 @@ int setup_dfs_referral(char* pathname, int max_referral_level, char** ppdata)
 	       && pathnamep[1] == '\\')
 		pathnamep++;
 
-	safe_strcpy(buf, pathnamep, sizeof(buf));
+	pstrcpy(buf, pathnamep);
 	if (!get_referred_path(buf, &junction, &consumedcnt,
 			       &self_referral))
 		return -1;
-- 
cgit 


From 2f0c70efb2c4b5b01eb073f5d5217108b4ca438f Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 24 Feb 2003 10:35:24 +0000
Subject: setenv takes 3 arguments... (This used to be commit
 6d18f64ef518cbb3d522cf1f92dc5cbc2e2cb642)

---
 source3/smbwrapper/smbsh.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'source3')

diff --git a/source3/smbwrapper/smbsh.c b/source3/smbwrapper/smbsh.c
index d853aa1afc..845d1d5606 100644
--- a/source3/smbwrapper/smbsh.c
+++ b/source3/smbwrapper/smbsh.c
@@ -92,7 +92,7 @@ int main(int argc, char *argv[])
 		smbw_setshared("PASSWORD", p);
 	}
 
-	setenv("PS1", "smbsh$ ");
+	setenv("PS1", "smbsh$ ", 1);
 
 	sys_getwd(wd);
 
@@ -107,12 +107,12 @@ int main(int argc, char *argv[])
 
 	if (file_exist(line, NULL)) {
 		slprintf(line,sizeof(line)-1,"%s/smbwrapper.32.so:DEFAULT", libd);
-		setenv("_RLD_LIST", line);
+		setenv("_RLD_LIST", line, 1);
 		slprintf(line,sizeof(line)-1,"%s/smbwrapper.so:DEFAULT", libd);
-		setenv("_RLDN32_LIST", line);
+		setenv("_RLDN32_LIST", line, 1);
 	} else {
 		slprintf(line,sizeof(line)-1,"%s/smbwrapper.so:DEFAULT", libd);
-		setenv("_RLD_LIST", line);
+		setenv("_RLD_LIST", line, 1);
 	}
 
 	{
-- 
cgit 


From eb64538dba772a9846c05e2712839dbaa12c39a1 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 24 Feb 2003 11:09:21 +0000
Subject: Patch from Luke Howard to add mutual kerberos authentication, and SMB
 session keys for kerberos authentication.

Andrew Bartlett
(This used to be commit 8b798f03dbbdd670ff9af4eb46f7b0845c611e0f)
---
 source3/configure.in             | 16 ++++++++++++
 source3/include/ads.h            |  5 ++++
 source3/include/asn_1.h          |  7 +++++
 source3/libads/kerberos_verify.c | 32 ++++++++++++++++++-----
 source3/libsmb/cliconnect.c      |  2 +-
 source3/libsmb/clikrb5.c         | 56 +++++++++++++++++++++++++++++++++-------
 source3/libsmb/clispnego.c       | 29 +++++++++++----------
 source3/smbd/sesssetup.c         | 52 +++++++++++++++++++++++++++----------
 8 files changed, 157 insertions(+), 42 deletions(-)

(limited to 'source3')

diff --git a/source3/configure.in b/source3/configure.in
index 66bdf5edf1..e3b5f2fe15 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -2250,6 +2250,22 @@ if test x"$samba_cv_HAVE_KRB5_TKT_ENC_PART2" = x"yes"; then
     AC_DEFINE(HAVE_KRB5_TKT_ENC_PART2,1,[Whether the krb5_ticket struct has a enc_part2 property])
 fi
 
+AC_CACHE_CHECK([for keyvalue in krb5_keyblock],samba_cv_HAVE_KRB5_KEYBLOCK_KEYVALUE,[
+AC_TRY_COMPILE([#include <krb5.h>],
+[krb5_keyblock key; key.keyvalue.data = NULL;],
+samba_cv_HAVE_KRB5_KEYBLOCK_KEYVALUE=yes,samba_cv_HAVE_KRB5_KEYBLOCK_KEYVALUE=no)])
+if test x"$samba_cv_HAVE_KRB5_KEYBLOCK_KEYVALUE" = x"yes"; then
+    AC_DEFINE(HAVE_KRB5_KEYBLOCK_KEYVALUE,1,[Whether the krb5_keyblock struct has a keyvalue property])
+fi
+
+AC_CACHE_CHECK([for ENCTYPE_ARCFOUR_HMAC_MD5],samba_cv_HAVE_ENCTYPE_ARCFOUR_HMAC_MD5,[
+AC_TRY_COMPILE([#include <krb5.h>],
+[krb5_enctype enctype; enctype = ENCTYPE_ARCFOUR_HMAC_MD5;],
+samba_cv_HAVE_ENCTYPE_ARCFOUR_HMAC_MD5=yes,samba_cv_HAVE_ENCTYPE_ARCFOUR_HMAC_MD5=no)])
+if test x"$samba_cv_HAVE_ENCTYPE_ARCFOUR_HMAC_MD5" = x"yes"; then
+    AC_DEFINE(HAVE_ENCTYPE_ARCFOUR_HMAC_MD5,1,[Whether the ENCTYPE_ARCFOUR_HMAC_MD5 key type is available])
+fi
+
   ########################################################
   # now see if we can find the krb5 libs in standard paths
   # or as specified above
diff --git a/source3/include/ads.h b/source3/include/ads.h
index 304a997b2c..f90983e405 100644
--- a/source3/include/ads.h
+++ b/source3/include/ads.h
@@ -208,3 +208,8 @@ typedef void **ADS_MODLIST;
 
 /* Kerberos environment variable names */
 #define KRB5_ENV_CCNAME "KRB5CCNAME"
+
+/* Heimdal uses a slightly different name */
+#if defined(HAVE_ENCTYPE_ARCFOUR_HMAC_MD5)
+#define ENCTYPE_ARCFOUR_HMAC ENCTYPE_ARCFOUR_HMAC_MD5
+#endif
diff --git a/source3/include/asn_1.h b/source3/include/asn_1.h
index ab7fa5d398..7d4da0db0c 100644
--- a/source3/include/asn_1.h
+++ b/source3/include/asn_1.h
@@ -59,4 +59,11 @@ typedef struct {
 #define SPNEGO_NEG_RESULT_INCOMPLETE 1
 #define SPNEGO_NEG_RESULT_REJECT 2
 
+/* not really ASN.1, but RFC 1964 */
+#define TOK_ID_KRB_AP_REQ	"\x01\x00"
+#define TOK_ID_KRB_AP_REP	"\x02\x00"
+#define TOK_ID_KRB_ERROR	"\x03\x00"
+#define TOK_ID_GSS_GETMIC	"\x01\x01"
+#define TOK_ID_GSS_WRAP		"\x02\x01"
+
 #endif /* _ASN_1_H */
diff --git a/source3/libads/kerberos_verify.c b/source3/libads/kerberos_verify.c
index 17fecf60c8..4d9a1bf765 100644
--- a/source3/libads/kerberos_verify.c
+++ b/source3/libads/kerberos_verify.c
@@ -3,7 +3,7 @@
    kerberos utility library
    Copyright (C) Andrew Tridgell 2001
    Copyright (C) Remus Koos 2001
-   
+   Copyright (C) Luke Howard 2003   
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -29,7 +29,9 @@
   authorization_data if available 
 */
 NTSTATUS ads_verify_ticket(ADS_STRUCT *ads, const DATA_BLOB *ticket, 
-			   char **principal, DATA_BLOB *auth_data)
+			   char **principal, DATA_BLOB *auth_data,
+			   DATA_BLOB *ap_rep,
+			   uint8 session_key[16])
 {
 	krb5_context context;
 	krb5_auth_context auth_context = NULL;
@@ -122,10 +124,24 @@ NTSTATUS ads_verify_ticket(ADS_STRUCT *ads, const DATA_BLOB *ticket,
 	if (!auth_ok) {
 		DEBUG(3,("krb5_rd_req with auth failed (%s)\n", 
 			 error_message(ret)));
-		SAFE_FREE(key);
 		return NT_STATUS_LOGON_FAILURE;
 	}
 
+	ret = krb5_mk_rep(context, auth_context, &packet);
+	if (ret) {
+		DEBUG(3,("Failed to generate mutual authentication reply (%s)\n",
+			error_message(ret)));
+		krb5_auth_con_free(context, auth_context);
+		return NT_STATUS_LOGON_FAILURE;
+	}
+
+	*ap_rep = data_blob(packet.data, packet.length);
+	free(packet.data);
+
+	krb5_get_smb_session_key(context, auth_context, session_key);
+	DEBUG(0,("SMB session key (from ticket) follows:\n"));
+	dump_data(0, session_key, 16);
+
 #if 0
 	file_save("/tmp/ticket.dat", ticket->data, ticket->length);
 #endif
@@ -134,20 +150,24 @@ NTSTATUS ads_verify_ticket(ADS_STRUCT *ads, const DATA_BLOB *ticket,
 
 #if 0
 	if (tkt->enc_part2) {
-		file_save("/tmp/authdata.dat", 
+		file_save("/tmp/authdata.dat",
 			  tkt->enc_part2->authorization_data[0]->contents,
 			  tkt->enc_part2->authorization_data[0]->length);
-	}
 #endif
 
 	if ((ret = krb5_unparse_name(context, get_principal_from_tkt(tkt),
 				     principal))) {
 		DEBUG(3,("krb5_unparse_name failed (%s)\n", 
 			 error_message(ret)));
+		data_blob_free(auth_data);
+		data_blob_free(ap_rep);
+		krb5_auth_con_free(context, auth_context);
 		return NT_STATUS_LOGON_FAILURE;
 	}
 
+	krb5_auth_con_free(context, auth_context);
+
 	return NT_STATUS_OK;
 }
 
-#endif
+#endif /* HAVE_KRB5 */
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 901daf4b09..4962ffa3c9 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -2,7 +2,7 @@
    Unix SMB/CIFS implementation.
    client connect/disconnect routines
    Copyright (C) Andrew Tridgell 1994-1998
-   Copyright (C) Andrew Barteltt 2001-2003
+   Copyright (C) Andrew Bartlett 2001-2003
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/source3/libsmb/clikrb5.c b/source3/libsmb/clikrb5.c
index bef6998a49..47dec1f171 100644
--- a/source3/libsmb/clikrb5.c
+++ b/source3/libsmb/clikrb5.c
@@ -2,7 +2,7 @@
    Unix SMB/CIFS implementation.
    simple kerberos5 routines for active directory
    Copyright (C) Andrew Tridgell 2001
-   Copyright (C) Luke Howard 2002
+   Copyright (C) Luke Howard 2002-2003
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -23,6 +23,16 @@
 
 #ifdef HAVE_KRB5
 
+#ifdef HAVE_KRB5_KEYBLOCK_KEYVALUE
+#define KRB5_KEY_TYPE(k)	((k)->keytype)
+#define KRB5_KEY_LENGTH(k)	((k)->keyvalue.length)
+#define KRB5_KEY_DATA(k)	((k)->keyvalue.data)
+#else
+#define	KRB5_KEY_TYPE(k)	((k)->enctype)
+#define KRB5_KEY_LENGTH(k)	((k)->length)
+#define KRB5_KEY_DATA(k)	((k)->contents)
+#endif /* HAVE_KRB5_KEYBLOCK_KEYVALUE */
+
 #ifndef HAVE_KRB5_SET_REAL_TIME
 /*
  * This function is not in the Heimdal mainline.
@@ -124,7 +134,7 @@ krb5_error_code get_kerberos_allowed_etypes(krb5_context context,
 	return krb5_get_default_in_tkt_etypes(context, enctypes);
 }
 #else
- __ERROR_XX_UNKNOWN_GET_ENCTYPES_FUNCTIONS
+#error UNKNOWN_GET_ENCTYPES_FUNCTIONS
 #endif
 
  void free_kerberos_etypes(krb5_context context, 
@@ -305,12 +315,12 @@ DATA_BLOB krb5_get_ticket(const char *principal, time_t time_offset)
 	DATA_BLOB ret;
 	krb5_enctype enc_types[] = {
 #ifdef ENCTYPE_ARCFOUR_HMAC
-		ENCTYPE_ARCFOUR_HMAC, 
-#endif
-				    ENCTYPE_DES_CBC_MD5, 
-				    ENCTYPE_DES_CBC_CRC, 
-				    ENCTYPE_NULL};
-
+		ENCTYPE_ARCFOUR_HMAC,
+#endif 
+		ENCTYPE_DES_CBC_MD5, 
+		ENCTYPE_DES_CBC_CRC, 
+		ENCTYPE_NULL};
+	
 	retval = krb5_init_context(&context);
 	if (retval) {
 		DEBUG(1,("krb5_init_context failed (%s)\n", 
@@ -355,11 +365,39 @@ failed:
 	return data_blob(NULL, 0);
 }
 
+BOOL krb5_get_smb_session_key(krb5_context context, krb5_auth_context auth_context, uint8 session_key[16])
+ {
+	krb5_keyblock *skey;
+	BOOL ret = False;
+
+	memset(session_key, 0, 16);
+
+#ifdef ENCTYPE_ARCFOUR_HMAC
+	if (krb5_auth_con_getremotesubkey(context, auth_context, &skey) == 0 && skey != NULL) {
+		if (KRB5_KEY_TYPE(skey) ==
+		    ENCTYPE_ARCFOUR_HMAC
+		    && KRB5_KEY_LENGTH(skey) == 16) {
+			memcpy(session_key, KRB5_KEY_DATA(skey), KRB5_KEY_LENGTH(skey));
+			ret = True;
+		}
+		krb5_free_keyblock(context, skey);
+	}
+#endif /* ENCTYPE_ARCFOUR_HMAC */
+
+	return ret;
+ }
 #else /* HAVE_KRB5 */
  /* this saves a few linking headaches */
- DATA_BLOB krb5_get_ticket(const char *principal, time_t time_offset)
+DATA_BLOB krb5_get_ticket(const char *principal, time_t time_offset)
  {
 	 DEBUG(0,("NO KERBEROS SUPPORT\n"));
 	 return data_blob(NULL, 0);
  }
+
+BOOL krb5_get_smb_session_key(krb5_context context, krb5_auth_context ac, uint8 session_key[16])
+ {
+	DEBUG(0,("NO KERBEROS SUPPORT\n"));
+	memset(session_key, 0, 16);
+	return False;
+ }
 #endif
diff --git a/source3/libsmb/clispnego.c b/source3/libsmb/clispnego.c
index e93f1855dd..dfa8f80146 100644
--- a/source3/libsmb/clispnego.c
+++ b/source3/libsmb/clispnego.c
@@ -3,6 +3,7 @@
    simple kerberos5/SPNEGO routines
    Copyright (C) Andrew Tridgell 2001
    Copyright (C) Jim McDonough   2002
+   Copyright (C) Luke Howard     2003
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -259,7 +260,7 @@ BOOL parse_negTokenTarg(DATA_BLOB blob, char *OIDs[ASN1_MAX_OIDS], DATA_BLOB *se
 /*
   generate a krb5 GSS-API wrapper packet given a ticket
 */
-DATA_BLOB spnego_gen_krb5_wrap(DATA_BLOB ticket)
+DATA_BLOB spnego_gen_krb5_wrap(DATA_BLOB ticket, uint8 tok_id[2])
 {
 	ASN1_DATA data;
 	DATA_BLOB ret;
@@ -268,7 +269,8 @@ DATA_BLOB spnego_gen_krb5_wrap(DATA_BLOB ticket)
 
 	asn1_push_tag(&data, ASN1_APPLICATION(0));
 	asn1_write_OID(&data, OID_KERBEROS5);
-	asn1_write_BOOLEAN(&data, 0);
+
+	asn1_write(&data, tok_id, 2);
 	asn1_write(&data, ticket.data, ticket.length);
 	asn1_pop_tag(&data);
 
@@ -286,7 +288,7 @@ DATA_BLOB spnego_gen_krb5_wrap(DATA_BLOB ticket)
 /*
   parse a krb5 GSS-API wrapper packet giving a ticket
 */
-BOOL spnego_parse_krb5_wrap(DATA_BLOB blob, DATA_BLOB *ticket)
+BOOL spnego_parse_krb5_wrap(DATA_BLOB blob, DATA_BLOB *ticket, uint8 tok_id[2])
 {
 	BOOL ret;
 	ASN1_DATA data;
@@ -295,15 +297,15 @@ BOOL spnego_parse_krb5_wrap(DATA_BLOB blob, DATA_BLOB *ticket)
 	asn1_load(&data, blob);
 	asn1_start_tag(&data, ASN1_APPLICATION(0));
 	asn1_check_OID(&data, OID_KERBEROS5);
-	asn1_check_BOOLEAN(&data, 0);
 
 	data_remaining = asn1_tag_remaining(&data);
 
-	if (data_remaining < 1) {
+	if (data_remaining < 3) {
 		data.has_error = True;
 	} else {
-		
-		*ticket = data_blob(data.data, data_remaining);
+		asn1_read(&data, tok_id, 2);
+		data_remaining -= 2;
+		*ticket = data_blob(NULL, data_remaining);
 		asn1_read(&data, ticket->data, ticket->length);
 	}
 
@@ -330,7 +332,7 @@ DATA_BLOB spnego_gen_negTokenTarg(const char *principal, int time_offset)
 	tkt = krb5_get_ticket(principal, time_offset);
 
 	/* wrap that up in a nice GSS-API wrapping */
-	tkt_wrapped = spnego_gen_krb5_wrap(tkt);
+	tkt_wrapped = spnego_gen_krb5_wrap(tkt, TOK_ID_KRB_AP_REQ);
 
 	/* and wrap that in a shiny SPNEGO wrapper */
 	targ = gen_negTokenTarg(krb_mechs, tkt_wrapped);
@@ -438,9 +440,10 @@ BOOL spnego_parse_auth(DATA_BLOB blob, DATA_BLOB *auth)
 }
 
 /*
-  generate a minimal SPNEGO NTLMSSP response packet.  Doesn't contain much.
+  generate a minimal SPNEGO response packet.  Doesn't contain much.
 */
-DATA_BLOB spnego_gen_auth_response(DATA_BLOB *ntlmssp_reply, NTSTATUS nt_status)
+DATA_BLOB spnego_gen_auth_response(DATA_BLOB *reply, NTSTATUS nt_status,
+				   const char *mechOID)
 {
 	ASN1_DATA data;
 	DATA_BLOB ret;
@@ -462,13 +465,13 @@ DATA_BLOB spnego_gen_auth_response(DATA_BLOB *ntlmssp_reply, NTSTATUS nt_status)
 	asn1_write_enumerated(&data, negResult);
 	asn1_pop_tag(&data);
 
-	if (negResult == SPNEGO_NEG_RESULT_INCOMPLETE) {
+	if (reply->data != NULL) {
 		asn1_push_tag(&data,ASN1_CONTEXT(1));
-		asn1_write_OID(&data, OID_NTLMSSP);
+		asn1_write_OID(&data, mechOID);
 		asn1_pop_tag(&data);
 		
 		asn1_push_tag(&data,ASN1_CONTEXT(2));
-		asn1_write_OctetString(&data, ntlmssp_reply->data, ntlmssp_reply->length);
+		asn1_write_OctetString(&data, reply->data, reply->length);
 		asn1_pop_tag(&data);
 	}
 
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index eafe805aba..7e5ec56a27 100644
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -4,6 +4,7 @@
    Copyright (C) Andrew Tridgell 1998-2001
    Copyright (C) Andrew Bartlett      2001
    Copyright (C) Jim McDonough        2002
+   Copyright (C) Luke Howard          2003
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -146,11 +147,14 @@ static int reply_spnego_kerberos(connection_struct *conn,
 	int sess_vuid;
 	NTSTATUS ret;
 	DATA_BLOB auth_data;
+	DATA_BLOB ap_rep, ap_rep_wrapped, response;
 	auth_serversupplied_info *server_info = NULL;
 	ADS_STRUCT *ads;
+	uint8 session_key[16];
+	uint8 tok_id[2];
 	BOOL foreign = False;
 
-	if (!spnego_parse_krb5_wrap(*secblob, &ticket)) {
+	if (!spnego_parse_krb5_wrap(*secblob, &ticket, tok_id)) {
 		return ERROR_NT(NT_STATUS_LOGON_FAILURE);
 	}
 
@@ -162,7 +166,7 @@ static int reply_spnego_kerberos(connection_struct *conn,
 
 	ads->auth.realm = strdup(lp_realm());
 
-	ret = ads_verify_ticket(ads, &ticket, &client, &auth_data);
+	ret = ads_verify_ticket(ads, &ticket, &client, &auth_data, &ap_rep, session_key);
 	if (!NT_STATUS_IS_OK(ret)) {
 		DEBUG(1,("Failed to verify incoming ticket!\n"));	
 		ads_destroy(&ads);
@@ -177,6 +181,7 @@ static int reply_spnego_kerberos(connection_struct *conn,
 	if (!p) {
 		DEBUG(3,("Doesn't look like a valid principal\n"));
 		ads_destroy(&ads);
+		data_blob_free(&ap_rep);
 		return ERROR_NT(NT_STATUS_LOGON_FAILURE);
 	}
 
@@ -184,6 +189,7 @@ static int reply_spnego_kerberos(connection_struct *conn,
 	if (strcasecmp(p+1, ads->auth.realm) != 0) {
 		DEBUG(3,("Ticket for foreign realm %s@%s\n", client, p+1));
 		if (!lp_allow_trusted_domains()) {
+			data_blob_free(&ap_rep);
 			return ERROR_NT(NT_STATUS_LOGON_FAILURE);
 		}
 		foreign = True;
@@ -209,31 +215,51 @@ static int reply_spnego_kerberos(connection_struct *conn,
 
 	if (!pw) {
 		DEBUG(1,("Username %s is invalid on this system\n",user));
+		data_blob_free(&ap_rep);
 		return ERROR_NT(NT_STATUS_NO_SUCH_USER);
 	}
 
 	if (!NT_STATUS_IS_OK(ret = make_server_info_pw(&server_info,pw))) {
 		DEBUG(1,("make_server_info_from_pw failed!\n"));
+		data_blob_free(&ap_rep);
 		return ERROR_NT(ret);
 	}
-	
+
+	/* Copy out the session key from the AP_REQ. */
+	memcpy(server_info->session_key, session_key, sizeof(session_key));
+
 	/* register_vuid keeps the server info */
 	sess_vuid = register_vuid(server_info, user);
 
 	free(user);
 
 	if (sess_vuid == -1) {
-		return ERROR_NT(NT_STATUS_LOGON_FAILURE);
+		ret = NT_STATUS_LOGON_FAILURE;
+	} else {
+		set_message(outbuf,4,0,True);
+		SSVAL(outbuf, smb_vwv3, 0);
+			
+		if (server_info->guest) {
+			SSVAL(outbuf,smb_vwv2,1);
+		}
+		
+		SSVAL(outbuf, smb_uid, sess_vuid);
 	}
 
-	set_message(outbuf,4,0,True);
-	SSVAL(outbuf, smb_vwv3, 0);
-	add_signature(outbuf);
- 
-	SSVAL(outbuf,smb_uid,sess_vuid);
-	SSVAL(inbuf,smb_uid,sess_vuid);
-	
-	return chain_reply(inbuf,outbuf,length,bufsize);
+        /* wrap that up in a nice GSS-API wrapping */
+	if (NT_STATUS_IS_OK(ret)) {
+		ap_rep_wrapped = spnego_gen_krb5_wrap(ap_rep, TOK_ID_KRB_AP_REP);
+	} else {
+		ap_rep_wrapped = data_blob(NULL, 0);
+	}
+	response = spnego_gen_auth_response(&ap_rep_wrapped, ret, OID_KERBEROS5_OLD);
+	reply_sesssetup_blob(conn, outbuf, response, ret);
+
+	data_blob_free(&ap_rep);
+	data_blob_free(&ap_rep_wrapped);
+	data_blob_free(&response);
+
+	return -1; /* already replied */
 }
 #endif
 
@@ -280,7 +306,7 @@ static BOOL reply_spnego_ntlmssp(connection_struct *conn, char *outbuf,
 		}
 	}
 
-        response = spnego_gen_auth_response(ntlmssp_blob, nt_status);
+        response = spnego_gen_auth_response(ntlmssp_blob, nt_status, OID_NTLMSSP);
 	ret = reply_sesssetup_blob(conn, outbuf, response, nt_status);
 	data_blob_free(&response);
 
-- 
cgit 


From 0e6dbeb2737700ece2a4502a6edf094f4f26894c Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 24 Feb 2003 11:16:27 +0000
Subject: typo (This used to be commit
 a47dee787413daaf0b550a47bbd78125490c356e)

---
 source3/smbwrapper/smbsh.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/smbwrapper/smbsh.c b/source3/smbwrapper/smbsh.c
index 845d1d5606..2cbdc76de1 100644
--- a/source3/smbwrapper/smbsh.c
+++ b/source3/smbwrapper/smbsh.c
@@ -101,7 +101,7 @@ int main(int argc, char *argv[])
 	smbw_setshared(line, wd);
 
 	slprintf(line,sizeof(line)-1,"%s/smbwrapper.so", libd);
-	etenv("LD_PRELOAD", line);
+	setenv("LD_PRELOAD", line);
 
 	slprintf(line,sizeof(line)-1,"%s/smbwrapper.32.so", libd);
 
-- 
cgit 


From 426cd68f74bb0490df54da500d3d9c1ea475e16f Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 24 Feb 2003 11:23:15 +0000
Subject: Move off-by-one buggy malloc()/safe_strcpy() combination to strdup()
 instead.

Andrew Bartlett
(This used to be commit c26881633d8a7f6d9b9ed9c6a97ce2b45bf2b317)
---
 source3/lib/util_getent.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'source3')

diff --git a/source3/lib/util_getent.c b/source3/lib/util_getent.c
index 7d45287bba..32641dbf83 100644
--- a/source3/lib/util_getent.c
+++ b/source3/lib/util_getent.c
@@ -224,18 +224,16 @@ static struct sys_userlist *add_members_to_userlist(struct sys_userlist *list_he
 
 	for (i = 0; i < num_users; i++) {
 		struct sys_userlist *entry = (struct sys_userlist *)malloc(sizeof(*entry));
-		size_t len = strlen(grp->gr_mem[i])+1;
 		if (entry == NULL) {
 			free_userlist(list_head);
 			return NULL;
 		}
-		entry->unix_name = (char *)malloc(len);
+		entry->unix_name = (char *)strdup(grp->gr_mem[i]);
 		if (entry->unix_name == NULL) {
 			SAFE_FREE(entry);
 			free_userlist(list_head);
 			return NULL;
 		}
-		safe_strcpy(entry->unix_name, grp->gr_mem[i],len);
 		DLIST_ADD(list_head, entry);
 	}
 	return list_head;
-- 
cgit 


From 05262ea49a3d428e015ef71c975231b108847b72 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 24 Feb 2003 11:24:27 +0000
Subject: Finish removing setenv replacements from smbwrapper. (This used to be
 commit 059ac2d839bf258408490f5ceb786a47cb5acb58)

---
 source3/smbwrapper/shared.c | 20 +-------------------
 source3/smbwrapper/smbsh.c  |  2 +-
 2 files changed, 2 insertions(+), 20 deletions(-)

(limited to 'source3')

diff --git a/source3/smbwrapper/shared.c b/source3/smbwrapper/shared.c
index 00dd30b70e..b4cfcf7148 100644
--- a/source3/smbwrapper/shared.c
+++ b/source3/smbwrapper/shared.c
@@ -52,7 +52,7 @@ void smbw_setup_shared(void)
 
 	slprintf(s,sizeof(s)-1,"%d", shared_fd);
 
-	smbw_setenv("SMBW_HANDLE", s);
+	setenv("SMBW_HANDLE", s, 1);
 
 	return;
 
@@ -194,24 +194,6 @@ void smbw_setshared(const char *name, const char *val)
 }
 
 
-/*****************************************************************
-set an env variable - some systems don't have this
-*****************************************************************/  
-int smbw_setenv(const char *name, const char *value)
-{
-	pstring s;
-	char *p;
-	int ret = -1;
-
-	slprintf(s,sizeof(s)-1,"%s=%s", name, value);
-
-	p = strdup(s);
-
-	if (p) ret = putenv(p);
-
-	return ret;
-}
-
 /*****************************************************************
 return true if the passed fd is the SMBW_HANDLE
 *****************************************************************/  
diff --git a/source3/smbwrapper/smbsh.c b/source3/smbwrapper/smbsh.c
index 2cbdc76de1..221c6d87c2 100644
--- a/source3/smbwrapper/smbsh.c
+++ b/source3/smbwrapper/smbsh.c
@@ -101,7 +101,7 @@ int main(int argc, char *argv[])
 	smbw_setshared(line, wd);
 
 	slprintf(line,sizeof(line)-1,"%s/smbwrapper.so", libd);
-	setenv("LD_PRELOAD", line);
+	setenv("LD_PRELOAD", line, 1);
 
 	slprintf(line,sizeof(line)-1,"%s/smbwrapper.32.so", libd);
 
-- 
cgit 


From 79aaa35ea5e8c74ff7755ec650aca88cc7e4cf7e Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 24 Feb 2003 21:07:03 +0000
Subject: Clean up non-krb5 breakages from my modifications to luke howard's
 patch.

Andrew Bartlett
(This used to be commit 32fd0c49009e38022523cc5c14567dd55de08206)
---
 source3/include/includes.h | 1 +
 source3/libsmb/clikrb5.c   | 8 +-------
 2 files changed, 2 insertions(+), 7 deletions(-)

(limited to 'source3')

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 5b4c5a695f..fab02141cb 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -1239,6 +1239,7 @@ krb5_const_principal get_principal_from_tkt(krb5_ticket *tkt);
 krb5_error_code krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, struct sockaddr **addr_pp, int *naddrs, int get_masters);
 krb5_error_code get_kerberos_allowed_etypes(krb5_context context, krb5_enctype **enctypes);
 void free_kerberos_etypes(krb5_context context, krb5_enctype *enctypes);
+BOOL krb5_get_smb_session_key(krb5_context context, krb5_auth_context auth_context, uint8 session_key[16]);
 #endif /* HAVE_KRB5 */
 
 #endif /* _INCLUDES_H */
diff --git a/source3/libsmb/clikrb5.c b/source3/libsmb/clikrb5.c
index 47dec1f171..6b0c7ddaf2 100644
--- a/source3/libsmb/clikrb5.c
+++ b/source3/libsmb/clikrb5.c
@@ -365,7 +365,7 @@ failed:
 	return data_blob(NULL, 0);
 }
 
-BOOL krb5_get_smb_session_key(krb5_context context, krb5_auth_context auth_context, uint8 session_key[16])
+ BOOL krb5_get_smb_session_key(krb5_context context, krb5_auth_context auth_context, uint8 session_key[16])
  {
 	krb5_keyblock *skey;
 	BOOL ret = False;
@@ -394,10 +394,4 @@ DATA_BLOB krb5_get_ticket(const char *principal, time_t time_offset)
 	 return data_blob(NULL, 0);
  }
 
-BOOL krb5_get_smb_session_key(krb5_context context, krb5_auth_context ac, uint8 session_key[16])
- {
-	DEBUG(0,("NO KERBEROS SUPPORT\n"));
-	memset(session_key, 0, 16);
-	return False;
- }
 #endif
-- 
cgit 


From c5871a1893ccaf81116defcdc20d644502e2f98c Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 24 Feb 2003 22:25:19 +0000
Subject: Whenever we have a password, use the in-memory ccache.  This fixes a
 bug where we were overwriting the user's ccache with the machine password
 (the -P option).

Andrew Bartlett
(This used to be commit 231d2f84ef36b30be98baf3b56ebf4a5cd8dad11)
---
 source3/utils/net_ads.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'source3')

diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 75bb29f213..bb87879044 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -131,7 +131,6 @@ static ADS_STRUCT *ads_startup(void)
 
 	if (opt_user_specified) {
 		need_password = True;
-		use_in_memory_ccache();
 	}
 
 retry:
@@ -142,8 +141,10 @@ retry:
 		free(prompt);
 	}
 
-	if (opt_password)
+	if (opt_password) {
+		use_in_memory_ccache();
 		ads->auth.password = strdup(opt_password);
+	}
 
 	ads->auth.user_name = strdup(opt_user_name);
 
-- 
cgit 


From f803c3237635880694d668d9ce3c29b46c311d43 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 25 Feb 2003 02:20:46 +0000
Subject: Fix a really nasty bug where some users in AD domains (particularly
 child domains) would not have the tokenGroups or memberOf attributes filled
 in.

This would cause a user to have no supplementary group membership.

Detect this by the fact that the primaryGid must be present in the tokenGroups,
and if it isn't (ie, if there is no tokenGroups at all), do a server-side
search on all groups using the 'member' attribute and the user's DN.

Andrew Bartlett
(This used to be commit a074f74e627e1d947a76bcf3a39e3c5df4d4ffe5)
---
 source3/nsswitch/winbindd_ads.c | 104 ++++++++++++++++++++++++++++++++++------
 1 file changed, 90 insertions(+), 14 deletions(-)

(limited to 'source3')

diff --git a/source3/nsswitch/winbindd_ads.c b/source3/nsswitch/winbindd_ads.c
index 9fd391870b..93c9babd5e 100644
--- a/source3/nsswitch/winbindd_ads.c
+++ b/source3/nsswitch/winbindd_ads.c
@@ -455,8 +455,10 @@ static NTSTATUS lookup_usergroups(struct winbindd_domain *domain,
 	ADS_STRUCT *ads = NULL;
 	const char *attrs[] = {"distinguishedName", NULL};
 	const char *attrs2[] = {"tokenGroups", "primaryGroupID", NULL};
+	const char *group_attrs[] = {"objectSid", "cn", NULL};
 	ADS_STATUS rc;
 	int count;
+	void *res = NULL;
 	void *msg = NULL;
 	char *exp;
 	char *user_dn;
@@ -467,22 +469,30 @@ static NTSTATUS lookup_usergroups(struct winbindd_domain *domain,
 	char *sidstr;
 	NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
 
-	*num_groups = 0;
-
 	DEBUG(3,("ads: lookup_usergroups\n"));
-
-	(*num_groups) = 0;
+	*num_groups = 0;
 
 	sid_from_rid(domain, user_rid, &sid);
 
 	ads = ads_cached_connection(domain);
 	if (!ads) goto done;
 
-	sidstr = sid_binstring(&sid);
-	asprintf(&exp, "(objectSid=%s)", sidstr);
+	if (!(sidstr = sid_binstring(&sid))) {
+		DEBUG(1,("lookup_usergroups(rid=%d) sid_binstring returned NULL\n", user_rid));
+		status = NT_STATUS_NO_MEMORY;
+		goto done;
+	}
+	if (asprintf(&exp, "(objectSid=%s)", sidstr) == -1) {
+		free(sidstr);
+		DEBUG(1,("lookup_usergroups(rid=%d) asprintf failed!\n", user_rid));
+		status = NT_STATUS_NO_MEMORY;
+		goto done;
+	}
+
 	rc = ads_search_retry(ads, &msg, exp, attrs);
 	free(exp);
 	free(sidstr);
+
 	if (!ADS_ERR_OK(rc)) {
 		DEBUG(1,("lookup_usergroups(rid=%d) ads_search: %s\n", user_rid, ads_errstr(rc)));
 		goto done;
@@ -507,20 +517,86 @@ static NTSTATUS lookup_usergroups(struct winbindd_domain *domain,
 		goto done;
 	}
 
-	count = ads_pull_sids(ads, mem_ctx, msg, "tokenGroups", &sids) + 1;
-	(*user_gids) = (uint32 *)talloc_zero(mem_ctx, sizeof(uint32) * count);
-	(*user_gids)[(*num_groups)++] = primary_group;
+	count = ads_pull_sids(ads, mem_ctx, msg, "tokenGroups", &sids);
 
-	for (i=1;i<count;i++) {
-		uint32 rid;
-		if (!sid_peek_check_rid(&domain->sid, &sids[i-1], &rid)) continue;
-		(*user_gids)[*num_groups] = rid;
-		(*num_groups)++;
+	if (msg) ads_msgfree(ads, msg);
+
+	/* there must always be at least one group in the token, 
+	   unless we are talking to a buggy Win2k server */
+	if (count == 0) {
+		/* buggy server, no tokenGroups.  Instead lookup what groups this user
+		   is a member of by DN search on member*/
+		if (asprintf(&exp, "(&(member=%s)(objectClass=group))", user_dn) == -1) {
+			free(sidstr);
+			DEBUG(1,("lookup_usergroups(rid=%d) asprintf failed!\n", user_rid));
+			status = NT_STATUS_NO_MEMORY;
+			goto done;
+		}
+
+		rc = ads_search_retry(ads, &res, exp, group_attrs);
+		free(exp);
+				
+		if (!ADS_ERR_OK(rc)) {
+			DEBUG(1,("lookup_usergroups(rid=%d) ads_search member=%s: %s\n", user_rid, user_dn, ads_errstr(rc)));
+			goto done;
+		}
+
+		count = ads_count_replies(ads, res);
+		if (count == 0) {
+			DEBUG(5,("lookup_usergroups: No supp groups found\n"));
+			goto done;
+		}
+		
+		(*user_gids) = (uint32 *)talloc_zero(mem_ctx, sizeof(uint32) * (count + 1));
+		(*user_gids)[0] = primary_group;
+		
+		*num_groups = 1;
+
+		for (msg = ads_first_entry(ads, res); msg; msg = ads_next_entry(ads, msg)) {
+			uint32 rid;
+			DOM_SID group_sid;
+			fstring sid_string;
+			const char *cn;
+			
+			cn = ads_pull_string(ads, mem_ctx, msg, "cn");
+			if (!cn) {
+				cn = "<CN NOT AVAILABLE>";
+			}
+
+			if (!ads_pull_sid(ads, msg, "objectSid", &group_sid)) {
+				DEBUG(1,("No sid for %s !?\n", cn));
+				continue;
+			}
+			
+			if (!sid_peek_check_rid(&domain->sid, &group_sid, &rid)) {
+				DEBUG(5,("sid for %s is out of domain or invalid\n", sid_to_string(sid_string, &sid)));
+				continue;
+			}
+			if (rid == primary_group) continue;
+
+			(*user_gids)[*num_groups] = rid;
+			(*num_groups)++;
+
+		}
+	} else {
+		(*user_gids) = (uint32 *)talloc_zero(mem_ctx, sizeof(uint32) * (count + 1));
+		(*user_gids)[0] = primary_group;
+		
+		*num_groups = 1;
+
+		for (i=0;i<count;i++) {
+			uint32 rid;
+			if (!sid_peek_check_rid(&domain->sid, &sids[i-1], &rid)) continue;
+			if (rid == primary_group) continue;
+			(*user_gids)[*num_groups] = rid;
+			(*num_groups)++;
+		}
 	}
 
 	status = NT_STATUS_OK;
 	DEBUG(3,("ads lookup_usergroups for rid=%d\n", user_rid));
 done:
+	if (res) ads_msgfree(ads, res);
 	if (msg) ads_msgfree(ads, msg);
 
 	return status;
-- 
cgit 


From d116f2c884ce66f69df2973faf34f20a1a7ec988 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 25 Feb 2003 02:23:19 +0000
Subject: tokenGroups are SIDs, so dump them as such. (This used to be commit
 43f07e9de70ad9993265e28a54239caba0121ab6)

---
 source3/libads/ldap.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source3')

diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index 29f44672f4..67827d27f3 100644
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -1215,6 +1215,7 @@ static BOOL ads_dump_field(char *field, void **values, void *data_area)
 		{"nTSecurityDescriptor", False, dump_sd},
 		{"dnsRecord", False, dump_binary},
 		{"objectSid", False, dump_sid},
+		{"tokenGroups", False, dump_sid},
 		{NULL, True, NULL}
 	};
 	int i;
-- 
cgit 


From bf095b837272cf2a17c7ffeb94a96f304922a6bf Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 25 Feb 2003 03:30:39 +0000
Subject: For some reason some attributes in ADS do not appear (and are not
 available) in general searches, but only if searching for the DN only.

In my case, it was the tokenGroups attribute that caused me trouble, hence
this patch.

Andrew Bartlett
(This used to be commit 8a0cc4c2beb5d6ad7e44bf47bf0f9ec4a3ffdb96)
---
 source3/utils/net_ads.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 63 insertions(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index bb87879044..8cd3bac802 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -53,6 +53,8 @@ int net_ads_usage(int argc, const char **argv)
 "\n\t lookup, add, or remove directory entry for a printer\n"\
 "\nnet ads search"\
 "\n\tperform a raw LDAP search and dump the results\n"
+"\nnet ads dn"\
+"\n\tperform a raw LDAP search and dump attributes of a particular DN\n"
 		);
 	return -1;
 }
@@ -1003,7 +1005,7 @@ static int net_ads_search(int argc, const char **argv)
 	exp = argv[0];
 	attrs = (argv + 1);
 
-	rc = ads_do_search_all(ads, ads->config.bind_path, 
+	rc = ads_do_search_all(ads, ads->config.bind_path,
 			       LDAP_SCOPE_SUBTREE,
 			       exp, attrs, &res);
 	if (!ADS_ERR_OK(rc)) {
@@ -1023,6 +1025,65 @@ static int net_ads_search(int argc, const char **argv)
 }
 
 
+/*
+  help for net ads search
+*/
+static int net_ads_dn_usage(int argc, const char **argv)
+{
+	d_printf(
+		"\nnet ads dn <dn> <attributes...>\n"\
+		"\nperform a raw LDAP search on a ADS server and dump the results\n"\
+		"The DN standard LDAP DN, and the attributes are a list of LDAP fields \n"\
+		"to show in the results\n\n"\
+		"Example: net ads dn 'CN=administrator,CN=Users,DC=my,DC=domain' sAMAccountName\n\n"
+		);
+	net_common_flags_usage(argc, argv);
+	return -1;
+}
+
+
+/*
+  general ADS search function. Useful in diagnosing problems in ADS
+*/
+static int net_ads_dn(int argc, const char **argv)
+{
+	ADS_STRUCT *ads;
+	ADS_STATUS rc;
+	const char *dn;
+	const char **attrs;
+	void *res = NULL;
+
+	if (argc < 1) {
+		return net_ads_dn_usage(argc, argv);
+	}
+
+	if (!(ads = ads_startup())) {
+		return -1;
+	}
+
+	dn = argv[0];
+	attrs = (argv + 1);
+
+	rc = ads_do_search_all(ads, dn, 
+			       LDAP_SCOPE_BASE,
+			       "(objectclass=*)", attrs, &res);
+	if (!ADS_ERR_OK(rc)) {
+		d_printf("search failed: %s\n", ads_errstr(rc));
+		return -1;
+	}	
+
+	d_printf("Got %d replies\n\n", ads_count_replies(ads, res));
+
+	/* dump the results */
+	ads_dump(ads, res);
+
+	ads_msgfree(ads, res);
+	ads_destroy(&ads);
+
+	return 0;
+}
+
+
 int net_ads_help(int argc, const char **argv)
 {
 	struct functable func[] = {
@@ -1058,6 +1119,7 @@ int net_ads(int argc, const char **argv)
 		{"CHOSTPASS", net_ads_change_localhost_pass},
 		{"PRINTER", net_ads_printer},
 		{"SEARCH", net_ads_search},
+		{"DN", net_ads_dn},
 		{"WORKGROUP", net_ads_workgroup},
 		{"LOOKUP", net_ads_lookup},
 		{"HELP", net_ads_help},
-- 
cgit 


From 589371e1d5844be9ea0da4c674635ccc42ab9498 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 25 Feb 2003 05:49:24 +0000
Subject: After some comments from tridge, clean the new usergroups code into a
 helper function.

Andrew Bartlett
(This used to be commit 212a52b3d2ca39fcea2990f9293754b08e9b68e4)
---
 source3/nsswitch/winbindd_ads.c | 165 +++++++++++++++++++++++-----------------
 1 file changed, 94 insertions(+), 71 deletions(-)

(limited to 'source3')

diff --git a/source3/nsswitch/winbindd_ads.c b/source3/nsswitch/winbindd_ads.c
index 93c9babd5e..22e4648f15 100644
--- a/source3/nsswitch/winbindd_ads.c
+++ b/source3/nsswitch/winbindd_ads.c
@@ -4,6 +4,7 @@
    Winbind ADS backend functions
 
    Copyright (C) Andrew Tridgell 2001
+   Copyright (C) Andrew Bartlett <abartlet@samba.org> 2003
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -445,6 +446,84 @@ done:
 	return status;
 }
 
+/* Lookup groups a user is a member of - alternate method, for when
+   tokenGroups are not available. */
+static NTSTATUS lookup_usergroups_alt(struct winbindd_domain *domain,
+				      TALLOC_CTX *mem_ctx,
+				      const char *user_dn, 
+				      uint32 primary_group,
+				      uint32 *num_groups, uint32 **user_gids)
+{
+	ADS_STATUS rc;
+	NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
+	int count;
+	void *res = NULL;
+	void *msg = NULL;
+	char *exp;
+	ADS_STRUCT *ads;
+	const char *group_attrs[] = {"objectSid", NULL};
+
+	ads = ads_cached_connection(domain);
+	if (!ads) goto done;
+
+	/* buggy server, no tokenGroups.  Instead lookup what groups this user
+	   is a member of by DN search on member*/
+	if (asprintf(&exp, "(&(member=%s)(objectClass=group))", user_dn) == -1) {
+		DEBUG(1,("lookup_usergroups(dn=%s) asprintf failed!\n", user_dn));
+		return NT_STATUS_NO_MEMORY;
+	}
+	
+	rc = ads_search_retry(ads, &res, exp, group_attrs);
+	free(exp);
+	
+	if (!ADS_ERR_OK(rc)) {
+		DEBUG(1,("lookup_usergroups ads_search member=%s: %s\n", user_dn, ads_errstr(rc)));
+		return ads_ntstatus(rc);
+	}
+	
+	count = ads_count_replies(ads, res);
+	if (count == 0) {
+		DEBUG(5,("lookup_usergroups: No supp groups found\n"));
+		
+		status = ads_ntstatus(rc);
+		goto done;
+	}
+	
+	(*user_gids) = (uint32 *)talloc_zero(mem_ctx, sizeof(uint32) * (count + 1));
+	(*user_gids)[0] = primary_group;
+	
+	*num_groups = 1;
+	
+	for (msg = ads_first_entry(ads, res); msg; msg = ads_next_entry(ads, msg)) {
+		uint32 rid;
+		DOM_SID group_sid;
+		fstring sid_string;
+		
+		if (!ads_pull_sid(ads, msg, "objectSid", &group_sid)) {
+			DEBUG(1,("No sid for this group ?!?\n"));
+			continue;
+		}
+		
+		if (!sid_peek_check_rid(&domain->sid, &group_sid, &rid)) {
+			DEBUG(5,("sid for %s is out of domain or invalid\n", sid_to_string(sid_string, &group_sid)));
+			continue;
+		}
+		if (rid == primary_group) continue;
+		
+		(*user_gids)[*num_groups] = rid;
+		(*num_groups)++;
+			
+	}
+
+	if (res) ads_msgfree(ads, res);
+	if (msg) ads_msgfree(ads, msg);
+
+	status = NT_STATUS_OK;
+
+	DEBUG(3,("ads lookup_usergroups (alt) for dn=%s\n", user_dn));
+done:
+	return status;
+}
 
 /* Lookup groups a user is a member of. */
 static NTSTATUS lookup_usergroups(struct winbindd_domain *domain,
@@ -455,10 +534,8 @@ static NTSTATUS lookup_usergroups(struct winbindd_domain *domain,
 	ADS_STRUCT *ads = NULL;
 	const char *attrs[] = {"distinguishedName", NULL};
 	const char *attrs2[] = {"tokenGroups", "primaryGroupID", NULL};
-	const char *group_attrs[] = {"objectSid", "cn", NULL};
 	ADS_STATUS rc;
 	int count;
-	void *res = NULL;
 	void *msg = NULL;
 	char *exp;
 	char *user_dn;
@@ -524,81 +601,27 @@ static NTSTATUS lookup_usergroups(struct winbindd_domain *domain,
 	/* there must always be at least one group in the token, 
 	   unless we are talking to a buggy Win2k server */
 	if (count == 0) {
-		/* buggy server, no tokenGroups.  Instead lookup what groups this user
-		   is a member of by DN search on member*/
-		if (asprintf(&exp, "(&(member=%s)(objectClass=group))", user_dn) == -1) {
-			free(sidstr);
-			DEBUG(1,("lookup_usergroups(rid=%d) asprintf failed!\n", user_rid));
-			status = NT_STATUS_NO_MEMORY;
-			goto done;
-		}
-
-		rc = ads_search_retry(ads, &res, exp, group_attrs);
-		free(exp);
-				
-		if (!ADS_ERR_OK(rc)) {
-			DEBUG(1,("lookup_usergroups(rid=%d) ads_search member=%s: %s\n", user_rid, user_dn, ads_errstr(rc)));
-			goto done;
-		}
-
-		count = ads_count_replies(ads, res);
-		if (count == 0) {
-			DEBUG(5,("lookup_usergroups: No supp groups found\n"));
-			goto done;
-		}
-		
-		(*user_gids) = (uint32 *)talloc_zero(mem_ctx, sizeof(uint32) * (count + 1));
-		(*user_gids)[0] = primary_group;
-		
-		*num_groups = 1;
-
-		for (msg = ads_first_entry(ads, res); msg; msg = ads_next_entry(ads, msg)) {
-			uint32 rid;
-			DOM_SID group_sid;
-			fstring sid_string;
-			const char *cn;
-			
-			cn = ads_pull_string(ads, mem_ctx, msg, "cn");
-			if (!cn) {
-				cn = "<CN NOT AVAILABLE>";
-			}
-
-			if (!ads_pull_sid(ads, msg, "objectSid", &group_sid)) {
-				DEBUG(1,("No sid for %s !?\n", cn));
-				continue;
-			}
-			
-			if (!sid_peek_check_rid(&domain->sid, &group_sid, &rid)) {
-				DEBUG(5,("sid for %s is out of domain or invalid\n", sid_to_string(sid_string, &sid)));
-				continue;
-			}
-			if (rid == primary_group) continue;
-
-			(*user_gids)[*num_groups] = rid;
-			(*num_groups)++;
+		return lookup_usergroups_alt(domain, mem_ctx, user_dn, 
+					       primary_group,
+					       num_groups, user_gids);
+	}
 
-		}
-	} else {
-		(*user_gids) = (uint32 *)talloc_zero(mem_ctx, sizeof(uint32) * (count + 1));
-		(*user_gids)[0] = primary_group;
-		
-		*num_groups = 1;
-
-		for (i=0;i<count;i++) {
-			uint32 rid;
-			if (!sid_peek_check_rid(&domain->sid, &sids[i-1], &rid)) continue;
-			if (rid == primary_group) continue;
-			(*user_gids)[*num_groups] = rid;
-			(*num_groups)++;
-		}
+	(*user_gids) = (uint32 *)talloc_zero(mem_ctx, sizeof(uint32) * (count + 1));
+	(*user_gids)[0] = primary_group;
+	
+	*num_groups = 1;
+	
+	for (i=0;i<count;i++) {
+		uint32 rid;
+		if (!sid_peek_check_rid(&domain->sid, &sids[i-1], &rid)) continue;
+		if (rid == primary_group) continue;
+		(*user_gids)[*num_groups] = rid;
+		(*num_groups)++;
 	}
 
 	status = NT_STATUS_OK;
 	DEBUG(3,("ads lookup_usergroups for rid=%d\n", user_rid));
 done:
-	if (res) ads_msgfree(ads, res);
-	if (msg) ads_msgfree(ads, msg);
-
 	return status;
 }
 
-- 
cgit 


From 3a2f56cb630a7566ef0a70052b3102651bf653cc Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Tue, 25 Feb 2003 06:24:13 +0000
Subject: Fixed up some const related compiler warnings. (This used to be
 commit 923425e497112c5d1e2e569da6c13dcd02b6a8af)

---
 source3/client/client.c        |  9 ++++++---
 source3/rpcclient/cmd_lsarpc.c | 24 ++++++++++++------------
 source3/rpcclient/cmd_samr.c   | 38 +++++++++++++++++++-------------------
 source3/rpcclient/rpcclient.c  |  6 +++---
 source3/rpcclient/rpcclient.h  |  4 ++--
 5 files changed, 42 insertions(+), 39 deletions(-)

(limited to 'source3')

diff --git a/source3/client/client.c b/source3/client/client.c
index 5da12fd984..b95d4d877c 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -51,7 +51,8 @@ static int max_protocol = PROTOCOL_NT1;
 extern pstring user_socket_options;
 
 static int process_tok(fstring tok);
-static int cmd_help(void);
+static NTSTATUS cmd_help(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc,
+			 const char **argv);
 
 /* 30 second timeout on most commands */
 #define CLIENT_TIMEOUT (30*1000)
@@ -979,7 +980,8 @@ static BOOL do_altname(char *name)
 /****************************************************************************
  Exit client.
 ****************************************************************************/
-static int cmd_quit(void)
+static NTSTATUS cmd_quit(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc,
+			 const char **argv)
 {
 	cli_shutdown(cli);
 	exit(0);
@@ -2149,7 +2151,8 @@ static int process_tok(fstring tok)
 /****************************************************************************
 help
 ****************************************************************************/
-static int cmd_help(void)
+static NTSTATUS cmd_help(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc,
+		    const char **argv)
 {
 	int i=0,j;
 	fstring buf;
diff --git a/source3/rpcclient/cmd_lsarpc.c b/source3/rpcclient/cmd_lsarpc.c
index 03df170c09..fab6a89ed5 100644
--- a/source3/rpcclient/cmd_lsarpc.c
+++ b/source3/rpcclient/cmd_lsarpc.c
@@ -64,7 +64,7 @@ done:
 
 static NTSTATUS cmd_lsa_query_info_policy(struct cli_state *cli, 
                                           TALLOC_CTX *mem_ctx, int argc, 
-                                          char **argv) 
+                                          const char **argv) 
 {
 	POLICY_HND pol;
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
@@ -134,7 +134,7 @@ static NTSTATUS cmd_lsa_query_info_policy(struct cli_state *cli,
 
 static NTSTATUS cmd_lsa_lookup_names(struct cli_state *cli, 
                                      TALLOC_CTX *mem_ctx, int argc, 
-                                     char **argv)
+                                     const char **argv)
 {
 	POLICY_HND pol;
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
@@ -179,7 +179,7 @@ static NTSTATUS cmd_lsa_lookup_names(struct cli_state *cli,
 /* Resolve a list of SIDs to a list of names */
 
 static NTSTATUS cmd_lsa_lookup_sids(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-                                    int argc, char **argv)
+                                    int argc, const char **argv)
 {
 	POLICY_HND pol;
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
@@ -246,7 +246,7 @@ static NTSTATUS cmd_lsa_lookup_sids(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 
 static NTSTATUS cmd_lsa_enum_trust_dom(struct cli_state *cli, 
                                        TALLOC_CTX *mem_ctx, int argc, 
-                                       char **argv)
+                                       const char **argv)
 {
 	POLICY_HND pol;
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
@@ -301,7 +301,7 @@ static NTSTATUS cmd_lsa_enum_trust_dom(struct cli_state *cli,
 
 static NTSTATUS cmd_lsa_enum_privilege(struct cli_state *cli, 
 				       TALLOC_CTX *mem_ctx, int argc, 
-                                          char **argv) 
+				       const char **argv) 
 {
 	POLICY_HND pol;
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
@@ -354,7 +354,7 @@ static NTSTATUS cmd_lsa_enum_privilege(struct cli_state *cli,
 
 static NTSTATUS cmd_lsa_get_dispname(struct cli_state *cli, 
                                      TALLOC_CTX *mem_ctx, int argc, 
-                                     char **argv) 
+                                     const char **argv) 
 {
 	POLICY_HND pol;
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
@@ -392,7 +392,7 @@ static NTSTATUS cmd_lsa_get_dispname(struct cli_state *cli,
 
 static NTSTATUS cmd_lsa_enum_sids(struct cli_state *cli, 
 				  TALLOC_CTX *mem_ctx, int argc, 
-                                     char **argv) 
+				  const char **argv) 
 {
 	POLICY_HND pol;
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
@@ -445,7 +445,7 @@ static NTSTATUS cmd_lsa_enum_sids(struct cli_state *cli,
 
 static NTSTATUS cmd_lsa_enum_privsaccounts(struct cli_state *cli, 
                                            TALLOC_CTX *mem_ctx, int argc, 
-                                           char **argv) 
+                                           const char **argv) 
 {
 	POLICY_HND dom_pol;
 	POLICY_HND user_pol;
@@ -500,7 +500,7 @@ static NTSTATUS cmd_lsa_enum_privsaccounts(struct cli_state *cli,
 
 static NTSTATUS cmd_lsa_enum_acct_rights(struct cli_state *cli, 
 					 TALLOC_CTX *mem_ctx, int argc, 
-					 char **argv) 
+					 const char **argv) 
 {
 	POLICY_HND dom_pol;
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
@@ -666,8 +666,8 @@ static NTSTATUS cmd_lsa_remove_acct_rights(struct cli_state *cli,
 /* Get a privilege value given its name */
 
 static NTSTATUS cmd_lsa_lookupprivvalue(struct cli_state *cli, 
-                                           TALLOC_CTX *mem_ctx, int argc, 
-                                           char **argv) 
+					TALLOC_CTX *mem_ctx, int argc, 
+					const char **argv) 
 {
 	POLICY_HND pol;
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
@@ -702,7 +702,7 @@ static NTSTATUS cmd_lsa_lookupprivvalue(struct cli_state *cli,
 
 static NTSTATUS cmd_lsa_query_secobj(struct cli_state *cli, 
 				     TALLOC_CTX *mem_ctx, int argc, 
-				     char **argv) 
+				     const char **argv) 
 {
 	POLICY_HND pol;
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
diff --git a/source3/rpcclient/cmd_samr.c b/source3/rpcclient/cmd_samr.c
index 85aface7be..cec6b1680b 100644
--- a/source3/rpcclient/cmd_samr.c
+++ b/source3/rpcclient/cmd_samr.c
@@ -264,7 +264,7 @@ static NTSTATUS try_samr_connects(struct cli_state *cli, TALLOC_CTX *mem_ctx,
  */
 static NTSTATUS cmd_samr_query_user(struct cli_state *cli, 
                                     TALLOC_CTX *mem_ctx,
-                                    int argc, char **argv) 
+                                    int argc, const char **argv) 
 {
 	POLICY_HND connect_pol, domain_pol, user_pol;
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
@@ -373,7 +373,7 @@ static void display_group_info_ctr(GROUP_INFO_CTR *ctr)
  */
 static NTSTATUS cmd_samr_query_group(struct cli_state *cli, 
                                      TALLOC_CTX *mem_ctx,
-                                     int argc, char **argv) 
+                                     int argc, const char **argv) 
 {
 	POLICY_HND connect_pol, domain_pol, group_pol;
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
@@ -435,7 +435,7 @@ done:
 
 static NTSTATUS cmd_samr_query_usergroups(struct cli_state *cli, 
                                           TALLOC_CTX *mem_ctx,
-                                          int argc, char **argv) 
+                                          int argc, const char **argv) 
 {
 	POLICY_HND 		connect_pol, 
 				domain_pol, 
@@ -499,8 +499,8 @@ static NTSTATUS cmd_samr_query_usergroups(struct cli_state *cli,
 /* Query aliases a user is a member of */
 
 static NTSTATUS cmd_samr_query_useraliases(struct cli_state *cli, 
-                                          TALLOC_CTX *mem_ctx,
-                                          int argc, char **argv) 
+					   TALLOC_CTX *mem_ctx,
+					   int argc, const char **argv) 
 {
 	POLICY_HND 		connect_pol, domain_pol;
 	NTSTATUS		result = NT_STATUS_UNSUCCESSFUL;
@@ -568,7 +568,7 @@ static NTSTATUS cmd_samr_query_useraliases(struct cli_state *cli,
 
 static NTSTATUS cmd_samr_query_groupmem(struct cli_state *cli, 
                                         TALLOC_CTX *mem_ctx,
-                                        int argc, char **argv) 
+                                        int argc, const char **argv) 
 {
 	POLICY_HND connect_pol, domain_pol, group_pol;
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
@@ -630,7 +630,7 @@ static NTSTATUS cmd_samr_query_groupmem(struct cli_state *cli,
 
 static NTSTATUS cmd_samr_enum_dom_users(struct cli_state *cli, 
 					TALLOC_CTX *mem_ctx,
-					int argc, char **argv) 
+					int argc, const char **argv) 
 {
 	POLICY_HND connect_pol, domain_pol;
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
@@ -704,7 +704,7 @@ static NTSTATUS cmd_samr_enum_dom_users(struct cli_state *cli,
 
 static NTSTATUS cmd_samr_enum_dom_groups(struct cli_state *cli, 
                                          TALLOC_CTX *mem_ctx,
-                                         int argc, char **argv) 
+                                         int argc, const char **argv) 
 {
 	POLICY_HND connect_pol, domain_pol;
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
@@ -777,7 +777,7 @@ static NTSTATUS cmd_samr_enum_dom_groups(struct cli_state *cli,
 
 static NTSTATUS cmd_samr_enum_als_groups(struct cli_state *cli, 
                                          TALLOC_CTX *mem_ctx,
-                                         int argc, char **argv) 
+                                         int argc, const char **argv) 
 {
 	POLICY_HND connect_pol, domain_pol;
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
@@ -859,7 +859,7 @@ static NTSTATUS cmd_samr_enum_als_groups(struct cli_state *cli,
 
 static NTSTATUS cmd_samr_query_aliasmem(struct cli_state *cli, 
                                         TALLOC_CTX *mem_ctx,
-                                        int argc, char **argv) 
+                                        int argc, const char **argv) 
 {
 	POLICY_HND connect_pol, domain_pol, alias_pol;
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
@@ -933,7 +933,7 @@ static NTSTATUS cmd_samr_query_aliasmem(struct cli_state *cli,
 
 static NTSTATUS cmd_samr_query_dispinfo(struct cli_state *cli, 
                                         TALLOC_CTX *mem_ctx,
-                                        int argc, char **argv) 
+                                        int argc, const char **argv) 
 {
 	POLICY_HND connect_pol, domain_pol;
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
@@ -1067,7 +1067,7 @@ static NTSTATUS cmd_samr_query_dispinfo(struct cli_state *cli,
 
 static NTSTATUS cmd_samr_query_dominfo(struct cli_state *cli, 
                                        TALLOC_CTX *mem_ctx,
-                                       int argc, char **argv) 
+                                       int argc, const char **argv) 
 {
 	POLICY_HND connect_pol, domain_pol;
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
@@ -1137,11 +1137,11 @@ static NTSTATUS cmd_samr_query_dominfo(struct cli_state *cli,
 
 static NTSTATUS cmd_samr_create_dom_user(struct cli_state *cli, 
                                          TALLOC_CTX *mem_ctx,
-                                         int argc, char **argv) 
+                                         int argc, const char **argv) 
 {
 	POLICY_HND connect_pol, domain_pol, user_pol;
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-	char *acct_name;
+	const char *acct_name;
 	uint16 acb_info;
 	uint32 unknown, user_rid;
 	uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
@@ -1193,7 +1193,7 @@ static NTSTATUS cmd_samr_create_dom_user(struct cli_state *cli,
 
 static NTSTATUS cmd_samr_lookup_names(struct cli_state *cli, 
                                       TALLOC_CTX *mem_ctx,
-                                      int argc, char **argv) 
+                                      int argc, const char **argv) 
 {
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
 	POLICY_HND connect_pol, domain_pol;
@@ -1263,7 +1263,7 @@ static NTSTATUS cmd_samr_lookup_names(struct cli_state *cli,
 
 static NTSTATUS cmd_samr_lookup_rids(struct cli_state *cli, 
                                      TALLOC_CTX *mem_ctx,
-                                     int argc, char **argv) 
+                                     int argc, const char **argv) 
 {
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
 	POLICY_HND connect_pol, domain_pol;
@@ -1320,7 +1320,7 @@ static NTSTATUS cmd_samr_lookup_rids(struct cli_state *cli,
 
 static NTSTATUS cmd_samr_delete_dom_user(struct cli_state *cli, 
                                          TALLOC_CTX *mem_ctx,
-                                         int argc, char **argv) 
+                                         int argc, const char **argv) 
 {
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
 	POLICY_HND connect_pol, domain_pol, user_pol;
@@ -1389,7 +1389,7 @@ static NTSTATUS cmd_samr_delete_dom_user(struct cli_state *cli,
  */
 static NTSTATUS cmd_samr_query_sec_obj(struct cli_state *cli, 
                                     TALLOC_CTX *mem_ctx,
-                                    int argc, char **argv) 
+                                    int argc, const char **argv) 
 {
 	POLICY_HND connect_pol, domain_pol, user_pol, *pol;
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
@@ -1466,7 +1466,7 @@ done:
 
 static NTSTATUS cmd_samr_get_dom_pwinfo(struct cli_state *cli, 
 					TALLOC_CTX *mem_ctx,
-					int argc, char **argv) 
+					int argc, const char **argv) 
 {
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
 	uint16 unk_0, unk_1, unk_2;
diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c
index 7a9c464cf6..5803055598 100644
--- a/source3/rpcclient/rpcclient.c
+++ b/source3/rpcclient/rpcclient.c
@@ -259,7 +259,7 @@ static void fetch_machine_sid(struct cli_state *cli)
 /* List the available commands on a given pipe */
 
 static NTSTATUS cmd_listcommands(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-                         int argc, char **argv)
+				 int argc, const char **argv)
 {
 	struct cmd_list *tmp;
         struct cmd_set *tmp_set;
@@ -364,7 +364,7 @@ static NTSTATUS cmd_help(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 /* Change the debug level */
 
 static NTSTATUS cmd_debuglevel(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-                               int argc, char **argv)
+                               int argc, const char **argv)
 {
 	if (argc > 2) {
 		printf("Usage: %s [debuglevel]\n", argv[0]);
@@ -479,7 +479,7 @@ static NTSTATUS do_cmd(struct cli_state *cli,
 
 	/* Run command */
 
-	result = cmd_entry->fn(cli, mem_ctx, argc, (char **) argv);
+	result = cmd_entry->fn(cli, mem_ctx, argc, (const char **) argv);
 
 	/* Cleanup */
 
diff --git a/source3/rpcclient/rpcclient.h b/source3/rpcclient/rpcclient.h
index 3276a62437..1bd3c1a641 100644
--- a/source3/rpcclient/rpcclient.h
+++ b/source3/rpcclient/rpcclient.h
@@ -24,8 +24,8 @@
 
 struct cmd_set {
 	const char *name;
-	NTSTATUS (*fn)(struct cli_state*, TALLOC_CTX *mem_ctx, int argc, 
-                       char **argv);
+	NTSTATUS (*fn)(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, 
+                       const char **argv);
         int pipe_idx;
 	const char *description;
 	const char *usage;
-- 
cgit 


From 7c7d796b6d292a7c98b099ad1e1adbc4f2363512 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Tue, 25 Feb 2003 20:51:23 +0000
Subject: Progress on CR 601

cache the printer_info_2 with the open printer handle.
cache is invalidated on a mod_a_printer() call **on that smbd**.

Yes, this means that the window for admins to step on each other
from different clients just got larger, but since handles a generally
short lived this is probably ok.
(This used to be commit 33c7b7522504fb15989f32add8e9a087c8d9d0fa)
---
 source3/include/nt_printing.h       |  45 +++++
 source3/printing/nt_printing.c      | 366 +++++++++++++++++++++---------------
 source3/registry/reg_printing.c     |   7 +-
 source3/rpc_parse/parse_spoolss.c   |   2 +-
 source3/rpc_server/srv_spoolss_nt.c | 277 ++++++++++++---------------
 source3/smbd/lanman.c               |   6 +-
 6 files changed, 388 insertions(+), 315 deletions(-)

(limited to 'source3')

diff --git a/source3/include/nt_printing.h b/source3/include/nt_printing.h
index 6d952a89a5..ca65a40d48 100644
--- a/source3/include/nt_printing.h
+++ b/source3/include/nt_printing.h
@@ -434,4 +434,49 @@ typedef struct {
 	SPOOLSS_NOTIFY_MSG_GROUP	*msg_groups;
 } SPOOLSS_NOTIFY_MSG_CTR;
 
+#define PRINTER_HANDLE_IS_PRINTER	0
+#define PRINTER_HANDLE_IS_PRINTSERVER	1
+
+/* structure to store the printer handles */
+/* and a reference to what it's pointing to */
+/* and the notify info asked about */
+/* that's the central struct */
+typedef struct _Printer{
+	struct _Printer *prev, *next;
+	BOOL document_started;
+	BOOL page_started;
+	uint32 jobid; /* jobid in printing backend */
+	BOOL printer_type;
+	TALLOC_CTX *ctx;
+	union {
+	  	fstring handlename;
+		fstring printerservername;
+	} dev;
+	uint32 type;
+	uint32 access_granted;
+	struct {
+		uint32 flags;
+		uint32 options;
+		fstring localmachine;
+		uint32 printerlocal;
+		SPOOL_NOTIFY_OPTION *option;
+		POLICY_HND client_hnd;
+		BOOL client_connected;
+		uint32 change;
+		/* are we in a FindNextPrinterChangeNotify() call? */
+		BOOL fnpcn;
+	} notify;
+	struct {
+		fstring machine;
+		fstring user;
+	} client;
+	
+	/* devmode sent in the OpenPrinter() call */
+	NT_DEVICEMODE	*nt_devmode;
+	
+	/* cache the printer info */
+	NT_PRINTER_INFO_LEVEL *printer_info;
+	
+} Printer_entry;
+
 #endif /* NT_PRINTING_H_ */
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index 836324ecc9..0f5067c5a0 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -3,7 +3,7 @@
  *  RPC Pipe client / server routines
  *  Copyright (C) Andrew Tridgell              1992-2000,
  *  Copyright (C) Jean François Micouleau      1998-2000.
- *  Copyright (C) Gerald Carter                     2002.
+ *  Copyright (C) Gerald Carter                2002-2003.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -565,8 +565,9 @@ BOOL add_a_form(nt_forms_struct **list, const FORM *form, int *count)
 }
 
 /****************************************************************************
- delete a named form struct
+ Delete a named form struct.
 ****************************************************************************/
+
 BOOL delete_a_form(nt_forms_struct **list, UNISTR2 *del_name, int *count, WERROR *ret)
 {
 	pstring key;
@@ -603,8 +604,9 @@ BOOL delete_a_form(nt_forms_struct **list, UNISTR2 *del_name, int *count, WERROR
 }
 
 /****************************************************************************
-update a form struct
+ Update a form struct.
 ****************************************************************************/
+
 void update_a_form(nt_forms_struct **list, const FORM *form, int count)
 {
 	int n=0;
@@ -612,8 +614,7 @@ void update_a_form(nt_forms_struct **list, const FORM *form, int count)
 	unistr2_to_ascii(form_name, &(form->name), sizeof(form_name)-1);
 
 	DEBUG(106, ("[%s]\n", form_name));
-	for (n=0; n<count; n++)
-	{
+	for (n=0; n<count; n++) {
 		DEBUGADD(106, ("n [%d]:[%s]\n", n, (*list)[n].name));
 		if (!strncmp((*list)[n].name, form_name, strlen(form_name)))
 			break;
@@ -631,9 +632,8 @@ void update_a_form(nt_forms_struct **list, const FORM *form, int count)
 }
 
 /****************************************************************************
-get the nt drivers list
-
-traverse the database and look-up the matching names
+ Get the nt drivers list.
+ Traverse the database and look-up the matching names.
 ****************************************************************************/
 int get_ntdrivers(fstring **list, const char *architecture, uint32 version)
 {
@@ -649,7 +649,9 @@ int get_ntdrivers(fstring **list, const char *architecture, uint32 version)
 	for (kbuf = tdb_firstkey(tdb_drivers);
 	     kbuf.dptr;
 	     newkey = tdb_nextkey(tdb_drivers, kbuf), safe_free(kbuf.dptr), kbuf=newkey) {
-		if (strncmp(kbuf.dptr, key, strlen(key)) != 0) continue;
+
+		if (strncmp(kbuf.dptr, key, strlen(key)) != 0)
+			continue;
 		
 		if((fl = Realloc(*list, sizeof(fstring)*(total+1))) == NULL) {
 			DEBUG(0,("get_ntdrivers: failed to enlarge list!\n"));
@@ -665,8 +667,8 @@ int get_ntdrivers(fstring **list, const char *architecture, uint32 version)
 }
 
 /****************************************************************************
-function to do the mapping between the long architecture name and
-the short one.
+ Function to do the mapping between the long architecture name and
+ the short one.
 ****************************************************************************/
 BOOL get_short_archi(char *short_archi, const char *long_archi)
 {
@@ -945,8 +947,8 @@ is no previous version, the new one is newer (obviously). If either file is
 missing the version info structure, compare the creation date (on Unix use
 the modification date). Otherwise chose the numerically larger version number.
 ****************************************************************************/
-static int file_version_is_newer(connection_struct *conn, fstring new_file,
-								fstring old_file)
+
+static int file_version_is_newer(connection_struct *conn, fstring new_file, fstring old_file)
 {
 	BOOL   use_version = True;
 	pstring filepath;
@@ -1866,7 +1868,8 @@ int pack_devicemode(NT_DEVICEMODE *nt_devmode, char *buf, int buflen)
 
 	len += tdb_pack(buf+len, buflen-len, "p", nt_devmode);
 
-	if (!nt_devmode) return len;
+	if (!nt_devmode)
+		return len;
 
 	len += tdb_pack(buf+len, buflen-len, "ffwwwwwwwwwwwwwwwwwwddddddddddddddp",
 			nt_devmode->devicename,
@@ -1937,15 +1940,13 @@ static int pack_values(NT_PRINTER_DATA *data, char *buf, int buflen)
 
 	/* loop over all keys */
 		
-	for ( i=0; i<data->num_keys; i++ )
-	{	
+	for ( i=0; i<data->num_keys; i++ ) {	
 		val_ctr = &data->keys[i].values;
 		num_values = regval_ctr_numvals( val_ctr );
 		
 		/* loop over all values */
 		
-		for ( j=0; j<num_values; j++ )
-		{
+		for ( j=0; j<num_values; j++ ) {
 			/* pathname should be stored as <key>\<value> */
 			
 			val = regval_ctr_specific_value( val_ctr, j );
@@ -1991,7 +1992,7 @@ uint32 del_a_printer(char *sharename)
 }
 
 /* FIXME!!!  Reorder so this forward declaration is not necessary --jerry */
-static WERROR get_a_printer_2(NT_PRINTER_INFO_LEVEL_2 **, fstring);
+static WERROR get_a_printer_2(NT_PRINTER_INFO_LEVEL_2 **, const char* sharename);
 static void free_nt_printer_info_level_2(NT_PRINTER_INFO_LEVEL_2 **);
 /****************************************************************************
 ****************************************************************************/
@@ -2169,6 +2170,9 @@ NT_DEVICEMODE *dup_nt_devicemode(NT_DEVICEMODE *nt_devicemode)
 {
 	NT_DEVICEMODE *new_nt_devicemode = NULL;
 
+	if ( !nt_devicemode )
+		return NULL;
+
 	if ((new_nt_devicemode = (NT_DEVICEMODE *)memdup(nt_devicemode, sizeof(NT_DEVICEMODE))) == NULL) {
 		DEBUG(0,("dup_nt_devicemode: malloc fail.\n"));
 		return NULL;
@@ -2222,8 +2226,7 @@ static void free_nt_printer_info_level_2(NT_PRINTER_INFO_LEVEL_2 **info_ptr)
 	/* clean up all registry keys */
 	
 	data = &info->data;
-	for ( i=0; i<data->num_keys; i++ ) 
-	{
+	for ( i=0; i<data->num_keys; i++ ) {
 		SAFE_FREE( data->keys[i].name );
 		regval_ctr_destroy( &data->keys[i].values );
 	}
@@ -2311,8 +2314,8 @@ int unpack_devicemode(NT_DEVICEMODE **nt_devmode, char *buf, int buflen)
 }
 
 /****************************************************************************
- allocate and initialize a new slot in 
- ***************************************************************************/
+ Allocate and initialize a new slot.
+***************************************************************************/
  
 static int add_new_printer_key( NT_PRINTER_DATA *data, const char *name )
 {
@@ -2360,8 +2363,7 @@ int lookup_printerkey( NT_PRINTER_DATA *data, const char *name )
 
 	/* loop over all existing keys */
 	
-	for ( i=0; i<data->num_keys; i++ ) 
-	{
+	for ( i=0; i<data->num_keys; i++ ) {
 		if ( strequal(data->keys[i].name, name) ) {
 			DEBUG(12,("lookup_printerkey: Found [%s]!\n", name));
 			key_index = i;
@@ -2388,10 +2390,8 @@ uint32 get_printer_subkeys( NT_PRINTER_DATA *data, const char* key, fstring **su
 	if ( !data )
 		return 0;
 		
-	for ( i=0; i<data->num_keys; i++ ) 
-	{
-		if ( StrnCaseCmp(data->keys[i].name, key, strlen(key)) == 0 )
-		{
+	for ( i=0; i<data->num_keys; i++ ) {
+		if ( StrnCaseCmp(data->keys[i].name, key, strlen(key)) == 0 ) {
 			/* match sure it is a subkey and not the key itself */
 			
 			key_len = strlen( key );
@@ -2436,7 +2436,7 @@ uint32 get_printer_subkeys( NT_PRINTER_DATA *data, const char* key, fstring **su
 	/* tag of the end */
 	
 	if (num_subkeys)
-		fstrcpy( subkeys_ptr[num_subkeys], "" );
+		fstrcpy(subkeys_ptr[num_subkeys], "" );
 	
 	*subkeys = subkeys_ptr;
 
@@ -2692,12 +2692,12 @@ WERROR unpublish_it(NT_PRINTER_INFO_LEVEL *printer)
  * @return WERROR indicating status of publishing
  ***************************************************************************/
 
-WERROR nt_printer_publish(int snum, int action)
+WERROR nt_printer_publish(Printer_entry *print_hnd, int snum, int action)
 {
 	NT_PRINTER_INFO_LEVEL *printer = NULL;
 	WERROR win_rc;
 
-	win_rc = get_a_printer(&printer, 2, lp_servicename(snum));
+	win_rc = get_a_printer(print_hnd, &printer, 2, lp_servicename(snum));
 	if (!W_ERROR_IS_OK(win_rc))
 		return win_rc;
 
@@ -2718,7 +2718,7 @@ WERROR nt_printer_publish(int snum, int action)
 	return win_rc;
 }
 
-BOOL is_printer_published(int snum, GUID *guid)
+BOOL is_printer_published(Printer_entry *print_hnd, int snum, GUID *guid)
 {
 	NT_PRINTER_INFO_LEVEL *printer = NULL;
 	REGVAL_CTR *ctr;
@@ -2727,7 +2727,7 @@ BOOL is_printer_published(int snum, GUID *guid)
 	int i;
 
 
-	win_rc = get_a_printer(&printer, 2, lp_servicename(snum));
+	win_rc = get_a_printer(print_hnd, &printer, 2, lp_servicename(snum));
 	if (!W_ERROR_IS_OK(win_rc))
 		return False;
 
@@ -2753,11 +2753,11 @@ BOOL is_printer_published(int snum, GUID *guid)
 }
 	
 #else
-WERROR nt_printer_publish(int snum, int action)
+WERROR nt_printer_publish(Printer_entry *print_hnd, int snum, int action)
 {
 	return WERR_OK;
 }
-BOOL is_printer_published(int snum, GUID *guid)
+BOOL is_printer_published(Printer_entry *print_hnd, int snum, GUID *guid)
 {
 	return False;
 }
@@ -2780,10 +2780,8 @@ WERROR delete_all_printer_data( NT_PRINTER_INFO_LEVEL_2 *p2, const char *key )
 	
 	/* remove all keys */
 
-	if ( !strlen(key) ) 
-	{
-		for ( i=0; i<data->num_keys; i++ ) 
-		{
+	if ( !strlen(key) ) {
+		for ( i=0; i<data->num_keys; i++ ) {
 			DEBUG(8,("delete_all_printer_data: Removed all Printer Data from key [%s]\n",
 				data->keys[i].name));
 		
@@ -2802,10 +2800,8 @@ WERROR delete_all_printer_data( NT_PRINTER_INFO_LEVEL_2 *p2, const char *key )
 
 	/* remove a specific key (and all subkeys) */
 	
-	for ( i=0; i<data->num_keys; i++ ) 
-	{
-		if ( StrnCaseCmp( data->keys[i].name, key, strlen(key)) == 0 )
-		{
+	for ( i=0; i<data->num_keys; i++ ) {
+		if ( StrnCaseCmp( data->keys[i].name, key, strlen(key)) == 0 ) {
 			DEBUG(8,("delete_all_printer_data: Removed all Printer Data from key [%s]\n",
 				data->keys[i].name));
 		
@@ -2849,8 +2845,7 @@ WERROR delete_all_printer_data( NT_PRINTER_INFO_LEVEL_2 *p2, const char *key )
 
 	/* sanity check to see if anything is left */
 
-	if ( !data->num_keys )
-	{
+	if ( !data->num_keys ) {
 		DEBUG(8,("delete_all_printer_data: No keys left for printer [%s]\n", p2->printername ));
 
 		SAFE_FREE( data->keys );
@@ -2956,8 +2951,7 @@ static int unpack_values(NT_PRINTER_DATA *printer_data, char *buf, int buflen)
 
 	/* loop and unpack the rest of the registry values */
 	
-	while ( True ) 
-	{
+	while ( True ) {
 	
 		/* check to see if there are any more registry values */
 		
@@ -3007,7 +3001,8 @@ static int unpack_values(NT_PRINTER_DATA *printer_data, char *buf, int buflen)
 		
 		regval_ctr_addvalue( &printer_data->keys[key_index].values, valuename, type, data_p, size );
 
-		SAFE_FREE(data_p); /* 'B' option to tdb_unpack does a malloc() */
+		SAFE_FREE(data_p); /* 'B' option to tdbpack does a malloc() */
+
 		DEBUG(8,("specific: [%s:%s], len: %d\n", keyname, valuename, size));
 	}
 
@@ -3099,9 +3094,9 @@ static void map_to_os2_driver(fstring drivername)
 }
 
 /****************************************************************************
-get a default printer info 2 struct
+ Get a default printer info 2 struct.
 ****************************************************************************/
-static WERROR get_a_printer_2_default(NT_PRINTER_INFO_LEVEL_2 **info_ptr, fstring sharename)
+static WERROR get_a_printer_2_default(NT_PRINTER_INFO_LEVEL_2 **info_ptr, const char *sharename)
 {
 	int snum;
 	NT_PRINTER_INFO_LEVEL_2 info;
@@ -3180,7 +3175,7 @@ static WERROR get_a_printer_2_default(NT_PRINTER_INFO_LEVEL_2 **info_ptr, fstrin
 
 /****************************************************************************
 ****************************************************************************/
-static WERROR get_a_printer_2(NT_PRINTER_INFO_LEVEL_2 **info_ptr, fstring sharename)
+static WERROR get_a_printer_2(NT_PRINTER_INFO_LEVEL_2 **info_ptr, const char *sharename)
 {
 	pstring key;
 	NT_PRINTER_INFO_LEVEL_2 info;
@@ -3270,7 +3265,7 @@ static WERROR get_a_printer_2(NT_PRINTER_INFO_LEVEL_2 **info_ptr, fstring sharen
 }
 
 /****************************************************************************
-debugging function, dump at level 6 the struct in the logs
+ Debugging function, dump at level 6 the struct in the logs.
 ****************************************************************************/
 static uint32 dump_a_printer(NT_PRINTER_INFO_LEVEL printer, uint32 level)
 {
@@ -3279,8 +3274,7 @@ static uint32 dump_a_printer(NT_PRINTER_INFO_LEVEL printer, uint32 level)
 	
 	DEBUG(106,("Dumping printer at level [%d]\n", level));
 	
-	switch (level)
-	{
+	switch (level) {
 		case 2:
 		{
 			if (printer.info_2 == NULL)
@@ -3325,26 +3319,6 @@ static uint32 dump_a_printer(NT_PRINTER_INFO_LEVEL printer, uint32 level)
 	return result;
 }
 
-/****************************************************************************
- Get the parameters we can substitute in an NT print job.
-****************************************************************************/
-
-void get_printer_subst_params(int snum, fstring *printername, fstring *sharename, fstring *portname)
-{
-	NT_PRINTER_INFO_LEVEL *printer = NULL;
-
-	**printername = **sharename = **portname = '\0';
-
-	if (!W_ERROR_IS_OK(get_a_printer(&printer, 2, lp_servicename(snum))))
-		return;
-
-	fstrcpy(*printername, printer->info_2->printername);
-	fstrcpy(*sharename, printer->info_2->sharename);
-	fstrcpy(*portname, printer->info_2->portname);
-
-	free_a_printer(&printer, 2);
-}
-
 /****************************************************************************
  Update the changeid time.
  This is SO NASTY as some drivers need this to change, others need it
@@ -3388,8 +3362,15 @@ WERROR mod_a_printer(NT_PRINTER_INFO_LEVEL printer, uint32 level)
 	
 	dump_a_printer(printer, level);	
 	
-	switch (level)
-	{
+	/* 
+	 * invalidate cache for all open handles to this printer.
+	 * cache for a given handle will be updated on the next 
+	 * get_a_printer() 
+	 */
+	 
+	invalidate_printer_hnd_cache( printer.info_2->sharename );
+	
+	switch (level) {
 		case 2:
 		{
 			/*
@@ -3424,6 +3405,7 @@ WERROR mod_a_printer(NT_PRINTER_INFO_LEVEL printer, uint32 level)
 			 */
 
 			result=update_a_printer_2(printer.info_2);
+			
 			break;
 		}
 		default:
@@ -3528,8 +3510,7 @@ BOOL set_driver_init(NT_PRINTER_INFO_LEVEL *printer, uint32 level)
 {
 	BOOL result = False;
 	
-	switch (level)
-	{
+	switch (level) {
 		case 2:
 			result = set_driver_init_2(printer->info_2);
 			break;
@@ -3600,7 +3581,8 @@ static uint32 update_driver_init_2(NT_PRINTER_INFO_LEVEL_2 *info)
 			ret = -1;
 			goto done;
 		}
-		else buf = tb;
+		else
+			buf = tb;
 		buflen = len;
 		goto again;
 	}
@@ -3636,13 +3618,10 @@ uint32 update_driver_init(NT_PRINTER_INFO_LEVEL printer, uint32 level)
 	
 	dump_a_printer(printer, level);	
 	
-	switch (level)
-	{
+	switch (level) {
 		case 2:
-		{
 			result = update_driver_init_2(printer.info_2);
 			break;
-		}
 		default:
 			result = 1;
 			break;
@@ -3711,8 +3690,7 @@ static WERROR save_driver_init_2(NT_PRINTER_INFO_LEVEL *printer, uint8 *data, ui
 	 */
 	DEBUG(8,("save_driver_init_2: Enter...\n"));
 	
-	if ( !printer->info_2->devmode && data_len ) 
-	{
+	if ( !printer->info_2->devmode && data_len ) {
 		/*
 		 * Set devmode on printer info, so entire printer initialization can be
 		 * saved to tdb.
@@ -3781,13 +3759,10 @@ WERROR save_driver_init(NT_PRINTER_INFO_LEVEL *printer, uint32 level, uint8 *dat
 {
 	WERROR status = WERR_OK;
 	
-	switch (level)
-	{
+	switch (level) {
 		case 2:
-		{
 			status = save_driver_init_2( printer, data, data_len );
 			break;
-		}
 		default:
 			status = WERR_UNKNOWN_LEVEL;
 			break;
@@ -3796,11 +3771,80 @@ WERROR save_driver_init(NT_PRINTER_INFO_LEVEL *printer, uint32 level, uint8 *dat
 	return status;
 }
 
+/****************************************************************************
+ Deep copy a NT_PRINTER_DATA
+****************************************************************************/
+
+static NTSTATUS copy_printer_data( NT_PRINTER_DATA *dst, NT_PRINTER_DATA *src )
+{
+	int i, j, num_vals, new_key_index;
+	REGVAL_CTR *src_key, *dst_key;
+	
+	if ( !dst || !src )
+		return NT_STATUS_NO_MEMORY;
+	
+	for ( i=0; i<src->num_keys; i++ ) {
+			   
+		/* create a new instance of the printerkey in the destination 
+		   printer_data object */
+		   
+		new_key_index = add_new_printer_key( dst, src->keys[i].name );
+		dst_key = &dst->keys[new_key_index].values;
+
+		src_key = &src->keys[i].values;
+		num_vals = regval_ctr_numvals( src_key );
+		
+		/* dup the printer entire printer key */
+		
+		for ( j=0; j<num_vals; j++ ) {
+			regval_ctr_copyvalue( dst_key, regval_ctr_specific_value(src_key, j) );
+		}
+	}
+		
+	return NT_STATUS_OK;
+}
+
+/****************************************************************************
+ Deep copy a NT_PRINTER_INFO_LEVEL_2 structure using malloc()'d memeory
+ Caller must free.
+****************************************************************************/
+
+static NT_PRINTER_INFO_LEVEL_2* dup_printer_2( TALLOC_CTX *ctx, NT_PRINTER_INFO_LEVEL_2 *printer )
+{
+	NT_PRINTER_INFO_LEVEL_2 *copy;
+	
+	if ( !printer )
+		return NULL;
+	
+	if ( !(copy = (NT_PRINTER_INFO_LEVEL_2 *)malloc(sizeof(NT_PRINTER_INFO_LEVEL_2))) )
+		return NULL;
+		
+	memcpy( copy, printer, sizeof(NT_PRINTER_INFO_LEVEL_2) );
+	
+	/* malloc()'d members copied here */
+	
+	copy->devmode = dup_nt_devicemode( printer->devmode );	
+
+	ZERO_STRUCT( copy->data );
+	copy_printer_data( &copy->data, &printer->data );
+	
+	/* this is talloc()'d; very ugly that we have a structure that 
+	   is half malloc()'d and half talloc()'d but that is the way 
+	   that the PRINTER_INFO stuff is written right now.  --jerry  */
+	   
+	copy->secdesc_buf = dup_sec_desc_buf( ctx, printer->secdesc_buf );
+		
+	return copy;
+}
+
 /****************************************************************************
  Get a NT_PRINTER_INFO_LEVEL struct. It returns malloced memory.
 ****************************************************************************/
 
-WERROR get_a_printer(NT_PRINTER_INFO_LEVEL **pp_printer, uint32 level, fstring sharename)
+#define ENABLE_PRINT_HND_CACHE	1
+
+WERROR get_a_printer( Printer_entry *print_hnd, NT_PRINTER_INFO_LEVEL **pp_printer, uint32 level, 
+			const char *sharename)
 {
 	WERROR result;
 	NT_PRINTER_INFO_LEVEL *printer = NULL;
@@ -3809,24 +3853,70 @@ WERROR get_a_printer(NT_PRINTER_INFO_LEVEL **pp_printer, uint32 level, fstring s
 
 	DEBUG(10,("get_a_printer: [%s] level %u\n", sharename, (unsigned int)level));
 
-	switch (level)
-	{
+	switch (level) {
 		case 2:
-		{
 			if ((printer = (NT_PRINTER_INFO_LEVEL *)malloc(sizeof(NT_PRINTER_INFO_LEVEL))) == NULL) {
 				DEBUG(0,("get_a_printer: malloc fail.\n"));
 				return WERR_NOMEM;
 			}
 			ZERO_STRUCTP(printer);
+			
+			/* 
+			 * check for cache first.  A Printer handle cannot changed
+			 * to another printer object so we only check that the printer 
+			 * is actually for a printer and that the printer_info pointer 
+			 * is valid
+			 */
+#ifdef ENABLE_PRINT_HND_CACHE	/* JERRY */
+			if ( print_hnd 
+				&& (print_hnd->printer_type==PRINTER_HANDLE_IS_PRINTER) 
+				&& print_hnd->printer_info )
+			{
+				if ( !(printer->info_2 = dup_printer_2(print_hnd->ctx, print_hnd->printer_info->info_2)) ) {
+					DEBUG(0,("get_a_printer: unable to copy cached printer info!\n"));
+					
+					SAFE_FREE(printer);
+					return WERR_NOMEM;
+				}
+				
+				DEBUG(10,("get_a_printer: using cached copy of printer_info_2\n"));
+				
+				*pp_printer = printer;				
+				result = WERR_OK;
+				
+				break;
+			}
+#endif 
+
+			/* no cache; look it up on disk */
+			
 			result=get_a_printer_2(&printer->info_2, sharename);
 			if (W_ERROR_IS_OK(result)) {
 				dump_a_printer(*printer, level);
+
+#if ENABLE_PRINT_HND_CACHE	/* JERRY */								
+				/* save a copy in cache */
+				if ( print_hnd && (print_hnd->printer_type==PRINTER_HANDLE_IS_PRINTER)) {
+					if ( !print_hnd->printer_info )
+						print_hnd->printer_info = (NT_PRINTER_INFO_LEVEL *)malloc(sizeof(NT_PRINTER_INFO_LEVEL));
+					
+					if ( print_hnd->printer_info ) {
+						print_hnd->printer_info->info_2 = dup_printer_2(print_hnd->ctx, printer->info_2);
+						
+						/* don't fail the lookup just because the cache update failed */
+						if ( !print_hnd->printer_info->info_2 )
+							DEBUG(0,("get_a_printer: unable to copy new printer info!\n"));
+					}
+					
+				}
+#endif
 				*pp_printer = printer;
-			} else {
-				SAFE_FREE(printer);
 			}
+			else 
+				SAFE_FREE(printer);
+	
+
 			break;
-		}
 		default:
 			result=WERR_UNKNOWN_LEVEL;
 			break;
@@ -3851,21 +3941,15 @@ uint32 free_a_printer(NT_PRINTER_INFO_LEVEL **pp_printer, uint32 level)
 	if (printer == NULL)
 		return 0;
 	
-	switch (level)
-	{
+	switch (level) {
 		case 2:
-		{
-			if (printer->info_2 != NULL)
-			{
+			if (printer->info_2 != NULL) {
 				free_nt_printer_info_level_2(&printer->info_2);
 				result=0;
-			}
-			else
-			{
+			} else
 				result=4;
-			}
 			break;
-		}
+
 		default:
 			result=1;
 			break;
@@ -3883,19 +3967,15 @@ uint32 add_a_printer_driver(NT_PRINTER_DRIVER_INFO_LEVEL driver, uint32 level)
 	DEBUG(104,("adding a printer at level [%d]\n", level));
 	dump_a_printer_driver(driver, level);
 	
-	switch (level)
-	{
+	switch (level) {
 		case 3:
-		{
 			result=add_a_printer_driver_3(driver.info_3);
 			break;
-		}
 
 		case 6:
-		{
 			result=add_a_printer_driver_6(driver.info_6);
 			break;
-		}
+
 		default:
 			result=1;
 			break;
@@ -3905,13 +3985,13 @@ uint32 add_a_printer_driver(NT_PRINTER_DRIVER_INFO_LEVEL driver, uint32 level)
 }
 /****************************************************************************
 ****************************************************************************/
+
 WERROR get_a_printer_driver(NT_PRINTER_DRIVER_INFO_LEVEL *driver, uint32 level,
                             fstring drivername, const char *architecture, uint32 version)
 {
 	WERROR result;
 	
-	switch (level)
-	{
+	switch (level) {
 		case 3:
 			/* Sometime we just want any version of the driver */
 			
@@ -3924,8 +4004,7 @@ WERROR get_a_printer_driver(NT_PRINTER_DRIVER_INFO_LEVEL *driver, uint32 level,
 					result = get_a_printer_driver_3( &driver->info_3, 
 							drivername, architecture, 2 );
 				}
-			}
-			else {
+			} else {
 				result = get_a_printer_driver_3(&driver->info_3, drivername, 
 					architecture, version);				
 			}
@@ -3948,8 +4027,7 @@ uint32 free_a_printer_driver(NT_PRINTER_DRIVER_INFO_LEVEL driver, uint32 level)
 {
 	uint32 result;
 	
-	switch (level)
-	{
+	switch (level) {
 		case 3:
 		{
 			NT_PRINTER_DRIVER_INFO_LEVEL_3 *info3;
@@ -3960,9 +4038,7 @@ uint32 free_a_printer_driver(NT_PRINTER_DRIVER_INFO_LEVEL driver, uint32 level)
 				ZERO_STRUCTP(info3);
 				SAFE_FREE(info3);
 				result=0;
-			}
-			else
-			{
+			} else {
 				result=4;
 			}
 			break;
@@ -3970,17 +4046,14 @@ uint32 free_a_printer_driver(NT_PRINTER_DRIVER_INFO_LEVEL driver, uint32 level)
 		case 6:
 		{
 			NT_PRINTER_DRIVER_INFO_LEVEL_6 *info6;
-			if (driver.info_6 != NULL)
-			{
+			if (driver.info_6 != NULL) {
 				info6=driver.info_6;
 				SAFE_FREE(info6->dependentfiles);
 				SAFE_FREE(info6->previousnames);
 				ZERO_STRUCTP(info6);
 				SAFE_FREE(info6);
 				result=0;
-			}
-			else
-			{
+			} else {
 				result=4;
 			}
 			break;
@@ -4011,12 +4084,11 @@ BOOL printer_driver_in_use ( NT_PRINTER_DRIVER_INFO_LEVEL_3 *info_3 )
 	
 	/* loop through the printers.tdb and check for the drivername */
 	
-	for (snum=0; snum<n_services; snum++) 
-	{
+	for (snum=0; snum<n_services; snum++) {
 		if ( !(lp_snum_ok(snum) && lp_print_ok(snum) ) )
 			continue;
 		
-		if ( !W_ERROR_IS_OK(get_a_printer(&printer, 2, lp_servicename(snum))) )
+		if ( !W_ERROR_IS_OK(get_a_printer(NULL, &printer, 2, lp_servicename(snum))) )
 			continue;
 		
 		if ( !StrCaseCmp(info_3->name, printer->info_2->drivername) ) {
@@ -4063,11 +4135,9 @@ static BOOL drv_file_in_use( char* file, NT_PRINTER_DRIVER_INFO_LEVEL_3 *info )
 	if ( !info->dependentfiles )
 		return False;
 	
-	while ( *info->dependentfiles[i] ) 
-	{
+	while ( *info->dependentfiles[i] ) {
 		if ( strequal(file, info->dependentfiles[i]) )
 			return True;
-			
 		i++;
 	}
 	
@@ -4085,8 +4155,7 @@ static void trim_dependent_file( fstring files[], int idx )
 	
 	/* bump everything down a slot */
 
-	while( *files[idx+1] ) 
-	{
+	while( *files[idx+1] ) {
 		fstrcpy( files[idx], files[idx+1] );
 		idx++;
 	}
@@ -4140,14 +4209,12 @@ static BOOL trim_overlap_drv_files( NT_PRINTER_DRIVER_INFO_LEVEL_3 *src,
 	if ( !src->dependentfiles )
 		return in_use;
 		
-	while ( *src->dependentfiles[i] ) 
-	{
+	while ( *src->dependentfiles[i] ) {
 		if ( drv_file_in_use(src->dependentfiles[i], drv) ) {
 			in_use = True;
 			DEBUG(10,("Removing [%s] from dependent file list\n", src->dependentfiles[i]));
 			trim_dependent_file( src->dependentfiles, i );
-		}
-		else
+		} else
 			i++;
 	} 		
 		
@@ -4192,15 +4259,12 @@ BOOL printer_driver_files_in_use ( NT_PRINTER_DRIVER_INFO_LEVEL_3 *info )
 
 	/* check each driver for overlap in files */
 		
-	for (i=0; i<ndrivers; i++) 
-	{
+	for (i=0; i<ndrivers; i++) {
 		DEBUGADD(5,("\tdriver: [%s]\n", list[i]));
 			
 		ZERO_STRUCT(driver);
 			
-		if ( !W_ERROR_IS_OK(get_a_printer_driver(&driver, 3, list[i], 
-			info->environment, version)) )
-		{
+		if ( !W_ERROR_IS_OK(get_a_printer_driver(&driver, 3, list[i], info->environment, version)) ) {
 			SAFE_FREE(list);
 			return True;
 		}
@@ -4208,8 +4272,7 @@ BOOL printer_driver_files_in_use ( NT_PRINTER_DRIVER_INFO_LEVEL_3 *info )
 		/* check if d2 uses any files from d1 */
 		/* only if this is a different driver than the one being deleted */
 			
-		if ( !strequal(info->name, driver.info_3->name) )
-		{
+		if ( !strequal(info->name, driver.info_3->name) ) {
 			if ( trim_overlap_drv_files(info, driver.info_3) ) {
 				free_a_printer_driver(driver, 3);
 				SAFE_FREE( list );
@@ -4307,15 +4370,13 @@ static BOOL delete_driver_files( NT_PRINTER_DRIVER_INFO_LEVEL_3 *info_3, struct
 	
 	/* check if we are done removing files */
 	
-	if ( info_3->dependentfiles )
-	{
+	if ( info_3->dependentfiles ) {
 		while ( *info_3->dependentfiles[i] ) {
 			char *file;
 
 			/* bypass the "\print$" portion of the path */
 			
-			if ( (file = strchr( info_3->dependentfiles[i]+1, '\\' )) != NULL )
-			{
+			if ( (file = strchr( info_3->dependentfiles[i]+1, '\\' )) != NULL ) {
 				DEBUG(10,("deleting dependent file [%s]\n", file));
 				unlink_internals(conn, 0, file );
 			}
@@ -4560,8 +4621,9 @@ BOOL nt_printing_getsec(TALLOC_CTX *ctx, const char *printername, SEC_DESC_BUF *
 	fstring key;
 	char *temp;
 
-	if (strlen(printername) > 2 && (temp = strchr(printername + 2, '\\')))
+	if (strlen(printername) > 2 && (temp = strchr(printername + 2, '\\'))) {
 		printername = temp + 1;
+	}
 
 	/* Fetch security descriptor from tdb */
 
@@ -4803,7 +4865,7 @@ BOOL print_time_access_check(int snum)
 	struct tm *t;
 	uint32 mins;
 
-	if (!W_ERROR_IS_OK(get_a_printer(&printer, 2, lp_servicename(snum))))
+	if (!W_ERROR_IS_OK(get_a_printer(NULL, &printer, 2, lp_servicename(snum))))
 		return False;
 
 	if (printer->info_2->starttime == 0 && printer->info_2->untiltime == 0)
diff --git a/source3/registry/reg_printing.c b/source3/registry/reg_printing.c
index 4b8eaa658e..619ffc7ee7 100644
--- a/source3/registry/reg_printing.c
+++ b/source3/registry/reg_printing.c
@@ -497,7 +497,7 @@ static int print_subpath_printers( char *key, REGSUBKEY_CTR *subkeys )
 	keystr = key2;
 	reg_split_path( keystr, &base, &new_path );
 
-	if ( !W_ERROR_IS_OK( get_a_printer(&printer, 2, base) ) )
+		if ( !W_ERROR_IS_OK( get_a_printer(NULL, &printer, 2, base) ) )
 		goto done;
 
 	num_subkeys = get_printer_subkeys( &printer->info_2->data, new_path?new_path:"", &subkey_names );
@@ -557,7 +557,7 @@ static int print_subpath_values_printers( char *key, REGVAL_CTR *val )
 	{
 		/* we are dealing with the printer itself */
 
-		if ( !W_ERROR_IS_OK( get_a_printer(&printer, 2, printername) ) )
+		if ( !W_ERROR_IS_OK( get_a_printer(NULL, &printer, 2, printername) ) )
 			goto done;
 
 		info2 = printer->info_2;
@@ -628,7 +628,6 @@ static int print_subpath_values_printers( char *key, REGVAL_CTR *val )
 			}
 		}
 
-				
 		prs_mem_free( &prs );
 		
 		num_values = regval_ctr_numvals( val );	
@@ -639,7 +638,7 @@ static int print_subpath_values_printers( char *key, REGVAL_CTR *val )
 		
 	/* now enumerate the key */
 	
-	if ( !W_ERROR_IS_OK( get_a_printer(&printer, 2, printername) ) )
+	if ( !W_ERROR_IS_OK( get_a_printer(NULL, &printer, 2, printername) ) )
 		goto done;
 	
 	/* iterate over all printer data and fill the regval container */
diff --git a/source3/rpc_parse/parse_spoolss.c b/source3/rpc_parse/parse_spoolss.c
index fb2aaf71ec..a34740f9ff 100644
--- a/source3/rpc_parse/parse_spoolss.c
+++ b/source3/rpc_parse/parse_spoolss.c
@@ -1372,7 +1372,7 @@ BOOL spoolss_io_r_getprinterdata(const char *desc, SPOOL_R_GETPRINTERDATA *r_u,
 			return False;
 	}
 
-	if (!prs_uint8s( r_u->type&(REG_SZ|REG_MULTI_SZ), "data", ps, depth, r_u->data, r_u->size ))
+	if (!prs_uint8s( False, "data", ps, depth, r_u->data, r_u->size ))
 		return False;
 		
 	if (!prs_align(ps))
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 93566c2bb7..fa9b8eaeff 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -5,7 +5,7 @@
  *  Copyright (C) Luke Kenneth Casson Leighton 1996-2000,
  *  Copyright (C) Jean François Micouleau      1998-2000,
  *  Copyright (C) Jeremy Allison               2001-2002,
- *  Copyright (C) Gerald Carter		       2000-2002,
+ *  Copyright (C) Gerald Carter		       2000-2003,
  *  Copyright (C) Tim Potter                   2001-2002.
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -37,8 +37,7 @@
 
 #define MAGIC_DISPLAY_FREQUENCY 0xfade2bad
 #define PHANTOM_DEVMODE_KEY "_p_f_a_n_t_0_m_"
-#define PRINTER_HANDLE_IS_PRINTER	0
-#define PRINTER_HANDLE_IS_PRINTSERVER	1
+
 
 /* Table to map the driver version */
 /* to OS */
@@ -55,46 +54,6 @@ struct table_node {
 	int     version;
 };
 
-
-/* structure to store the printer handles */
-/* and a reference to what it's pointing to */
-/* and the notify info asked about */
-/* that's the central struct */
-typedef struct _Printer{
-	struct _Printer *prev, *next;
-	BOOL document_started;
-	BOOL page_started;
-	uint32 jobid; /* jobid in printing backend */
-	BOOL printer_type;
-	union {
-	  	fstring handlename;
-		fstring printerservername;
-	} dev;
-	uint32 type;
-	uint32 access_granted;
-	struct {
-		uint32 flags;
-		uint32 options;
-		fstring localmachine;
-		uint32 printerlocal;
-		SPOOL_NOTIFY_OPTION *option;
-		POLICY_HND client_hnd;
-		BOOL client_connected;
-		uint32 change;
-		/* are we in a FindNextPrinterChangeNotify() call? */
-		BOOL fnpcn;
-	} notify;
-	struct {
-		fstring machine;
-		fstring user;
-	} client;
-	
-	/* devmode sent in the OpenPrinter() call */
-	NT_DEVICEMODE	*nt_devmode;
-	
-	
-} Printer_entry;
-
 static Printer_entry *printers_list;
 
 typedef struct _counter_printer_0 {
@@ -251,6 +210,9 @@ static void free_printer_entry(void *ptr)
 	Printer->notify.client_connected=False;
 	
 	free_nt_devicemode( &Printer->nt_devmode );
+	free_a_printer( &Printer->printer_info, 2 );
+	
+	talloc_destroy( Printer->ctx );
 
 	/* Remove from the internal list. */
 	DLIST_REMOVE(printers_list, Printer);
@@ -303,6 +265,29 @@ static Printer_entry *find_printer_index_by_hnd(pipes_struct *p, POLICY_HND *hnd
 	return find_printer;
 }
 
+/****************************************************************************
+  find printer index by handle
+****************************************************************************/
+
+void invalidate_printer_hnd_cache( char *printername )
+{
+	Printer_entry *p;
+	
+	DEBUG(10,("invalidate_printer_hnd_cache: printer [%s]\n", printername));
+
+	for ( p=printers_list; p; p=p->next )
+	{
+		if ( p->printer_type==PRINTER_HANDLE_IS_PRINTER 
+			&& StrCaseCmp(p->dev.handlename, printername)==0)
+		{
+			DEBUG(10,("invalidating printer_info cache for handl:\n"));
+			free_a_printer( &p->printer_info, 2 );
+			p->printer_info = NULL;
+		}
+	}
+
+	return;
+}
 /****************************************************************************
  Close printer index by handle.
 ****************************************************************************/
@@ -534,6 +519,11 @@ static BOOL open_printer_hnd(pipes_struct *p, POLICY_HND *hnd, char *name, uint3
 
 	ZERO_STRUCTP(new_printer);
 	
+	if ( !(new_printer->ctx = talloc_init("Printer Entry [0x%x]", (uint32)hnd)) ) {
+		DEBUG(0,("open_printer_hnd: talloc_init() failed!\n"));
+		return False;
+	}
+	
 	new_printer->notify.option=NULL;
 				
 	/* Add to the internal list. */
@@ -861,8 +851,7 @@ static int notify_msg_ctr_addmsg( SPOOLSS_NOTIFY_MSG_CTR *ctr, SPOOLSS_NOTIFY_MS
 	
 	/* add a new group? */
 	
-	if ( i == ctr->num_groups )
-	{
+	if ( i == ctr->num_groups ) {
 		ctr->num_groups++;
 
 		if ( !(groups = talloc_realloc( ctr->ctx, ctr->msg_groups, sizeof(SPOOLSS_NOTIFY_MSG_GROUP)*ctr->num_groups)) ) {
@@ -929,8 +918,7 @@ static void send_notify2_changes( SPOOLSS_NOTIFY_MSG_CTR *ctr, uint32 idx )
 	
 	/* loop over all printers */
 	
-	for (p = printers_list; p; p = p->next) 
-	{
+	for (p = printers_list; p; p = p->next) {
 		SPOOL_NOTIFY_INFO_DATA *data;
 		uint32	data_len = 0;
 		uint32 	id;
@@ -961,8 +949,7 @@ static void send_notify2_changes( SPOOLSS_NOTIFY_MSG_CTR *ctr, uint32 idx )
 		
 		/* build the array of change notifications */
 		
-		for ( i=0; i<msg_group->num_msgs; i++ )
-		{
+		for ( i=0; i<msg_group->num_msgs; i++ ) {
 			SPOOLSS_NOTIFY_MSG	*msg = &messages[i];
 			
 			/* Are we monitoring this event? */
@@ -995,8 +982,7 @@ static void send_notify2_changes( SPOOLSS_NOTIFY_MSG_CTR *ctr, uint32 idx )
 
 			/* Convert unix jobid to smb jobid */
 
-			if (msg->flags & SPOOLSS_NOTIFY_MSG_UNIX_JOBID) 
-			{
+			if (msg->flags & SPOOLSS_NOTIFY_MSG_UNIX_JOBID) {
 				id = sysjob_to_jobid(msg->id);
 
 				if (id == -1) {
@@ -1204,7 +1190,7 @@ void do_drv_upgrade_printer(int msg_type, pid_t src, void *buf, size_t len)
 			WERROR result;
 			NT_PRINTER_INFO_LEVEL *printer = NULL;
 			
-			result = get_a_printer(&printer, 2, lp_servicename(snum));
+			result = get_a_printer(NULL, &printer, 2, lp_const_servicename(snum));
 			if (!W_ERROR_IS_OK(result))
 				continue;
 				
@@ -1300,7 +1286,7 @@ void reset_all_printerdata(int msg_type, pid_t src, void *buf, size_t len)
 			WERROR result;
 			NT_PRINTER_INFO_LEVEL *printer = NULL;
 			
-			result = get_a_printer( &printer, 2, lp_servicename(snum) );
+			result = get_a_printer( NULL, &printer, 2, lp_const_servicename(snum) );
 			if ( !W_ERROR_IS_OK(result) )
 				continue;
 				
@@ -2157,9 +2143,7 @@ static WERROR get_printer_dataex( TALLOC_CTX *ctx, NT_PRINTER_INFO_LEVEL *printe
 
 static WERROR delete_printer_dataex( NT_PRINTER_INFO_LEVEL *printer, const char *key, const char *value )
 {
-	delete_printer_data( printer->info_2, key, value );
-	
-	return mod_a_printer(*printer, 2);
+	return delete_printer_data( printer->info_2, key, value );
 }
 
 /****************************************************************************
@@ -2171,9 +2155,7 @@ static WERROR set_printer_dataex( NT_PRINTER_INFO_LEVEL *printer, const char *ke
 {
 	delete_printer_data( printer->info_2, key, value );
 	
-	add_printer_data( printer->info_2, key, value, type, data, real_len );
-	
-	return mod_a_printer(*printer, 2);
+	return add_printer_data( printer->info_2, key, value, type, data, real_len );
 }
 
 /********************************************************************
@@ -2349,7 +2331,7 @@ WERROR _spoolss_getprinterdata(pipes_struct *p, SPOOL_Q_GETPRINTERDATA *q_u, SPO
 			goto done;
 		}
 
-		status = get_a_printer(&printer, 2, lp_servicename(snum));
+		status = get_a_printer(Printer, &printer, 2, lp_servicename(snum));
 		if ( !W_ERROR_IS_OK(status) )
 			goto done;
 
@@ -3443,7 +3425,7 @@ void construct_info_data(SPOOL_NOTIFY_INFO_DATA *info_data, uint16 type, uint16
  *
  ********************************************************************/
 
-static BOOL construct_notify_printer_info(SPOOL_NOTIFY_INFO *info, int
+static BOOL construct_notify_printer_info(Printer_entry *print_hnd, SPOOL_NOTIFY_INFO *info, int
 					  snum, SPOOL_NOTIFY_OPTION_TYPE
 					  *option_type, uint32 id,
 					  TALLOC_CTX *mem_ctx) 
@@ -3462,11 +3444,10 @@ static BOOL construct_notify_printer_info(SPOOL_NOTIFY_INFO *info, int
 		(option_type->type==PRINTER_NOTIFY_TYPE?"PRINTER_NOTIFY_TYPE":"JOB_NOTIFY_TYPE"),
 		option_type->count, lp_servicename(snum)));
 	
-	if (!W_ERROR_IS_OK(get_a_printer(&printer, 2, lp_servicename(snum))))
+	if (!W_ERROR_IS_OK(get_a_printer(print_hnd, &printer, 2, lp_const_servicename(snum))))
 		return False;
 
-	for(field_num=0; field_num<option_type->count; field_num++) 
-	{
+	for(field_num=0; field_num<option_type->count; field_num++) {
 		field = option_type->fields[field_num];
 		
 		DEBUG(4,("construct_notify_printer_info: notify [%d]: type [%x], field [%x]\n", field_num, type, field));
@@ -3474,12 +3455,10 @@ static BOOL construct_notify_printer_info(SPOOL_NOTIFY_INFO *info, int
 		if (!search_notify(type, field, &j) )
 			continue;
 
-		if((tid=(SPOOL_NOTIFY_INFO_DATA *)Realloc(info->data, (info->count+1)*sizeof(SPOOL_NOTIFY_INFO_DATA))) == NULL) 
-		{
+		if((tid=(SPOOL_NOTIFY_INFO_DATA *)Realloc(info->data, (info->count+1)*sizeof(SPOOL_NOTIFY_INFO_DATA))) == NULL) {
 			DEBUG(2,("construct_notify_printer_info: failed to enlarge buffer info->data!\n"));
 			return False;
-		}
-		else 
+		} else 
 			info->data = tid;
 
 		current_data = &info->data[info->count];
@@ -3611,7 +3590,7 @@ static WERROR printserver_notify_info(pipes_struct *p, POLICY_HND *hnd,
 		for (snum=0; snum<n_services; snum++)
 		{
 			if ( lp_browseable(snum) && lp_snum_ok(snum) && lp_print_ok(snum) )
-				construct_notify_printer_info ( info, snum, option_type, snum, mem_ctx );
+				construct_notify_printer_info ( Printer, info, snum, option_type, snum, mem_ctx );
 		}
 	}
 			
@@ -3671,7 +3650,7 @@ static WERROR printer_notify_info(pipes_struct *p, POLICY_HND *hnd, SPOOL_NOTIFY
 		
 		switch ( option_type->type ) {
 		case PRINTER_NOTIFY_TYPE:
-			if(construct_notify_printer_info(info, snum, 
+			if(construct_notify_printer_info(Printer, info, snum, 
 							 option_type, id,
 							 mem_ctx))  
 				id--;
@@ -3682,8 +3661,7 @@ static WERROR printer_notify_info(pipes_struct *p, POLICY_HND *hnd, SPOOL_NOTIFY
 
 			count = print_queue_status(snum, &queue, &status);
 
-			if (!W_ERROR_IS_OK(get_a_printer(&printer, 2, 
-							 lp_servicename(snum))))
+			if (!W_ERROR_IS_OK(get_a_printer(Printer, &printer, 2, lp_const_servicename(snum))))
 				goto done;
 
 			for (j=0; j<count; j++) {
@@ -3783,7 +3761,7 @@ done:
  * fill a printer_info_0 struct
  ********************************************************************/
 
-static BOOL construct_printer_info_0(PRINTER_INFO_0 *printer, int snum)
+static BOOL construct_printer_info_0(Printer_entry *print_hnd, PRINTER_INFO_0 *printer, int snum)
 {
 	pstring chaine;
 	int count;
@@ -3794,7 +3772,7 @@ static BOOL construct_printer_info_0(PRINTER_INFO_0 *printer, int snum)
 	time_t setuptime;
 	print_status_struct status;
 	
-	if (!W_ERROR_IS_OK(get_a_printer(&ntprinter, 2, lp_servicename(snum))))
+	if (!W_ERROR_IS_OK(get_a_printer(print_hnd, &ntprinter, 2, lp_const_servicename(snum))))
 		return False;
 
 	count = print_queue_length(snum, &status);
@@ -3892,13 +3870,13 @@ static BOOL construct_printer_info_0(PRINTER_INFO_0 *printer, int snum)
  * construct_printer_info_1
  * fill a printer_info_1 struct
  ********************************************************************/
-static BOOL construct_printer_info_1(uint32 flags, PRINTER_INFO_1 *printer, int snum)
+static BOOL construct_printer_info_1(Printer_entry *print_hnd, uint32 flags, PRINTER_INFO_1 *printer, int snum)
 {
 	pstring chaine;
 	pstring chaine2;
 	NT_PRINTER_INFO_LEVEL *ntprinter = NULL;
 
-	if (!W_ERROR_IS_OK(get_a_printer(&ntprinter, 2, lp_servicename(snum))))
+	if (!W_ERROR_IS_OK(get_a_printer(print_hnd, &ntprinter, 2, lp_const_servicename(snum))))
 		return False;
 
 	printer->flags=flags;
@@ -3997,7 +3975,7 @@ DEVICEMODE *construct_dev_mode(int snum)
 	
 	DEBUGADD(8,("getting printer characteristics\n"));
 
-	if (!W_ERROR_IS_OK(get_a_printer(&printer, 2, lp_servicename(snum)))) 
+	if (!W_ERROR_IS_OK(get_a_printer(NULL, &printer, 2, lp_const_servicename(snum)))) 
 		return NULL;
 
 	if ( !printer->info_2->devmode ) {
@@ -4030,14 +4008,14 @@ done:
  * fill a printer_info_2 struct
  ********************************************************************/
 
-static BOOL construct_printer_info_2(PRINTER_INFO_2 *printer, int snum)
+static BOOL construct_printer_info_2(Printer_entry *print_hnd, PRINTER_INFO_2 *printer, int snum)
 {
 	int count;
 	NT_PRINTER_INFO_LEVEL *ntprinter = NULL;
 
 	print_status_struct status;
 
-	if (!W_ERROR_IS_OK(get_a_printer(&ntprinter, 2, lp_servicename(snum))))
+	if (!W_ERROR_IS_OK(get_a_printer(print_hnd, &ntprinter, 2, lp_const_servicename(snum))))
 		return False;
 		
 	count = print_queue_length(snum, &status);
@@ -4093,12 +4071,12 @@ static BOOL construct_printer_info_2(PRINTER_INFO_2 *printer, int snum)
  * fill a printer_info_3 struct
  ********************************************************************/
 
-static BOOL construct_printer_info_3(PRINTER_INFO_3 **pp_printer, int snum)
+static BOOL construct_printer_info_3(Printer_entry *print_hnd, PRINTER_INFO_3 **pp_printer, int snum)
 {
 	NT_PRINTER_INFO_LEVEL *ntprinter = NULL;
 	PRINTER_INFO_3 *printer = NULL;
 
-	if (!W_ERROR_IS_OK(get_a_printer(&ntprinter, 2, lp_servicename(snum))))
+	if (!W_ERROR_IS_OK(get_a_printer(print_hnd, &ntprinter, 2, lp_const_servicename(snum))))
 		return False;
 
 	*pp_printer = NULL;
@@ -4148,11 +4126,11 @@ static BOOL construct_printer_info_3(PRINTER_INFO_3 **pp_printer, int snum)
  * fill a printer_info_4 struct
  ********************************************************************/
 
-static BOOL construct_printer_info_4(PRINTER_INFO_4 *printer, int snum)
+static BOOL construct_printer_info_4(Printer_entry *print_hnd, PRINTER_INFO_4 *printer, int snum)
 {
 	NT_PRINTER_INFO_LEVEL *ntprinter = NULL;
 
-	if (!W_ERROR_IS_OK(get_a_printer(&ntprinter, 2, lp_servicename(snum))))
+	if (!W_ERROR_IS_OK(get_a_printer(print_hnd, &ntprinter, 2, lp_const_servicename(snum))))
 		return False;
 		
 	init_unistr(&printer->printername, ntprinter->info_2->printername);				/* printername*/
@@ -4168,11 +4146,11 @@ static BOOL construct_printer_info_4(PRINTER_INFO_4 *printer, int snum)
  * fill a printer_info_5 struct
  ********************************************************************/
 
-static BOOL construct_printer_info_5(PRINTER_INFO_5 *printer, int snum)
+static BOOL construct_printer_info_5(Printer_entry *print_hnd, PRINTER_INFO_5 *printer, int snum)
 {
 	NT_PRINTER_INFO_LEVEL *ntprinter = NULL;
 
-	if (!W_ERROR_IS_OK(get_a_printer(&ntprinter, 2, lp_servicename(snum))))
+	if (!W_ERROR_IS_OK(get_a_printer(print_hnd, &ntprinter, 2, lp_const_servicename(snum))))
 		return False;
 		
 	init_unistr(&printer->printername, ntprinter->info_2->printername);
@@ -4194,12 +4172,12 @@ static BOOL construct_printer_info_5(PRINTER_INFO_5 *printer, int snum)
  * fill a printer_info_7 struct
  ********************************************************************/
 
-static BOOL construct_printer_info_7(PRINTER_INFO_7 *printer, int snum)
+static BOOL construct_printer_info_7(Printer_entry *print_hnd, PRINTER_INFO_7 *printer, int snum)
 {
 	char *guid_str = NULL;
 	GUID guid;
 	
-	if (is_printer_published(snum, &guid)) {
+	if (is_printer_published(print_hnd, snum, &guid)) {
 		asprintf(&guid_str, "{%s}", uuid_string_static(guid));
 		strupper(guid_str);
 		init_unistr(&printer->guid, guid_str);
@@ -4230,7 +4208,7 @@ static WERROR enum_all_printers_info_1(uint32 flags, NEW_BUFFER *buffer, uint32
 		if (lp_browseable(snum) && lp_snum_ok(snum) && lp_print_ok(snum) ) {
 			DEBUG(4,("Found a printer in smb.conf: %s[%x]\n", lp_servicename(snum), snum));
 
-			if (construct_printer_info_1(flags, &current_prt, snum)) {
+			if (construct_printer_info_1(NULL, flags, &current_prt, snum)) {
 				if((tp=Realloc(printers, (*returned +1)*sizeof(PRINTER_INFO_1))) == NULL) {
 					DEBUG(2,("enum_all_printers_info_1: failed to enlarge printers buffer!\n"));
 					SAFE_FREE(printers);
@@ -4399,7 +4377,7 @@ static WERROR enum_all_printers_info_2(NEW_BUFFER *buffer, uint32 offered, uint3
 		if (lp_browseable(snum) && lp_snum_ok(snum) && lp_print_ok(snum) ) {
 			DEBUG(4,("Found a printer in smb.conf: %s[%x]\n", lp_servicename(snum), snum));
 				
-			if (construct_printer_info_2(&current_prt, snum)) {
+			if (construct_printer_info_2(NULL, &current_prt, snum)) {
 				if((tp=Realloc(printers, (*returned +1)*sizeof(PRINTER_INFO_2))) == NULL) {
 					DEBUG(2,("enum_all_printers_info_2: failed to enlarge printers buffer!\n"));
 					SAFE_FREE(printers);
@@ -4570,14 +4548,14 @@ WERROR _spoolss_enumprinters( pipes_struct *p, SPOOL_Q_ENUMPRINTERS *q_u, SPOOL_
 /****************************************************************************
 ****************************************************************************/
 
-static WERROR getprinter_level_0(int snum, NEW_BUFFER *buffer, uint32 offered, uint32 *needed)
+static WERROR getprinter_level_0(Printer_entry *print_hnd, int snum, NEW_BUFFER *buffer, uint32 offered, uint32 *needed)
 {
 	PRINTER_INFO_0 *printer=NULL;
 
 	if((printer=(PRINTER_INFO_0*)malloc(sizeof(PRINTER_INFO_0))) == NULL)
 		return WERR_NOMEM;
 
-	construct_printer_info_0(printer, snum);
+	construct_printer_info_0(print_hnd, printer, snum);
 	
 	/* check the required size. */	
 	*needed += spoolss_size_printer_info_0(printer);
@@ -4603,14 +4581,14 @@ static WERROR getprinter_level_0(int snum, NEW_BUFFER *buffer, uint32 offered, u
 /****************************************************************************
 ****************************************************************************/
 
-static WERROR getprinter_level_1(int snum, NEW_BUFFER *buffer, uint32 offered, uint32 *needed)
+static WERROR getprinter_level_1(Printer_entry *print_hnd, int snum, NEW_BUFFER *buffer, uint32 offered, uint32 *needed)
 {
 	PRINTER_INFO_1 *printer=NULL;
 
 	if((printer=(PRINTER_INFO_1*)malloc(sizeof(PRINTER_INFO_1))) == NULL)
 		return WERR_NOMEM;
 
-	construct_printer_info_1(PRINTER_ENUM_ICON8, printer, snum);
+	construct_printer_info_1(print_hnd, PRINTER_ENUM_ICON8, printer, snum);
 	
 	/* check the required size. */	
 	*needed += spoolss_size_printer_info_1(printer);
@@ -4636,14 +4614,14 @@ static WERROR getprinter_level_1(int snum, NEW_BUFFER *buffer, uint32 offered, u
 /****************************************************************************
 ****************************************************************************/
 
-static WERROR getprinter_level_2(int snum, NEW_BUFFER *buffer, uint32 offered, uint32 *needed)
+static WERROR getprinter_level_2(Printer_entry *print_hnd, int snum, NEW_BUFFER *buffer, uint32 offered, uint32 *needed)
 {
 	PRINTER_INFO_2 *printer=NULL;
 
 	if((printer=(PRINTER_INFO_2*)malloc(sizeof(PRINTER_INFO_2)))==NULL)
 		return WERR_NOMEM;
 	
-	construct_printer_info_2(printer, snum);
+	construct_printer_info_2(print_hnd, printer, snum);
 	
 	/* check the required size. */	
 	*needed += spoolss_size_printer_info_2(printer);
@@ -4672,11 +4650,11 @@ static WERROR getprinter_level_2(int snum, NEW_BUFFER *buffer, uint32 offered, u
 /****************************************************************************
 ****************************************************************************/
 
-static WERROR getprinter_level_3(int snum, NEW_BUFFER *buffer, uint32 offered, uint32 *needed)
+static WERROR getprinter_level_3(Printer_entry *print_hnd, int snum, NEW_BUFFER *buffer, uint32 offered, uint32 *needed)
 {
 	PRINTER_INFO_3 *printer=NULL;
 
-	if (!construct_printer_info_3(&printer, snum))
+	if (!construct_printer_info_3(print_hnd, &printer, snum))
 		return WERR_NOMEM;
 	
 	/* check the required size. */	
@@ -4703,14 +4681,14 @@ static WERROR getprinter_level_3(int snum, NEW_BUFFER *buffer, uint32 offered, u
 /****************************************************************************
 ****************************************************************************/
 
-static WERROR getprinter_level_4(int snum, NEW_BUFFER *buffer, uint32 offered, uint32 *needed)
+static WERROR getprinter_level_4(Printer_entry *print_hnd, int snum, NEW_BUFFER *buffer, uint32 offered, uint32 *needed)
 {
 	PRINTER_INFO_4 *printer=NULL;
 
 	if((printer=(PRINTER_INFO_4*)malloc(sizeof(PRINTER_INFO_4)))==NULL)
 		return WERR_NOMEM;
 
-	if (!construct_printer_info_4(printer, snum))
+	if (!construct_printer_info_4(print_hnd, printer, snum))
 		return WERR_NOMEM;
 	
 	/* check the required size. */	
@@ -4737,14 +4715,14 @@ static WERROR getprinter_level_4(int snum, NEW_BUFFER *buffer, uint32 offered, u
 /****************************************************************************
 ****************************************************************************/
 
-static WERROR getprinter_level_5(int snum, NEW_BUFFER *buffer, uint32 offered, uint32 *needed)
+static WERROR getprinter_level_5(Printer_entry *print_hnd, int snum, NEW_BUFFER *buffer, uint32 offered, uint32 *needed)
 {
 	PRINTER_INFO_5 *printer=NULL;
 
 	if((printer=(PRINTER_INFO_5*)malloc(sizeof(PRINTER_INFO_5)))==NULL)
 		return WERR_NOMEM;
 
-	if (!construct_printer_info_5(printer, snum))
+	if (!construct_printer_info_5(print_hnd, printer, snum))
 		return WERR_NOMEM;
 	
 	/* check the required size. */	
@@ -4768,14 +4746,14 @@ static WERROR getprinter_level_5(int snum, NEW_BUFFER *buffer, uint32 offered, u
 	return WERR_OK;	
 }
 
-static WERROR getprinter_level_7(int snum, NEW_BUFFER *buffer, uint32 offered, uint32 *needed)
+static WERROR getprinter_level_7(Printer_entry *print_hnd, int snum, NEW_BUFFER *buffer, uint32 offered, uint32 *needed)
 {
 	PRINTER_INFO_7 *printer=NULL;
 
 	if((printer=(PRINTER_INFO_7*)malloc(sizeof(PRINTER_INFO_7)))==NULL)
 		return WERR_NOMEM;
 
-	if (!construct_printer_info_7(printer, snum))
+	if (!construct_printer_info_7(print_hnd, printer, snum))
 		return WERR_NOMEM;
 	
 	/* check the required size. */	
@@ -4809,6 +4787,7 @@ WERROR _spoolss_getprinter(pipes_struct *p, SPOOL_Q_GETPRINTER *q_u, SPOOL_R_GET
 	NEW_BUFFER *buffer = NULL;
 	uint32 offered = q_u->offered;
 	uint32 *needed = &r_u->needed;
+	Printer_entry *Printer=find_printer_index_by_hnd(p, handle);
 
 	int snum;
 
@@ -4823,19 +4802,19 @@ WERROR _spoolss_getprinter(pipes_struct *p, SPOOL_Q_GETPRINTER *q_u, SPOOL_R_GET
 
 	switch (level) {
 	case 0:
-		return getprinter_level_0(snum, buffer, offered, needed);
+		return getprinter_level_0(Printer, snum, buffer, offered, needed);
 	case 1:
-		return getprinter_level_1(snum, buffer, offered, needed);
+		return getprinter_level_1(Printer, snum, buffer, offered, needed);
 	case 2:		
-		return getprinter_level_2(snum, buffer, offered, needed);
+		return getprinter_level_2(Printer, snum, buffer, offered, needed);
 	case 3:		
-		return getprinter_level_3(snum, buffer, offered, needed);
+		return getprinter_level_3(Printer, snum, buffer, offered, needed);
 	case 4:		
-		return getprinter_level_4(snum, buffer, offered, needed);
+		return getprinter_level_4(Printer, snum, buffer, offered, needed);
 	case 5:		
-		return getprinter_level_5(snum, buffer, offered, needed);
+		return getprinter_level_5(Printer, snum, buffer, offered, needed);
 	case 7:
-		return getprinter_level_7(snum, buffer, offered, needed);
+		return getprinter_level_7(Printer, snum, buffer, offered, needed);
 	}
 	return WERR_UNKNOWN_LEVEL;
 }	
@@ -4860,7 +4839,7 @@ static WERROR construct_printer_driver_info_1(DRIVER_INFO_1 *info, int snum, fst
 
 	ZERO_STRUCT(driver);
 
-	if (!W_ERROR_IS_OK(get_a_printer(&printer, 2, lp_servicename(snum))))
+	if (!W_ERROR_IS_OK(get_a_printer(NULL, &printer, 2, lp_const_servicename(snum))))
 		return WERR_INVALID_PRINTER_NAME;
 
 	if (!W_ERROR_IS_OK(get_a_printer_driver(&driver, 3, printer->info_2->drivername, architecture, version)))
@@ -4920,7 +4899,7 @@ static WERROR construct_printer_driver_info_2(DRIVER_INFO_2 *info, int snum, fst
 	ZERO_STRUCT(printer);
 	ZERO_STRUCT(driver);
 
-	if (!W_ERROR_IS_OK(get_a_printer(&printer, 2, lp_servicename(snum))))
+	if (!W_ERROR_IS_OK(get_a_printer(NULL, &printer, 2, lp_const_servicename(snum))))
 		return WERR_INVALID_PRINTER_NAME;
 
 	if (!W_ERROR_IS_OK(get_a_printer_driver(&driver, 3, printer->info_2->drivername, architecture, version)))
@@ -5059,7 +5038,7 @@ static WERROR construct_printer_driver_info_3(DRIVER_INFO_3 *info, int snum, fst
 	WERROR status;
 	ZERO_STRUCT(driver);
 
-	status=get_a_printer(&printer, 2, lp_servicename(snum) );
+	status=get_a_printer(NULL, &printer, 2, lp_const_servicename(snum) );
 	DEBUG(8,("construct_printer_driver_info_3: status: %s\n", dos_errstr(status)));
 	if (!W_ERROR_IS_OK(status))
 		return WERR_INVALID_PRINTER_NAME;
@@ -5184,7 +5163,7 @@ static WERROR construct_printer_driver_info_6(DRIVER_INFO_6 *info, int snum,
 	
 	ZERO_STRUCT(driver);
 
-	status=get_a_printer(&printer, 2, lp_servicename(snum) );
+	status=get_a_printer(NULL, &printer, 2, lp_const_servicename(snum) );
 	
 	DEBUG(8,("construct_printer_driver_info_6: status: %s\n", dos_errstr(status)));
 	
@@ -5853,13 +5832,6 @@ static WERROR update_printer(pipes_struct *p, POLICY_HND *handle, uint32 level,
 
 	result = WERR_OK;
 
-	if (level!=2) {
-		DEBUG(0,("update_printer: Send a mail to samba@samba.org\n"));
-		DEBUGADD(0,("with the following message: update_printer: level!=2\n"));
-		result = WERR_UNKNOWN_LEVEL;
-		goto done;
-	}
-
 	if (!Printer) {
 		result = WERR_BADFID;
 		goto done;
@@ -5870,8 +5842,8 @@ static WERROR update_printer(pipes_struct *p, POLICY_HND *handle, uint32 level,
 		goto done;
 	}
 
-	if (!W_ERROR_IS_OK(get_a_printer(&printer, 2, lp_servicename(snum))) ||
-	    (!W_ERROR_IS_OK(get_a_printer(&old_printer, 2, lp_servicename(snum))))) {
+	if (!W_ERROR_IS_OK(get_a_printer(Printer, &printer, 2, lp_const_servicename(snum))) ||
+	    (!W_ERROR_IS_OK(get_a_printer(Printer, &old_printer, 2, lp_const_servicename(snum))))) {
 		result = WERR_BADFID;
 		goto done;
 	}
@@ -5899,13 +5871,6 @@ static WERROR update_printer(pipes_struct *p, POLICY_HND *handle, uint32 level,
 			result =  WERR_NOMEM;
 			goto done;
 		}
-
-		/* 
-		 * make sure we actually reload the services after 
-		 * this as smb.conf could have a new section in it 
-		 * .... shouldn't .... but could
-		 */
-		reload_services(False);	
 	}
 
 	/* Do sanity check on the requested changes for Samba */
@@ -5964,9 +5929,6 @@ static WERROR update_printer(pipes_struct *p, POLICY_HND *handle, uint32 level,
 		notify_printer_driver(snum, printer->info_2->drivername);
 	}
 
-	/* Update printer info */
-	result = mod_a_printer(*printer, 2);
-
 	/* 
 	 * flag which changes actually occured.  This is a small subset of 
 	 * all the possible changes.  We also have to update things in the 
@@ -6022,6 +5984,9 @@ static WERROR update_printer(pipes_struct *p, POLICY_HND *handle, uint32 level,
 	set_printer_dataex( printer, SPOOL_DSSPOOLER_KEY, "uNCName",
 		REG_SZ, (uint8*)buffer.buffer, buffer.uni_str_len*2 );
 
+	/* Update printer info */
+	result = mod_a_printer(*printer, 2);
+
 done:
 	free_a_printer(&printer, 2);
 	free_a_printer(&old_printer, 2);
@@ -6051,7 +6016,7 @@ static WERROR publish_or_unpublish_printer(pipes_struct *p, POLICY_HND *handle,
 	if (!get_printer_snum(p, handle, &snum))
 		return WERR_BADFID;
 	
-	nt_printer_publish(snum, info7->action);
+	nt_printer_publish(Printer, snum, info7->action);
 	
 	return WERR_OK;
 #else
@@ -6287,7 +6252,7 @@ static WERROR enumjobs_level2(print_queue_struct *queue, int snum,
 		goto done;
 	}
 
-	result = get_a_printer(&ntprinter, 2, lp_servicename(snum));
+	result = get_a_printer(NULL, &ntprinter, 2, lp_servicename(snum));
 	if (!W_ERROR_IS_OK(result)) {
 		*returned = 0;
 		goto done;
@@ -7591,7 +7556,7 @@ WERROR _spoolss_enumprinterdata(pipes_struct *p, SPOOL_Q_ENUMPRINTERDATA *q_u, S
 	if (!get_printer_snum(p,handle, &snum))
 		return WERR_BADFID;
 	
-	result = get_a_printer(&printer, 2, lp_servicename(snum));
+	result = get_a_printer(Printer, &printer, 2, lp_const_servicename(snum));
 	if (!W_ERROR_IS_OK(result))
 		return result;
 		
@@ -7655,9 +7620,9 @@ WERROR _spoolss_enumprinterdata(pipes_struct *p, SPOOL_Q_ENUMPRINTERDATA *q_u, S
 		/* out_value should default to "" or else NT4 has
 		   problems unmarshalling the response */
 
-		*out_max_value_len = (in_value_len/sizeof(uint16));
+		*out_max_value_len=(in_value_len/sizeof(uint16));
 		
-		if ( (*out_value=(uint16 *)talloc_zero(p->mem_ctx, in_value_len*sizeof(uint8))) == NULL ) 
+		if((*out_value=(uint16 *)talloc_zero(p->mem_ctx, in_value_len*sizeof(uint8))) == NULL)
 		{
 			result = WERR_NOMEM;
 			goto done;
@@ -7692,7 +7657,7 @@ WERROR _spoolss_enumprinterdata(pipes_struct *p, SPOOL_Q_ENUMPRINTERDATA *q_u, S
 		 */
 	
 		/* name */
-		*out_max_value_len = ( in_value_len / sizeof(uint16) );
+		*out_max_value_len=(in_value_len/sizeof(uint16));
 		if ( (*out_value = (uint16 *)talloc_zero(p->mem_ctx, in_value_len*sizeof(uint8))) == NULL ) 
 		{
 			result = WERR_NOMEM;
@@ -7765,7 +7730,7 @@ WERROR _spoolss_setprinterdata( pipes_struct *p, SPOOL_Q_SETPRINTERDATA *q_u, SP
 		goto done;
 	}
 
-	status = get_a_printer(&printer, 2, lp_servicename(snum));
+	status = get_a_printer(Printer, &printer, 2, lp_const_servicename(snum));
 	if (!W_ERROR_IS_OK(status))
 		return status;
 
@@ -7857,7 +7822,7 @@ WERROR _spoolss_deleteprinterdata(pipes_struct *p, SPOOL_Q_DELETEPRINTERDATA *q_
 		return WERR_ACCESS_DENIED;
 	}
 
-	status = get_a_printer(&printer, 2, lp_servicename(snum));
+	status = get_a_printer(Printer, &printer, 2, lp_const_servicename(snum));
 	if (!W_ERROR_IS_OK(status))
 		return status;
 
@@ -7901,7 +7866,7 @@ WERROR _spoolss_addform( pipes_struct *p, SPOOL_Q_ADDFORM *q_u, SPOOL_R_ADDFORM
 		if (!get_printer_snum(p,handle, &snum))
 	                return WERR_BADFID;
 	 
-		status = get_a_printer(&printer, 2, lp_servicename(snum));
+		status = get_a_printer(Printer, &printer, 2, lp_const_servicename(snum));
         	if (!W_ERROR_IS_OK(status))
 			goto done;
 	}
@@ -7972,7 +7937,7 @@ WERROR _spoolss_deleteform( pipes_struct *p, SPOOL_Q_DELETEFORM *q_u, SPOOL_R_DE
 		if (!get_printer_snum(p,handle, &snum))
 	                return WERR_BADFID;
 	 
-		status = get_a_printer(&printer, 2, lp_servicename(snum));
+		status = get_a_printer(Printer, &printer, 2, lp_const_servicename(snum));
         	if (!W_ERROR_IS_OK(status))
 			goto done;
 	}
@@ -8040,7 +8005,7 @@ WERROR _spoolss_setform(pipes_struct *p, SPOOL_Q_SETFORM *q_u, SPOOL_R_SETFORM *
 		if (!get_printer_snum(p,handle, &snum))
 	                return WERR_BADFID;
 	 
-		status = get_a_printer(&printer, 2, lp_servicename(snum));
+		status = get_a_printer(Printer, &printer, 2, lp_const_servicename(snum));
         	if (!W_ERROR_IS_OK(status))
 			goto done;
 	}
@@ -8390,7 +8355,7 @@ static WERROR getjob_level_2(print_queue_struct *queue, int count, int snum, uin
 		goto done;
 	}
 	
-	ret = get_a_printer(&ntprinter, 2, lp_servicename(snum));
+	ret = get_a_printer(NULL, &ntprinter, 2, lp_const_servicename(snum));
 	if (!W_ERROR_IS_OK(ret))
 		goto done;
 	
@@ -8543,7 +8508,7 @@ WERROR _spoolss_getprinterdataex(pipes_struct *p, SPOOL_Q_GETPRINTERDATAEX *q_u,
 	if ( !get_printer_snum(p,handle, &snum) )
 		return WERR_BADFID;
 
-	status = get_a_printer(&printer, 2, lp_servicename(snum));
+	status = get_a_printer(Printer, &printer, 2, lp_servicename(snum));
 	if ( !W_ERROR_IS_OK(status) )
 		goto done;
 
@@ -8638,7 +8603,7 @@ WERROR _spoolss_setprinterdataex(pipes_struct *p, SPOOL_Q_SETPRINTERDATAEX *q_u,
 		return WERR_ACCESS_DENIED;
 	}
 
-	status = get_a_printer(&printer, 2, lp_servicename(snum));
+	status = get_a_printer(Printer, &printer, 2, lp_servicename(snum));
 	if (!W_ERROR_IS_OK(status))
 		return status;
 
@@ -8657,11 +8622,10 @@ WERROR _spoolss_setprinterdataex(pipes_struct *p, SPOOL_Q_SETPRINTERDATAEX *q_u,
 	
 	status = set_printer_dataex( printer, keyname, valuename, type, data, real_len ); 
 	
-	/* save the OID if one was specified and the previous set call succeeded */
-	
-	if ( W_ERROR_IS_OK(status) && oid_string )
+	if ( W_ERROR_IS_OK(status) )
 	{
-
+		/* save the OID if one was specified */
+		if ( oid_string ) {
 		fstrcat( keyname, "\\" );
 		fstrcat( keyname, SPOOL_OID_KEY );
 		
@@ -8676,6 +8640,9 @@ WERROR _spoolss_setprinterdataex(pipes_struct *p, SPOOL_Q_SETPRINTERDATAEX *q_u,
 		                    REG_SZ, (void*)oid_string, strlen(oid_string)+1 );		
 	}
 	
+		status = mod_a_printer(*printer, 2);
+	}
+		
 	free_a_printer(&printer, 2);
 
 	return status;
@@ -8713,7 +8680,7 @@ WERROR _spoolss_deleteprinterdataex(pipes_struct *p, SPOOL_Q_DELETEPRINTERDATAEX
 		return WERR_ACCESS_DENIED;
 	}
 
-	status = get_a_printer(&printer, 2, lp_servicename(snum));
+	status = get_a_printer(Printer, &printer, 2, lp_const_servicename(snum));
 	if (!W_ERROR_IS_OK(status))
 		return status;
 
@@ -8757,7 +8724,7 @@ WERROR _spoolss_enumprinterkey(pipes_struct *p, SPOOL_Q_ENUMPRINTERKEY *q_u, SPO
 	if ( !get_printer_snum(p,handle, &snum) )
 		return WERR_BADFID;
 
-	status = get_a_printer(&printer, 2, lp_servicename(snum));
+	status = get_a_printer(Printer, &printer, 2, lp_const_servicename(snum));
 	if (!W_ERROR_IS_OK(status))
 		return status;
 		
@@ -8832,7 +8799,7 @@ WERROR _spoolss_deleteprinterkey(pipes_struct *p, SPOOL_Q_DELETEPRINTERKEY *q_u,
 		return WERR_ACCESS_DENIED;
 	}
 
-	status = get_a_printer(&printer, 2, lp_servicename(snum));
+	status = get_a_printer(Printer, &printer, 2, lp_const_servicename(snum));
 	if (!W_ERROR_IS_OK(status))
 		return status;
 	
@@ -8901,7 +8868,7 @@ WERROR _spoolss_enumprinterdataex(pipes_struct *p, SPOOL_Q_ENUMPRINTERDATAEX *q_
 		return WERR_BADFID;
 	
 	ZERO_STRUCT(printer);
-	result = get_a_printer(&printer, 2, lp_servicename(snum));
+	result = get_a_printer(Printer, &printer, 2, lp_const_servicename(snum));
 	if (!W_ERROR_IS_OK(result))
 		return result;
 	
diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c
index 25f390be55..98857c6d32 100644
--- a/source3/smbd/lanman.c
+++ b/source3/smbd/lanman.c
@@ -500,7 +500,7 @@ static BOOL get_driver_name(int snum, pstring drivername)
 	NT_PRINTER_INFO_LEVEL *info = NULL;
 	BOOL in_tdb = False;
 
-	get_a_printer (&info, 2, lp_servicename(snum));
+	get_a_printer (NULL, &info, 2, lp_servicename(snum));
 	if (info != NULL) {
 		pstrcpy( drivername, info->info_2->drivername);
 		in_tdb = True;
@@ -522,7 +522,7 @@ static void fill_printq_info_52(connection_struct *conn, int snum,
 	NT_PRINTER_DRIVER_INFO_LEVEL 	driver;
 	NT_PRINTER_INFO_LEVEL 		*printer = NULL;
 
-	if ( !W_ERROR_IS_OK(get_a_printer( &printer, 2, lp_servicename(snum))) ) {
+	if ( !W_ERROR_IS_OK(get_a_printer( NULL, &printer, 2, lp_servicename(snum))) ) {
 		DEBUG(3,("fill_printq_info_52: Failed to lookup printer [%s]\n", 
 			lp_servicename(snum)));
 		goto err;
@@ -679,7 +679,7 @@ static int get_printerdrivernumber(int snum)
 	NT_PRINTER_DRIVER_INFO_LEVEL 	driver;
 	NT_PRINTER_INFO_LEVEL 		*printer = NULL;
 
-	if ( !W_ERROR_IS_OK(get_a_printer( &printer, 2, lp_servicename(snum))) ) {
+	if ( !W_ERROR_IS_OK(get_a_printer( NULL, &printer, 2, lp_servicename(snum))) ) {
 		DEBUG(3,("get_printerdrivernumber: Failed to lookup printer [%s]\n", 
 			lp_servicename(snum)));
 		goto done;
-- 
cgit 


From 64e53c9b22f23506acfd2fb4552b7c43129631a6 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Tue, 25 Feb 2003 23:28:28 +0000
Subject: Fix breakage done by myself yesterday. (This used to be commit
 f4492de2d668082df6ae06933d12a3cfe120d403)

---
 source3/client/client.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'source3')

diff --git a/source3/client/client.c b/source3/client/client.c
index b95d4d877c..5da12fd984 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -51,8 +51,7 @@ static int max_protocol = PROTOCOL_NT1;
 extern pstring user_socket_options;
 
 static int process_tok(fstring tok);
-static NTSTATUS cmd_help(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc,
-			 const char **argv);
+static int cmd_help(void);
 
 /* 30 second timeout on most commands */
 #define CLIENT_TIMEOUT (30*1000)
@@ -980,8 +979,7 @@ static BOOL do_altname(char *name)
 /****************************************************************************
  Exit client.
 ****************************************************************************/
-static NTSTATUS cmd_quit(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc,
-			 const char **argv)
+static int cmd_quit(void)
 {
 	cli_shutdown(cli);
 	exit(0);
@@ -2151,8 +2149,7 @@ static int process_tok(fstring tok)
 /****************************************************************************
 help
 ****************************************************************************/
-static NTSTATUS cmd_help(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc,
-		    const char **argv)
+static int cmd_help(void)
 {
 	int i=0,j;
 	fstring buf;
-- 
cgit 


From 7d581bebd437cd66000a1cac4b74b1ec4408f672 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Tue, 25 Feb 2003 23:30:46 +0000
Subject: Fix unused variable warning when ENCTYPE_ARCFOUR_HMAC is not defined.
 (This used to be commit 92abafa62894a125c5a09fc92f5056e4d8b51089)

---
 source3/libsmb/clikrb5.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source3')

diff --git a/source3/libsmb/clikrb5.c b/source3/libsmb/clikrb5.c
index 6b0c7ddaf2..5edc56daa9 100644
--- a/source3/libsmb/clikrb5.c
+++ b/source3/libsmb/clikrb5.c
@@ -367,7 +367,9 @@ failed:
 
  BOOL krb5_get_smb_session_key(krb5_context context, krb5_auth_context auth_context, uint8 session_key[16])
  {
+#ifdef ENCTYPE_ARCFOUR_HMAC
 	krb5_keyblock *skey;
+#endif
 	BOOL ret = False;
 
 	memset(session_key, 0, 16);
-- 
cgit 


From 991f6cc3c13cdeb8d7cf0dea25af29bbc7987c64 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Tue, 25 Feb 2003 23:34:57 +0000
Subject: More const fixes and flow on fixes from yesterday's const-fest. (This
 used to be commit 018733eedd7897e6811e8461c07e3acf418c0e09)

---
 source3/rpc_client/cli_dfs.c      | 12 ++++---
 source3/rpc_client/cli_lsarpc.c   |  5 +--
 source3/rpc_client/cli_netlogon.c |  2 +-
 source3/rpc_client/cli_spoolss.c  | 17 +++++-----
 source3/rpc_client/cli_srvsvc.c   |  7 +++--
 source3/rpc_parse/parse_dfs.c     | 13 ++++----
 source3/rpc_parse/parse_spoolss.c | 14 +++++----
 source3/rpcclient/cmd_dfs.c       | 16 +++++-----
 source3/rpcclient/cmd_ds.c        |  2 +-
 source3/rpcclient/cmd_netlogon.c  | 12 +++----
 source3/rpcclient/cmd_reg.c       |  4 +--
 source3/rpcclient/cmd_spoolss.c   | 66 +++++++++++++++++++--------------------
 source3/rpcclient/cmd_srvsvc.c    |  8 ++---
 source3/rpcclient/rpcclient.c     |  4 +--
 source3/torture/samtest.c         |  2 +-
 source3/torture/vfstest.c         |  2 +-
 16 files changed, 97 insertions(+), 89 deletions(-)

(limited to 'source3')

diff --git a/source3/rpc_client/cli_dfs.c b/source3/rpc_client/cli_dfs.c
index 7fc27b9c3b..2136b69df0 100644
--- a/source3/rpc_client/cli_dfs.c
+++ b/source3/rpc_client/cli_dfs.c
@@ -67,8 +67,8 @@ NTSTATUS cli_dfs_exist(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 }
 
 NTSTATUS cli_dfs_add(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-                     char *entrypath, char *servername, char *sharename,
-                     char *comment, uint32 flags)
+                     const char *entrypath, const char *servername, 
+		     const char *sharename, const char *comment, uint32 flags)
 {
 	prs_struct qbuf, rbuf;
 	DFS_Q_DFS_ADD q;
@@ -111,7 +111,8 @@ NTSTATUS cli_dfs_add(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 }
 
 NTSTATUS cli_dfs_remove(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-                        char *entrypath, char *servername, char *sharename)
+                        const char *entrypath, const char *servername, 
+			const char *sharename)
 {
 	prs_struct qbuf, rbuf;
 	DFS_Q_DFS_REMOVE q;
@@ -153,8 +154,9 @@ NTSTATUS cli_dfs_remove(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 }
 
 NTSTATUS cli_dfs_get_info(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-                          char *entrypath, char *servername, char *sharename,
-                          uint32 info_level, DFS_INFO_CTR *ctr)
+                          const char *entrypath, const char *servername, 
+			  const char *sharename, uint32 info_level, 
+			  DFS_INFO_CTR *ctr)
 
 {
 	prs_struct qbuf, rbuf;
diff --git a/source3/rpc_client/cli_lsarpc.c b/source3/rpc_client/cli_lsarpc.c
index e878d02211..9002ad3d1b 100644
--- a/source3/rpc_client/cli_lsarpc.c
+++ b/source3/rpc_client/cli_lsarpc.c
@@ -805,7 +805,8 @@ NTSTATUS cli_lsa_enum_privilege(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 /** Get privilege name */
 
 NTSTATUS cli_lsa_get_dispname(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-			      POLICY_HND *pol, char *name, uint16 lang_id, uint16 lang_id_sys,
+			      POLICY_HND *pol, const char *name, 
+			      uint16 lang_id, uint16 lang_id_sys,
 			      fstring description, uint16 *lang_id_desc)
 {
 	prs_struct qbuf, rbuf;
@@ -1050,7 +1051,7 @@ NTSTATUS cli_lsa_enum_privsaccount(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 /** Get a privilege value given its name */
 
 NTSTATUS cli_lsa_lookupprivvalue(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-			      POLICY_HND *pol, char *name, LUID *luid)
+				 POLICY_HND *pol, const char *name, LUID *luid)
 {
 	prs_struct qbuf, rbuf;
 	LSA_Q_LOOKUPPRIVVALUE q;
diff --git a/source3/rpc_client/cli_netlogon.c b/source3/rpc_client/cli_netlogon.c
index b5ad798755..cbb09803af 100644
--- a/source3/rpc_client/cli_netlogon.c
+++ b/source3/rpc_client/cli_netlogon.c
@@ -489,7 +489,7 @@ NTSTATUS cli_netlogon_sam_deltas(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 /* Logon domain user */
 
 NTSTATUS cli_netlogon_sam_logon(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-                                char *username, char *password,
+                                const char *username, const char *password,
                                 int logon_type)
 {
 	prs_struct qbuf, rbuf;
diff --git a/source3/rpc_client/cli_spoolss.c b/source3/rpc_client/cli_spoolss.c
index a1aa6664c1..bb6ce1b998 100644
--- a/source3/rpc_client/cli_spoolss.c
+++ b/source3/rpc_client/cli_spoolss.c
@@ -1243,8 +1243,8 @@ WERROR cli_spoolss_addform(struct cli_state *cli, TALLOC_CTX *mem_ctx,
  */
 
 WERROR cli_spoolss_setform(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-			   POLICY_HND *handle, uint32 level, char *form_name,
-			   FORM *form)
+			   POLICY_HND *handle, uint32 level, 
+			   const char *form_name, FORM *form)
 {
 	prs_struct qbuf, rbuf;
 	SPOOL_Q_SETFORM q;
@@ -1305,8 +1305,8 @@ WERROR cli_spoolss_setform(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 
 WERROR cli_spoolss_getform(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 			   uint32 offered, uint32 *needed,
-			   POLICY_HND *handle, char *formname, uint32 level, 
-			   FORM_1 *form)
+			   POLICY_HND *handle, const char *formname, 
+			   uint32 level, FORM_1 *form)
 {
 	prs_struct qbuf, rbuf;
 	SPOOL_Q_GETFORM q;
@@ -1377,7 +1377,7 @@ WERROR cli_spoolss_getform(struct cli_state *cli, TALLOC_CTX *mem_ctx,
  */
 
 WERROR cli_spoolss_deleteform(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-			      POLICY_HND *handle, char *form_name)
+			      POLICY_HND *handle, const char *form_name)
 {
 	prs_struct qbuf, rbuf;
 	SPOOL_Q_DELETEFORM q;
@@ -1899,7 +1899,7 @@ WERROR cli_spoolss_enddocprinter(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 
 WERROR cli_spoolss_getprinterdata(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 				  uint32 offered, uint32 *needed,
-				  POLICY_HND *hnd, char *valuename, 
+				  POLICY_HND *hnd, const char *valuename, 
 				  REGISTRY_VALUE *value)
 {
 	prs_struct qbuf, rbuf;
@@ -1953,8 +1953,9 @@ WERROR cli_spoolss_getprinterdata(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 
 WERROR cli_spoolss_getprinterdataex(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 				    uint32 offered, uint32 *needed,
-				    POLICY_HND *hnd, char *keyname, 
-				    char *valuename, REGISTRY_VALUE *value)
+				    POLICY_HND *hnd, const char *keyname, 
+				    const char *valuename, 
+				    REGISTRY_VALUE *value)
 {
 	prs_struct qbuf, rbuf;
 	SPOOL_Q_GETPRINTERDATAEX q;
diff --git a/source3/rpc_client/cli_srvsvc.c b/source3/rpc_client/cli_srvsvc.c
index b6c6b377ff..6cd18f2e43 100644
--- a/source3/rpc_client/cli_srvsvc.c
+++ b/source3/rpc_client/cli_srvsvc.c
@@ -230,9 +230,10 @@ WERROR cli_srvsvc_net_share_del(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 }
 
 WERROR cli_srvsvc_net_share_add(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-				char *netname, uint32 type, char *remark, 
-				uint32 perms, uint32 max_uses, uint32 num_uses,
-				char *path, char *passwd)
+				const char *netname, uint32 type, 
+				const char *remark, uint32 perms, 
+				uint32 max_uses, uint32 num_uses, 
+				const char *path, const char *passwd)
 {
 	prs_struct qbuf, rbuf;
 	SRV_Q_NET_SHARE_ADD q;
diff --git a/source3/rpc_parse/parse_dfs.c b/source3/rpc_parse/parse_dfs.c
index ccd6d429fa..6f13500359 100644
--- a/source3/rpc_parse/parse_dfs.c
+++ b/source3/rpc_parse/parse_dfs.c
@@ -76,8 +76,8 @@ BOOL dfs_io_r_dfs_exist(const char *desc, DFS_R_DFS_EXIST *q_d, prs_struct *ps,
 Make a DFS_Q_DFS_REMOVE structure
 *******************************************************************/
 
-BOOL init_dfs_q_dfs_remove(DFS_Q_DFS_REMOVE *q_d, char *entrypath, 
-			   char *servername, char *sharename)
+BOOL init_dfs_q_dfs_remove(DFS_Q_DFS_REMOVE *q_d, const char *entrypath, 
+			   const char *servername, const char *sharename)
 {
 	DEBUG(5,("init_dfs_q_dfs_remove\n"));
 	init_unistr2(&q_d->DfsEntryPath, entrypath,  strlen(entrypath)+1);
@@ -149,8 +149,9 @@ BOOL dfs_io_r_dfs_remove(const char *desc, DFS_R_DFS_REMOVE *r_d, prs_struct *ps
 Make a DFS_Q_DFS_ADD structure
 *******************************************************************/
 
-BOOL init_dfs_q_dfs_add(DFS_Q_DFS_ADD *q_d, char *entrypath, char *servername,
-			char *sharename, char *comment, uint32 flags)
+BOOL init_dfs_q_dfs_add(DFS_Q_DFS_ADD *q_d, const char *entrypath, 
+			const char *servername, const char *sharename, 
+			const char *comment, uint32 flags)
 {
 	DEBUG(5,("init_dfs_q_dfs_add\n"));
 	q_d->ptr_DfsEntryPath = q_d->ptr_ServerName = q_d->ptr_ShareName = 1;
@@ -231,8 +232,8 @@ BOOL dfs_io_r_dfs_add(const char *desc, DFS_R_DFS_ADD *r_d, prs_struct *ps, int
 	return True;
 }
 
-BOOL init_dfs_q_dfs_get_info(DFS_Q_DFS_GET_INFO *q_d, char *entrypath,
-			     char *servername, char *sharename, 
+BOOL init_dfs_q_dfs_get_info(DFS_Q_DFS_GET_INFO *q_d, const char *entrypath,
+			     const char *servername, const char *sharename, 
 			     uint32 info_level)
 {
 	DEBUG(5,("init_dfs_q2_get_info\n"));
diff --git a/source3/rpc_parse/parse_spoolss.c b/source3/rpc_parse/parse_spoolss.c
index a34740f9ff..47737908f0 100644
--- a/source3/rpc_parse/parse_spoolss.c
+++ b/source3/rpc_parse/parse_spoolss.c
@@ -1202,7 +1202,7 @@ BOOL make_spoolss_q_deleteprinterdriver(
 
 BOOL make_spoolss_q_getprinterdata(SPOOL_Q_GETPRINTERDATA *q_u,
 				   const POLICY_HND *handle,
-				   char *valuename, uint32 size)
+				   const char *valuename, uint32 size)
 {
         if (q_u == NULL) return False;
 
@@ -1221,7 +1221,8 @@ BOOL make_spoolss_q_getprinterdata(SPOOL_Q_GETPRINTERDATA *q_u,
 
 BOOL make_spoolss_q_getprinterdataex(SPOOL_Q_GETPRINTERDATAEX *q_u,
 				     const POLICY_HND *handle,
-				     char *keyname, char *valuename, uint32 size)
+				     const char *keyname, 
+				     const char *valuename, uint32 size)
 {
         if (q_u == NULL) return False;
 
@@ -7503,7 +7504,7 @@ BOOL make_spoolss_q_addform(SPOOL_Q_ADDFORM *q_u, POLICY_HND *handle,
  ********************************************************************/
 
 BOOL make_spoolss_q_setform(SPOOL_Q_SETFORM *q_u, POLICY_HND *handle, 
-			    int level, char *form_name, FORM *form)
+			    int level, const char *form_name, FORM *form)
 {
 	memcpy(&q_u->handle, handle, sizeof(POLICY_HND));
 	q_u->level = level;
@@ -7518,7 +7519,8 @@ BOOL make_spoolss_q_setform(SPOOL_Q_SETFORM *q_u, POLICY_HND *handle,
  * init a structure.
  ********************************************************************/
 
-BOOL make_spoolss_q_deleteform(SPOOL_Q_DELETEFORM *q_u, POLICY_HND *handle, char *form)
+BOOL make_spoolss_q_deleteform(SPOOL_Q_DELETEFORM *q_u, POLICY_HND *handle, 
+			       const char *form)
 {
 	memcpy(&q_u->handle, handle, sizeof(POLICY_HND));
 	init_unistr2(&q_u->name, form, strlen(form) + 1);
@@ -7530,8 +7532,8 @@ BOOL make_spoolss_q_deleteform(SPOOL_Q_DELETEFORM *q_u, POLICY_HND *handle, char
  ********************************************************************/
 
 BOOL make_spoolss_q_getform(SPOOL_Q_GETFORM *q_u, POLICY_HND *handle, 
-                            char *formname, uint32 level, NEW_BUFFER *buffer,
-			    uint32 offered)
+                            const char *formname, uint32 level, 
+			    NEW_BUFFER *buffer, uint32 offered)
 {
         memcpy(&q_u->handle, handle, sizeof(POLICY_HND));
         q_u->level = level;
diff --git a/source3/rpcclient/cmd_dfs.c b/source3/rpcclient/cmd_dfs.c
index e3c4b77645..715174c824 100644
--- a/source3/rpcclient/cmd_dfs.c
+++ b/source3/rpcclient/cmd_dfs.c
@@ -25,7 +25,7 @@
 /* Check DFS is supported by the remote server */
 
 static NTSTATUS cmd_dfs_exist(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-                              int argc, char **argv)
+                              int argc, const char **argv)
 {
 	BOOL dfs_exists;
 	NTSTATUS result;
@@ -44,10 +44,10 @@ static NTSTATUS cmd_dfs_exist(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 }
 
 static NTSTATUS cmd_dfs_add(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-                            int argc, char **argv)
+                            int argc, const char **argv)
 {
 	NTSTATUS result;
-	char *entrypath, *servername, *sharename, *comment;
+	const char *entrypath, *servername, *sharename, *comment;
 	uint32 flags = 0;
 
 	if (argc != 5) {
@@ -68,10 +68,10 @@ static NTSTATUS cmd_dfs_add(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 }
 
 static NTSTATUS cmd_dfs_remove(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-                               int argc, char **argv)
+                               int argc, const char **argv)
 {
 	NTSTATUS result;
-	char *entrypath, *servername, *sharename;
+	const char *entrypath, *servername, *sharename;
 
 	if (argc != 4) {
 		printf("Usage: %s entrypath servername sharename\n", argv[0]);
@@ -169,7 +169,7 @@ static void display_dfs_info_ctr(DFS_INFO_CTR *ctr)
 /* Enumerate dfs shares */
 
 static NTSTATUS cmd_dfs_enum(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-                             int argc, char **argv)
+                             int argc, const char **argv)
 {
 	DFS_INFO_CTR ctr;
 	NTSTATUS result;
@@ -192,10 +192,10 @@ static NTSTATUS cmd_dfs_enum(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 }
 
 static NTSTATUS cmd_dfs_getinfo(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-                                int argc, char **argv)
+                                int argc, const char **argv)
 {
 	NTSTATUS result;
-	char *entrypath, *servername, *sharename;
+	const char *entrypath, *servername, *sharename;
 	uint32 info_level = 1;
 	DFS_INFO_CTR ctr;
 
diff --git a/source3/rpcclient/cmd_ds.c b/source3/rpcclient/cmd_ds.c
index 946015c1e3..9de6d6a9ec 100644
--- a/source3/rpcclient/cmd_ds.c
+++ b/source3/rpcclient/cmd_ds.c
@@ -26,7 +26,7 @@
 
 static NTSTATUS cmd_ds_dsrole_getprimarydominfo(struct cli_state *cli, 
 				     TALLOC_CTX *mem_ctx, int argc, 
-				     char **argv) 
+				     const char **argv) 
 {
 	NTSTATUS result;
 	DS_DOMINFO_CTR	ctr;
diff --git a/source3/rpcclient/cmd_netlogon.c b/source3/rpcclient/cmd_netlogon.c
index 53a926d52b..407bff3735 100644
--- a/source3/rpcclient/cmd_netlogon.c
+++ b/source3/rpcclient/cmd_netlogon.c
@@ -24,7 +24,7 @@
 
 static NTSTATUS cmd_netlogon_logon_ctrl2(struct cli_state *cli, 
                                          TALLOC_CTX *mem_ctx, int argc, 
-                                         char **argv)
+                                         const char **argv)
 {
 	uint32 query_level = 1;
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
@@ -47,7 +47,7 @@ static NTSTATUS cmd_netlogon_logon_ctrl2(struct cli_state *cli,
 
 static NTSTATUS cmd_netlogon_logon_ctrl(struct cli_state *cli, 
                                         TALLOC_CTX *mem_ctx, int argc, 
-                                        char **argv)
+                                        const char **argv)
 {
 #if 0
 	uint32 query_level = 1;
@@ -143,7 +143,7 @@ static void display_sam_sync(uint32 num_deltas, SAM_DELTA_HDR *hdr_deltas,
 
 static NTSTATUS cmd_netlogon_sam_sync(struct cli_state *cli, 
                                       TALLOC_CTX *mem_ctx, int argc,
-                                      char **argv)
+                                      const char **argv)
 {
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
         unsigned char trust_passwd[16];
@@ -204,7 +204,7 @@ static NTSTATUS cmd_netlogon_sam_sync(struct cli_state *cli,
 
 static NTSTATUS cmd_netlogon_sam_deltas(struct cli_state *cli, 
                                         TALLOC_CTX *mem_ctx, int argc,
-                                        char **argv)
+                                        const char **argv)
 {
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
         unsigned char trust_passwd[16];
@@ -266,12 +266,12 @@ static NTSTATUS cmd_netlogon_sam_deltas(struct cli_state *cli,
 
 static NTSTATUS cmd_netlogon_sam_logon(struct cli_state *cli, 
                                        TALLOC_CTX *mem_ctx, int argc,
-                                       char **argv)
+                                       const char **argv)
 {
         unsigned char trust_passwd[16];
         NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
         int logon_type = NET_LOGON_TYPE;
-        char *username, *password;
+        const char *username, *password;
 	uint32 neg_flags = 0x000001ff;
 	int auth_level = 2;
 
diff --git a/source3/rpcclient/cmd_reg.c b/source3/rpcclient/cmd_reg.c
index 5d29b4c51a..19c0e7f71f 100644
--- a/source3/rpcclient/cmd_reg.c
+++ b/source3/rpcclient/cmd_reg.c
@@ -895,7 +895,7 @@ static void cmd_reg_get_key_sec(struct client_info *info)
 nt registry shutdown
 ****************************************************************************/
 static NTSTATUS cmd_reg_shutdown(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-                                 int argc, char **argv)
+                                 int argc, const char **argv)
 {
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
 	fstring msg;
@@ -950,7 +950,7 @@ abort a shutdown
 ****************************************************************************/
 static NTSTATUS cmd_reg_abort_shutdown(struct cli_state *cli, 
                                        TALLOC_CTX *mem_ctx, int argc, 
-                                       char **argv)
+                                       const char **argv)
 {
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
 
diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c
index 66f2e8dc99..9f6f539e19 100644
--- a/source3/rpcclient/cmd_spoolss.c
+++ b/source3/rpcclient/cmd_spoolss.c
@@ -86,7 +86,7 @@ BOOL get_short_archi(char *short_archi, const char *long_archi)
   */
 static NTSTATUS cmd_spoolss_not_implemented(struct cli_state *cli, 
                                             TALLOC_CTX *mem_ctx,
-                                            int argc, char **argv)
+                                            int argc, const char **argv)
 {
 	printf ("(*) This command is not currently implemented.\n");
 	return NT_STATUS_OK;
@@ -98,7 +98,7 @@ static NTSTATUS cmd_spoolss_not_implemented(struct cli_state *cli,
  */
 static NTSTATUS cmd_spoolss_open_printer_ex(struct cli_state *cli, 
                                             TALLOC_CTX *mem_ctx,
-                                            int argc, char **argv)
+                                            int argc, const char **argv)
 {
 	WERROR 	        werror;
 	fstring		printername;
@@ -300,7 +300,7 @@ static void display_print_info_3(PRINTER_INFO_3 *i3)
 
 static NTSTATUS cmd_spoolss_enum_printers(struct cli_state *cli, 
                                           TALLOC_CTX *mem_ctx,
-                                          int argc, char **argv)
+                                          int argc, const char **argv)
 {
 	WERROR                  result;
 	uint32			info_level = 1;
@@ -405,7 +405,7 @@ static void display_port_info_2(PORT_INFO_2 *i2)
 
 static NTSTATUS cmd_spoolss_enum_ports(struct cli_state *cli, 
 				       TALLOC_CTX *mem_ctx, int argc, 
-				       char **argv)
+				       const char **argv)
 {
 	WERROR         		result;
 	uint32                  needed, info_level = 1;
@@ -457,7 +457,7 @@ static NTSTATUS cmd_spoolss_enum_ports(struct cli_state *cli,
  */
 static NTSTATUS cmd_spoolss_setprinter(struct cli_state *cli,
                                        TALLOC_CTX *mem_ctx,
-                                       int argc, char **argv)
+                                       int argc, const char **argv)
 {
 	POLICY_HND 	pol;
 	WERROR		result;
@@ -527,7 +527,7 @@ static NTSTATUS cmd_spoolss_setprinter(struct cli_state *cli,
  */
 static NTSTATUS cmd_spoolss_getprinter(struct cli_state *cli,
                                        TALLOC_CTX *mem_ctx,
-                                       int argc, char **argv)
+                                       int argc, const char **argv)
 {
 	POLICY_HND 	pol;
 	WERROR          result;
@@ -646,7 +646,7 @@ static void display_reg_value(REGISTRY_VALUE value)
  */
 static NTSTATUS cmd_spoolss_getprinterdata(struct cli_state *cli,
 					   TALLOC_CTX *mem_ctx,
-					   int argc, char **argv)
+					   int argc, const char **argv)
 {
 	POLICY_HND 	pol;
 	WERROR          result;
@@ -655,7 +655,7 @@ static NTSTATUS cmd_spoolss_getprinterdata(struct cli_state *cli,
 			servername,
 			user;
 	uint32 needed;
-	char *valuename;
+	const char *valuename;
 	REGISTRY_VALUE value;
 
 	if (argc != 3) {
@@ -690,7 +690,7 @@ static NTSTATUS cmd_spoolss_getprinterdata(struct cli_state *cli,
 	/* Get printer info */
 
 	result = cli_spoolss_getprinterdata(cli, mem_ctx, 0, &needed,
-					&pol, valuename, &value);
+					    &pol, valuename, &value);
 
 	if (W_ERROR_V(result) == ERRmoredata)
 		result = cli_spoolss_getprinterdata(
@@ -717,7 +717,7 @@ static NTSTATUS cmd_spoolss_getprinterdata(struct cli_state *cli,
  */
 static NTSTATUS cmd_spoolss_getprinterdataex(struct cli_state *cli,
 					     TALLOC_CTX *mem_ctx,
-					     int argc, char **argv)
+					     int argc, const char **argv)
 {
 	POLICY_HND 	pol;
 	WERROR          result;
@@ -726,7 +726,7 @@ static NTSTATUS cmd_spoolss_getprinterdataex(struct cli_state *cli,
 			servername,
 			user;
 	uint32 needed;
-	char *valuename, *keyname;
+	const char *valuename, *keyname;
 	REGISTRY_VALUE value;
 
 	if (argc != 4) {
@@ -902,7 +902,7 @@ static void display_print_driver_3(DRIVER_INFO_3 *i1)
  */
 static NTSTATUS cmd_spoolss_getdriver(struct cli_state *cli, 
                                       TALLOC_CTX *mem_ctx,
-                                      int argc, char **argv)
+                                      int argc, const char **argv)
 {
 	POLICY_HND 	pol;
 	WERROR          werror;
@@ -992,7 +992,7 @@ static NTSTATUS cmd_spoolss_getdriver(struct cli_state *cli,
  */
 static NTSTATUS cmd_spoolss_enum_drivers(struct cli_state *cli, 
                                          TALLOC_CTX *mem_ctx,
-                                         int argc, char **argv)
+                                         int argc, const char **argv)
 {
 	WERROR werror;
 	uint32          info_level = 1;
@@ -1080,7 +1080,7 @@ static void display_printdriverdir_1(DRIVER_DIRECTORY_1 *i1)
  */
 static NTSTATUS cmd_spoolss_getdriverdir(struct cli_state *cli, 
                                          TALLOC_CTX *mem_ctx,
-                                         int argc, char **argv)
+                                         int argc, const char **argv)
 {
 	WERROR result;
 	fstring			env;
@@ -1145,7 +1145,7 @@ void set_drv_info_3_env (DRIVER_INFO_3 *info, const char *arch)
  wrapper for strtok to get the next parameter from a delimited list.
  Needed to handle the empty parameter string denoted by "NULL"
  *************************************************************************/
-static char* get_driver_3_param (char* str, const char* delim, UNISTR* dest)
+static char* get_driver_3_param (const char* str, const char* delim, UNISTR* dest)
 {
 	char	*ptr;
 
@@ -1175,7 +1175,7 @@ static char* get_driver_3_param (char* str, const char* delim, UNISTR* dest)
 static BOOL init_drv_info_3_members (
 	TALLOC_CTX *mem_ctx, 
 	DRIVER_INFO_3 *info, 
-	char *args
+	const char *args
 )
 {
 	char	*str, *str2;
@@ -1224,7 +1224,7 @@ static BOOL init_drv_info_3_members (
 
 static NTSTATUS cmd_spoolss_addprinterdriver(struct cli_state *cli, 
                                              TALLOC_CTX *mem_ctx,
-                                             int argc, char **argv)
+                                             int argc, const char **argv)
 {
 	WERROR result;
 	uint32                  level = 3;
@@ -1277,7 +1277,7 @@ static NTSTATUS cmd_spoolss_addprinterdriver(struct cli_state *cli,
 
 static NTSTATUS cmd_spoolss_addprinterex(struct cli_state *cli, 
                                          TALLOC_CTX *mem_ctx,
-                                         int argc, char **argv)
+                                         int argc, const char **argv)
 {
 	WERROR result;
 	uint32			level = 2;
@@ -1334,7 +1334,7 @@ static NTSTATUS cmd_spoolss_addprinterex(struct cli_state *cli,
 
 static NTSTATUS cmd_spoolss_setdriver(struct cli_state *cli, 
                                       TALLOC_CTX *mem_ctx,
-                                      int argc, char **argv)
+                                      int argc, const char **argv)
 {
 	POLICY_HND		pol;
 	WERROR                  result;
@@ -1412,7 +1412,7 @@ done:
 
 static NTSTATUS cmd_spoolss_deletedriver(struct cli_state *cli, 
                                          TALLOC_CTX *mem_ctx,
-                                         int argc, char **argv)
+                                         int argc, const char **argv)
 {
 	WERROR result;
 	fstring			servername;
@@ -1454,7 +1454,7 @@ static NTSTATUS cmd_spoolss_deletedriver(struct cli_state *cli,
 
 static NTSTATUS cmd_spoolss_getprintprocdir(struct cli_state *cli, 
 					    TALLOC_CTX *mem_ctx,
-					    int argc, char **argv)
+					    int argc, const char **argv)
 {
 	WERROR result;
 	char *servername = NULL, *environment = NULL;
@@ -1497,7 +1497,7 @@ static NTSTATUS cmd_spoolss_getprintprocdir(struct cli_state *cli,
 /* Add a form */
 
 static NTSTATUS cmd_spoolss_addform(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-				    int argc, char **argv)
+				    int argc, const char **argv)
 {
 	POLICY_HND handle;
 	WERROR werror;
@@ -1556,7 +1556,7 @@ static NTSTATUS cmd_spoolss_addform(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 /* Set a form */
 
 static NTSTATUS cmd_spoolss_setform(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-				    int argc, char **argv)
+				    int argc, const char **argv)
 {
 	POLICY_HND handle;
 	WERROR werror;
@@ -1614,7 +1614,7 @@ static NTSTATUS cmd_spoolss_setform(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 /* Get a form */
 
 static NTSTATUS cmd_spoolss_getform(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-				    int argc, char **argv)
+				    int argc, const char **argv)
 {
 	POLICY_HND handle;
 	WERROR werror;
@@ -1678,7 +1678,7 @@ static NTSTATUS cmd_spoolss_getform(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 
 static NTSTATUS cmd_spoolss_deleteform(struct cli_state *cli, 
 				       TALLOC_CTX *mem_ctx, int argc, 
-				       char **argv)
+				       const char **argv)
 {
 	POLICY_HND handle;
 	WERROR werror;
@@ -1725,7 +1725,7 @@ static NTSTATUS cmd_spoolss_deleteform(struct cli_state *cli,
 
 static NTSTATUS cmd_spoolss_enum_forms(struct cli_state *cli, 
 				       TALLOC_CTX *mem_ctx, int argc, 
-				       char **argv)
+				       const char **argv)
 {
 	POLICY_HND handle;
 	WERROR werror;
@@ -1793,7 +1793,7 @@ static NTSTATUS cmd_spoolss_enum_forms(struct cli_state *cli,
 
 static NTSTATUS cmd_spoolss_setprinterdata(struct cli_state *cli,
 					    TALLOC_CTX *mem_ctx,
-					    int argc, char **argv)
+					    int argc, const char **argv)
 {
 	WERROR result;
 	uint32 needed;
@@ -1912,7 +1912,7 @@ static void display_job_info_2(JOB_INFO_2 *job)
 
 static NTSTATUS cmd_spoolss_enum_jobs(struct cli_state *cli, 
 				      TALLOC_CTX *mem_ctx, int argc, 
-				      char **argv)
+				      const char **argv)
 {
 	WERROR result;
 	uint32 needed, level = 1, num_jobs, i;
@@ -1987,7 +1987,7 @@ done:
 
 static NTSTATUS cmd_spoolss_enum_data( struct cli_state *cli, 
 				       TALLOC_CTX *mem_ctx, int argc, 
-				       char **argv)
+				       const char **argv)
 {
 	WERROR result;
 	uint32 i=0, val_needed, data_needed;
@@ -2046,14 +2046,14 @@ done:
 
 static NTSTATUS cmd_spoolss_enum_data_ex( struct cli_state *cli, 
 					  TALLOC_CTX *mem_ctx, int argc, 
-					  char **argv)
+					  const char **argv)
 {
 	WERROR result;
 	uint32 needed, i;
 	BOOL got_hnd = False;
 	pstring printername;
 	fstring servername, user;
-	char *keyname = NULL;
+	const char *keyname = NULL;
 	POLICY_HND hnd;
 	REGVAL_CTR ctr;
 
@@ -2111,7 +2111,7 @@ done:
 
 static NTSTATUS cmd_spoolss_enum_printerkey( struct cli_state *cli, 
 					     TALLOC_CTX *mem_ctx, int argc, 
-					     char **argv)
+					     const char **argv)
 {
 	WERROR result;
 	uint32 needed, returned;
@@ -2183,7 +2183,7 @@ done:
 
 static NTSTATUS cmd_spoolss_rffpcnex(struct cli_state *cli, 
 				     TALLOC_CTX *mem_ctx, int argc, 
-				     char **argv)
+				     const char **argv)
 {
 	fstring servername, printername;
 	POLICY_HND hnd;
diff --git a/source3/rpcclient/cmd_srvsvc.c b/source3/rpcclient/cmd_srvsvc.c
index 10fdfd7437..8597c7bc2e 100644
--- a/source3/rpcclient/cmd_srvsvc.c
+++ b/source3/rpcclient/cmd_srvsvc.c
@@ -181,7 +181,7 @@ static void display_srv_info_102(SRV_INFO_102 *sv102)
 /* Server query info */
 static NTSTATUS cmd_srvsvc_srv_query_info(struct cli_state *cli, 
                                           TALLOC_CTX *mem_ctx,
-                                          int argc, char **argv)
+                                          int argc, const char **argv)
 {
 	uint32 info_level = 101;
 	SRV_INFO_CTR ctr;
@@ -248,7 +248,7 @@ static void display_share_info_2(SRV_SHARE_INFO_2 *info2)
 
 static NTSTATUS cmd_srvsvc_net_share_enum(struct cli_state *cli, 
                                           TALLOC_CTX *mem_ctx,
-                                          int argc, char **argv)
+                                          int argc, const char **argv)
 {
 	uint32 info_level = 2;
 	SRV_SHARE_INFO_CTR ctr;
@@ -294,7 +294,7 @@ static NTSTATUS cmd_srvsvc_net_share_enum(struct cli_state *cli,
 
 static NTSTATUS cmd_srvsvc_net_remote_tod(struct cli_state *cli, 
                                           TALLOC_CTX *mem_ctx,
-                                          int argc, char **argv)
+                                          int argc, const char **argv)
 {
 	TIME_OF_DAY_INFO tod;
 	WERROR result;
@@ -316,7 +316,7 @@ static NTSTATUS cmd_srvsvc_net_remote_tod(struct cli_state *cli,
 
 static NTSTATUS cmd_srvsvc_net_file_enum(struct cli_state *cli, 
 					 TALLOC_CTX *mem_ctx,
-					 int argc, char **argv)
+					 int argc, const char **argv)
 {
 	uint32 info_level = 3;
 	SRV_FILE_INFO_CTR ctr;
diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c
index 5803055598..127506fb39 100644
--- a/source3/rpcclient/rpcclient.c
+++ b/source3/rpcclient/rpcclient.c
@@ -304,7 +304,7 @@ static NTSTATUS cmd_listcommands(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 /* Display help on commands */
 
 static NTSTATUS cmd_help(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-                         int argc, char **argv)
+                         int argc, const char **argv)
 {
 	struct cmd_list *tmp;
         struct cmd_set *tmp_set;
@@ -381,7 +381,7 @@ static NTSTATUS cmd_debuglevel(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 }
 
 static NTSTATUS cmd_quit(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-                         int argc, char **argv)
+                         int argc, const char **argv)
 {
 	exit(0);
 	return NT_STATUS_OK; /* NOTREACHED */
diff --git a/source3/torture/samtest.c b/source3/torture/samtest.c
index a1ccec098b..0de2e5d288 100644
--- a/source3/torture/samtest.c
+++ b/source3/torture/samtest.c
@@ -73,7 +73,7 @@ static NTSTATUS cmd_conf(struct samtest_state *sam, TALLOC_CTX *mem_ctx,
 
 /* Display help on commands */
 static NTSTATUS cmd_help(struct samtest_state *st, TALLOC_CTX *mem_ctx,
-			 int argc, char **argv)
+			 int argc, const char **argv)
 {
 	struct cmd_list *tmp;
 	struct cmd_set *tmp_set;
diff --git a/source3/torture/vfstest.c b/source3/torture/vfstest.c
index fd1f83109e..04f31656d3 100644
--- a/source3/torture/vfstest.c
+++ b/source3/torture/vfstest.c
@@ -124,7 +124,7 @@ static NTSTATUS cmd_conf(struct vfs_state *vfs, TALLOC_CTX *mem_ctx,
 	
 /* Display help on commands */
 static NTSTATUS cmd_help(struct vfs_state *vfs, TALLOC_CTX *mem_ctx,
-			 int argc, char **argv)
+			 int argc, const char **argv)
 {
 	struct cmd_list *tmp;
 	struct cmd_set *tmp_set;
-- 
cgit 


From f9d577ac099974f58522c1c5c42e5804a62c8e0b Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Tue, 25 Feb 2003 23:35:25 +0000
Subject: Fix compiler warning. (This used to be commit
 0308f24ad209a28799b36d041be2dc2be2b2dac8)

---
 source3/utils/profiles.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/utils/profiles.c b/source3/utils/profiles.c
index b4087cf6cf..4f40b93810 100644
--- a/source3/utils/profiles.c
+++ b/source3/utils/profiles.c
@@ -391,7 +391,7 @@ typedef struct acl_struct {
 
 #define OFF(f) (0x1000 + (f) + 4) 
 
-void print_sid(DOM_SID *sid);
+static void print_sid(DOM_SID *sid);
 
 int verbose = 1;
 DOM_SID old_sid, new_sid;
-- 
cgit 


From b906a9df75b6bdc6fe166e9aa5a8aa398176a518 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Wed, 26 Feb 2003 00:52:41 +0000
Subject: Merge from appliance:

>Another hopeful fix for CR#1168.  Change the RPC used in querying
>domain users from QueryDispInfo to EnumDomainUsers.  Hopefully this
>will fix the random dropouts that keep occuring when listing large
>domains.
>
>My thought is that since QueryDispInfo is only used in the NT user
>manager it may have a bug with large domains.  A more commonly used
>RPC may not have such problems.
(This used to be commit 0501b7d0b12fa8063ffe6a9d4ecc3391d0c2f45d)
---
 source3/nsswitch/winbindd_rpc.c | 57 +++++++++++++++++------------------------
 1 file changed, 23 insertions(+), 34 deletions(-)

(limited to 'source3')

diff --git a/source3/nsswitch/winbindd_rpc.c b/source3/nsswitch/winbindd_rpc.c
index 48f528f520..90d8e4f616 100644
--- a/source3/nsswitch/winbindd_rpc.c
+++ b/source3/nsswitch/winbindd_rpc.c
@@ -3,7 +3,7 @@
 
    Winbind rpc backend functions
 
-   Copyright (C) Tim Potter 2000-2001
+   Copyright (C) Tim Potter 2000-2001,2003
    Copyright (C) Andrew Tridgell 2001
    
    This program is free software; you can redistribute it and/or modify
@@ -39,18 +39,17 @@ static NTSTATUS query_user_list(struct winbindd_domain *domain,
 	POLICY_HND dom_pol;
 	BOOL got_dom_pol = False;
 	uint32 des_access = SEC_RIGHTS_MAXIMUM_ALLOWED;
-	int i, loop_count = 0;
-	int retry;
+	int i, start_idx, retry;
 
 	DEBUG(3,("rpc: query_user_list\n"));
 
 	*num_entries = 0;
 	*info = NULL;
 
-	/* Get sam handle */
-
 	retry = 0;
 	do {
+		/* Get sam handle */
+
 		if (!(hnd = cm_get_sam_handle(domain->name)))
 			goto done;
 
@@ -66,50 +65,39 @@ static NTSTATUS query_user_list(struct winbindd_domain *domain,
 
 	got_dom_pol = True;
 
-	i = 0;
+	i = start_idx = 0;
 	do {
-		SAM_DISPINFO_CTR ctr;
-		SAM_DISPINFO_1 info1;
-		uint32 count = 0, start=i, max_entries, max_size;
-		int j;
 		TALLOC_CTX *ctx2;
+		char **dom_users;
+		uint32 num_dom_users, *dom_rids, j, size = 0xffff;
+		uint16 acb_mask = ACB_NORMAL;
 
-		ctr.sam.info1 = &info1;
-
-		ctx2 = talloc_init("winbindd dispinfo");
-		if (!ctx2) {
+		if (!(ctx2 = talloc_init("winbindd enum_users"))) {
 			result = NT_STATUS_NO_MEMORY;
 			goto done;
-		}
-		
-		get_query_dispinfo_params(
-			loop_count, &max_entries, &max_size);
-
-		/* Query display info level 1 */
-		result = cli_samr_query_dispinfo(
-			hnd->cli, ctx2, &dom_pol, &start, 1, &count, 
-			max_entries, max_size, &ctr);
+		}		
 
-		loop_count++;
+		result = cli_samr_enum_dom_users(
+			hnd->cli, ctx2, &dom_pol, &start_idx, acb_mask,
+			size, &dom_users, &dom_rids, &num_dom_users);
 
-		if (!NT_STATUS_IS_OK(result) && 
-		    !NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES)) break;
+		*num_entries += num_dom_users;
 
-		(*num_entries) += count;
+		*info = talloc_realloc(
+			mem_ctx, *info, 
+			(*num_entries) * sizeof(WINBIND_USERINFO));
 
-		/* now map the result into the WINBIND_USERINFO structure */
-		(*info) = talloc_realloc(mem_ctx, *info,
-					 (*num_entries)*sizeof(WINBIND_USERINFO));
 		if (!(*info)) {
 			result = NT_STATUS_NO_MEMORY;
 			talloc_destroy(ctx2);
 			goto done;
 		}
 
-		for (j=0;j<count;i++, j++) {
-			(*info)[i].acct_name = unistr2_tdup(mem_ctx, &info1.str[j].uni_acct_name);
-			(*info)[i].full_name = unistr2_tdup(mem_ctx, &info1.str[j].uni_full_name);
-			(*info)[i].user_rid = info1.sam[j].rid_user;
+		for (j = 0; j < num_dom_users; i++, j++) {
+			(*info)[i].acct_name = 
+				talloc_strdup(mem_ctx, dom_users[j]);
+			(*info)[i].full_name = talloc_strdup(mem_ctx, "");
+			(*info)[i].user_rid = dom_rids[j];
 			/* For the moment we set the primary group for
 			   every user to be the Domain Users group.
 			   There are serious problems with determining
@@ -121,6 +109,7 @@ static NTSTATUS query_user_list(struct winbindd_domain *domain,
 		}
 
 		talloc_destroy(ctx2);
+
 	} while (NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES));
 
  done:
-- 
cgit 


From f7bb6982980abf32b98fee8e2624bb5932554dfe Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Wed, 26 Feb 2003 06:19:16 +0000
Subject: init_valid_table: Fix a memory leak that would lose the
 dynamically-created valid table every time the configuration was reloaded.
 (This used to be commit e42b237d980461caf2dd2a8f82c17bf674facb7d)

---
 source3/lib/util_unistr.c | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

(limited to 'source3')

diff --git a/source3/lib/util_unistr.c b/source3/lib/util_unistr.c
index 522ab7eb40..c666155f9f 100644
--- a/source3/lib/util_unistr.c
+++ b/source3/lib/util_unistr.c
@@ -105,27 +105,34 @@ static int check_dos_char(smb_ucs2_t c)
  **/
 void init_valid_table(void)
 {
-	static int initialised;
 	static int mapped_file;
 	int i;
 	const char *allowed = ".!#$%&'()_-@^`~";
+	uint8 *valid_file;
 
-	if (initialised && mapped_file) return;
-	initialised = 1;
+	if (mapped_file) {
+		/* Can't unmap files, so stick with what we have */
+		return;
+	}
 
-	valid_table = map_file(lib_path("valid.dat"), 0x10000);
-	if (valid_table) {
+	valid_file = map_file(lib_path("valid.dat"), 0x10000);
+	if (valid_file) {
+		valid_table = valid_file;
 		mapped_file = 1;
 		return;
 	}
 
-	/* Otherwise, using a dynamically loaded one. */
+	/* Otherwise, we're using a dynamically created valid_table.
+	 * It might need to be regenerated if the code page changed.
+	 * We know that we're not using a mapped file, so we can
+	 * free() the old one. */
 	if (valid_table) free(valid_table);
 
 	DEBUG(2,("creating default valid table\n"));
 	valid_table = malloc(0x10000);
-	for (i=0;i<128;i++) valid_table[i] = isalnum(i) || 
-				    strchr(allowed,i);
+	for (i=0;i<128;i++)
+		valid_table[i] = isalnum(i) || strchr(allowed,i);
+	
 	for (;i<0x10000;i++) {
 		smb_ucs2_t c;
 		SSVAL(&c, 0, i);
-- 
cgit 


From cee64b535355ed14aa8c9a30f51432563391ea34 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 26 Feb 2003 12:21:01 +0000
Subject: Kill RID-only and domain+RID madness from winbind.

Now we deal with SIDs in almost all of winbind (a couple of limited exceptions
remain, but I'm looking into them - they use non-winbind structs ATM).

This has particular benifits in returning out-of-domain SIDs for group
membership (Need to look into this a bit more) as well as general code quality.

This also removes much of the complexity from the idmap interface, which now
only deals with mapping IDs, not with SID->domain translations.

Breifly tested, but needs more.  Fixes some valgrind-found bugs from my
previous commit.

Winbind cache chagned to using SID strings in some places, as I could not
follow exactly how to save and restore multiple packed sids properly.

Andrew Bartlett
(This used to be commit 9247cf08c40f016a924d600ac906cfc6a7016777)
---
 source3/nsswitch/winbindd.h           |  28 +++---
 source3/nsswitch/winbindd_ads.c       | 178 ++++++++++++++++++----------------
 source3/nsswitch/winbindd_cache.c     | 159 +++++++++++++++++-------------
 source3/nsswitch/winbindd_group.c     | 114 +++++++++++-----------
 source3/nsswitch/winbindd_idmap.c     |  82 ----------------
 source3/nsswitch/winbindd_idmap_tdb.c |  78 ---------------
 source3/nsswitch/winbindd_rpc.c       |  93 ++++++++++++------
 source3/nsswitch/winbindd_user.c      |  56 +++++------
 source3/nsswitch/winbindd_util.c      |  29 +++++-
 9 files changed, 377 insertions(+), 440 deletions(-)

(limited to 'source3')

diff --git a/source3/nsswitch/winbindd.h b/source3/nsswitch/winbindd.h
index a498b76626..8bd8a83748 100644
--- a/source3/nsswitch/winbindd.h
+++ b/source3/nsswitch/winbindd.h
@@ -63,7 +63,8 @@ struct getent_state {
 struct getpwent_user {
 	fstring name;                        /* Account name */
 	fstring gecos;                       /* User information */
-	uint32 user_rid, group_rid;          /* NT user and group rids */
+	DOM_SID user_sid;                    /* NT user and primary group SIDs */
+	DOM_SID group_sid;
 };
 
 /* Server state structure */
@@ -81,8 +82,8 @@ extern struct winbindd_state server_state;  /* Server information */
 typedef struct {
 	char *acct_name;
 	char *full_name;
-	uint32 user_rid;
-	uint32 group_rid; /* primary group */
+	DOM_SID *user_sid;                    /* NT user and primary group SIDs */
+	DOM_SID *group_sid;
 } WINBIND_USERINFO;
 
 /* Structures to hold per domain information */
@@ -138,6 +139,7 @@ struct winbindd_methods {
 				    
 	/* convert one user or group name to a sid */
 	NTSTATUS (*name_to_sid)(struct winbindd_domain *domain,
+				TALLOC_CTX *mem_ctx,
 				const char *name,
 				DOM_SID *sid,
 				enum SID_NAME_USE *type);
@@ -149,10 +151,10 @@ struct winbindd_methods {
 				char **name,
 				enum SID_NAME_USE *type);
 
-	/* lookup user info for a given rid */
+	/* lookup user info for a given SID */
 	NTSTATUS (*query_user)(struct winbindd_domain *domain, 
 			       TALLOC_CTX *mem_ctx, 
-			       uint32 user_rid, 
+			       DOM_SID *user_sid,
 			       WINBIND_USERINFO *user_info);
 
 	/* lookup all groups that a user is a member of. The backend
@@ -160,14 +162,15 @@ struct winbindd_methods {
 	   function */
 	NTSTATUS (*lookup_usergroups)(struct winbindd_domain *domain,
 				      TALLOC_CTX *mem_ctx,
-				      uint32 user_rid, 
-				      uint32 *num_groups, uint32 **user_gids);
+				      DOM_SID *user_sid,
+				      uint32 *num_groups, DOM_SID ***user_gids);
 
 	/* find all members of the group with the specified group_rid */
 	NTSTATUS (*lookup_groupmem)(struct winbindd_domain *domain,
 				    TALLOC_CTX *mem_ctx,
-				    uint32 group_rid, uint32 *num_names, 
-				    uint32 **rid_mem, char ***names, 
+				    DOM_SID *group_sid,
+				    uint32 *num_names, 
+				    DOM_SID ***sid_mem, char ***names, 
 				    uint32 **name_types);
 
 	/* return the current global sequence number */
@@ -207,13 +210,6 @@ struct idmap_methods {
   BOOL (*get_uid_from_sid)(DOM_SID *sid, uid_t *uid);
   BOOL (*get_gid_from_sid)(DOM_SID *sid, gid_t *gid);
 
-  BOOL (*get_rid_from_uid)(uid_t uid, uint32 *user_rid, 
-                           struct winbindd_domain **domain);
-  BOOL (*get_rid_from_gid)(gid_t gid, uint32 *group_rid,
-                           struct winbindd_domain **domain);
-  BOOL (*get_uid_from_rid)(const char *dom_name, uint32 rid, uid_t *uid);
-  BOOL (*get_gid_from_rid)(const char *dom_name, uint32 rid, gid_t *gid);
-
   /* Called when backend is unloaded */
   BOOL (*close)(void);
   /* Called to dump backend status */
diff --git a/source3/nsswitch/winbindd_ads.c b/source3/nsswitch/winbindd_ads.c
index 22e4648f15..6c79e59bae 100644
--- a/source3/nsswitch/winbindd_ads.c
+++ b/source3/nsswitch/winbindd_ads.c
@@ -89,13 +89,6 @@ static ADS_STRUCT *ads_cached_connection(struct winbindd_domain *domain)
 	return ads;
 }
 
-/* useful utility */
-static void sid_from_rid(struct winbindd_domain *domain, uint32 rid, DOM_SID *sid)
-{
-	sid_copy(sid, &domain->sid);
-	sid_append_rid(sid, rid);
-}
-
 
 /* Query display info for a realm. This is the basic user list fn */
 static NTSTATUS query_user_list(struct winbindd_domain *domain,
@@ -144,7 +137,9 @@ static NTSTATUS query_user_list(struct winbindd_domain *domain,
 	for (msg = ads_first_entry(ads, res); msg; msg = ads_next_entry(ads, msg)) {
 		char *name, *gecos;
 		DOM_SID sid;
-		uint32 rid, group;
+		DOM_SID *sid2;
+		DOM_SID *group_sid;
+		uint32 group;
 		uint32 atype;
 
 		if (!ads_pull_uint32(ads, msg, "sAMAccountType", &atype) ||
@@ -164,15 +159,20 @@ static NTSTATUS query_user_list(struct winbindd_domain *domain,
 			continue;
 		}
 
-		if (!sid_peek_check_rid(&domain->sid, &sid, &rid)) {
-			DEBUG(1,("No rid for %s !?\n", name));
-			continue;
+		sid2 = talloc(mem_ctx, sizeof(*sid2));
+		if (!sid2) {
+			status = NT_STATUS_NO_MEMORY;
+			goto done;
 		}
 
+		sid_copy(sid2, &sid);
+
+		group_sid = rid_to_talloced_sid(domain, mem_ctx, group);
+
 		(*info)[i].acct_name = name;
 		(*info)[i].full_name = gecos;
-		(*info)[i].user_rid = rid;
-		(*info)[i].group_rid = group;
+		(*info)[i].user_sid = sid2;
+		(*info)[i].group_sid = group_sid;
 		i++;
 	}
 
@@ -297,6 +297,7 @@ static NTSTATUS enum_local_groups(struct winbindd_domain *domain,
 
 /* convert a single name to a sid in a domain */
 static NTSTATUS name_to_sid(struct winbindd_domain *domain,
+			    TALLOC_CTX *mem_ctx,
 			    const char *name,
 			    DOM_SID *sid,
 			    enum SID_NAME_USE *type)
@@ -329,13 +330,13 @@ static NTSTATUS sid_to_name(struct winbindd_domain *domain,
 }
 
 
-/* convert a DN to a name, rid and name type 
+/* convert a DN to a name, SID and name type 
    this might become a major speed bottleneck if groups have
    lots of users, in which case we could cache the results
 */
 static BOOL dn_lookup(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx,
 		      const char *dn,
-		      char **name, uint32 *name_type, uint32 *rid)
+		      char **name, uint32 *name_type, DOM_SID *sid)
 {
 	char *exp;
 	void *res = NULL;
@@ -343,7 +344,6 @@ static BOOL dn_lookup(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx,
 			       "objectSid", "sAMAccountType", NULL};
 	ADS_STATUS rc;
 	uint32 atype;
-	DOM_SID sid;
 	char *escaped_dn = escape_ldap_string_alloc(dn);
 
 	if (!escaped_dn) {
@@ -366,8 +366,7 @@ static BOOL dn_lookup(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx,
 	}
 	(*name_type) = ads_atype_map(atype);
 
-	if (!ads_pull_sid(ads, res, "objectSid", &sid) || 
-	    !sid_peek_rid(&sid, rid)) {
+	if (!ads_pull_sid(ads, res, "objectSid", sid)) {
 		goto failed;
 	}
 
@@ -382,60 +381,63 @@ failed:
 /* Lookup user information from a rid */
 static NTSTATUS query_user(struct winbindd_domain *domain, 
 			   TALLOC_CTX *mem_ctx, 
-			   uint32 user_rid, 
+			   DOM_SID *sid, 
 			   WINBIND_USERINFO *info)
 {
 	ADS_STRUCT *ads = NULL;
 	const char *attrs[] = {"userPrincipalName", 
 			       "sAMAccountName",
-			       "name", "objectSid", 
+			       "name", 
 			       "primaryGroupID", NULL};
 	ADS_STATUS rc;
 	int count;
 	void *msg = NULL;
 	char *exp;
-	DOM_SID sid;
 	char *sidstr;
+	uint32 group_rid;
 	NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
+	DOM_SID *sid2;
+	fstring sid_string;
 
 	DEBUG(3,("ads: query_user\n"));
 
-	sid_from_rid(domain, user_rid, &sid);
-
 	ads = ads_cached_connection(domain);
 	if (!ads) goto done;
 
-	sidstr = sid_binstring(&sid);
+	sidstr = sid_binstring(sid);
 	asprintf(&exp, "(objectSid=%s)", sidstr);
 	rc = ads_search_retry(ads, &msg, exp, attrs);
 	free(exp);
 	free(sidstr);
 	if (!ADS_ERR_OK(rc)) {
-		DEBUG(1,("query_user(rid=%d) ads_search: %s\n", user_rid, ads_errstr(rc)));
+		DEBUG(1,("query_user(sid=%s) ads_search: %s\n", sid_to_string(sid_string, sid), ads_errstr(rc)));
 		goto done;
 	}
 
 	count = ads_count_replies(ads, msg);
 	if (count != 1) {
-		DEBUG(1,("query_user(rid=%d): Not found\n", user_rid));
+		DEBUG(1,("query_user(sid=%s): Not found\n", sid_to_string(sid_string, sid)));
 		goto done;
 	}
 
 	info->acct_name = ads_pull_username(ads, mem_ctx, msg);
 	info->full_name = ads_pull_string(ads, mem_ctx, msg, "name");
-	if (!ads_pull_sid(ads, msg, "objectSid", &sid)) {
-		DEBUG(1,("No sid for %d !?\n", user_rid));
-		goto done;
-	}
-	if (!ads_pull_uint32(ads, msg, "primaryGroupID", &info->group_rid)) {
-		DEBUG(1,("No primary group for %d !?\n", user_rid));
+
+	if (!ads_pull_uint32(ads, msg, "primaryGroupID", &group_rid)) {
+		DEBUG(1,("No primary group for %s !?\n", sid_to_string(sid_string, sid)));
 		goto done;
 	}
 	
-	if (!sid_peek_check_rid(&domain->sid,&sid, &info->user_rid)) {
-		DEBUG(1,("No rid for %d !?\n", user_rid));
+	sid2 = talloc(mem_ctx, sizeof(*sid2));
+	if (!sid2) {
+		status = NT_STATUS_NO_MEMORY;
 		goto done;
 	}
+	sid_copy(sid2, sid);
+	
+	info->user_sid = sid2;
+
+	info->group_sid = rid_to_talloced_sid(domain, mem_ctx, group_rid);
 
 	status = NT_STATUS_OK;
 
@@ -451,8 +453,8 @@ done:
 static NTSTATUS lookup_usergroups_alt(struct winbindd_domain *domain,
 				      TALLOC_CTX *mem_ctx,
 				      const char *user_dn, 
-				      uint32 primary_group,
-				      uint32 *num_groups, uint32 **user_gids)
+				      DOM_SID *primary_group,
+				      uint32 *num_groups, DOM_SID ***user_gids)
 {
 	ADS_STATUS rc;
 	NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
@@ -489,47 +491,48 @@ static NTSTATUS lookup_usergroups_alt(struct winbindd_domain *domain,
 		goto done;
 	}
 	
-	(*user_gids) = (uint32 *)talloc_zero(mem_ctx, sizeof(uint32) * (count + 1));
+	(*user_gids) = talloc_zero(mem_ctx, sizeof(**user_gids) * (count + 1));
 	(*user_gids)[0] = primary_group;
 	
 	*num_groups = 1;
 	
 	for (msg = ads_first_entry(ads, res); msg; msg = ads_next_entry(ads, msg)) {
-		uint32 rid;
 		DOM_SID group_sid;
-		fstring sid_string;
 		
 		if (!ads_pull_sid(ads, msg, "objectSid", &group_sid)) {
 			DEBUG(1,("No sid for this group ?!?\n"));
 			continue;
 		}
 		
-		if (!sid_peek_check_rid(&domain->sid, &group_sid, &rid)) {
-			DEBUG(5,("sid for %s is out of domain or invalid\n", sid_to_string(sid_string, &group_sid)));
-			continue;
-		}
-		if (rid == primary_group) continue;
+		if (sid_equal(&group_sid, primary_group)) continue;
 		
-		(*user_gids)[*num_groups] = rid;
+		(*user_gids)[*num_groups] = talloc(mem_ctx, sizeof(***user_gids));
+		if (!(*user_gids)[*num_groups]) {
+			status = NT_STATUS_NO_MEMORY;
+			goto done;
+		}
+
+		sid_copy((*user_gids)[*num_groups], &group_sid);
+
 		(*num_groups)++;
 			
 	}
 
-	if (res) ads_msgfree(ads, res);
-	if (msg) ads_msgfree(ads, msg);
-
 	status = NT_STATUS_OK;
 
 	DEBUG(3,("ads lookup_usergroups (alt) for dn=%s\n", user_dn));
 done:
+	if (res) ads_msgfree(ads, res);
+	if (msg) ads_msgfree(ads, msg);
+
 	return status;
 }
 
 /* Lookup groups a user is a member of. */
 static NTSTATUS lookup_usergroups(struct winbindd_domain *domain,
 				  TALLOC_CTX *mem_ctx,
-				  uint32 user_rid, 
-				  uint32 *num_groups, uint32 **user_gids)
+				  DOM_SID *sid, 
+				  uint32 *num_groups, DOM_SID ***user_gids)
 {
 	ADS_STRUCT *ads = NULL;
 	const char *attrs[] = {"distinguishedName", NULL};
@@ -541,27 +544,26 @@ static NTSTATUS lookup_usergroups(struct winbindd_domain *domain,
 	char *user_dn;
 	DOM_SID *sids;
 	int i;
-	uint32 primary_group;
-	DOM_SID sid;
+	DOM_SID *primary_group;
+	uint32 primary_group_rid;
 	char *sidstr;
+	fstring sid_string;
 	NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
 
 	DEBUG(3,("ads: lookup_usergroups\n"));
 	*num_groups = 0;
 
-	sid_from_rid(domain, user_rid, &sid);
-
 	ads = ads_cached_connection(domain);
 	if (!ads) goto done;
 
-	if (!(sidstr = sid_binstring(&sid))) {
-		DEBUG(1,("lookup_usergroups(rid=%d) sid_binstring returned NULL\n", user_rid));
+	if (!(sidstr = sid_binstring(sid))) {
+		DEBUG(1,("lookup_usergroups(sid=%s) sid_binstring returned NULL\n", sid_to_string(sid_string, sid)));
 		status = NT_STATUS_NO_MEMORY;
 		goto done;
 	}
 	if (asprintf(&exp, "(objectSid=%s)", sidstr) == -1) {
 		free(sidstr);
-		DEBUG(1,("lookup_usergroups(rid=%d) asprintf failed!\n", user_rid));
+		DEBUG(1,("lookup_usergroups(sid=%s) asprintf failed!\n", sid_to_string(sid_string, sid)));
 		status = NT_STATUS_NO_MEMORY;
 		goto done;
 	}
@@ -571,13 +573,13 @@ static NTSTATUS lookup_usergroups(struct winbindd_domain *domain,
 	free(sidstr);
 
 	if (!ADS_ERR_OK(rc)) {
-		DEBUG(1,("lookup_usergroups(rid=%d) ads_search: %s\n", user_rid, ads_errstr(rc)));
+		DEBUG(1,("lookup_usergroups(sid=%s) ads_search: %s\n", sid_to_string(sid_string, sid), ads_errstr(rc)));
 		goto done;
 	}
 
 	user_dn = ads_pull_string(ads, mem_ctx, msg, "distinguishedName");
 	if (!user_dn) {
-		DEBUG(1,("lookup_usergroups(rid=%d) ads_search did not return a a distinguishedName!\n", user_rid));
+		DEBUG(1,("lookup_usergroups(sid=%s) ads_search did not return a a distinguishedName!\n", sid_to_string(sid_string, sid)));
 		goto done;
 	}
 
@@ -585,15 +587,17 @@ static NTSTATUS lookup_usergroups(struct winbindd_domain *domain,
 
 	rc = ads_search_retry_dn(ads, &msg, user_dn, attrs2);
 	if (!ADS_ERR_OK(rc)) {
-		DEBUG(1,("lookup_usergroups(rid=%d) ads_search tokenGroups: %s\n", user_rid, ads_errstr(rc)));
+		DEBUG(1,("lookup_usergroups(sid=%s) ads_search tokenGroups: %s\n", sid_to_string(sid_string, sid), ads_errstr(rc)));
 		goto done;
 	}
 
-	if (!ads_pull_uint32(ads, msg, "primaryGroupID", &primary_group)) {
-		DEBUG(1,("%s: No primary group for rid=%d !?\n", domain->name, user_rid));
+	if (!ads_pull_uint32(ads, msg, "primaryGroupID", &primary_group_rid)) {
+		DEBUG(1,("%s: No primary group for sid=%s !?\n", domain->name, sid_to_string(sid_string, sid)));
 		goto done;
 	}
 
+	primary_group = rid_to_talloced_sid(domain, mem_ctx, primary_group_rid);
+
 	count = ads_pull_sids(ads, mem_ctx, msg, "tokenGroups", &sids);
 
 	if (msg) ads_msgfree(ads, msg);
@@ -602,25 +606,30 @@ static NTSTATUS lookup_usergroups(struct winbindd_domain *domain,
 	   unless we are talking to a buggy Win2k server */
 	if (count == 0) {
 		return lookup_usergroups_alt(domain, mem_ctx, user_dn, 
-					       primary_group,
-					       num_groups, user_gids);
+					     primary_group,
+					     num_groups, user_gids);
 	}
 
-	(*user_gids) = (uint32 *)talloc_zero(mem_ctx, sizeof(uint32) * (count + 1));
+	(*user_gids) = talloc_zero(mem_ctx, sizeof(**user_gids) * (count + 1));
 	(*user_gids)[0] = primary_group;
 	
 	*num_groups = 1;
 	
 	for (i=0;i<count;i++) {
-		uint32 rid;
-		if (!sid_peek_check_rid(&domain->sid, &sids[i-1], &rid)) continue;
-		if (rid == primary_group) continue;
-		(*user_gids)[*num_groups] = rid;
+		if (sid_equal(&sids[i], primary_group)) continue;
+		
+		(*user_gids)[*num_groups] = talloc(mem_ctx, sizeof(***user_gids));
+		if (!(*user_gids)[*num_groups]) {
+			status = NT_STATUS_NO_MEMORY;
+			goto done;
+		}
+
+		sid_copy((*user_gids)[*num_groups], &sids[i]);
 		(*num_groups)++;
 	}
 
 	status = NT_STATUS_OK;
-	DEBUG(3,("ads lookup_usergroups for rid=%d\n", user_rid));
+	DEBUG(3,("ads lookup_usergroups for sid=%s\n", sid_to_string(sid_string, sid)));
 done:
 	return status;
 }
@@ -630,11 +639,10 @@ done:
  */
 static NTSTATUS lookup_groupmem(struct winbindd_domain *domain,
 				TALLOC_CTX *mem_ctx,
-				uint32 group_rid, uint32 *num_names, 
-				uint32 **rid_mem, char ***names, 
+				DOM_SID *group_sid, uint32 *num_names, 
+				DOM_SID ***sid_mem, char ***names, 
 				uint32 **name_types)
 {
-	DOM_SID group_sid;
 	ADS_STATUS rc;
 	int count;
 	void *res=NULL;
@@ -645,14 +653,14 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain *domain,
 	const char *attrs[] = {"member", NULL};
 	char **members;
 	int i, num_members;
+	fstring sid_string;
 
 	*num_names = 0;
 
 	ads = ads_cached_connection(domain);
 	if (!ads) goto done;
 
-	sid_from_rid(domain, group_rid, &group_sid);
-	sidstr = sid_binstring(&group_sid);
+	sidstr = sid_binstring(group_sid);
 
 	/* search for all members of the group */
 	asprintf(&exp, "(objectSid=%s)",sidstr);
@@ -684,24 +692,30 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain *domain,
 	for (i=0;members[i];i++) /* noop */ ;
 	num_members = i;
 
-	(*rid_mem) = talloc_zero(mem_ctx, sizeof(uint32) * num_members);
-	(*name_types) = talloc_zero(mem_ctx, sizeof(uint32) * num_members);
-	(*names) = talloc_zero(mem_ctx, sizeof(char *) * num_members);
+	(*sid_mem) = talloc_zero(mem_ctx, sizeof(**sid_mem) * num_members);
+	(*name_types) = talloc_zero(mem_ctx, sizeof(**name_types) * num_members);
+	(*names) = talloc_zero(mem_ctx, sizeof(**names) * num_members);
 
 	for (i=0;i<num_members;i++) {
-		uint32 name_type, rid;
+		uint32 name_type;
 		char *name;
+		DOM_SID sid;
 
-		if (dn_lookup(ads, mem_ctx, members[i], &name, &name_type, &rid)) {
+		if (dn_lookup(ads, mem_ctx, members[i], &name, &name_type, &sid)) {
 		    (*names)[*num_names] = name;
 		    (*name_types)[*num_names] = name_type;
-		    (*rid_mem)[*num_names] = rid;
+		    (*sid_mem)[*num_names] = talloc(mem_ctx, sizeof(***sid_mem));
+		    if (!(*sid_mem)[*num_names]) {
+			    status = NT_STATUS_NO_MEMORY;
+			    goto done;
+		    }
+		    sid_copy((*sid_mem)[*num_names], &sid);
 		    (*num_names)++;
 		}
 	}	
 
 	status = NT_STATUS_OK;
-	DEBUG(3,("ads lookup_groupmem for rid=%d\n", group_rid));
+	DEBUG(3,("ads lookup_groupmem for sid=%s\n", sid_to_string(sid_string, group_sid)));
 done:
 	if (res) ads_msgfree(ads, res);
 
diff --git a/source3/nsswitch/winbindd_cache.c b/source3/nsswitch/winbindd_cache.c
index 6ba1d48f5a..5fb59e7467 100644
--- a/source3/nsswitch/winbindd_cache.c
+++ b/source3/nsswitch/winbindd_cache.c
@@ -192,6 +192,23 @@ static char *centry_string(struct cache_entry *centry, TALLOC_CTX *mem_ctx)
 	return ret;
 }
 
+/* pull a string from a cache entry, using the supplied
+   talloc context 
+*/
+static DOM_SID *centry_sid(struct cache_entry *centry, TALLOC_CTX *mem_ctx)
+{
+	DOM_SID *sid;
+	char *sid_string;
+	sid = talloc(mem_ctx, sizeof(*sid));
+	if (!sid) return NULL;
+	
+	sid_string = centry_string(centry, mem_ctx);
+	if (!string_to_sid(sid, sid_string)) {
+		return NULL;
+	}
+	return sid;
+}
+
 /* the server is considered down if it can't give us a sequence number */
 static BOOL wcache_server_down(struct winbindd_domain *domain)
 {
@@ -258,6 +275,9 @@ static BOOL centry_expired(struct winbindd_domain *domain, struct cache_entry *c
   fetch an entry from the cache, with a varargs key. auto-fetch the sequence
   number and return status
 */
+static struct cache_entry *wcache_fetch(struct winbind_cache *cache, 
+					struct winbindd_domain *domain,
+					const char *format, ...) PRINTF_ATTRIBUTE(3,4);
 static struct cache_entry *wcache_fetch(struct winbind_cache *cache, 
 					struct winbindd_domain *domain,
 					const char *format, ...)
@@ -370,6 +390,13 @@ static void centry_put_string(struct cache_entry *centry, const char *s)
 	centry->ofs += len;
 }
 
+static void centry_put_sid(struct cache_entry *centry, const DOM_SID *sid) 
+{
+	int len;
+	fstring sid_string;
+	centry_put_string(centry, sid_to_string(sid_string, sid));
+}
+
 /*
   start a centry for output. When finished, call centry_end()
 */
@@ -393,6 +420,7 @@ struct cache_entry *centry_start(struct winbindd_domain *domain, NTSTATUS status
 /*
   finish a centry and write it to the tdb
 */
+static void centry_end(struct cache_entry *centry, const char *format, ...) PRINTF_ATTRIBUTE(2,3);
 static void centry_end(struct cache_entry *centry, const char *format, ...)
 {
 	va_list ap;
@@ -412,39 +440,30 @@ static void centry_end(struct cache_entry *centry, const char *format, ...)
 	free(kstr);
 }
 
-/* form a sid from the domain plus rid */
-static DOM_SID *form_sid(struct winbindd_domain *domain, uint32 rid)
-{
-	static DOM_SID sid;
-	sid_copy(&sid, &domain->sid);
-	sid_append_rid(&sid, rid);
-	return &sid;
-}
-
-static void wcache_save_name_to_sid(struct winbindd_domain *domain, NTSTATUS status, 
-				    const char *name, DOM_SID *sid, enum SID_NAME_USE type)
+static void wcache_save_name_to_sid(struct winbindd_domain *domain, 
+				    NTSTATUS status, 
+				    const char *name, DOM_SID *sid, 
+				    enum SID_NAME_USE type)
 {
 	struct cache_entry *centry;
 	uint32 len;
 	fstring uname;
+	fstring sid_string;
 
 	centry = centry_start(domain, status);
 	if (!centry) return;
-	len = sid_size(sid);
-	centry_expand(centry, len);
-	centry_put_uint32(centry, type);
-	sid_linearize(centry->data + centry->ofs, len, sid);
-	centry->ofs += len;
+	centry_put_sid(centry, sid);
 	fstrcpy(uname, name);
 	strupper(uname);
-	centry_end(centry, "NS/%s/%s", domain->name, uname);
+	centry_end(centry, "NS/%s", sid_to_string(sid_string, sid));
 	centry_free(centry);
 }
 
 static void wcache_save_sid_to_name(struct winbindd_domain *domain, NTSTATUS status, 
-				    DOM_SID *sid, const char *name, enum SID_NAME_USE type, uint32 rid)
+				    DOM_SID *sid, const char *name, enum SID_NAME_USE type)
 {
 	struct cache_entry *centry;
+	fstring sid_string;
 
 	centry = centry_start(domain, status);
 	if (!centry) return;
@@ -452,7 +471,7 @@ static void wcache_save_sid_to_name(struct winbindd_domain *domain, NTSTATUS sta
 		centry_put_uint32(centry, type);
 		centry_put_string(centry, name);
 	}
-	centry_end(centry, "SN/%s/%d", domain->name, rid);
+	centry_end(centry, "SN/%s", sid_to_string(sid_string, sid));
 	centry_free(centry);
 }
 
@@ -460,14 +479,15 @@ static void wcache_save_sid_to_name(struct winbindd_domain *domain, NTSTATUS sta
 static void wcache_save_user(struct winbindd_domain *domain, NTSTATUS status, WINBIND_USERINFO *info)
 {
 	struct cache_entry *centry;
+	fstring sid_string;
 
 	centry = centry_start(domain, status);
 	if (!centry) return;
 	centry_put_string(centry, info->acct_name);
 	centry_put_string(centry, info->full_name);
-	centry_put_uint32(centry, info->user_rid);
-	centry_put_uint32(centry, info->group_rid);
-	centry_end(centry, "U/%s/%d", domain->name, info->user_rid);
+	centry_put_sid(centry, info->user_sid);
+	centry_put_sid(centry, info->group_sid);
+	centry_end(centry, "U/%s", sid_to_string(sid_string, info->user_sid));
 	centry_free(centry);
 }
 
@@ -481,7 +501,7 @@ static NTSTATUS query_user_list(struct winbindd_domain *domain,
 	struct winbind_cache *cache = get_cache(domain);
 	struct cache_entry *centry = NULL;
 	NTSTATUS status;
-	int i;
+	unsigned int i;
 
 	if (!cache->tdb) goto do_query;
 
@@ -497,8 +517,8 @@ static NTSTATUS query_user_list(struct winbindd_domain *domain,
 	for (i=0; i<(*num_entries); i++) {
 		(*info)[i].acct_name = centry_string(centry, mem_ctx);
 		(*info)[i].full_name = centry_string(centry, mem_ctx);
-		(*info)[i].user_rid = centry_uint32(centry);
-		(*info)[i].group_rid = centry_uint32(centry);
+		(*info)[i].user_sid = centry_sid(centry, mem_ctx);
+		(*info)[i].group_sid = centry_sid(centry, mem_ctx);
 	}
 
 do_cached:	
@@ -524,18 +544,18 @@ do_query:
 	for (i=0; i<(*num_entries); i++) {
 		centry_put_string(centry, (*info)[i].acct_name);
 		centry_put_string(centry, (*info)[i].full_name);
-		centry_put_uint32(centry, (*info)[i].user_rid);
-		centry_put_uint32(centry, (*info)[i].group_rid);
+		centry_put_sid(centry, (*info)[i].user_sid);
+		centry_put_sid(centry, (*info)[i].group_sid);
 		if (cache->backend->consistent) {
 			/* when the backend is consistent we can pre-prime some mappings */
 			wcache_save_name_to_sid(domain, NT_STATUS_OK, 
 						(*info)[i].acct_name, 
-						form_sid(domain, (*info)[i].user_rid),
+						(*info)[i].user_sid,
 						SID_NAME_USER);
 			wcache_save_sid_to_name(domain, NT_STATUS_OK, 
-						form_sid(domain, (*info)[i].user_rid),
+						(*info)[i].user_sid,
 						(*info)[i].acct_name, 
-						SID_NAME_USER, (*info)[i].user_rid);
+						SID_NAME_USER);
 			wcache_save_user(domain, NT_STATUS_OK, &(*info)[i]);
 		}
 	}	
@@ -555,7 +575,7 @@ static NTSTATUS enum_dom_groups(struct winbindd_domain *domain,
 	struct winbind_cache *cache = get_cache(domain);
 	struct cache_entry *centry = NULL;
 	NTSTATUS status;
-	int i;
+	unsigned int i;
 
 	if (!cache->tdb) goto do_query;
 
@@ -615,7 +635,7 @@ static NTSTATUS enum_local_groups(struct winbindd_domain *domain,
 	struct winbind_cache *cache = get_cache(domain);
 	struct cache_entry *centry = NULL;
 	NTSTATUS status;
-	int i;
+	unsigned int i;
 
 	if (!cache->tdb) goto do_query;
 
@@ -669,7 +689,7 @@ do_query:
 		centry_put_string(centry, (*info)[i].acct_name);
 		centry_put_string(centry, (*info)[i].acct_desc);
 		centry_put_uint32(centry, (*info)[i].rid);
-	}	
+	}
 	centry_end(centry, "GL/%s/local", domain->name);
 	centry_free(centry);
 
@@ -679,6 +699,7 @@ skip_save:
 
 /* convert a single name to a sid in a domain */
 static NTSTATUS name_to_sid(struct winbindd_domain *domain,
+			    TALLOC_CTX *mem_ctx,
 			    const char *name,
 			    DOM_SID *sid,
 			    enum SID_NAME_USE *type)
@@ -687,6 +708,7 @@ static NTSTATUS name_to_sid(struct winbindd_domain *domain,
 	struct cache_entry *centry = NULL;
 	NTSTATUS status;
 	fstring uname;
+	DOM_SID *sid2;
 
 	if (!cache->tdb) goto do_query;
 
@@ -695,7 +717,12 @@ static NTSTATUS name_to_sid(struct winbindd_domain *domain,
 	centry = wcache_fetch(cache, domain, "NS/%s/%s", domain->name, uname);
 	if (!centry) goto do_query;
 	*type = centry_uint32(centry);
-	sid_parse(centry->data + centry->ofs, centry->len - centry->ofs, sid);
+	sid2 = centry_sid(centry, mem_ctx);
+	if (!sid2) {
+		ZERO_STRUCTP(sid);
+	} else {
+		sid_copy(sid, sid2);
+	}
 
 	status = centry->status;
 	centry_free(centry);
@@ -707,7 +734,7 @@ do_query:
 	if (wcache_server_down(domain)) {
 		return NT_STATUS_SERVER_DISABLED;
 	}
-	status = cache->backend->name_to_sid(domain, name, sid, type);
+	status = cache->backend->name_to_sid(domain, mem_ctx, name, sid, type);
 
 	/* and save it */
 	wcache_save_name_to_sid(domain, status, name, sid, *type);
@@ -729,14 +756,11 @@ static NTSTATUS sid_to_name(struct winbindd_domain *domain,
 	struct winbind_cache *cache = get_cache(domain);
 	struct cache_entry *centry = NULL;
 	NTSTATUS status;
-	uint32 rid = 0;
-
-	if (!sid_peek_check_rid(&domain->sid, sid, &rid))
-		return NT_STATUS_INVALID_PARAMETER;
+	fstring sid_string;
 
 	if (!cache->tdb) goto do_query;
 
-	centry = wcache_fetch(cache, domain, "SN/%s/%d", domain->name, rid);
+	centry = wcache_fetch(cache, domain, "SN/%s", sid_to_string(sid_string, sid));
 	if (!centry) goto do_query;
 	if (NT_STATUS_IS_OK(centry->status)) {
 		*type = centry_uint32(centry);
@@ -756,7 +780,7 @@ do_query:
 
 	/* and save it */
 	refresh_sequence_number(domain, True);
-	wcache_save_sid_to_name(domain, status, sid, *name, *type, rid);
+	wcache_save_sid_to_name(domain, status, sid, *name, *type);
 	wcache_save_name_to_sid(domain, status, *name, sid, *type);
 
 	return status;
@@ -766,22 +790,23 @@ do_query:
 /* Lookup user information from a rid */
 static NTSTATUS query_user(struct winbindd_domain *domain, 
 			   TALLOC_CTX *mem_ctx, 
-			   uint32 user_rid, 
+			   DOM_SID *user_sid, 
 			   WINBIND_USERINFO *info)
 {
 	struct winbind_cache *cache = get_cache(domain);
 	struct cache_entry *centry = NULL;
 	NTSTATUS status;
+	fstring sid_string;
 
 	if (!cache->tdb) goto do_query;
 
-	centry = wcache_fetch(cache, domain, "U/%s/%d", domain->name, user_rid);
+	centry = wcache_fetch(cache, domain, "U/%s", sid_to_string(sid_string, user_sid));
 	if (!centry) goto do_query;
 
 	info->acct_name = centry_string(centry, mem_ctx);
 	info->full_name = centry_string(centry, mem_ctx);
-	info->user_rid = centry_uint32(centry);
-	info->group_rid = centry_uint32(centry);
+	info->user_sid = centry_sid(centry, mem_ctx);
+	info->group_sid = centry_sid(centry, mem_ctx);
 	status = centry->status;
 	centry_free(centry);
 	return status;
@@ -793,7 +818,7 @@ do_query:
 		return NT_STATUS_SERVER_DISABLED;
 	}
 	
-	status = cache->backend->query_user(domain, mem_ctx, user_rid, info);
+	status = cache->backend->query_user(domain, mem_ctx, user_sid, info);
 
 	/* and save it */
 	refresh_sequence_number(domain, True);
@@ -806,17 +831,18 @@ do_query:
 /* Lookup groups a user is a member of. */
 static NTSTATUS lookup_usergroups(struct winbindd_domain *domain,
 				  TALLOC_CTX *mem_ctx,
-				  uint32 user_rid, 
-				  uint32 *num_groups, uint32 **user_gids)
+				  DOM_SID *user_sid, 
+				  uint32 *num_groups, DOM_SID ***user_gids)
 {
 	struct winbind_cache *cache = get_cache(domain);
 	struct cache_entry *centry = NULL;
 	NTSTATUS status;
-	int i;
+	unsigned int i;
+	fstring sid_string;
 
 	if (!cache->tdb) goto do_query;
 
-	centry = wcache_fetch(cache, domain, "UG/%s/%d", domain->name, user_rid);
+	centry = wcache_fetch(cache, domain, "UG/%s", sid_to_string(sid_string, user_sid));
 	if (!centry) goto do_query;
 
 	*num_groups = centry_uint32(centry);
@@ -826,7 +852,7 @@ static NTSTATUS lookup_usergroups(struct winbindd_domain *domain,
 	(*user_gids) = talloc(mem_ctx, sizeof(**user_gids) * (*num_groups));
 	if (! (*user_gids)) smb_panic("lookup_usergroups out of memory");
 	for (i=0; i<(*num_groups); i++) {
-		(*user_gids)[i] = centry_uint32(centry);
+		(*user_gids)[i] = centry_sid(centry, mem_ctx);
 	}
 
 do_cached:	
@@ -841,7 +867,7 @@ do_query:
 	if (wcache_server_down(domain)) {
 		return NT_STATUS_SERVER_DISABLED;
 	}
-	status = cache->backend->lookup_usergroups(domain, mem_ctx, user_rid, num_groups, user_gids);
+	status = cache->backend->lookup_usergroups(domain, mem_ctx, user_sid, num_groups, user_gids);
 
 	/* and save it */
 	refresh_sequence_number(domain, True);
@@ -849,9 +875,9 @@ do_query:
 	if (!centry) goto skip_save;
 	centry_put_uint32(centry, *num_groups);
 	for (i=0; i<(*num_groups); i++) {
-		centry_put_uint32(centry, (*user_gids)[i]);
+		centry_put_sid(centry, (*user_gids)[i]);
 	}	
-	centry_end(centry, "UG/%s/%d", domain->name, user_rid);
+	centry_end(centry, "UG/%s", sid_to_string(sid_string, user_sid));
 	centry_free(centry);
 
 skip_save:
@@ -861,34 +887,35 @@ skip_save:
 
 static NTSTATUS lookup_groupmem(struct winbindd_domain *domain,
 				TALLOC_CTX *mem_ctx,
-				uint32 group_rid, uint32 *num_names, 
-				uint32 **rid_mem, char ***names, 
+				DOM_SID *group_sid, uint32 *num_names, 
+				DOM_SID ***sid_mem, char ***names, 
 				uint32 **name_types)
 {
 	struct winbind_cache *cache = get_cache(domain);
 	struct cache_entry *centry = NULL;
 	NTSTATUS status;
-	int i;
+	unsigned int i;
+	fstring sid_string;
 
 	if (!cache->tdb) goto do_query;
 
-	centry = wcache_fetch(cache, domain, "GM/%s/%d", domain->name, group_rid);
+	centry = wcache_fetch(cache, domain, "GM/%s", sid_to_string(sid_string, group_sid));
 	if (!centry) goto do_query;
 
 	*num_names = centry_uint32(centry);
 	
 	if (*num_names == 0) goto do_cached;
 
-	(*rid_mem) = talloc(mem_ctx, sizeof(**rid_mem) * (*num_names));
+	(*sid_mem) = talloc(mem_ctx, sizeof(**sid_mem) * (*num_names));
 	(*names) = talloc(mem_ctx, sizeof(**names) * (*num_names));
 	(*name_types) = talloc(mem_ctx, sizeof(**name_types) * (*num_names));
 
-	if (! (*rid_mem) || ! (*names) || ! (*name_types)) {
+	if (! (*sid_mem) || ! (*names) || ! (*name_types)) {
 		smb_panic("lookup_groupmem out of memory");
 	}
 
 	for (i=0; i<(*num_names); i++) {
-		(*rid_mem)[i] = centry_uint32(centry);
+		(*sid_mem)[i] = centry_sid(centry, mem_ctx);
 		(*names)[i] = centry_string(centry, mem_ctx);
 		(*name_types)[i] = centry_uint32(centry);
 	}
@@ -900,7 +927,7 @@ do_cached:
 
 do_query:
 	(*num_names) = 0;
-	(*rid_mem) = NULL;
+	(*sid_mem) = NULL;
 	(*names) = NULL;
 	(*name_types) = NULL;
 	
@@ -908,8 +935,8 @@ do_query:
 	if (wcache_server_down(domain)) {
 		return NT_STATUS_SERVER_DISABLED;
 	}
-	status = cache->backend->lookup_groupmem(domain, mem_ctx, group_rid, num_names, 
-						 rid_mem, names, name_types);
+	status = cache->backend->lookup_groupmem(domain, mem_ctx, group_sid, num_names, 
+						 sid_mem, names, name_types);
 
 	/* and save it */
 	refresh_sequence_number(domain, True);
@@ -917,11 +944,11 @@ do_query:
 	if (!centry) goto skip_save;
 	centry_put_uint32(centry, *num_names);
 	for (i=0; i<(*num_names); i++) {
-		centry_put_uint32(centry, (*rid_mem)[i]);
+		centry_put_sid(centry, (*sid_mem)[i]);
 		centry_put_string(centry, (*names)[i]);
 		centry_put_uint32(centry, (*name_types)[i]);
 	}	
-	centry_end(centry, "GM/%s/%d", domain->name, group_rid);
+	centry_end(centry, "GM/%s", sid_to_string(sid_string, group_sid));
 	centry_free(centry);
 
 skip_save:
diff --git a/source3/nsswitch/winbindd_group.c b/source3/nsswitch/winbindd_group.c
index 94a826fbbc..d06db5943c 100644
--- a/source3/nsswitch/winbindd_group.c
+++ b/source3/nsswitch/winbindd_group.c
@@ -49,43 +49,44 @@ static BOOL fill_grent(struct winbindd_gr *gr, const char *dom_name,
 	return True;
 }
 
-/* Fill in the group membership field of a NT group given by group_rid */
+/* Fill in the group membership field of a NT group given by group_sid */
 
 static BOOL fill_grent_mem(struct winbindd_domain *domain,
-			   uint32 group_rid, 
+			   DOM_SID *group_sid, 
 			   enum SID_NAME_USE group_name_type, 
 			   int *num_gr_mem, char **gr_mem, int *gr_mem_len)
 {
-	uint32 *rid_mem = NULL, num_names = 0;
+	DOM_SID **sid_mem = NULL;
+	uint32 num_names = 0;
 	uint32 *name_types = NULL;
-	int buf_len, buf_ndx, i;
+	unsigned int buf_len, buf_ndx, i;
 	char **names = NULL, *buf;
 	BOOL result = False;
 	TALLOC_CTX *mem_ctx;
 	NTSTATUS status;
+	fstring sid_string;
 
 	if (!(mem_ctx = talloc_init("fill_grent_mem(%s)", domain->name)))
 		return False;
 
 	/* Initialise group membership information */
 	
-	DEBUG(10, ("group %s rid 0x%x\n", domain ? domain->name : "NULL", 
-		   group_rid));
+	DEBUG(10, ("group SID %s\n", sid_to_string(sid_string, group_sid)));
 
 	*num_gr_mem = 0;
 	
 	if (group_name_type != SID_NAME_DOM_GRP) {
-		DEBUG(1, ("rid %d in domain %s isn't a domain group\n", 
-			  group_rid, domain->name));
+		DEBUG(1, ("SID %s in domain %s isn't a domain group\n", 
+			  sid_to_string(sid_string, group_sid), domain->name));
                 goto done;
 	}
 
 	/* Lookup group members */
-	status = domain->methods->lookup_groupmem(domain, mem_ctx, group_rid, &num_names, 
-						  &rid_mem, &names, &name_types);
+	status = domain->methods->lookup_groupmem(domain, mem_ctx, group_sid, &num_names, 
+						  &sid_mem, &names, &name_types);
 	if (!NT_STATUS_IS_OK(status)) {
-		DEBUG(1, ("could not lookup membership for group rid %d in domain %s (error: %s)\n", 
-			  group_rid, domain->name, nt_errstr(status)));
+		DEBUG(1, ("could not lookup membership for group rid %s in domain %s (error: %s)\n", 
+			  sid_to_string(sid_string, group_sid), domain->name, nt_errstr(status)));
 
 		goto done;
 	}
@@ -94,7 +95,7 @@ static BOOL fill_grent_mem(struct winbindd_domain *domain,
 
 	if (DEBUGLEVEL >= 10) {
 		for (i = 0; i < num_names; i++)
-			DEBUG(10, ("\t%20s %x %d\n", names[i], rid_mem[i],
+			DEBUG(10, ("\t%20s %s %d\n", names[i], sid_to_string(sid_string, sid_mem[i]),
 				   name_types[i]));
 	}
 
@@ -190,7 +191,6 @@ enum winbindd_result winbindd_getgrnam(struct winbindd_cli_state *state)
 	DOM_SID group_sid;
 	struct winbindd_domain *domain;
 	enum SID_NAME_USE name_type;
-	uint32 group_rid;
 	fstring name_domain, name_group;
 	char *tmp, *gr_mem;
 	gid_t gid;
@@ -233,10 +233,6 @@ enum winbindd_result winbindd_getgrnam(struct winbindd_cli_state *state)
 		return WINBINDD_ERROR;
 	}
 
-	/* Fill in group structure */
-	if (!sid_peek_check_rid(&domain->sid, &group_sid, &group_rid))
-		return WINBINDD_ERROR;
-
 	if (!winbindd_idmap_get_gid_from_sid(&group_sid, &gid)) {
 		DEBUG(1, ("error converting unix gid to sid\n"));
 		return WINBINDD_ERROR;
@@ -244,7 +240,7 @@ enum winbindd_result winbindd_getgrnam(struct winbindd_cli_state *state)
 
 	if (!fill_grent(&state->response.data.gr, name_domain,
 			name_group, gid) ||
-	    !fill_grent_mem(domain, group_rid, name_type,
+	    !fill_grent_mem(domain, &group_sid, name_type,
 			    &state->response.data.gr.num_gr_mem,
 			    &gr_mem, &gr_mem_len)) {
 		return WINBINDD_ERROR;
@@ -269,7 +265,6 @@ enum winbindd_result winbindd_getgrgid(struct winbindd_cli_state *state)
 	enum SID_NAME_USE name_type;
 	fstring dom_name;
 	fstring group_name;
-	uint32 group_rid;
 	int gr_mem_len;
 	char *gr_mem;
 
@@ -284,17 +279,13 @@ enum winbindd_result winbindd_getgrgid(struct winbindd_cli_state *state)
 
 	/* Get rid from gid */
 
-	if (!winbindd_idmap_get_rid_from_gid(state->request.data.gid, 
-					     &group_rid, &domain)) {
+	if (!winbindd_idmap_get_sid_from_gid(state->request.data.gid, &group_sid)) {
 		DEBUG(1, ("could not convert gid %d to rid\n", 
 			  state->request.data.gid));
 		return WINBINDD_ERROR;
 	}
 
-	/* Get sid from gid */
-
-	sid_copy(&group_sid, &domain->sid);
-	sid_append_rid(&group_sid, group_rid);
+	/* Get name from sid */
 
 	if (!winbindd_lookup_name_by_sid(&group_sid, dom_name, group_name, &name_type)) {
 		DEBUG(1, ("could not lookup sid\n"));
@@ -310,9 +301,16 @@ enum winbindd_result winbindd_getgrgid(struct winbindd_cli_state *state)
 
 	/* Fill in group structure */
 
+	domain = find_domain_from_sid(&group_sid);
+
+	if (!domain) {
+		DEBUG(1,("Can't find domain from sid\n"));
+		return WINBINDD_ERROR;
+	}
+
 	if (!fill_grent(&state->response.data.gr, dom_name, group_name, 
 			state->request.data.gid) ||
-	    !fill_grent_mem(domain, group_rid, name_type,
+	    !fill_grent_mem(domain, &group_sid, name_type,
 			    &state->response.data.gr.num_gr_mem,
 			    &gr_mem, &gr_mem_len))
 		return WINBINDD_ERROR;
@@ -544,7 +542,9 @@ enum winbindd_result winbindd_getgrent(struct winbindd_cli_state *state)
 		gid_t group_gid;
 		int gr_mem_len;
 		char *gr_mem, *new_gr_mem_list;
-		
+		DOM_SID group_sid;
+		struct winbindd_domain *domain;
+				
 		/* Do we need to fetch another chunk of groups? */
 
 	tryagain:
@@ -578,16 +578,25 @@ enum winbindd_result winbindd_getgrent(struct winbindd_cli_state *state)
 		
 		name_list = ent->sam_entries;
 		
+		if (!(domain = 
+		      find_domain_from_name(ent->domain_name))) {
+			DEBUG(3, ("No such domain %s in winbindd_getgrent\n", ent->domain_name));
+			result = False;
+			goto done;
+		}
+
 		/* Lookup group info */
 		
-		if (!winbindd_idmap_get_gid_from_rid(
-			ent->domain_name,
-			name_list[ent->sam_entry_index].rid,
-			&group_gid)) {
+		sid_copy(&group_sid, &domain->sid);
+		sid_append_rid(&group_sid, name_list[ent->sam_entry_index].rid);
+
+		if (!winbindd_idmap_get_gid_from_sid(
+			    &group_sid,
+			    &group_gid)) {
 			
 			DEBUG(1, ("could not look up gid for group %s\n", 
 				  name_list[ent->sam_entry_index].acct_name));
-
+			
 			ent->sam_entry_index++;
 			goto tryagain;
 		}
@@ -608,15 +617,7 @@ enum winbindd_result winbindd_getgrent(struct winbindd_cli_state *state)
 		/* Fill in group membership entry */
 
 		if (result) {
-			struct winbindd_domain *domain;
-
-			if (!(domain = 
-			      find_domain_from_name(ent->domain_name))) {
-				DEBUG(3, ("No such domain %s in winbindd_getgrent\n", ent->domain_name));
-				result = False;
-				goto done;
-			}
-
+			DOM_SID member_sid;
 			group_list[group_list_ndx].num_gr_mem = 0;
 			gr_mem = NULL;
 			gr_mem_len = 0;
@@ -625,9 +626,11 @@ enum winbindd_result winbindd_getgrent(struct winbindd_cli_state *state)
 			if (state->request.cmd == WINBINDD_GETGRLST) {
 				result = True;
 			} else {
+				sid_copy(&member_sid, &domain->sid);
+				sid_append_rid(&member_sid, name_list[ent->sam_entry_index].rid);
 				result = fill_grent_mem(
 					domain,
-					name_list[ent->sam_entry_index].rid,
+					&member_sid,
 					SID_NAME_DOM_GRP,
 					&group_list[group_list_ndx].num_gr_mem, 
 					&gr_mem, &gr_mem_len);
@@ -730,7 +733,7 @@ enum winbindd_result winbindd_list_groups(struct winbindd_cli_state *state)
 	struct winbindd_domain *domain;
 	char *extra_data = NULL;
 	char *ted = NULL;
-	int extra_data_len = 0, i;
+	unsigned int extra_data_len = 0, i;
 
 	DEBUG(3, ("[%5d]: list groups\n", state->pid));
 
@@ -805,13 +808,13 @@ enum winbindd_result winbindd_getgroups(struct winbindd_cli_state *state)
 	fstring name_domain, name_user;
 	DOM_SID user_sid;
 	enum SID_NAME_USE name_type;
-	uint32 user_rid, num_groups, num_gids;
+	uint32 num_groups, num_gids;
 	NTSTATUS status;
-	uint32 *user_gids;
+	DOM_SID **user_gids;
 	struct winbindd_domain *domain;
 	enum winbindd_result result = WINBINDD_ERROR;
 	gid_t *gid_list;
-	int i;
+	unsigned int i;
 	TALLOC_CTX *mem_ctx;
 	
 	/* Ensure null termination */
@@ -852,9 +855,9 @@ enum winbindd_result winbindd_getgroups(struct winbindd_cli_state *state)
 		goto done;
 	}
 
-	sid_split_rid(&user_sid, &user_rid);
-
-	status = domain->methods->lookup_usergroups(domain, mem_ctx, user_rid, &num_groups, &user_gids);
+	status = domain->methods->lookup_usergroups(domain, mem_ctx, 
+						    &user_sid, &num_groups, 
+						    &user_gids);
 	if (!NT_STATUS_IS_OK(status)) goto done;
 
 	/* Copy data back to client */
@@ -866,12 +869,13 @@ enum winbindd_result winbindd_getgroups(struct winbindd_cli_state *state)
 		goto done;
 
 	for (i = 0; i < num_groups; i++) {
-		if (!winbindd_idmap_get_gid_from_rid(domain->name, 
-						     user_gids[i], 
-						     &gid_list[num_gids])) {
+		if (!winbindd_idmap_get_gid_from_sid(
+			    user_gids[i], 
+			    &gid_list[num_gids])) {
+			fstring sid_string;
 
-			DEBUG(1, ("unable to convert group rid %d to gid\n", 
-				  user_gids[i]));
+			DEBUG(1, ("unable to convert group sid %s to gid\n", 
+				  sid_to_string(sid_string, user_gids[i])));
 			continue;
 		}
 			
diff --git a/source3/nsswitch/winbindd_idmap.c b/source3/nsswitch/winbindd_idmap.c
index 0a17fcd87f..de547cde41 100644
--- a/source3/nsswitch/winbindd_idmap.c
+++ b/source3/nsswitch/winbindd_idmap.c
@@ -121,48 +121,6 @@ BOOL winbindd_idmap_get_gid_from_sid(DOM_SID *sid, gid_t *gid)
   return ret;
 }
 
-/* Get UID from RID */
-BOOL winbindd_idmap_get_uid_from_rid(const char *dom_name, uint32 rid, 
-                                     uid_t *uid)
-{
-  BOOL ret = False;
-
-  if (!impl) {
-    impl = get_impl(lp_idmap_backend());
-    if (!impl) {
-      DEBUG(0, ("winbindd_idmap_init: could not load backend '%s'\n",
-                lp_idmap_backend()));
-    }
-  }
-
-  if (impl) {
-    ret = impl->get_uid_from_rid(dom_name, rid, uid);
-  }
-
-  return ret;
-}
-
-/* Get GID From RID */
-BOOL winbindd_idmap_get_gid_from_rid(const char *dom_name, uint32 rid, 
-                                     gid_t *gid)
-{
-  BOOL ret = False;
-
-  if (!impl) {
-    impl = get_impl(lp_idmap_backend());
-    if (!impl) {
-      DEBUG(0, ("winbindd_idmap_init: could not load backend '%s'\n",
-                lp_idmap_backend()));
-    }
-  }
-
-  if (impl) {
-    ret = impl->get_gid_from_rid(dom_name, rid, gid);
-  }
-
-  return ret;
-}
-
 /* Get SID from UID */
 BOOL winbindd_idmap_get_sid_from_uid(uid_t uid, DOM_SID *sid)
 {
@@ -202,46 +160,6 @@ BOOL winbindd_idmap_get_sid_from_gid(gid_t gid, DOM_SID *sid)
   return ret;
 }
 
-/* Get RID From UID */
-BOOL winbindd_idmap_get_rid_from_uid(uid_t uid, uint32 *user_rid,
-                                     struct winbindd_domain **domain)
-{
-  BOOL ret = False;
-
-  if (!impl) {
-    impl = get_impl(lp_idmap_backend());
-  }
-
-  if (impl) {
-    ret = impl->get_rid_from_uid(uid, user_rid, domain);
-  } else {
-    DEBUG(0, ("winbindd_idmap_init: could not load backend '%s'\n",
-              lp_idmap_backend()));
-  }
-
-  return ret;
-}
-
-/* Get RID from GID */
-BOOL winbindd_idmap_get_rid_from_gid(gid_t gid, uint32 *group_rid, 
-                                     struct winbindd_domain **domain)
-{
-  BOOL ret = False;
-
-  if (!impl) {
-    impl = get_impl(lp_idmap_backend());
-  }
-
-  if (impl) {
-    ret = impl->get_rid_from_gid(gid, group_rid, domain);
-  } else {
-    DEBUG(0, ("winbindd_idmap_init: could not load backend '%s'\n",
-              lp_idmap_backend()));
-  }
-
-  return ret;
-}
-
 /* Close backend */
 BOOL winbindd_idmap_close(void)
 {
diff --git a/source3/nsswitch/winbindd_idmap_tdb.c b/source3/nsswitch/winbindd_idmap_tdb.c
index f27c3c1b5f..911b3b41d2 100644
--- a/source3/nsswitch/winbindd_idmap_tdb.c
+++ b/source3/nsswitch/winbindd_idmap_tdb.c
@@ -342,78 +342,6 @@ static BOOL tdb_get_gid_from_sid(DOM_SID * sid, gid_t * gid)
 	return tdb_get_id_from_sid(sid, gid, True);
 }
 
-/* Get a uid from a user rid */
-static BOOL tdb_get_uid_from_rid(const char *dom_name, uint32 rid,
-				 uid_t * uid)
-{
-	struct winbindd_domain *domain;
-	DOM_SID sid;
-
-	if (!(domain = find_domain_from_name(dom_name))) {
-		return False;
-	}
-
-	sid_copy(&sid, &domain->sid);
-	sid_append_rid(&sid, rid);
-
-	return tdb_get_id_from_sid(&sid, uid, False);
-}
-
-/* Get a gid from a group rid */
-static BOOL tdb_get_gid_from_rid(const char *dom_name, uint32 rid,
-				 gid_t * gid)
-{
-	struct winbindd_domain *domain;
-	DOM_SID sid;
-
-	if (!(domain = find_domain_from_name(dom_name))) {
-		return False;
-	}
-
-	sid_copy(&sid, &domain->sid);
-	sid_append_rid(&sid, rid);
-
-	return tdb_get_id_from_sid(&sid, gid, True);
-}
-
-/* Get a user rid from a uid */
-static BOOL tdb_get_rid_from_uid(uid_t uid, uint32 * user_rid,
-				 struct winbindd_domain **domain)
-{
-	DOM_SID sid;
-
-	if (!tdb_get_sid_from_id((int) uid, &sid, False)) {
-		return False;
-	}
-
-	*domain = find_domain_from_sid(&sid);
-	if (!*domain)
-		return False;
-
-	sid_split_rid(&sid, user_rid);
-
-	return True;
-}
-
-/* Get a group rid from a gid */
-static BOOL tdb_get_rid_from_gid(gid_t gid, uint32 * group_rid,
-				 struct winbindd_domain **domain)
-{
-	DOM_SID sid;
-
-	if (!tdb_get_sid_from_id((int) gid, &sid, True)) {
-		return False;
-	}
-
-	*domain = find_domain_from_sid(&sid);
-	if (!*domain)
-		return False;
-
-	sid_split_rid(&sid, group_rid);
-
-	return True;
-}
-
 /* Close the tdb */
 static BOOL tdb_idmap_close(void)
 {
@@ -500,12 +428,6 @@ struct idmap_methods tdb_idmap_methods = {
 	tdb_get_uid_from_sid,
 	tdb_get_gid_from_sid,
 
-	tdb_get_rid_from_uid,
-	tdb_get_rid_from_gid,
-
-	tdb_get_uid_from_rid,
-	tdb_get_gid_from_rid,
-
 	tdb_idmap_close,
 
 	tdb_idmap_status
diff --git a/source3/nsswitch/winbindd_rpc.c b/source3/nsswitch/winbindd_rpc.c
index 90d8e4f616..03b0a1e706 100644
--- a/source3/nsswitch/winbindd_rpc.c
+++ b/source3/nsswitch/winbindd_rpc.c
@@ -26,6 +26,7 @@
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
 
+
 /* Query display info for a domain.  This returns enough information plus a
    bit extra to give an overview of domain users for the User Manager
    application. */
@@ -39,7 +40,7 @@ static NTSTATUS query_user_list(struct winbindd_domain *domain,
 	POLICY_HND dom_pol;
 	BOOL got_dom_pol = False;
 	uint32 des_access = SEC_RIGHTS_MAXIMUM_ALLOWED;
-	int i, start_idx, retry;
+	unsigned int i, start_idx, retry;
 
 	DEBUG(3,("rpc: query_user_list\n"));
 
@@ -97,7 +98,7 @@ static NTSTATUS query_user_list(struct winbindd_domain *domain,
 			(*info)[i].acct_name = 
 				talloc_strdup(mem_ctx, dom_users[j]);
 			(*info)[i].full_name = talloc_strdup(mem_ctx, "");
-			(*info)[i].user_rid = dom_rids[j];
+			(*info)[i].user_sid = rid_to_talloced_sid(domain, mem_ctx, dom_rids[j]);
 			/* For the moment we set the primary group for
 			   every user to be the Domain Users group.
 			   There are serious problems with determining
@@ -105,7 +106,10 @@ static NTSTATUS query_user_list(struct winbindd_domain *domain,
 			   This should really be made into a 'winbind
 			   force group' smb.conf parameter or
 			   something like that. */
-			(*info)[i].group_rid = DOMAIN_GROUP_RID_USERS;
+			(*info)[i].user_sid 
+				= rid_to_talloced_sid(domain, 
+						      mem_ctx, 
+						      DOMAIN_GROUP_RID_USERS);
 		}
 
 		talloc_destroy(ctx2);
@@ -252,11 +256,11 @@ static NTSTATUS enum_local_groups(struct winbindd_domain *domain,
 
 /* convert a single name to a sid in a domain */
 static NTSTATUS name_to_sid(struct winbindd_domain *domain,
+			    TALLOC_CTX *mem_ctx,
 			    const char *name,
 			    DOM_SID *sid,
 			    enum SID_NAME_USE *type)
 {
-	TALLOC_CTX *mem_ctx;
 	CLI_POLICY_HND *hnd;
 	NTSTATUS status;
 	DOM_SID *sids = NULL;
@@ -266,23 +270,16 @@ static NTSTATUS name_to_sid(struct winbindd_domain *domain,
 
 	DEBUG(3,("rpc: name_to_sid name=%s\n", name));
 
-	if (!(mem_ctx = talloc_init("name_to_sid[rpc] for [%s]\\[%s]", domain->name, name))) {
-		DEBUG(0, ("talloc_init failed!\n"));
-		return NT_STATUS_NO_MEMORY;
-	}
-        
 	full_name = talloc_asprintf(mem_ctx, "%s\\%s", domain->name, name);
 	
 	if (!full_name) {
 		DEBUG(0, ("talloc_asprintf failed!\n"));
-		talloc_destroy(mem_ctx);
 		return NT_STATUS_NO_MEMORY;
 	}
 
 	retry = 0;
 	do {
 		if (!(hnd = cm_get_lsa_handle(domain->name))) {
-			talloc_destroy(mem_ctx);
 			return NT_STATUS_UNSUCCESSFUL;
 		}
         
@@ -297,7 +294,6 @@ static NTSTATUS name_to_sid(struct winbindd_domain *domain,
 		*type = types[0];
 	}
 
-	talloc_destroy(mem_ctx);
 	return status;
 }
 
@@ -345,17 +341,22 @@ static NTSTATUS sid_to_name(struct winbindd_domain *domain,
 /* Lookup user information from a rid or username. */
 static NTSTATUS query_user(struct winbindd_domain *domain, 
 			   TALLOC_CTX *mem_ctx, 
-			   uint32 user_rid, 
+			   DOM_SID *user_sid, 
 			   WINBIND_USERINFO *user_info)
 {
 	CLI_POLICY_HND *hnd;
-	NTSTATUS result;
+	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
 	POLICY_HND dom_pol, user_pol;
 	BOOL got_dom_pol = False, got_user_pol = False;
 	SAM_USERINFO_CTR *ctr;
 	int retry;
+	fstring sid_string;
+	uint32 user_rid;
 
-	DEBUG(3,("rpc: query_user rid=%u\n", user_rid));
+	DEBUG(3,("rpc: query_user rid=%s\n", sid_to_string(sid_string, user_sid)));
+	if (!sid_peek_check_rid(&domain->sid, user_sid, &user_rid)) {
+		goto done;
+	}
 
 	retry = 0;
 	do {
@@ -394,8 +395,8 @@ static NTSTATUS query_user(struct winbindd_domain *domain,
 	cli_samr_close(hnd->cli, mem_ctx, &user_pol);
 	got_user_pol = False;
 
-	user_info->user_rid = user_rid;
-	user_info->group_rid = ctr->info.id21->group_rid;
+	user_info->user_sid = rid_to_talloced_sid(domain, mem_ctx, user_rid);
+	user_info->group_sid = rid_to_talloced_sid(domain, mem_ctx, ctr->info.id21->group_rid);
 	user_info->acct_name = unistr2_tdup(mem_ctx, 
 					    &ctr->info.id21->uni_user_name);
 	user_info->full_name = unistr2_tdup(mem_ctx, 
@@ -415,8 +416,8 @@ static NTSTATUS query_user(struct winbindd_domain *domain,
 /* Lookup groups a user is a member of.  I wish Unix had a call like this! */
 static NTSTATUS lookup_usergroups(struct winbindd_domain *domain,
 				  TALLOC_CTX *mem_ctx,
-				  uint32 user_rid, 
-				  uint32 *num_groups, uint32 **user_gids)
+				  DOM_SID *user_sid,
+				  uint32 *num_groups, DOM_SID ***user_gids)
 {
 	CLI_POLICY_HND *hnd;
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
@@ -424,15 +425,17 @@ static NTSTATUS lookup_usergroups(struct winbindd_domain *domain,
 	uint32 des_access = SEC_RIGHTS_MAXIMUM_ALLOWED;
 	BOOL got_dom_pol = False, got_user_pol = False;
 	DOM_GID *user_groups;
-	int i;
-	int retry;
+	unsigned int i;
+	unsigned int retry;
+	fstring sid_string;
+	uint32 user_rid;
 
-	DEBUG(3,("rpc: lookup_usergroups rid=%u\n", user_rid));
+	DEBUG(3,("rpc: lookup_usergroups sid=%s\n", sid_to_string(sid_string, user_sid)));
 
 	*num_groups = 0;
 
 	/* First try cached universal groups from logon */
-	*user_gids = uni_group_cache_fetch(&domain->sid, user_rid, mem_ctx, num_groups);
+	*user_gids = uni_group_cache_fetch(&domain->sid, user_sid, mem_ctx, num_groups);
 	if((*num_groups > 0) && *user_gids) {
 		return NT_STATUS_OK;
 	} else {
@@ -448,7 +451,7 @@ static NTSTATUS lookup_usergroups(struct winbindd_domain *domain,
 
 		/* Get domain handle */
 		result = cli_samr_open_domain(hnd->cli, mem_ctx, &hnd->pol,
-						des_access, &domain->sid, &dom_pol);
+					      des_access, &domain->sid, &dom_pol);
 	} while (!NT_STATUS_IS_OK(result) && (retry++ < 1) && hnd && hnd->cli && hnd->cli->fd == -1);
 
 	if (!NT_STATUS_IS_OK(result))
@@ -456,6 +459,11 @@ static NTSTATUS lookup_usergroups(struct winbindd_domain *domain,
 
 	got_dom_pol = True;
 
+
+	if (!sid_peek_check_rid(&domain->sid, user_sid, &user_rid)) {
+		goto done;
+	}
+
 	/* Get user handle */
 	result = cli_samr_open_user(hnd->cli, mem_ctx, &dom_pol,
 					des_access, user_rid, &user_pol);
@@ -473,8 +481,13 @@ static NTSTATUS lookup_usergroups(struct winbindd_domain *domain,
 		goto done;
 
 	(*user_gids) = talloc(mem_ctx, sizeof(uint32) * (*num_groups));
+	if (!(*user_gids)) {
+		result = NT_STATUS_NO_MEMORY;
+		goto done;
+	}
+
 	for (i=0;i<(*num_groups);i++) {
-		(*user_gids)[i] = user_groups[i].g_rid;
+		(*user_gids)[i] = rid_to_talloced_sid(domain, mem_ctx, user_groups[i].g_rid);
 	}
 	
  done:
@@ -492,8 +505,8 @@ static NTSTATUS lookup_usergroups(struct winbindd_domain *domain,
 /* Lookup group membership given a rid.   */
 static NTSTATUS lookup_groupmem(struct winbindd_domain *domain,
 				TALLOC_CTX *mem_ctx,
-				uint32 group_rid, uint32 *num_names, 
-				uint32 **rid_mem, char ***names, 
+				DOM_SID *group_sid, uint32 *num_names, 
+				DOM_SID ***sid_mem, char ***names, 
 				uint32 **name_types)
 {
         CLI_POLICY_HND *hnd;
@@ -502,9 +515,17 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain *domain,
         POLICY_HND dom_pol, group_pol;
         uint32 des_access = SEC_RIGHTS_MAXIMUM_ALLOWED;
         BOOL got_dom_pol = False, got_group_pol = False;
+	uint32 *rid_mem = NULL;
+	uint32 group_rid;
 	int retry;
+	unsigned int j;
+	fstring sid_string;
+
+	DEBUG(10,("rpc: lookup_groupmem %s sid=%s\n", domain->name, sid_to_string(sid_string, group_sid)));
 
-	DEBUG(10,("rpc: lookup_groupmem %s rid=%u\n", domain->name, group_rid));
+	if (!sid_peek_check_rid(&domain->sid, group_sid, &group_rid)) {
+		goto done;
+	}
 
 	*num_names = 0;
 
@@ -539,7 +560,7 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain *domain,
            group. */
 
         result = cli_samr_query_groupmem(hnd->cli, mem_ctx,
-                                         &group_pol, num_names, rid_mem,
+                                         &group_pol, num_names, &rid_mem,
                                          name_types);
 
         if (!NT_STATUS_IS_OK(result))
@@ -554,6 +575,16 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain *domain,
 
         *names = talloc_zero(mem_ctx, *num_names * sizeof(char *));
         *name_types = talloc_zero(mem_ctx, *num_names * sizeof(uint32));
+        *sid_mem = talloc_zero(mem_ctx, *num_names * sizeof(DOM_SID *));
+
+	for (j=0;j<(*num_names);j++) {
+		(*sid_mem)[j] = rid_to_talloced_sid(domain, mem_ctx, (rid_mem)[j]);
+	}
+	
+	if (!*names || !*name_types) {
+		result = NT_STATUS_NO_MEMORY;
+		goto done;
+	}
 
         for (i = 0; i < *num_names; i += MAX_LOOKUP_RIDS) {
                 int num_lookup_rids = MIN(*num_names - i, MAX_LOOKUP_RIDS);
@@ -566,7 +597,7 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain *domain,
                 result = cli_samr_lookup_rids(hnd->cli, mem_ctx,
                                               &dom_pol, 1000, /* flags */
                                               num_lookup_rids,
-                                              &(*rid_mem)[i],
+                                              &rid_mem[i],
                                               &tmp_num_names,
                                               &tmp_names, &tmp_types);
 
@@ -581,7 +612,7 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain *domain,
 
                 memcpy(&(*name_types)[i], tmp_types, sizeof(uint32) *
                        tmp_num_names);
-
+		
                 total_names += tmp_num_names;
         }
 
diff --git a/source3/nsswitch/winbindd_user.c b/source3/nsswitch/winbindd_user.c
index 06c95224ab..ee05543d30 100644
--- a/source3/nsswitch/winbindd_user.c
+++ b/source3/nsswitch/winbindd_user.c
@@ -29,29 +29,30 @@
 /* Fill a pwent structure with information we have obtained */
 
 static BOOL winbindd_fill_pwent(char *dom_name, char *user_name, 
-				uint32 user_rid, uint32 group_rid, 
+				DOM_SID *user_sid, DOM_SID *group_sid,
 				char *full_name, struct winbindd_pw *pw)
 {
 	extern userdom_struct current_user_info;
 	fstring output_username;
 	pstring homedir;
+	fstring sid_string;
 	
 	if (!pw || !dom_name || !user_name)
 		return False;
 	
 	/* Resolve the uid number */
 	
-	if (!winbindd_idmap_get_uid_from_rid(dom_name, user_rid, 
+	if (!winbindd_idmap_get_uid_from_sid(user_sid, 
 					     &pw->pw_uid)) {
-		DEBUG(1, ("error getting user id for rid %d\n", user_rid));
+		DEBUG(1, ("error getting user id for sid %s\n", sid_to_string(sid_string, user_sid)));
 		return False;
 	}
 	
 	/* Resolve the gid number */   
 	
-	if (!winbindd_idmap_get_gid_from_rid(dom_name, group_rid, 
+	if (!winbindd_idmap_get_gid_from_sid(group_sid, 
 					     &pw->pw_gid)) {
-		DEBUG(1, ("error getting group id for rid %d\n", group_rid));
+		DEBUG(1, ("error getting group id for sid %s\n", sid_to_string(sid_string, group_sid)));
 		return False;
 	}
 
@@ -95,7 +96,6 @@ static BOOL winbindd_fill_pwent(char *dom_name, char *user_name,
 
 enum winbindd_result winbindd_getpwnam(struct winbindd_cli_state *state) 
 {
-	uint32 user_rid;
 	WINBIND_USERINFO user_info;
 	DOM_SID user_sid;
 	NTSTATUS status;
@@ -144,9 +144,7 @@ enum winbindd_result winbindd_getpwnam(struct winbindd_cli_state *state)
 		return WINBINDD_ERROR;
 	}
 
-	sid_split_rid(&user_sid, &user_rid);
-
-	status = domain->methods->query_user(domain, mem_ctx, user_rid, 
+	status = domain->methods->query_user(domain, mem_ctx, &user_sid, 
 					     &user_info);
 
 	if (!NT_STATUS_IS_OK(status)) {
@@ -158,7 +156,7 @@ enum winbindd_result winbindd_getpwnam(struct winbindd_cli_state *state)
     
 	/* Now take all this information and fill in a passwd structure */	
 	if (!winbindd_fill_pwent(name_domain, name_user, 
-				 user_rid, user_info.group_rid, 
+				 user_info.user_sid, user_info.group_sid, 
 				 user_info.full_name,
 				 &state->response.data.pw)) {
 		talloc_destroy(mem_ctx);
@@ -176,7 +174,6 @@ enum winbindd_result winbindd_getpwuid(struct winbindd_cli_state *state)
 {
 	DOM_SID user_sid;
 	struct winbindd_domain *domain;
-	uint32 user_rid;
 	fstring dom_name;
 	fstring user_name;
 	enum SID_NAME_USE name_type;
@@ -196,18 +193,15 @@ enum winbindd_result winbindd_getpwuid(struct winbindd_cli_state *state)
 	
 	/* Get rid from uid */
 
-	if (!winbindd_idmap_get_rid_from_uid(state->request.data.uid, 
-					     &user_rid, &domain)) {
-		DEBUG(1, ("could not convert uid %d to rid\n", 
+	if (!winbindd_idmap_get_sid_from_uid(state->request.data.uid, 
+					     &user_sid)) {
+		DEBUG(1, ("could not convert uid %d to SID\n", 
 			  state->request.data.uid));
 		return WINBINDD_ERROR;
 	}
 	
 	/* Get name and name type from rid */
 
-	sid_copy(&user_sid, &domain->sid);
-	sid_append_rid(&user_sid, user_rid);
-	
 	if (!winbindd_lookup_name_by_sid(&user_sid, dom_name, user_name, &name_type)) {
 		fstring temp;
 		
@@ -216,6 +210,13 @@ enum winbindd_result winbindd_getpwuid(struct winbindd_cli_state *state)
 		return WINBINDD_ERROR;
 	}
 	
+	domain = find_domain_from_sid(&user_sid);
+
+	if (!domain) {
+		DEBUG(1,("Can't find domain from sid\n"));
+		return WINBINDD_ERROR;
+	}
+
 	/* Get some user info */
 	
 	if (!(mem_ctx = talloc_init("winbind_getpwuid(%d)",
@@ -225,7 +226,7 @@ enum winbindd_result winbindd_getpwuid(struct winbindd_cli_state *state)
 		return WINBINDD_ERROR;
 	}
 
-	status = domain->methods->query_user(domain, mem_ctx, user_rid, 
+	status = domain->methods->query_user(domain, mem_ctx, &user_sid, 
 					     &user_info);
 
 	if (!NT_STATUS_IS_OK(status)) {
@@ -237,7 +238,7 @@ enum winbindd_result winbindd_getpwuid(struct winbindd_cli_state *state)
 	
 	/* Resolve gid number */
 
-	if (!winbindd_idmap_get_gid_from_rid(domain->name, user_info.group_rid, &gid)) {
+	if (!winbindd_idmap_get_gid_from_sid(user_info.group_sid, &gid)) {
 		DEBUG(1, ("error getting group id for user %s\n", user_name));
 		talloc_destroy(mem_ctx);
 		return WINBINDD_ERROR;
@@ -245,7 +246,8 @@ enum winbindd_result winbindd_getpwuid(struct winbindd_cli_state *state)
 
 	/* Fill in password structure */
 
-	if (!winbindd_fill_pwent(domain->name, user_name, user_rid, user_info.group_rid,
+	if (!winbindd_fill_pwent(domain->name, user_name, user_info.user_sid, 
+				 user_info.group_sid,
 				 user_info.full_name, &state->response.data.pw)) {
 		talloc_destroy(mem_ctx);
 		return WINBINDD_ERROR;
@@ -332,13 +334,13 @@ static BOOL get_sam_user_entries(struct getent_state *ent)
 	TALLOC_CTX *mem_ctx;
 	struct winbindd_domain *domain;
 	struct winbindd_methods *methods;
-	int i;
+	unsigned int i;
 
 	if (ent->num_sam_entries)
 		return False;
 
 	if (!(mem_ctx = talloc_init("get_sam_user_entries(%s)",
-					  ent->domain_name)))
+				    ent->domain_name)))
 		return False;
 
 	if (!(domain = find_domain_from_name(ent->domain_name))) {
@@ -393,8 +395,8 @@ static BOOL get_sam_user_entries(struct getent_state *ent)
 		}
 		
 		/* User and group ids */
-		name_list[ent->num_sam_entries+i].user_rid = info[i].user_rid;
-		name_list[ent->num_sam_entries+i].group_rid = info[i].group_rid;
+		sid_copy(&name_list[ent->num_sam_entries+i].user_sid, info[i].user_sid);
+		sid_copy(&name_list[ent->num_sam_entries+i].group_sid, info[i].group_sid);
 	}
 		
 	ent->num_sam_entries += num_entries;
@@ -492,8 +494,8 @@ enum winbindd_result winbindd_getpwent(struct winbindd_cli_state *state)
 		result = winbindd_fill_pwent(
 			ent->domain_name, 
 			name_list[ent->sam_entry_index].name,
-			name_list[ent->sam_entry_index].user_rid,
-			name_list[ent->sam_entry_index].group_rid,
+			&name_list[ent->sam_entry_index].user_sid,
+			&name_list[ent->sam_entry_index].group_sid,
 			name_list[ent->sam_entry_index].gecos,
 			&user_list[user_list_ndx]);
 		
@@ -540,7 +542,7 @@ enum winbindd_result winbindd_list_users(struct winbindd_cli_state *state)
 	for (domain = domain_list(); domain; domain = domain->next) {
 		NTSTATUS status;
 		struct winbindd_methods *methods;
-		int i;
+		unsigned int i;
 
 		methods = domain->methods;
 
diff --git a/source3/nsswitch/winbindd_util.c b/source3/nsswitch/winbindd_util.c
index 3fa08029b6..fdbfd92b5a 100644
--- a/source3/nsswitch/winbindd_util.c
+++ b/source3/nsswitch/winbindd_util.c
@@ -271,14 +271,20 @@ BOOL winbindd_lookup_sid_by_name(struct winbindd_domain *domain,
 				 enum SID_NAME_USE *type)
 {
 	NTSTATUS result;
-        
+        TALLOC_CTX *mem_ctx;
 	/* Don't bother with machine accounts */
-        
+
 	if (name[strlen(name) - 1] == '$')
 		return False;
 
+	mem_ctx = talloc_init("lookup_sid_by_name for %s\n", name);
+	if (!mem_ctx) 
+		return False;
+        
 	/* Lookup name */
-	result = domain->methods->name_to_sid(domain, name, sid, type);
+	result = domain->methods->name_to_sid(domain, mem_ctx, name, sid, type);
+
+	talloc_destroy(mem_ctx);
         
 	/* Return rid and type if lookup successful */
 	if (!NT_STATUS_IS_OK(result)) {
@@ -528,3 +534,20 @@ int winbindd_num_clients(void)
 {
 	return _num_clients;
 }
+
+/* Help with RID -> SID conversion */
+
+DOM_SID *rid_to_talloced_sid(struct winbindd_domain *domain,
+				    TALLOC_CTX *mem_ctx,
+				    uint32 rid) 
+{
+	DOM_SID *sid;
+	sid = talloc(mem_ctx, sizeof(*sid));
+	if (!sid) {
+		smb_panic("rid_to_to_talloced_sid: talloc for DOM_SID failed!\n");
+	}
+	sid_copy(sid, &domain->sid);
+	sid_append_rid(sid, rid);
+	return sid;
+}
+	
-- 
cgit 


From ca80787248bfe7fe8dff12486ba32520f6910341 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 26 Feb 2003 12:23:03 +0000
Subject: Netlogon-unigroup changes needed for the winbind RID-to-SID
 conversion.

This changes the cache format, which will simply invalidate existing entries,
leaving them dead in the cache.

Andrew Bartlett
(This used to be commit 3fc179362ea849db23490b971a9f64f943e7f7f8)
---
 source3/libsmb/netlogon_unigrp.c | 37 +++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)

(limited to 'source3')

diff --git a/source3/libsmb/netlogon_unigrp.c b/source3/libsmb/netlogon_unigrp.c
index fa2fe32f35..466410d800 100644
--- a/source3/libsmb/netlogon_unigrp.c
+++ b/source3/libsmb/netlogon_unigrp.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#define UNIGROUP_PREFIX "UNIGROUP"
 
 /*
     Handle for netlogon_unigrp.tdb database. It is used internally
@@ -50,17 +51,22 @@ BOOL uni_group_cache_init(void)
 BOOL  uni_group_cache_store_netlogon(TALLOC_CTX *mem_ctx, NET_USER_INFO_3 *user)
 {
 	TDB_DATA key,data;
-        fstring keystr;
-        int i;
+        fstring keystr, sid_string;
+	DOM_SID user_sid;
+        unsigned int i;
 
 	if (!uni_group_cache_init()) {
 		DEBUG(0,("uni_group_cache_store_netlogon: cannot open netlogon_unigrp.tdb for write!\n"));
 		return False;
 	}
 
-	/* Prepare key as DOMAIN-SID/USER-RID string */
-	slprintf(keystr, sizeof(keystr), "%s/%d", 
-		 sid_string_static(&user->dom_sid.sid), user->user_rid);
+	sid_copy(&user_sid, &user->dom_sid.sid);
+	sid_append_rid(&user_sid, user->user_rid);
+
+	/* Prepare key as USER-SID string */
+	slprintf(keystr, sizeof(keystr), "%s/%s",
+		 UNIGROUP_PREFIX,
+		 sid_to_string(sid_string, &user_sid));
 	key.dptr = keystr;
 	key.dsize = strlen(keystr) + 1;
 	
@@ -90,14 +96,15 @@ BOOL  uni_group_cache_store_netlogon(TALLOC_CTX *mem_ctx, NET_USER_INFO_3 *user)
     and elements are array[0] ... array[num_elements-1]
     
 */
-uint32* uni_group_cache_fetch(DOM_SID *domain, uint32 user_rid,
+DOM_SID **uni_group_cache_fetch(DOM_SID *domain, DOM_SID *user_sid,
 			      TALLOC_CTX *mem_ctx, uint32 *num_groups)
 {
 	TDB_DATA key,data;
 	fstring keystr;
-	uint32 *groups;
+	DOM_SID **groups;
 	uint32 i;
 	uint32 group_count;
+	fstring sid_string;
 	
 	if (!domain) {
 		DEBUG(1,("uni_group_cache_fetch: expected non-null domain sid\n"));
@@ -123,8 +130,9 @@ uint32* uni_group_cache_fetch(DOM_SID *domain, uint32 user_rid,
 	*num_groups = 0;
 	
 	/* Fetch universal groups */
-	slprintf(keystr, sizeof(keystr), "%s/%d", 
-		 sid_string_static(domain), user_rid);
+	slprintf(keystr, sizeof(keystr), "%s/%s", 
+		 UNIGROUP_PREFIX,
+		 sid_to_string(sid_string, user_sid));
 	key.dptr = keystr;
 	key.dsize = strlen(keystr) + 1;
 	data = tdb_fetch(netlogon_unigrp_tdb, key);
@@ -136,12 +144,17 @@ uint32* uni_group_cache_fetch(DOM_SID *domain, uint32 user_rid,
 	
 	/* Transfer data to receiver's memory context */
 	group_count = IVAL(&((uint32*)data.dptr)[0],0);
-	groups = talloc(mem_ctx, (group_count)*sizeof(uint32));
+	groups = talloc(mem_ctx, (group_count)*sizeof(*groups));
 	if (groups) {
 		for(i=0; i<group_count; i++) {
-			groups[i] = IVAL(&((uint32*)data.dptr)[i+1],0);
+			groups[i] = talloc(mem_ctx, sizeof(**groups));
+			if (!groups[i]) {
+				DEBUG(1,("uni_group_cache_fetch: cannot allocate uni groups in receiver's memory context\n"));
+				return NULL;
+			}
+			sid_copy(groups[i], domain);
+			sid_append_rid(groups[i], IVAL(&((uint32*)data.dptr)[i+1],0));
 		}
-		
 	} else {
 		DEBUG(1,("uni_group_cache_fetch: cannot allocate uni groups in receiver's memory context\n"));
 	}
-- 
cgit 


From 20d0bb23103b219d96aa0ae73136521022f48762 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 26 Feb 2003 12:31:17 +0000
Subject: Add -Wwrite-strings to our --enable-developer settings.

We have compiled relitivly 'clean' with this setting since I did a massive
cleanup last month.  This should help us stay that way.

Andrew Bartlett
(This used to be commit 284479bf388f5e39d9be78eeb1ac6cdd001fb8df)
---
 source3/configure.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3')

diff --git a/source3/configure.in b/source3/configure.in
index e3b5f2fe15..269d70c2fc 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -205,12 +205,12 @@ AC_ARG_ENABLE(debug,
 
 AC_ARG_ENABLE(developer, [  --enable-developer      Turn on developer warnings and debugging (default=no)],
     [if eval "test x$enable_developer = xyes"; then
-	CFLAGS="${CFLAGS} -g -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual -Wcast-align -DDEBUG_PASSWORD -DDEVELOPER"
+	CFLAGS="${CFLAGS} -g -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -DDEBUG_PASSWORD -DDEVELOPER"
     fi])
 
 AC_ARG_ENABLE(krb5developer, [  --enable-krb5developer  Turn on developer warnings and debugging, except -Wstrict-prototypes (default=no)],
     [if eval "test x$enable_krb5developer = xyes"; then
-	CFLAGS="${CFLAGS} -g -Wall -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -DDEBUG_PASSWORD -DDEVELOPER"
+	CFLAGS="${CFLAGS} -g -Wall -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -DDEBUG_PASSWORD -DDEVELOPER"
     fi])
 
 AC_ARG_ENABLE(dmalloc, [  --enable-dmalloc        Enable heap debugging [default=no]])
-- 
cgit 


From f6f76ad5ed7b3eee7cbd3bca6f3ccd1194a0e98a Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Thu, 27 Feb 2003 00:43:23 +0000
Subject: Fix to allow blocking lock notification to be done rapidly (no wait
 for smb -> smb lock release). Adds new PENDING_LOCK type to lockdb (does not
 interfere with existing locks). Jeremy. (This used to be commit
 22fc0d48ff2052b4274c65f85050c58b235bf4e4)

---
 source3/include/messages.h |  1 +
 source3/include/smb.h      |  2 +-
 source3/locking/brlock.c   | 82 ++++++++++++++++++++++++++++++++++++++++++----
 source3/locking/locking.c  |  4 +--
 source3/smbd/blocking.c    | 78 +++++++++++++++++++++++++++++++++++++++----
 source3/smbd/process.c     |  7 ++++
 source3/smbd/reply.c       |  7 ++--
 7 files changed, 162 insertions(+), 19 deletions(-)

(limited to 'source3')

diff --git a/source3/include/messages.h b/source3/include/messages.h
index 2b8ca8bbe9..ce167a772d 100644
--- a/source3/include/messages.h
+++ b/source3/include/messages.h
@@ -62,6 +62,7 @@
 #define MSG_SMB_FORCE_TDIS   3002
 #define MSG_SMB_SAM_SYNC     3003
 #define MSG_SMB_SAM_REPL     3004
+#define MSG_SMB_UNLOCK       3005
 
 /* Flags to classify messages - used in message_send_all() */
 /* Sender will filter by flag. */
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 71051e341e..a2b341d0fc 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -772,7 +772,7 @@ typedef enum
 } parm_class;
 
 /* passed to br lock code */
-enum brl_type {READ_LOCK, WRITE_LOCK};
+enum brl_type {READ_LOCK, WRITE_LOCK, PENDING_LOCK};
 
 struct enum_list {
 	int value;
diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index 9902c7bbd7..4cd885f1a6 100644
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -98,6 +98,9 @@ static BOOL brl_same_context(struct lock_context *ctx1,
 static BOOL brl_conflict(struct lock_struct *lck1, 
 			 struct lock_struct *lck2)
 {
+	if (lck1->lock_type == PENDING_LOCK || lck2->lock_type == PENDING_LOCK )
+		return False;
+
 	if (lck1->lock_type == READ_LOCK && lck2->lock_type == READ_LOCK) {
 		return False;
 	}
@@ -119,6 +122,9 @@ static BOOL brl_conflict(struct lock_struct *lck1,
 static BOOL brl_conflict1(struct lock_struct *lck1, 
 			 struct lock_struct *lck2)
 {
+	if (lck1->lock_type == PENDING_LOCK || lck2->lock_type == PENDING_LOCK )
+		return False;
+
 	if (lck1->lock_type == READ_LOCK && lck2->lock_type == READ_LOCK) {
 		return False;
 	}
@@ -148,6 +154,9 @@ static BOOL brl_conflict1(struct lock_struct *lck1,
 
 static BOOL brl_conflict_other(struct lock_struct *lck1, struct lock_struct *lck2)
 {
+	if (lck1->lock_type == PENDING_LOCK || lck2->lock_type == PENDING_LOCK )
+		return False;
+
 	if (lck1->lock_type == READ_LOCK && lck2->lock_type == READ_LOCK) 
 		return False;
 
@@ -385,16 +394,30 @@ NTSTATUS brl_lock(SMB_DEV_T dev, SMB_INO_T ino, int fnum,
 	return status;
 }
 
+/****************************************************************************
+ Check if an unlock overlaps a pending lock.
+****************************************************************************/
+
+static BOOL brl_pending_overlap(struct lock_struct *lock, struct lock_struct *pend_lock)
+{
+	if ((lock->start <= pend_lock->start) && (lock->start + lock->size > pend_lock->start))
+		return True;
+	if ((lock->start >= pend_lock->start) && (lock->start <= pend_lock->start + pend_lock->size))
+		return True;
+	return False;
+}
+
 /****************************************************************************
  Unlock a range of bytes.
 ****************************************************************************/
 
 BOOL brl_unlock(SMB_DEV_T dev, SMB_INO_T ino, int fnum,
 		uint16 smbpid, pid_t pid, uint16 tid,
-		br_off start, br_off size)
+		br_off start, br_off size,
+		BOOL remove_pending_locks_only)
 {
 	TDB_DATA kbuf, dbuf;
-	int count, i;
+	int count, i, j;
 	struct lock_struct *locks;
 	struct lock_context context;
 
@@ -452,9 +475,34 @@ BOOL brl_unlock(SMB_DEV_T dev, SMB_INO_T ino, int fnum,
 		struct lock_struct *lock = &locks[i];
 
 		if (brl_same_context(&lock->context, &context) &&
-		    lock->fnum == fnum &&
-		    lock->start == start &&
-		    lock->size == size) {
+				lock->fnum == fnum &&
+				lock->start == start &&
+				lock->size == size) {
+
+			if (remove_pending_locks_only && lock->lock_type != PENDING_LOCK)
+				continue;
+
+			if (lock->lock_type != PENDING_LOCK) {
+				/* Send unlock messages to any pending waiters that overlap. */
+				for (j=0; j<count; j++) {
+					struct lock_struct *pend_lock = &locks[j];
+
+					/* Ignore non-pending locks. */
+					if (pend_lock->lock_type != PENDING_LOCK)
+						continue;
+
+					/* We could send specific lock info here... */
+					if (brl_pending_overlap(lock, pend_lock)) {
+						DEBUG(10,("brl_unlock: sending unlock message to pid %u\n",
+									(unsigned int)pend_lock->context.pid ));
+
+						message_send_pid(pend_lock->context.pid,
+								MSG_SMB_UNLOCK,
+								NULL, 0, True);
+					}
+				}
+			}
+
 			/* found it - delete it */
 			if (count == 1) {
 				tdb_delete(tdb, kbuf);
@@ -546,7 +594,7 @@ BOOL brl_locktest(SMB_DEV_T dev, SMB_INO_T ino, int fnum,
 void brl_close(SMB_DEV_T dev, SMB_INO_T ino, pid_t pid, int tid, int fnum)
 {
 	TDB_DATA kbuf, dbuf;
-	int count, i, dcount=0;
+	int count, i, j, dcount=0;
 	struct lock_struct *locks;
 
 	kbuf = locking_key(dev,ino);
@@ -561,12 +609,34 @@ void brl_close(SMB_DEV_T dev, SMB_INO_T ino, pid_t pid, int tid, int fnum)
 	/* there are existing locks - remove any for this fnum */
 	locks = (struct lock_struct *)dbuf.dptr;
 	count = dbuf.dsize / sizeof(*locks);
+
 	for (i=0; i<count; i++) {
 		struct lock_struct *lock = &locks[i];
 
 		if (lock->context.tid == tid &&
 		    lock->context.pid == pid &&
 		    lock->fnum == fnum) {
+
+			/* Send unlock messages to any pending waiters that overlap. */
+			for (j=0; j<count; j++) {
+				struct lock_struct *pend_lock = &locks[j];
+
+				/* Ignore our own or non-pending locks. */
+				if (pend_lock->lock_type != PENDING_LOCK)
+					continue;
+
+				if (pend_lock->context.tid == tid &&
+				    pend_lock->context.pid == pid &&
+				    pend_lock->fnum == fnum)
+					continue;
+
+				/* We could send specific lock info here... */
+				if (brl_pending_overlap(lock, pend_lock))
+					message_send_pid(pend_lock->context.pid,
+							MSG_SMB_UNLOCK,
+							NULL, 0, True);
+			}
+
 			/* found it - delete it */
 			if (count > 1 && i < count-1) {
 				memmove(&locks[i], &locks[i+1], 
diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index fdfd4d661c..651f905e15 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -132,7 +132,7 @@ static NTSTATUS do_lock(files_struct *fsp,connection_struct *conn, uint16 lock_p
 				 */
 				(void)brl_unlock(fsp->dev, fsp->inode, fsp->fnum,
 								lock_pid, sys_getpid(), conn->cnum, 
-								offset, count);
+								offset, count, False);
 			}
 		}
 	}
@@ -201,7 +201,7 @@ NTSTATUS do_unlock(files_struct *fsp,connection_struct *conn, uint16 lock_pid,
 	 */
 
 	ok = brl_unlock(fsp->dev, fsp->inode, fsp->fnum,
-			lock_pid, sys_getpid(), conn->cnum, offset, count);
+			lock_pid, sys_getpid(), conn->cnum, offset, count, False);
    
 	if (!ok) {
 		DEBUG(10,("do_unlock: returning ERRlock.\n" ));
diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index 14239272c2..581ce43f91 100644
--- a/source3/smbd/blocking.c
+++ b/source3/smbd/blocking.c
@@ -1,7 +1,7 @@
 /* 
    Unix SMB/CIFS implementation.
    Blocking Locking functions
-   Copyright (C) Jeremy Allison 1998
+   Copyright (C) Jeremy Allison 1998-2003
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -33,6 +33,9 @@ typedef struct {
   files_struct *fsp;
   time_t expire_time;
   int lock_num;
+  SMB_BIG_UINT offset;
+  SMB_BIG_UINT count;
+  uint16 lock_pid;
   char *inbuf;
   int length;
 } blocking_lock_record;
@@ -77,13 +80,18 @@ static BOOL in_chained_smb(void)
   return (chain_size != 0);
 }
 
+static void received_unlock_msg(int msg_type, pid_t src, void *buf, size_t len);
+
 /****************************************************************************
  Function to push a blocking lock request onto the lock queue.
 ****************************************************************************/
 
-BOOL push_blocking_lock_request( char *inbuf, int length, int lock_timeout, int lock_num)
+BOOL push_blocking_lock_request( char *inbuf, int length, int lock_timeout,
+		int lock_num, uint16 lock_pid, SMB_BIG_UINT offset, SMB_BIG_UINT count)
 {
+  static BOOL set_lock_msg;
   blocking_lock_record *blr;
+  NTSTATUS status;
 
   if(in_chained_smb() ) {
     DEBUG(0,("push_blocking_lock_request: cannot queue a chained request (currently).\n"));
@@ -110,11 +118,31 @@ BOOL push_blocking_lock_request( char *inbuf, int length, int lock_timeout, int
   blr->fsp = get_fsp_from_pkt(inbuf);
   blr->expire_time = (lock_timeout == -1) ? (time_t)-1 : time(NULL) + (time_t)lock_timeout;
   blr->lock_num = lock_num;
+  blr->lock_pid = lock_pid;
+  blr->offset = offset;
+  blr->count = count;
   memcpy(blr->inbuf, inbuf, length);
   blr->length = length;
 
+  /* Add a pending lock record for this. */
+  status = brl_lock(blr->fsp->dev, blr->fsp->inode, blr->fsp->fnum,
+		lock_pid, sys_getpid(), blr->fsp->conn->cnum,
+		offset, count,
+		PENDING_LOCK);
+
+  if (!NT_STATUS_IS_OK(status)) {
+	DEBUG(0,("push_blocking_lock_request: failed to add PENDING_LOCK record.\n"));
+	free_blocking_lock_record(blr);
+	return False;
+  }
+
   ubi_slAddTail(&blocking_lock_queue, blr);
 
+  /* Ensure we'll receive messages when this is unlocked. */
+  if (!set_lock_msg) {
+	  message_register(MSG_SMB_UNLOCK, received_unlock_msg);
+	  set_lock_msg = True;
+  }
 
   DEBUG(3,("push_blocking_lock_request: lock request length=%d blocked with expiry time %d (+%d) \
 for fnum = %d, name = %s\n", length, (int)blr->expire_time, lock_timeout,
@@ -493,6 +521,10 @@ void remove_pending_lock_requests_by_fid(files_struct *fsp)
       DEBUG(10,("remove_pending_lock_requests_by_fid - removing request type %d for \
 file %s fnum = %d\n", blr->com_type, fsp->fsp_name, fsp->fnum ));
 
+      brl_unlock(blr->fsp->dev, blr->fsp->inode, blr->fsp->fnum,
+		blr->lock_pid, sys_getpid(), blr->fsp->conn->cnum,
+		blr->offset, blr->count, True);
+
       free_blocking_lock_record((blocking_lock_record *)ubi_slRemNext( &blocking_lock_queue, prev));
       blr = (blocking_lock_record *)(prev ? ubi_slNext(prev) : ubi_slFirst(&blocking_lock_queue));
       continue;
@@ -520,6 +552,9 @@ void remove_pending_lock_requests_by_mid(int mid)
 file %s fnum = %d\n", blr->com_type, fsp->fsp_name, fsp->fnum ));
 
       blocking_lock_reply_error(blr,NT_STATUS_CANCELLED);
+      brl_unlock(blr->fsp->dev, blr->fsp->inode, blr->fsp->fnum,
+		blr->lock_pid, sys_getpid(), blr->fsp->conn->cnum,
+		blr->offset, blr->count, True);
       free_blocking_lock_record((blocking_lock_record *)ubi_slRemNext( &blocking_lock_queue, prev));
       blr = (blocking_lock_record *)(prev ? ubi_slNext(prev) : ubi_slFirst(&blocking_lock_queue));
       continue;
@@ -530,9 +565,20 @@ file %s fnum = %d\n", blr->com_type, fsp->fsp_name, fsp->fnum ));
   }
 }
 
+/****************************************************************************
+  Set a flag as an unlock request affects one of our pending locks.
+*****************************************************************************/
+
+static void received_unlock_msg(int msg_type, pid_t src, void *buf, size_t len)
+{
+	DEBUG(10,("received_unlock_msg\n"));
+	process_blocking_lock_queue(time(NULL));
+}
+
 /****************************************************************************
  Return the number of seconds to the next blocking locks timeout, or default_timeout
 *****************************************************************************/
+
 unsigned blocking_locks_timeout(unsigned default_timeout)
 {
 	unsigned timeout = default_timeout;
@@ -540,22 +586,21 @@ unsigned blocking_locks_timeout(unsigned default_timeout)
 	blocking_lock_record *blr = (blocking_lock_record *)ubi_slFirst(&blocking_lock_queue);
 
 	/* note that we avoid the time() syscall if there are no blocking locks */
-	if (!blr) {
+	if (!blr)
 		return timeout;
-	}
 
 	t = time(NULL);
 
 	while (blr) {
-		if (timeout > (blr->expire_time - t)) {
+		if ((blr->expire_time != (time_t)-1) &&
+					(timeout > (blr->expire_time - t))) {
 			timeout = blr->expire_time - t;
 		}
 		blr = (blocking_lock_record *)ubi_slNext(blr);
 	}
 
-	if (timeout < 1) {
+	if (timeout < 1)
 		timeout = 1;
-	}
 
 	return timeout;
 }
@@ -604,6 +649,10 @@ void process_blocking_lock_queue(time_t t)
       DEBUG(5,("process_blocking_lock_queue: pending lock fnum = %d for file %s timed out.\n",
           fsp->fnum, fsp->fsp_name ));
 
+      brl_unlock(fsp->dev, fsp->inode, fsp->fnum,
+		blr->lock_pid, sys_getpid(), conn->cnum,
+		blr->offset, blr->count, True);
+
       blocking_lock_reply_error(blr,NT_STATUS_FILE_LOCK_CONFLICT);
       free_blocking_lock_record((blocking_lock_record *)ubi_slRemNext( &blocking_lock_queue, prev));
       blr = (blocking_lock_record *)(prev ? ubi_slNext(prev) : ubi_slFirst(&blocking_lock_queue));
@@ -617,6 +666,11 @@ void process_blocking_lock_queue(time_t t)
        * Remove the entry and return an error to the client.
        */
       blocking_lock_reply_error(blr,NT_STATUS_ACCESS_DENIED);
+
+      brl_unlock(fsp->dev, fsp->inode, fsp->fnum,
+		blr->lock_pid, sys_getpid(), conn->cnum,
+		blr->offset, blr->count, True);
+
       free_blocking_lock_record((blocking_lock_record *)ubi_slRemNext( &blocking_lock_queue, prev));
       blr = (blocking_lock_record *)(prev ? ubi_slNext(prev) : ubi_slFirst(&blocking_lock_queue));
       continue;
@@ -628,6 +682,11 @@ void process_blocking_lock_queue(time_t t)
        * Remove the entry and return an error to the client.
        */
       blocking_lock_reply_error(blr,NT_STATUS_ACCESS_DENIED);
+
+      brl_unlock(fsp->dev, fsp->inode, fsp->fnum,
+		blr->lock_pid, sys_getpid(), conn->cnum,
+		blr->offset, blr->count, True);
+
       free_blocking_lock_record((blocking_lock_record *)ubi_slRemNext( &blocking_lock_queue, prev));
       blr = (blocking_lock_record *)(prev ? ubi_slNext(prev) : ubi_slFirst(&blocking_lock_queue));
       change_to_root_user();
@@ -641,6 +700,11 @@ void process_blocking_lock_queue(time_t t)
      */
 
     if(blocking_lock_record_process(blr)) {
+
+      brl_unlock(fsp->dev, fsp->inode, fsp->fnum,
+		blr->lock_pid, sys_getpid(), conn->cnum,
+		blr->offset, blr->count, True);
+
       free_blocking_lock_record((blocking_lock_record *)ubi_slRemNext( &blocking_lock_queue, prev));
       blr = (blocking_lock_record *)(prev ? ubi_slNext(prev) : ubi_slFirst(&blocking_lock_queue));
       change_to_root_user();
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index c002abad16..57bc236eef 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -1271,6 +1271,13 @@ void smbd_process(void)
 		lp_talloc_free();
 		main_loop_talloc_free();
 
+		/* Did someone ask for immediate checks on things like blocking locks ? */
+		if (select_timeout == 0) {
+			if(!timeout_processing( deadtime, &select_timeout, &last_timeout_processing_time))
+				return;
+			num_smbs = 0; /* Reset smb counter. */
+		}
+
 		while (!receive_message_or_smb(InBuffer,BUFFER_SIZE+LARGE_WRITEX_HDR_SIZE,select_timeout)) {
 			if(!timeout_processing( deadtime, &select_timeout, &last_timeout_processing_time))
 				return;
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 580878fe32..71e880476c 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -1609,7 +1609,8 @@ int reply_lockread(connection_struct *conn, char *inbuf,char *outbuf, int length
 			 * this smb into a queued request and push it
 			 * onto the blocking lock queue.
 			 */
-			if(push_blocking_lock_request(inbuf, length, -1, 0)) {
+			if(push_blocking_lock_request(inbuf, length, -1, 0, SVAL(inbuf,smb_pid), (SMB_BIG_UINT)startpos,
+								(SMB_BIG_UINT)numtoread)) {
 				END_PROFILE(SMBlockread);
 				return -1;
 			}
@@ -2514,7 +2515,7 @@ int reply_lock(connection_struct *conn,
 			 * this smb into a queued request and push it
 			 * onto the blocking lock queue.
 			 */
-			if(push_blocking_lock_request(inbuf, length, -1, 0)) {
+			if(push_blocking_lock_request(inbuf, length, -1, 0, SVAL(inbuf,smb_pid), offset, count)) {
 				END_PROFILE(SMBlock);
 				return -1;
 			}
@@ -3955,7 +3956,7 @@ no oplock granted on this file (%s).\n", fsp->fnum, fsp->fsp_name));
 				 * this smb into a queued request and push it
 				 * onto the blocking lock queue.
 				 */
-				if(push_blocking_lock_request(inbuf, length, lock_timeout, i)) {
+				if(push_blocking_lock_request(inbuf, length, lock_timeout, i, lock_pid, offset, count)) {
 					END_PROFILE(SMBlockingX);
 					return -1;
 				}
-- 
cgit 


From d62f60f53ac18b3de9c7922105c6796361b91a11 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 27 Feb 2003 01:05:12 +0000
Subject: Fix possible memory leak on failure. (This used to be commit
 052ebc44cde8d31571ed1edb602794349825be11)

---
 source3/nsswitch/winbindd_ads.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source3')

diff --git a/source3/nsswitch/winbindd_ads.c b/source3/nsswitch/winbindd_ads.c
index 6c79e59bae..de3757aa44 100644
--- a/source3/nsswitch/winbindd_ads.c
+++ b/source3/nsswitch/winbindd_ads.c
@@ -580,6 +580,7 @@ static NTSTATUS lookup_usergroups(struct winbindd_domain *domain,
 	user_dn = ads_pull_string(ads, mem_ctx, msg, "distinguishedName");
 	if (!user_dn) {
 		DEBUG(1,("lookup_usergroups(sid=%s) ads_search did not return a a distinguishedName!\n", sid_to_string(sid_string, sid)));
+		if (msg) ads_msgfree(ads, msg);
 		goto done;
 	}
 
-- 
cgit 


From d21b15ff57aa39337e76a06da74a55e48f4b0696 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 27 Feb 2003 01:54:41 +0000
Subject: - Rename 'modules = ' to 'preload modules = ' - Add
 smb_probe_module() - Add init_modules() - Call these functions (This used to
 be commit f8f21653225792c0001d183c6efe8b7d89a0785d)

---
 source3/lib/module.c           | 35 +++++++++++++++++++++++++---
 source3/param/loadparm.c       |  6 ++---
 source3/passdb/pdb_interface.c | 53 +++++++++++++++++++++++++++---------------
 source3/smbd/server.c          |  3 +--
 source3/utils/pdbedit.c        |  3 +--
 source3/utils/testparm.c       |  6 +++++
 6 files changed, 77 insertions(+), 29 deletions(-)

(limited to 'source3')

diff --git a/source3/lib/module.c b/source3/lib/module.c
index dd94f79950..4e2fe48af7 100644
--- a/source3/lib/module.c
+++ b/source3/lib/module.c
@@ -75,18 +75,47 @@ int smb_load_modules(const char **modules)
 	return success;
 }
 
+int smb_probe_module(const char *subsystem, const char *module)
+{
+	pstring full_path;
+	
+	/* Check for absolute path */
+	if(module[0] == '/')return smb_load_module(module);
+	
+	pstrcpy(full_path, lib_path(subsystem));
+	pstrcat(full_path, "/");
+	pstrcat(full_path, module);
+	pstrcat(full_path, ".");
+	pstrcat(full_path, shlib_ext());
+	
+	return smb_load_module(full_path);
+}
+
 #else /* HAVE_DLOPEN */
 
 int smb_load_module(const char *module_name)
 {
-	DEBUG(0,("This samba executable has not been build with plugin support"));
+	DEBUG(0,("This samba executable has not been built with plugin support"));
 	return False;
 }
 
 int smb_load_modules(const char **modules)
 {
-	DEBUG(0,("This samba executable has not been build with plugin support"));
-	return -1;
+	DEBUG(0,("This samba executable has not been built with plugin support"));
+	return False;
+}
+
+int smb_probe_module(const char *subsystem, const char *module)
+{
+	DEBUG(0,("This samba executable has not been built with plugin support, not probing")); 
+	return False;
 }
 
 #endif /* HAVE_DLOPEN */
+
+void init_modules(void)
+{
+	if(lp_preload_modules()) 
+		smb_load_modules(lp_preload_modules());
+	/* FIXME: load static modules */
+}
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index b57b169adc..0eeb9be9de 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -120,7 +120,7 @@ typedef struct
 	char *szPrivateDir;
 	char **szPassdbBackend;
 	char **szSamBackend;
-	char **szModules;
+	char **szPreloadModules;
 	char *szPasswordServer;
 	char *szSocketOptions;
 	char *szRealm;
@@ -823,7 +823,7 @@ static struct parm_struct parm_table[] = {
 	{"allow hosts", P_LIST, P_LOCAL, &sDefault.szHostsallow, NULL, NULL, FLAG_HIDE},
 	{"hosts deny", P_LIST, P_LOCAL, &sDefault.szHostsdeny, NULL, NULL, FLAG_GLOBAL | FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT | FLAG_DEVELOPER},
 	{"deny hosts", P_LIST, P_LOCAL, &sDefault.szHostsdeny, NULL, NULL, FLAG_HIDE},
-	{"modules", P_LIST, P_GLOBAL, &Globals.szModules, NULL, NULL, FLAG_BASIC | FLAG_GLOBAL},
+	{"preload modules", P_LIST, P_GLOBAL, &Globals.szPreloadModules, NULL, NULL, FLAG_BASIC | FLAG_GLOBAL},
 
 	{"Logging Options", P_SEP, P_SEPARATOR},
 
@@ -1609,7 +1609,7 @@ static FN_GLOBAL_STRING(lp_announce_version, &Globals.szAnnounceVersion)
 FN_GLOBAL_LIST(lp_netbios_aliases, &Globals.szNetbiosAliases)
 FN_GLOBAL_LIST(lp_passdb_backend, &Globals.szPassdbBackend)
 FN_GLOBAL_LIST(lp_sam_backend, &Globals.szSamBackend)
-FN_GLOBAL_LIST(lp_modules, &Globals.szModules)
+FN_GLOBAL_LIST(lp_preload_modules, &Globals.szPreloadModules)
 FN_GLOBAL_STRING(lp_panic_action, &Globals.szPanicAction)
 FN_GLOBAL_STRING(lp_adduser_script, &Globals.szAddUserScript)
 FN_GLOBAL_STRING(lp_deluser_script, &Globals.szDelUserScript)
diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c
index d465439dda..48a039b3de 100644
--- a/source3/passdb/pdb_interface.c
+++ b/source3/passdb/pdb_interface.c
@@ -86,6 +86,18 @@ BOOL smb_register_passdb(const char *name, pdb_init_function init, int version)
 	return True;
 }
 
+struct pdb_init_function_entry *pdb_find_backend_entry(const char *name)
+{
+	struct pdb_init_function_entry *entry = backends;
+
+	while(entry) {
+		if (strequal(entry->name, name)) return entry;
+		entry = entry->next;
+	}
+
+	return NULL;
+}
+
 static NTSTATUS context_setsampwent(struct pdb_context *context, BOOL update)
 {
 	NTSTATUS ret = NT_STATUS_UNSUCCESSFUL;
@@ -423,8 +435,6 @@ static NTSTATUS make_pdb_methods_name(struct pdb_methods **methods, struct pdb_c
 
 	lazy_initialize_passdb();
 
-	entry = backends;
-
 	p = strchr(module_name, ':');
 
 	if (p) {
@@ -435,27 +445,32 @@ static NTSTATUS make_pdb_methods_name(struct pdb_methods **methods, struct pdb_c
 
 	trim_string(module_name, " ", " ");
 
+
 	DEBUG(5,("Attempting to find an passdb backend to match %s (%s)\n", selected, module_name));
-	while(entry) {
-		if (strequal(entry->name, module_name))
-		{
-			DEBUG(5,("Found pdb backend %s\n", module_name));
-			nt_status = entry->init(context, methods, module_location);
-			if (NT_STATUS_IS_OK(nt_status)) {
-				DEBUG(5,("pdb backend %s has a valid init\n", selected));
-			} else {
-				DEBUG(0,("pdb backend %s did not correctly init (error was %s)\n", selected, nt_errstr(nt_status)));
-			}
-			SAFE_FREE(module_name);
-			return nt_status;
-			break; /* unreached */
-		}
-		entry = entry->next;
-	}
 
+	entry = pdb_find_backend_entry(module_name);
+	
+	/* Try to find a module that contains this module */
+	if(!entry) { 
+		smb_probe_module("passdb", module_name);
+		entry = pdb_find_backend_entry(module_name);
+	}
+	
 	/* No such backend found */
+	if(!entry) { 
+		SAFE_FREE(module_name);
+		return NT_STATUS_INVALID_PARAMETER;
+	}
+	
+	DEBUG(5,("Found pdb backend %s\n", module_name));
+	nt_status = entry->init(context, methods, module_location);
+	if (NT_STATUS_IS_OK(nt_status)) {
+		DEBUG(5,("pdb backend %s has a valid init\n", selected));
+	} else {
+		DEBUG(0,("pdb backend %s did not correctly init (error was %s)\n", selected, nt_errstr(nt_status)));
+	}
 	SAFE_FREE(module_name);
-	return NT_STATUS_INVALID_PARAMETER;
+	return nt_status;
 }
 
 /******************************************************************
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index ba03a9b9de..b7fb3b5701 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -412,8 +412,7 @@ static BOOL open_sockets_smbd(BOOL is_daemon, BOOL interactive, const char *smb_
 				}
 
 				/* Load DSO's */
-				if(lp_modules()) 
-					smb_load_modules(lp_modules());
+				init_modules();
 
 				return True; 
 			}
diff --git a/source3/utils/pdbedit.c b/source3/utils/pdbedit.c
index ee269114c9..cec3e70687 100644
--- a/source3/utils/pdbedit.c
+++ b/source3/utils/pdbedit.c
@@ -536,8 +536,7 @@ int main (int argc, char **argv)
 		exit(1);
 	}
 
-	if(lp_modules())
-		smb_load_modules(lp_modules());
+	init_modules();
 	
 	if (!init_names())
 		exit(1);
diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index 0fafd1b83d..b68deaaa5d 100644
--- a/source3/utils/testparm.c
+++ b/source3/utils/testparm.c
@@ -177,6 +177,12 @@ via the %%o substitution. With encrypted passwords this is not possible.\n", lp_
 		printf("'algorithmic rid base' must be even.\n");
 	}
 
+#ifndef HAVE_DLOPEN
+	if (lp_preload_modules()) {
+		printf("WARNING: 'preload modules = ' set while loading plugins not supported.\n");
+	}
+#endif
+
 	return ret;
 }   
 
-- 
cgit 


From 742dcedfa2d5ae6361e62cb057e87eb54eb46d26 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 27 Feb 2003 02:17:54 +0000
Subject: We now use <anchor/> instead of just <anchor> (strict XML syntax)
 (This used to be commit 7c00fff475e15a9e9d5c3d2c8394a2cdc1b90cac)

---
 source3/script/find_missing_doc.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/script/find_missing_doc.pl b/source3/script/find_missing_doc.pl
index b582446569..b27a405e4d 100755
--- a/source3/script/find_missing_doc.pl
+++ b/source3/script/find_missing_doc.pl
@@ -30,7 +30,7 @@ close(IN);
 open(IN,$topdir.$doc_file) || die("Can't open $topdir$doc_file");
 
 while(<IN>) {
-	if( /<term><anchor id="([^"]*)">([^<]*?)([ ]*)\(.\)([ ]*)<\/term>/g ) {
+	if( /<term><anchor id="([^"]*)"\/>([^<]*?)([ ]*)\(.\)([ ]*)<\/term>/g ) {
 		$key = $1;
 		$value = $2;
 		$doc{$value} = $key;
-- 
cgit 


From 5c82d3f00a2973b7f0881606d94ed36f0d0aa6be Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Thu, 27 Feb 2003 05:53:25 +0000
Subject: Doxygen janitor (This used to be commit
 67bf36c69d19463c28066b276d74ac4784b26bed)

---
 source3/lib/iconv.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'source3')

diff --git a/source3/lib/iconv.c b/source3/lib/iconv.c
index 5292e9cf0a..f622704853 100644
--- a/source3/lib/iconv.c
+++ b/source3/lib/iconv.c
@@ -90,11 +90,12 @@ static size_t sys_iconv(void *cd,
 #endif
 }
 
-/*
-  this is a simple portable iconv() implementaion. It only knows about
-  a very small number of character sets - just enough that Samba works
-  on systems that don't have iconv
- */
+/**
+ * This is a simple portable iconv() implementaion.
+ *
+ * It only knows about a very small number of character sets - just
+ * enough that Samba works on systems that don't have iconv.
+ **/
 size_t smb_iconv(smb_iconv_t cd, 
 		 const char **inbuf, size_t *inbytesleft,
 		 char **outbuf, size_t *outbytesleft)
-- 
cgit 


From 97e7d2ffae74c9c07b38143c8fb028ee91b153bd Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Thu, 27 Feb 2003 21:21:02 +0000
Subject: additional fix for CR 601   * distinguish WinXP from Win2k   * add a
 1/3 of a second delay in OpenPrinter     in order to trigger a LAN/WAN
 optimization in     2k clients. (This used to be commit
 96570699d1b715f47c35aa211da6ec18f6fc4109)

---
 source3/include/smb.h               |  2 +-
 source3/lib/util.c                  |  3 +++
 source3/rpc_server/srv_spoolss_nt.c |  6 ++++++
 source3/smbd/sesssetup.c            | 17 ++++++++++++++++-
 4 files changed, 26 insertions(+), 2 deletions(-)

(limited to 'source3')

diff --git a/source3/include/smb.h b/source3/include/smb.h
index a2b341d0fc..bd4f113039 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1408,7 +1408,7 @@ enum ldap_ssl_types {LDAP_SSL_ON, LDAP_SSL_OFF, LDAP_SSL_START_TLS};
 enum ldap_passwd_sync_types {LDAP_PASSWD_SYNC_ON, LDAP_PASSWD_SYNC_OFF, LDAP_PASSWD_SYNC_ONLY};
 
 /* Remote architectures we know about. */
-enum remote_arch_types {RA_UNKNOWN, RA_WFWG, RA_OS2, RA_WIN95, RA_WINNT, RA_WIN2K, RA_SAMBA};
+enum remote_arch_types {RA_UNKNOWN, RA_WFWG, RA_OS2, RA_WIN95, RA_WINNT, RA_WIN2K, RA_WINXP, RA_SAMBA};
 
 /* case handling */
 enum case_handling {CASE_LOWER,CASE_UPPER};
diff --git a/source3/lib/util.c b/source3/lib/util.c
index 3958600cbd..15b75356a8 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -1764,6 +1764,9 @@ void set_remote_arch(enum remote_arch_types type)
 	case RA_WIN2K:
 		fstrcpy(remote_arch, "Win2K");
 		return;
+	case RA_WINXP:
+		fstrcpy(remote_arch, "WinXP");
+		return;
 	case RA_SAMBA:
 		fstrcpy(remote_arch,"Samba");
 		return;
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index fa9b8eaeff..4006d0c08e 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -1675,6 +1675,12 @@ Can't find printer handle we created for printer %s\n", name ));
 			&Printer->nt_devmode );
 	 }
 
+	/* HACK ALERT!!! Sleep for 1/3 of a second to try trigger a LAN/WAN 
+	   optimization in Windows 2000 clients  --jerry */
+
+	if ( RA_WIN2K == get_remote_arch() )
+		usleep( 384000 );
+
 	return WERR_OK;
 }
 
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index 7e5ec56a27..dfe246e398 100644
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -557,7 +557,7 @@ int reply_sesssetup_and_X(connection_struct *conn, char *inbuf,char *outbuf,
 				set_remote_arch( RA_WIN95);
 			}
 		}
-		
+
 		if (!doencrypt) {
 			/* both Win95 and WinNT stuff up the password lengths for
 			   non-encrypting systems. Uggh. 
@@ -607,6 +607,21 @@ int reply_sesssetup_and_X(connection_struct *conn, char *inbuf,char *outbuf,
 		p += srvstr_pull_buf(inbuf, native_lanman, p, sizeof(native_lanman), STR_TERMINATE);
 		DEBUG(3,("Domain=[%s]  NativeOS=[%s] NativeLanMan=[%s]\n",
 			 domain,native_os,native_lanman));
+
+		/* 
+		 * we distinguish between 2K and XP by the "Native Lan Manager" string
+		 *   WinXP => "Windows 2002 5.1"
+		 *   Win2k => "Windows 2000 5.0"
+		 *   NT4   => "Windows NT 4.0" 
+		 *   Win9x => "Windows 4.0"
+		 */
+		 
+		if ( ra_type == RA_WIN2K ) {
+			if ( 0 == strcmp( native_lanman, "Windows 2002 5.1" ) )
+				set_remote_arch( RA_WINXP );
+		}
+		
+
 	}
 	
 	DEBUG(3,("sesssetupX:name=[%s]\\[%s]@[%s]\n", domain, user, get_remote_machine_name()));
-- 
cgit 


From dc1cd583cb4224f0fdb8c4529b59a66eeddba2f9 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Thu, 27 Feb 2003 21:37:54 +0000
Subject: don't pass NULL pointers to strcmp() (This used to be commit
 6631984b12a3f74b93f7031c433dd81d6586a5df)

---
 source3/smbd/dir.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3')

diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index e022d26ea3..2a5f7ffd71 100644
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -1063,8 +1063,8 @@ char *DirCacheCheck( const char *path, const char *name, int snum )
 			NULL != entry;
 			entry = (dir_cache_entry *)ubi_dlNext( entry ) ) {
 		if( entry->snum == snum
-				&& 0 == strcmp( name, entry->name )
-				&& 0 == strcmp( path, entry->path ) ) {
+				&& entry->name && 0 == strcmp( name, entry->name )
+				&& entry->path && 0 == strcmp( path, entry->path ) ) {
 			DEBUG(4, ("Got dir cache hit on %s %s -> %s\n",path,name,entry->dname));
 			return( entry->dname );
 		}
-- 
cgit 


From 3a7d807ec9974f0b4d7938a4b734c2c7f350cd08 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Thu, 27 Feb 2003 23:24:26 +0000
Subject: and the winner of "i should have just written it in assembly is..."

don't use pstrcpy() when you are not dealing with pstrings.
(This used to be commit 7d547f50f914747291acc71fd3544ad92ce91f0e)
---
 source3/smbd/dir.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source3')

diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index 2a5f7ffd71..10241e88d9 100644
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -1028,9 +1028,9 @@ void DirCacheAdd( const char *path, char *name, char *dname, int snum )
 		return;             /* so just return as if nothing happened. */
 
 	/* Set pointers correctly and load values. */
-	entry->path  = pstrcpy( (char *)&entry[1], path);
-	entry->name  = pstrcpy( &(entry->path[pathlen]), name);
-	entry->dname = pstrcpy( &(entry->name[namelen]), dname);
+	entry->path  = memcpy( (char *)&entry[1], path, strlen(path) );
+	entry->name  = memcpy( &(entry->path[pathlen]), name, strlen(name) );
+	entry->dname = memcpy( &(entry->name[namelen]), dname, strlen(dname) );
 	entry->snum  = snum;
 
 	/* Add the new entry to the linked list. */
-- 
cgit 


From 17c417e6e66e05d6bcee98cb1c7ebfa7d98a5347 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Thu, 27 Feb 2003 23:52:37 +0000
Subject:  don't forget the NULL (This used to be commit
 f80610120483c929afbec83d2b8649cb3e5111b0)

---
 source3/smbd/dir.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source3')

diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index 10241e88d9..95acf4a262 100644
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -1028,9 +1028,9 @@ void DirCacheAdd( const char *path, char *name, char *dname, int snum )
 		return;             /* so just return as if nothing happened. */
 
 	/* Set pointers correctly and load values. */
-	entry->path  = memcpy( (char *)&entry[1], path, strlen(path) );
-	entry->name  = memcpy( &(entry->path[pathlen]), name, strlen(name) );
-	entry->dname = memcpy( &(entry->name[namelen]), dname, strlen(dname) );
+	entry->path  = memcpy( (char *)&entry[1], path, strlen(path)+1 );
+	entry->name  = memcpy( &(entry->path[pathlen]), name, strlen(name)+1 );
+	entry->dname = memcpy( &(entry->name[namelen]), dname, strlen(dname)+1 );
 	entry->snum  = snum;
 
 	/* Add the new entry to the linked list. */
-- 
cgit 


From 9f0ae6fad2d0099a58fec389ddd430c0448ec02e Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Fri, 28 Feb 2003 00:26:20 +0000
Subject: *Excellent* patch from Michael Steffens <michael_steffens@hp.com> to
 limit the unix domain sockets used by winbindd (also solves FD_SETSIZE
 problem in winbindd to boot !). Adds a "last_access" field to winbindd
 connections, and will close the oldest idle connection once the number of
 open connections goes over WINBINDD_MAX_SIMULTANEOUS_CLIENTS (defined in
 local.h as 200 currently). Jeremy. (This used to be commit
 a82caefda49396641e8650db8a7ef51752ba6c41)

---
 source3/include/local.h     |  2 ++
 source3/nsswitch/winbindd.c | 53 ++++++++++++++++++++++++++++++++++++++++-----
 source3/nsswitch/winbindd.h | 21 +++++++++---------
 3 files changed, 61 insertions(+), 15 deletions(-)

(limited to 'source3')

diff --git a/source3/include/local.h b/source3/include/local.h
index e16cdbbc5d..29b0641119 100644
--- a/source3/include/local.h
+++ b/source3/include/local.h
@@ -221,4 +221,6 @@
 /* Number in seconds for winbindd to wait for the mutex. Make this 2 * smbd wait time. */
 #define WINBIND_SERVER_MUTEX_WAIT_TIME (( ((NUM_CLI_AUTH_CONNECT_RETRIES) * ((CLI_AUTH_TIMEOUT)/1000)) + 5)*2)
 
+/* Max number of simultaneous winbindd socket connections. */
+#define WINBINDD_MAX_SIMULTANEOUS_CLIENTS 200
 #endif
diff --git a/source3/nsswitch/winbindd.c b/source3/nsswitch/winbindd.c
index 09b89462ec..ad37768c09 100644
--- a/source3/nsswitch/winbindd.c
+++ b/source3/nsswitch/winbindd.c
@@ -339,7 +339,9 @@ static void new_connection(int listen_sock)
 	
 	ZERO_STRUCTP(state);
 	state->sock = sock;
-	
+
+	state->last_access = time(NULL);	
+
 	/* Add to connection list */
 	
 	winbindd_add_client(state);
@@ -375,6 +377,35 @@ static void remove_client(struct winbindd_cli_state *state)
 }
 
 
+/* Shutdown client connection which has been idle for the longest time */
+
+static BOOL remove_idle_client(void)
+{
+	struct winbindd_cli_state *state, *remove_state = NULL;
+	time_t last_access = 0;
+	int nidle = 0;
+
+	for (state = winbindd_client_list(); state; state = state->next) {
+		if (state->read_buf_len == 0 && state->write_buf_len == 0 &&
+				!state->getpwent_state && !state->getgrent_state) {
+			nidle++;
+			if (!last_access || state->last_access < last_access) {
+				last_access = state->last_access;
+				remove_state = state;
+			}
+		}
+	}
+
+	if (remove_state) {
+		DEBUG(5,("Found %d idle client connections, shutting down sock %d, pid %u\n",
+			nidle, remove_state->sock, (unsigned int)remove_state->pid));
+		remove_client(remove_state);
+		return True;
+	}
+
+	return False;
+}
+
 /* Process a complete received packet from a client */
 
 void winbind_process_packet(struct winbindd_cli_state *state)
@@ -427,6 +458,7 @@ void winbind_client_read(struct winbindd_cli_state *state)
 	/* Update client state */
 	
 	state->read_buf_len += n;
+	state->last_access = time(NULL);
 }
 
 /* Write some data to a client connection */
@@ -477,7 +509,8 @@ static void client_write(struct winbindd_cli_state *state)
 	/* Update client state */
 	
 	state->write_buf_len -= num_written;
-	
+	state->last_access = time(NULL);
+
 	/* Have we written all data? */
 	
 	if (state->write_buf_len == 0) {
@@ -508,7 +541,7 @@ static void client_write(struct winbindd_cli_state *state)
 	}
 }
 
-/* Process incoming clients on accept_sock.  We use a tricky non-blocking,
+/* Process incoming clients on listen_sock.  We use a tricky non-blocking,
    non-forking, non-threaded model which allows us to handle many
    simultaneous connections while remaining impervious to many denial of
    service attacks. */
@@ -608,7 +641,7 @@ static void process_loop(void)
 			exit(1);
 		}
 
-		/* Create a new connection if accept_sock readable */
+		/* Create a new connection if listen_sock readable */
 
 		if (selret > 0) {
 
@@ -616,8 +649,18 @@ static void process_loop(void)
 				dual_select(&w_fds);
 			}
 
-			if (FD_ISSET(listen_sock, &r_fds))
+			if (FD_ISSET(listen_sock, &r_fds)) {
+				while (winbindd_num_clients() > WINBINDD_MAX_SIMULTANEOUS_CLIENTS - 1) {
+					DEBUG(5,("winbindd: Exceeding %d client connections, removing idle connection.\n",
+						WINBINDD_MAX_SIMULTANEOUS_CLIENTS));
+					if (!remove_idle_client()) {
+						DEBUG(0,("winbindd: Exceeding %d client connections, no idle connection found\n",
+							WINBINDD_MAX_SIMULTANEOUS_CLIENTS));
+						break;
+					}
+				}
 				new_connection(listen_sock);
+			}
             
 			/* Process activity on client connections */
             
diff --git a/source3/nsswitch/winbindd.h b/source3/nsswitch/winbindd.h
index 8bd8a83748..42ef209faf 100644
--- a/source3/nsswitch/winbindd.h
+++ b/source3/nsswitch/winbindd.h
@@ -36,16 +36,17 @@
 /* Client state structure */
 
 struct winbindd_cli_state {
-    struct winbindd_cli_state *prev, *next;   /* Linked list pointers */
-    int sock;                                 /* Open socket from client */
-    pid_t pid;                                /* pid of client */
-    int read_buf_len, write_buf_len;          /* Indexes in request/response */
-    BOOL finished;                            /* Can delete from list */
-    BOOL write_extra_data;                    /* Write extra_data field */
-    struct winbindd_request request;          /* Request from client */
-    struct winbindd_response response;        /* Respose to client */
-    struct getent_state *getpwent_state;      /* State for getpwent() */
-    struct getent_state *getgrent_state;      /* State for getgrent() */
+	struct winbindd_cli_state *prev, *next;   /* Linked list pointers */
+	int sock;                                 /* Open socket from client */
+	pid_t pid;                                /* pid of client */
+	int read_buf_len, write_buf_len;          /* Indexes in request/response */
+	BOOL finished;                            /* Can delete from list */
+	BOOL write_extra_data;                    /* Write extra_data field */
+	time_t last_access;                       /* Time of last access (read or write) */
+	struct winbindd_request request;          /* Request from client */
+	struct winbindd_response response;        /* Respose to client */
+	struct getent_state *getpwent_state;      /* State for getpwent() */
+	struct getent_state *getgrent_state;      /* State for getgrent() */
 };
 
 /* State between get{pw,gr}ent() calls */
-- 
cgit 


From a001b706bd85f40b2b9096af1ab92b135440f184 Mon Sep 17 00:00:00 2001
From: Jim McDonough <jmcd@samba.org>
Date: Fri, 28 Feb 2003 03:21:22 +0000
Subject: Improve net ads lookup: - More info is printed - (grand)child domains
 handled properly

Thanks to Anthony Liguori (aliguori@us.ibm.com)
(This used to be commit 3dbcb4d93f7c192eb2ccea5941a3843b5de1190e)
---
 source3/utils/net_ads_cldap.c | 203 +++++++++++++++++++++++++++++-------------
 1 file changed, 142 insertions(+), 61 deletions(-)

(limited to 'source3')

diff --git a/source3/utils/net_ads_cldap.c b/source3/utils/net_ads_cldap.c
index f81c763093..d369fbdf50 100644
--- a/source3/utils/net_ads_cldap.c
+++ b/source3/utils/net_ads_cldap.c
@@ -2,6 +2,7 @@
    Samba Unix/Linux SMB client library 
    net ads cldap functions 
    Copyright (C) 2001 Andrew Tridgell (tridge@samba.org)
+   Copyright (C) 2003 Jim McDonough (jmcd@us.ibm.com)
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -23,60 +24,69 @@
 
 #ifdef HAVE_ADS
 
+struct netlogon_string {
+	uint32 comp_len;
+	char **component;
+	uint8 extra_flag;
+};
+
 struct cldap_netlogon_reply {
-	uint32 version;
+	uint32 type;
 	uint32 flags;
 	GUID guid;
-	char *domain;
-	char *server_name;
-	char *domain_flatname;
-	char *server_flatname;
-	char *dns_name;
-	uint32 unknown2[2];
-};
 
+	struct netlogon_string forest;
+	struct netlogon_string domain;
+	struct netlogon_string hostname;
 
-/*
-  pull a length prefixed string from a packet
-  return number of bytes consumed
-*/
-static unsigned pull_len_string(char **ret, const char *p)
-{
-	unsigned len = *p;
-	(*ret) = NULL;
-	if (len == 0) return 1;
-	(*ret) = smb_xstrndup(p+1, len);
-	return len+1;
-}
+	struct netlogon_string netbios_domain;
+	struct netlogon_string netbios_hostname;
+
+	struct netlogon_string user_name;
+	struct netlogon_string site_name;
+
+	struct netlogon_string unk0;
+
+	uint32 version;
+	uint16 lmnt_token;
+	uint16 lm20_token;
+};
 
 /*
-  pull a dotted string from a packet
-  return number of bytes consumed
+  These strings are rather interesting... They are composed of a series of
+  length encoded strings, terminated by either 1) a zero length string or 2)
+  a 0xc0 byte with what appears to be a one byte flags immediately following.
 */
-static unsigned pull_dotted_string(char **ret, const char *p)
+static unsigned pull_netlogon_string(struct netlogon_string *ret,const char *d)
 {
-	char *s;
-	unsigned len, total_len=0;
+	char *s, *p = (char *)d;
+
+	ZERO_STRUCTP(ret);
 
-	(*ret) = NULL;
+	do {
+		unsigned len = (unsigned char)*p;
+		p++;
 
-	while ((len = pull_len_string(&s, p)) > 1) {
-		if (total_len) {
-			char *s2;
-			asprintf(&s2, "%s.%s", *ret, s);
-			SAFE_FREE(*ret);
-			(*ret) = s2;
+		if (len > 0 && len != 0xc0) {
+			ret->component = realloc(ret->component,
+						 ++ret->comp_len *
+						 sizeof(char *));
+
+			ret->component[ret->comp_len - 1] = 
+				smb_xstrndup(p, len);
+			p += len;
 		} else {
-			(*ret) = s;
+			if (len == 0xc0) {
+				ret->extra_flag = *p;
+				p++;
+			};
+			break;
 		}
-		total_len += len;
-		p += len;
-	}
+	} while (1);
 
-	return total_len + 1;
+	return (p - d);
 }
 
-
 /*
   do a cldap netlogon query
 */
@@ -190,19 +200,25 @@ static int recv_cldap_netlogon(int sock, struct cldap_netlogon_reply *reply)
 
 	p = os3.data;
 
-	reply->version = IVAL(p, 0); p += 4;
+	reply->type = IVAL(p, 0); p += 4;
 	reply->flags = IVAL(p, 0); p += 4;
+
 	memcpy(&reply->guid.info, p, GUID_SIZE);
 	p += GUID_SIZE;
-	p += pull_dotted_string(&reply->domain, p);
-	p += 2; /* 0xc018 - whats this? */
-	p += pull_len_string(&reply->server_name, p);
-	p += 2; /* 0xc018 - whats this? */
-	p += pull_len_string(&reply->domain_flatname, p);
-	p += 1;
-	p += pull_len_string(&reply->server_flatname, p);
-	p += 2;
-	p += pull_len_string(&reply->dns_name, p);
+
+	p += pull_netlogon_string(&reply->forest, p);
+	p += pull_netlogon_string(&reply->domain, p);
+	p += pull_netlogon_string(&reply->hostname, p);
+	p += pull_netlogon_string(&reply->netbios_domain, p);
+	p += pull_netlogon_string(&reply->netbios_hostname, p);
+	p += pull_netlogon_string(&reply->user_name, p);
+	p += pull_netlogon_string(&reply->site_name, p);
+
+	p += pull_netlogon_string(&reply->unk0, p);
+
+	reply->version = IVAL(p, 0);
+	reply->lmnt_token = SVAL(p, 4);
+	reply->lm20_token = SVAL(p, 6);
 
 	data_blob_free(&os1);
 	data_blob_free(&os2);
@@ -212,17 +228,50 @@ static int recv_cldap_netlogon(int sock, struct cldap_netlogon_reply *reply)
 	return 0;
 }
 
+/*
+  free a netlogon string
+*/
+static void netlogon_string_free(struct netlogon_string *str)
+{
+	int i;
+
+	for (i = 0; i < str->comp_len; ++i) {
+		SAFE_FREE(str->component[i]);
+	}
+	SAFE_FREE(str->component);
+}
 
 /*
   free a cldap reply packet
 */
 static void cldap_reply_free(struct cldap_netlogon_reply *reply)
 {
-	SAFE_FREE(reply->domain);
-	SAFE_FREE(reply->server_name);
-	SAFE_FREE(reply->domain_flatname);
-	SAFE_FREE(reply->server_flatname);
-	SAFE_FREE(reply->dns_name);
+	netlogon_string_free(&reply->forest);
+	netlogon_string_free(&reply->domain);
+	netlogon_string_free(&reply->hostname);
+	netlogon_string_free(&reply->netbios_domain);
+	netlogon_string_free(&reply->netbios_hostname);
+	netlogon_string_free(&reply->user_name);
+	netlogon_string_free(&reply->site_name);
+	netlogon_string_free(&reply->unk0);
+}
+
+static void d_print_netlogon_string(const char *label, 
+				    struct netlogon_string *str)
+{
+	int i;
+
+	if (str->comp_len) {
+		d_printf("%s", label);
+		if (str->extra_flag) {
+			d_printf("[%d]", str->extra_flag);
+		}
+		d_printf(": ");
+		for (i = 0; i < str->comp_len; ++i) {
+			d_printf("%s%s", (i ? "." : ""), str->component[i]);
+		}
+		d_printf("\n");
+	}
 }
 
 /*
@@ -246,7 +295,6 @@ int ads_cldap_netlogon(ADS_STRUCT *ads)
 	if (ret != 0) {
 		return ret;
 	}
-
 	ret = recv_cldap_netlogon(sock, &reply);
 	close(sock);
 
@@ -254,15 +302,48 @@ int ads_cldap_netlogon(ADS_STRUCT *ads)
 		return -1;
 	}
 
-	d_printf("Version: 0x%x\n", reply.version);
+	d_printf("Information for Domain Controller: %s\n\n", 
+		 ads->config.ldap_server_name);
+
+	d_printf("Response Type: 0x%x\n", reply.type);
 	d_printf("GUID: "); 
 	print_guid(&reply.guid);
-	d_printf("Flags:   0x%x\n", reply.flags);
-	d_printf("Domain: %s\n", reply.domain);
-	d_printf("Server Name: %s\n", reply.server_name);
-	d_printf("Flatname: %s\n", reply.domain_flatname);
-	d_printf("Server Name2: %s\n", reply.server_flatname);
-	d_printf("DNS Name: %s\n", reply.dns_name);
+	d_printf("Flags:\n"
+		 "\tIs a PDC:                                   %s\n"
+		 "\tIs a GC of the forest:                      %s\n"
+		 "\tIs an LDAP server:                          %s\n"
+		 "\tSupports DS:                                %s\n"
+		 "\tIs running a KDC:                           %s\n"
+		 "\tIs running time services:                   %s\n"
+		 "\tIs the closest DC:                          %s\n"
+		 "\tIs writable:                                %s\n"
+		 "\tHas a hardware clock:                       %s\n"
+		 "\tIs a non-domain NC serviced by LDAP server: %s\n",
+		 (reply.flags & ADS_PDC) ? "yes" : "no",
+		 (reply.flags & ADS_GC) ? "yes" : "no",
+		 (reply.flags & ADS_LDAP) ? "yes" : "no",
+		 (reply.flags & ADS_DS) ? "yes" : "no",
+		 (reply.flags & ADS_KDC) ? "yes" : "no",
+		 (reply.flags & ADS_TIMESERV) ? "yes" : "no",
+		 (reply.flags & ADS_CLOSEST) ? "yes" : "no",
+		 (reply.flags & ADS_WRITABLE) ? "yes" : "no",
+		 (reply.flags & ADS_GOOD_TIMESERV) ? "yes" : "no",
+		 (reply.flags & ADS_NDNC) ? "yes" : "no");
+
+	d_print_netlogon_string("Forest", &reply.forest);
+	d_print_netlogon_string("Domain", &reply.domain);
+	d_print_netlogon_string("Hostname", &reply.hostname);
+
+	d_print_netlogon_string("Pre-Win2k Domain", &reply.netbios_domain);
+	d_print_netlogon_string("Pre-Win2k Hostname", &reply.netbios_hostname);
+
+	d_print_netlogon_string("User name", &reply.user_name);
+	d_print_netlogon_string("Site Name", &reply.site_name);
+	d_print_netlogon_string("Unknown Field", &reply.unk0);
+
+	d_printf("NT Version: %d\n", reply.version);
+	d_printf("LMNT Token: %0.2x\n", reply.lmnt_token);
+	d_printf("LM20 Token: %0.2x\n", reply.lm20_token);
 
 	cldap_reply_free(&reply);
 	
-- 
cgit 


From db47e9450aff5ff5b6853f163d4aab117d1c77aa Mon Sep 17 00:00:00 2001
From: Jim McDonough <jmcd@samba.org>
Date: Fri, 28 Feb 2003 03:29:03 +0000
Subject: cleanup some compiler warnings (This used to be commit
 87cebe797f06fab4a5d0077fd78b2183ff7333a5)

---
 source3/utils/net_ads_cldap.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source3')

diff --git a/source3/utils/net_ads_cldap.c b/source3/utils/net_ads_cldap.c
index d369fbdf50..ad66af0439 100644
--- a/source3/utils/net_ads_cldap.c
+++ b/source3/utils/net_ads_cldap.c
@@ -59,7 +59,7 @@ struct cldap_netlogon_reply {
 */
 static unsigned pull_netlogon_string(struct netlogon_string *ret,const char *d)
 {
-	char *s, *p = (char *)d;
+	char *p = (char *)d;
 
 	ZERO_STRUCTP(ret);
 
@@ -342,8 +342,8 @@ int ads_cldap_netlogon(ADS_STRUCT *ads)
 	d_print_netlogon_string("Unknown Field", &reply.unk0);
 
 	d_printf("NT Version: %d\n", reply.version);
-	d_printf("LMNT Token: %0.2x\n", reply.lmnt_token);
-	d_printf("LM20 Token: %0.2x\n", reply.lm20_token);
+	d_printf("LMNT Token: %.2x\n", reply.lmnt_token);
+	d_printf("LM20 Token: %.2x\n", reply.lm20_token);
 
 	cldap_reply_free(&reply);
 	
-- 
cgit 


From 37e39f5be4ae0156565b009ae210f2c95e906142 Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Fri, 28 Feb 2003 03:34:18 +0000
Subject: Add simple test harness that exposes StrCaseCmp for testing. (This
 used to be commit ab77beca041595bc3bd70de3a6e1b49159a4964b)

---
 source3/torture/t_strcmp.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 source3/torture/t_strcmp.c

(limited to 'source3')

diff --git a/source3/torture/t_strcmp.c b/source3/torture/t_strcmp.c
new file mode 100644
index 0000000000..622769001b
--- /dev/null
+++ b/source3/torture/t_strcmp.c
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2003 by Martin Pool
+ *
+ * Test harness for StrCaseCmp
+ */
+
+#include "includes.h"
+
+int main(int argc, char *argv[])
+{
+	if (argc != 3) {
+		fprintf(stderr, "usage: %s STRING1 STRING2\nCompares two strings\n",
+			argv[0]);
+		return 2;
+	}
+	
+	printf("%d\n", StrCaseCmp(argv[1], argv[2]));
+	
+	return 0;
+}
-- 
cgit 


From 921e569ed50408d42ddab5d524cf39a86429d488 Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Fri, 28 Feb 2003 03:51:25 +0000
Subject: Add a comment about the meaning of samba's internal character set and
 how this interacts with it. (This used to be commit
 eb876ee9cf24eda04e0856899b232d060c669c0c)

---
 source3/lib/iconv.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'source3')

diff --git a/source3/lib/iconv.c b/source3/lib/iconv.c
index f622704853..6786003de5 100644
--- a/source3/lib/iconv.c
+++ b/source3/lib/iconv.c
@@ -21,6 +21,30 @@
 
 #include "includes.h"
 
+
+/**
+ * @file
+ *
+ * @brief Samba wrapper/stub for iconv character set conversion.
+ *
+ * iconv is the XPG2 interface for converting between character
+ * encodings.  This file provides a Samba wrapper around it, and also
+ * a simple reimplementation that is used if the system does not
+ * implement iconv.
+ *
+ * Samba only works with encodings that are supersets of ASCII: ascii
+ * characters like whitespace can be tested for directly, multibyte
+ * sequences start with a byte with the high bit set, and strings are
+ * terminated by \0.
+ *
+ * Note that the only function provided by iconv is conversion between
+ * characters.  It doesn't directly support operations like
+ * uppercasing or comparison.  We have to convert to UCS-2 and compare
+ * there.
+ *
+ * @sa Samba Developers Guide
+ **/
+
 static size_t ascii_pull(void *,char **, size_t *, char **, size_t *);
 static size_t ascii_push(void *,char **, size_t *, char **, size_t *);
 static size_t  utf8_pull(void *,char **, size_t *, char **, size_t *);
-- 
cgit 


From 290098e39e04d66897e09c792a85b9a79cd86d49 Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Fri, 28 Feb 2003 03:59:47 +0000
Subject: Remove reference to "mainpage.dox" and CodingStandards, which have
 been removed.

Put subdirectory names in file list, so we get lib/util_chr.c, not
just util_chr.c.
(This used to be commit aa2efaab1ffc77bec051cd206000951c72adeccc)
---
 source3/Doxyfile     | 7 +++----
 source3/mainpage.dox | 7 -------
 2 files changed, 3 insertions(+), 11 deletions(-)
 delete mode 100644 source3/mainpage.dox

(limited to 'source3')

diff --git a/source3/Doxyfile b/source3/Doxyfile
index 914ba25672..c1040781d8 100644
--- a/source3/Doxyfile
+++ b/source3/Doxyfile
@@ -23,8 +23,8 @@ HIDE_UNDOC_CLASSES     = NO
 BRIEF_MEMBER_DESC      = YES
 REPEAT_BRIEF           = YES
 ALWAYS_DETAILED_SEC    = NO
-FULL_PATH_NAMES        = NO
-STRIP_FROM_PATH        = *source
+FULL_PATH_NAMES        = YES
+STRIP_FROM_PATH        = $(PWD)/
 INTERNAL_DOCS          = YES
 CLASS_DIAGRAMS         = YES
 SOURCE_BROWSER         = YES
@@ -61,8 +61,7 @@ WARN_LOGFILE           =
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = . \
-                         mainpage.dox
+INPUT                  = . 
 FILE_PATTERNS          = *.c \
                          *.h \
                          *.idl
diff --git a/source3/mainpage.dox b/source3/mainpage.dox
deleted file mode 100644
index 8b72f80462..0000000000
--- a/source3/mainpage.dox
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
-
-@mainpage
-
-@li \ref CodingSuggestions
-
-**/
-- 
cgit 


From 7ca743713b71fe31e3e81f56c91b70206df7a143 Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Fri, 28 Feb 2003 04:06:56 +0000
Subject: Fix comment typo (This used to be commit
 d2fd52c1b50f2d1abad84668911b04c72fdc4b8d)

---
 source3/web/swat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 21ae104cef..4211b2f15a 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -21,7 +21,7 @@
 */
 
 /**
- * @group swat SWAT
+ * @defgroup swat SWAT
  * @{ 
  * @file swat.c
  *
-- 
cgit 


From 22d482dade44b51bc150aa9f34fc89e995ccc934 Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Fri, 28 Feb 2003 04:09:58 +0000
Subject: Doxygen janitor: check_domain_match parameter is spelled
 "auth_context". (This used to be commit
 571c3ce19344276aac1af56d2f69fcc5523f36eb)

---
 source3/auth/auth.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3')

diff --git a/source3/auth/auth.c b/source3/auth/auth.c
index 2abdec3a39..8b33010e91 100644
--- a/source3/auth/auth.c
+++ b/source3/auth/auth.c
@@ -162,8 +162,8 @@ static BOOL check_domain_match(const char *user, const char *domain)
  * @param user_info Contains the user supplied components, including the passwords.
  *                  Must be created with make_user_info() or one of its wrappers.
  *
- * @param auth_info Supplies the challenges and some other data. 
- *                  Must be created with make_auth_info(), and the challenges should be 
+ * @param auth_context Supplies the challenges and some other data. 
+ *                  Must be created with make_auth_context(), and the challenges should be 
  *                  filled in, either at creation or by calling the challenge geneation 
  *                  function auth_get_challenge().  
  *
-- 
cgit 


From 4125dfca83930b42d28ef08f920e41c6b2f62134 Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Fri, 28 Feb 2003 04:11:28 +0000
Subject: Doxygen janitor: rpc_resolve_dc parameter is spelled "trust_passwd"
 (This used to be commit 9dbc3dcfe0bccf1f76930ae86970b48ba5ed1e91)

---
 source3/auth/auth_domain.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/auth/auth_domain.c b/source3/auth/auth_domain.c
index b3f50072bc..0d90a184a4 100644
--- a/source3/auth/auth_domain.c
+++ b/source3/auth/auth_domain.c
@@ -115,7 +115,7 @@ static NTSTATUS rpc_resolve_dc(const char *server,
  * @param cli the cli to return containing the active connection
  * @param server either a machine name or text IP address to
  *               connect to.
- * @param trust_password the trust password to establish the
+ * @param trust_passwd the trust password to establish the
  *                       credentials with.
  *
  **/
-- 
cgit 


From f5f59e866e5b761a6b0c95d29bb2d1ec0136652f Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Fri, 28 Feb 2003 04:17:30 +0000
Subject: Doxygen janitor: fix parameter names, grammar, tag names. (This used
 to be commit 42d9ec28cd55dbcfda546c84fb842938aeda544d)

---
 source3/lib/gencache.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'source3')

diff --git a/source3/lib/gencache.c b/source3/lib/gencache.c
index 7260e477b8..5c8ad1339b 100644
--- a/source3/lib/gencache.c
+++ b/source3/lib/gencache.c
@@ -94,12 +94,12 @@ BOOL gencache_shutdown(void)
  * Set an entry in the cache file. If there's no such
  * one, then add it.
  *
- * @param key string that represents a key of this entry
+ * @param keystr string that represents a key of this entry
  * @param value text representation value being cached
  * @param timeout time when the value is expired
  *
- * @return true when entry is successfuly stored or
- *         false on the attempt's failure
+ * @retval true when entry is successfuly stored
+ * @retval false on failure
  **/
  
 BOOL gencache_set(const char *keystr, const char *value, time_t timeout)
@@ -134,12 +134,12 @@ BOOL gencache_set(const char *keystr, const char *value, time_t timeout)
 /**
  * Set existing entry to the cache file.
  *
- * @param key string that represents a key of this entry
- * @param value text representation value being cached
+ * @param keystr string that represents a key of this entry
+ * @param valstr text representation value being cached
  * @param timeout time when the value is expired
  *
- * @return true when entry is successfuly set or
- *         false on the attempt's failure
+ * @retval true when entry is successfuly set
+ * @retval false on failure
  **/
 
 BOOL gencache_set_only(const char *keystr, const char *valstr, time_t timeout)
@@ -189,10 +189,10 @@ BOOL gencache_set_only(const char *keystr, const char *valstr, time_t timeout)
 /**
  * Delete one entry from the cache file.
  *
- * @param key string that represents a key of this entry
+ * @param keystr string that represents a key of this entry
  *
- * @return true upon successful deletion or
- *         false in case of failure
+ * @retval true upon successful deletion
+ * @retval false in case of failure
  **/
 
 BOOL gencache_del(const char *keystr)
@@ -218,14 +218,14 @@ BOOL gencache_del(const char *keystr)
 /**
  * Get existing entry from the cache file.
  *
- * @param key string that represents a key of this entry
- * @param value buffer that is allocated and filled with the entry value
+ * @param keystr string that represents a key of this entry
+ * @param valstr buffer that is allocated and filled with the entry value
  *        buffer's disposing must be done outside
  * @param timeout pointer to a time_t that is filled with entry's
  *        timeout
  *
- * @return true when entry is successfuly fetched or
- *         false on the failure
+ * @retval true when entry is successfuly fetched
+ * @retval False for failure
  **/
 
 BOOL gencache_get(const char *keystr, char **valstr, time_t *timeout)
-- 
cgit 


From 481b4e6d6ceeab644b5c4d1ee11bc221d8035202 Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Fri, 28 Feb 2003 04:21:55 +0000
Subject: Doxygen janitor (This used to be commit
 9af07173152c5e861d13b33a8d4aee8167a50b66)

---
 source3/lib/iconv.c    |  2 +-
 source3/lib/messages.c | 14 +++++++-------
 source3/web/swat.c     |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'source3')

diff --git a/source3/lib/iconv.c b/source3/lib/iconv.c
index 6786003de5..8b360a14c6 100644
--- a/source3/lib/iconv.c
+++ b/source3/lib/iconv.c
@@ -35,7 +35,7 @@
  * Samba only works with encodings that are supersets of ASCII: ascii
  * characters like whitespace can be tested for directly, multibyte
  * sequences start with a byte with the high bit set, and strings are
- * terminated by \0.
+ * terminated by a nul byte.
  *
  * Note that the only function provided by iconv is conversion between
  * characters.  It doesn't directly support operations like
diff --git a/source3/lib/messages.c b/source3/lib/messages.c
index 3603758e9f..5ff0e45c61 100644
--- a/source3/lib/messages.c
+++ b/source3/lib/messages.c
@@ -21,11 +21,11 @@
 */
 
 /**
-   @defgroups messages Internal messaging framework
-   @{
-   @file messages.c
-
-   This module is used for internal messaging between Samba daemons. 
+  @defgroup messages Internal messaging framework
+  @{
+  @file messages.c
+  
+  @brief  Module for internal messaging between Samba daemons. 
 
    The idea is that if a part of Samba wants to do communication with
    another Samba process then it will do a message_register() of a
@@ -36,7 +36,7 @@
    use that to reply by message_send_pid().  See ping_message() for a
    simple example.
 
-   *NOTE*: Dispatch functions must be able to cope with incoming
+   @caution Dispatch functions must be able to cope with incoming
    messages on an *odd* byte boundary.
 
    This system doesn't have any inherent size limitations but is not
@@ -524,7 +524,7 @@ static int traverse_fn(TDB_CONTEXT *the_tdb, TDB_DATA kbuf, TDB_DATA dbuf, void
  * @param n_sent Set to the number of messages sent.  This should be
  * equal to the number of processes, but be careful for races.
  *
- * @return True for success.
+ * @retval True for success.
  **/
 BOOL message_send_all(TDB_CONTEXT *conn_tdb, int msg_type,
 		      const void *buf, size_t len,
diff --git a/source3/web/swat.c b/source3/web/swat.c
index 4211b2f15a..d6693b4e75 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -21,7 +21,7 @@
 */
 
 /**
- * @defgroup swat SWAT
+ * @defgroup swat SWAT - Samba Web Administration Tool
  * @{ 
  * @file swat.c
  *
-- 
cgit 


From e7ff3803a385925b52f09526d2bbc8ca479d2ae4 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 28 Feb 2003 04:36:08 +0000
Subject: - added help on -P option - added general options to 'net -h' help
 (This used to be commit ee8a7fdab7f5aa6f4a64f2eea90f0d44ae0f388a)

---
 source3/utils/net_help.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source3')

diff --git a/source3/utils/net_help.c b/source3/utils/net_help.c
index 782a530035..4000a248ff 100644
--- a/source3/utils/net_help.c
+++ b/source3/utils/net_help.c
@@ -47,6 +47,7 @@ int net_common_flags_usage(int argc, const char **argv)
 	d_printf("\t-U or --user=<name>\t\tuser name\n");
 	d_printf("\t-s or --conf=<path>\t\tpathname of smb.conf file\n");
 	d_printf("\t-l or --long\t\t\tDisplay full information\n");
+	d_printf("\t-P or --machine-pass\t\tAuthenticate as machine account\n");
 	return -1;
 }
 
@@ -160,6 +161,7 @@ static int net_usage(int argc, const char **argv)
 		 "  net rpc <command>\tto run RPC commands\n"\
 		 "\n"\
 		 "Type \"net help <option>\" to get more information on that option\n");
+	net_common_flags_usage(argc, argv);
 	return -1;
 }
 
-- 
cgit 


From e443560789b5fc1d47e4008680e0484e002ad15d Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Fri, 28 Feb 2003 05:34:19 +0000
Subject: Doxygen janitor: add note that strequal is in fact case-insensitive.
 (This used to be commit a4b9c5c2576c80a5f60d47d178b9b8c50d348893)

---
 source3/lib/util_str.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'source3')

diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c
index cc4b6fe5c5..070c59c1b2 100644
--- a/source3/lib/util_str.c
+++ b/source3/lib/util_str.c
@@ -164,9 +164,10 @@ int StrnCaseCmp(const char *s, const char *t, size_t n)
 }
 
 /**
- Compare 2 strings.
-**/
-
+ * Compare 2 strings.
+ *
+ * @note The comparison is case-insensitive.
+ **/
 BOOL strequal(const char *s1, const char *s2)
 {
 	if (s1 == s2)
@@ -178,9 +179,10 @@ BOOL strequal(const char *s1, const char *s2)
 }
 
 /**
- Compare 2 strings up to and including the nth char.
-**/
-
+ * Compare 2 strings up to and including the nth char.
+ *
+ * @note The comparison is case-insensitive.
+ **/
 BOOL strnequal(const char *s1,const char *s2,size_t n)
 {
   if (s1 == s2)
-- 
cgit 


From 7972855b810aabcd4115806652494bb21654323e Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 28 Feb 2003 06:03:35 +0000
Subject: fixed a crash bug in the new winbindd 'sids rule!' code (This used to
 be commit 7dfd59963dba921907893b9d1bffe797e9d8b4ad)

---
 source3/nsswitch/winbindd_rpc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/nsswitch/winbindd_rpc.c b/source3/nsswitch/winbindd_rpc.c
index 03b0a1e706..9989f27109 100644
--- a/source3/nsswitch/winbindd_rpc.c
+++ b/source3/nsswitch/winbindd_rpc.c
@@ -106,7 +106,7 @@ static NTSTATUS query_user_list(struct winbindd_domain *domain,
 			   This should really be made into a 'winbind
 			   force group' smb.conf parameter or
 			   something like that. */
-			(*info)[i].user_sid 
+			(*info)[i].group_sid 
 				= rid_to_talloced_sid(domain, 
 						      mem_ctx, 
 						      DOMAIN_GROUP_RID_USERS);
-- 
cgit 


From 3467ed21dd3ec0ae537564eb0219ad86517c5638 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 28 Feb 2003 08:47:22 +0000
Subject: Fix HTTP error codes (patch by Vance Lankhaar) (This used to be
 commit 3780d127313ad9f4411751d34fd6e1d96b1422cf)

---
 source3/web/cgi.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source3')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 8abc2f0bd5..212c2884b6 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -455,11 +455,11 @@ void cgi_setup(const char *rootdir, int auth_required)
 	char *lang;
 
 	if (chdir(rootdir)) {
-		cgi_setup_error("400 Server Error", "",
+		cgi_setup_error("500 Server Error", "",
 				"chdir failed - the server is not configured correctly");
 	}
 
-	/* Handle the possability we might be running as non-root */
+	/* Handle the possibility we might be running as non-root */
 	sec_init();
 
 	if ((lang=getenv("HTTP_ACCEPT_LANGUAGE"))) {
@@ -478,7 +478,7 @@ void cgi_setup(const char *rootdir, int auth_required)
 	inetd_server = True;
 
 	if (!check_access(1, lp_hostsallow(-1), lp_hostsdeny(-1))) {
-		cgi_setup_error("400 Server Error", "",
+		cgi_setup_error("403 Forbidden", "",
 				"Samba is configured to deny access from this client\n<br>Check your \"hosts allow\" and \"hosts deny\" options in smb.conf ");
 	}
 
-- 
cgit 


From 728da472c2c25afcfc0115e5c6bd78cf6df14ee8 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Sat, 1 Mar 2003 00:48:09 +0000
Subject: Ensure added jobs increment total_jobs. Jeremy. (This used to be
 commit d29c6853dd0c43825b3775020076f34faa5cd329)

---
 source3/printing/printing.c | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'source3')

diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index c9612ab3a9..26ea52e35a 100644
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -916,6 +916,9 @@ static void print_queue_update(int snum)
 
 	SAFE_FREE(tstruct.queue);
 
+	DEBUG(10,("print_queue_update: printer %s INFO/total_jobs = %d\n",
+				printer_name, tstruct.total_jobs ));
+
 	tdb_store_int32(pdb->tdb, "INFO/total_jobs", tstruct.total_jobs);
 
 	get_queue_status(snum, &old_status);
@@ -1733,6 +1736,9 @@ to open spool file %s.\n", pjob.filename));
 
 	pjob_store(snum, jobid, &pjob);
 
+	/* Ensure we keep a rough count of the number of total jobs... */
+	tdb_change_int32_atomic(pdb->tdb, "INFO/total_jobs", &njobs, 1);
+
 	release_print_db(pdb);
 
 	return jobid;
-- 
cgit 


From 4e5439438c452e7153f122de2ca7428e885b4c6a Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 1 Mar 2003 01:07:18 +0000
Subject: the new DEVELOPER checks for string overflows have (as expected)
 broken a lot of stuff. These two macros are meant to make life easier when
 fixing these bugs. I'm guessing we will see more macros like this (eg.
 fstrcpy_base) (This used to be commit
 50389c0cb2504d7941ec691af21d6a20ae5c5de7)

---
 source3/include/safe_string.h | 9 +++++++++
 source3/libsmb/clirap.c       | 6 +++---
 2 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'source3')

diff --git a/source3/include/safe_string.h b/source3/include/safe_string.h
index 26bf6cdd6f..431dc400aa 100644
--- a/source3/include/safe_string.h
+++ b/source3/include/safe_string.h
@@ -87,4 +87,13 @@ char * __unsafe_string_function_usage_here__(void);
 #define strlower(s) strlower_m(s)
 #define strupper(s) strupper_m(s)
 
+/* the addition of the DEVELOPER checks in safe_strcpy means we must
+ * update a lot of code. To make this a little easier here are some
+ * functions that provide the lengths with less pain */
+#define pstrcpy_base(dest, src, pstring_base) \
+    safe_strcpy(dest, src, sizeof(pstring)-PTR_DIFF(dest,pstring_base)-1)
+
+#define push_pstring_base(dest, src, pstring_base) \
+    push_ascii(dest, src, sizeof(pstring)-PTR_DIFF(dest,pstring_base)-1, STR_TERMINATE)
+
 #endif
diff --git a/source3/libsmb/clirap.c b/source3/libsmb/clirap.c
index f8f840abaa..24108d40f3 100644
--- a/source3/libsmb/clirap.c
+++ b/source3/libsmb/clirap.c
@@ -221,10 +221,10 @@ BOOL cli_NetServerEnum(struct cli_state *cli, char *workgroup, uint32 stype,
 	p = param;
 	SSVAL(p,0,0x68); /* api number */
 	p += 2;
-	pstrcpy(p,"WrLehDz");
+	pstrcpy_base(p,"WrLehDz", param);
 	p = skip_string(p,1);
   
-	pstrcpy(p,"B16BBDz");
+	pstrcpy_base(p,"B16BBDz", param);
 
 	p = skip_string(p,1);
 	SSVAL(p,0,uLevel);
@@ -233,7 +233,7 @@ BOOL cli_NetServerEnum(struct cli_state *cli, char *workgroup, uint32 stype,
 	SIVAL(p,0,stype);
 	p += 4;
 
-	p += push_pstring(p, workgroup);
+	p += push_pstring_base(p, workgroup, param);
 	
 	if (cli_api(cli, 
                     param, PTR_DIFF(p,param), 8,        /* params, length, max */
-- 
cgit 


From e2366787aea4c1a083eb481dc3e58ec09a33c9e8 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Sat, 1 Mar 2003 02:39:14 +0000
Subject: Added limit to number of jobs enumerated. Set to 0 (means no limit).
 Yes I will add the docs.... Jeremy. (This used to be commit
 4a739d914bb87a3c8d071dfd0f275a9aab1cf90a)

---
 source3/param/loadparm.c            | 4 ++++
 source3/rpc_server/srv_spoolss_nt.c | 6 ++++++
 2 files changed, 10 insertions(+)

(limited to 'source3')

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 0eeb9be9de..246023ba47 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -340,6 +340,7 @@ typedef struct
 	char *szMSDfsProxy;
 	int iMinPrintSpace;
 	int iMaxPrintJobs;
+	int iMaxReportedPrintJobs;
 	int iWriteCacheSize;
 	int iCreate_mask;
 	int iCreate_force_mode;
@@ -460,6 +461,7 @@ static service sDefault = {
 	NULL,                   /* szMSDfsProxy */
 	0,			/* iMinPrintSpace */
 	1000,			/* iMaxPrintJobs */
+	0,			/* iMaxReportedPrintJobs */
 	0,			/* iWriteCacheSize */
 	0744,			/* iCreate_mask */
 	0000,			/* iCreate_force_mode */
@@ -907,6 +909,7 @@ static struct parm_struct parm_table[] = {
 	{"Printing Options", P_SEP, P_SEPARATOR},
 	
 	{"total print jobs", P_INTEGER, P_GLOBAL, &Globals.iTotalPrintJobs, NULL, NULL, FLAG_PRINT},
+	{"max reported print jobs", P_INTEGER, P_LOCAL, &sDefault.iMaxReportedPrintJobs, NULL, NULL, FLAG_PRINT},
 	{"max print jobs", P_INTEGER, P_LOCAL, &sDefault.iMaxPrintJobs, NULL, NULL, FLAG_PRINT},
 	{"load printers", P_BOOL, P_GLOBAL, &Globals.bLoadPrinters, NULL, NULL, FLAG_PRINT},
 	{"printcap name", P_STRING, P_GLOBAL, &Globals.szPrintcapname, NULL, NULL, FLAG_PRINT | FLAG_DEVELOPER},
@@ -1838,6 +1841,7 @@ FN_LOCAL_INTEGER(lp_max_connections, iMaxConnections)
 FN_LOCAL_INTEGER(lp_defaultcase, iDefaultCase)
 FN_LOCAL_INTEGER(lp_minprintspace, iMinPrintSpace)
 FN_LOCAL_INTEGER(lp_printing, iPrinting)
+FN_LOCAL_INTEGER(lp_max_reported_jobs, iMaxReportedPrintJobs)
 FN_LOCAL_INTEGER(lp_oplock_contention_limit, iOplockContentionLimit)
 FN_LOCAL_INTEGER(lp_csc_policy, iCSCPolicy)
 FN_LOCAL_INTEGER(lp_write_cache_size, iWriteCacheSize)
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 4006d0c08e..b321832930 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -6323,6 +6323,7 @@ WERROR _spoolss_enumjobs( pipes_struct *p, SPOOL_Q_ENUMJOBS *q_u, SPOOL_R_ENUMJO
 	int snum;
 	print_status_struct prt_status;
 	print_queue_struct *queue=NULL;
+	int max_rep_jobs;
 
 	/* that's an [in out] buffer */
 	spoolss_move_buffer(q_u->buffer, &r_u->buffer);
@@ -6336,6 +6337,8 @@ WERROR _spoolss_enumjobs( pipes_struct *p, SPOOL_Q_ENUMJOBS *q_u, SPOOL_R_ENUMJO
 	if (!get_printer_snum(p, handle, &snum))
 		return WERR_BADFID;
 
+	max_rep_jobs = lp_max_reported_jobs(snum);
+
 	*returned = print_queue_status(snum, &queue, &prt_status);
 	DEBUGADD(4,("count:[%d], status:[%d], [%s]\n", *returned, prt_status.status, prt_status.message));
 
@@ -6344,6 +6347,9 @@ WERROR _spoolss_enumjobs( pipes_struct *p, SPOOL_Q_ENUMJOBS *q_u, SPOOL_R_ENUMJO
 		return WERR_OK;
 	}
 
+	if (max_rep_jobs && (*returned > max_rep_jobs))
+		*returned = max_rep_jobs;
+
 	switch (level) {
 	case 1:
 		return enumjobs_level1(queue, snum, buffer, offered, needed, returned);
-- 
cgit 


From 9043696121cf05fc64f12507058dd56345809a6f Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 1 Mar 2003 10:47:38 +0000
Subject: i forgot to commit the privilege db init call (This used to be commit
 e8ec2b118071ce1d8cbfbcebce3781ac753c5c22)

---
 source3/smbd/server.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'source3')

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index b7fb3b5701..0bcfcb9c78 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -894,6 +894,10 @@ static BOOL init_structs(void )
 	if (!init_change_notify())
 		exit(1);
 
+	/* Setup privileges database */
+	if (!privilege_init())
+		exit(1);
+
 	/* re-initialise the timezone */
 	TimeInit();
 
-- 
cgit 


From aa543f1345a2a10b65d6f3162f7db81b96db3d6a Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 3 Mar 2003 08:35:49 +0000
Subject: Add const (This used to be commit
 251b91f46988053eccc53f814a23ed5ca787c852)

---
 source3/libsmb/clispnego.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/libsmb/clispnego.c b/source3/libsmb/clispnego.c
index dfa8f80146..53f7eb6e7d 100644
--- a/source3/libsmb/clispnego.c
+++ b/source3/libsmb/clispnego.c
@@ -260,7 +260,7 @@ BOOL parse_negTokenTarg(DATA_BLOB blob, char *OIDs[ASN1_MAX_OIDS], DATA_BLOB *se
 /*
   generate a krb5 GSS-API wrapper packet given a ticket
 */
-DATA_BLOB spnego_gen_krb5_wrap(DATA_BLOB ticket, uint8 tok_id[2])
+DATA_BLOB spnego_gen_krb5_wrap(DATA_BLOB ticket, const uint8 tok_id[2])
 {
 	ASN1_DATA data;
 	DATA_BLOB ret;
-- 
cgit 


From 1cf903851279309b9060357ce73e1ed680757929 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 3 Mar 2003 09:12:40 +0000
Subject: Fixes to the vfs_fake_perms modules - we only need to specify the VFS
 functions that we actually modify.

Also a better implementation of the stat() and fstat() functions.

Andrew Bartlett
(This used to be commit 03e74be11cf76167ed211398016274cbaba5847b)
---
 source3/modules/vfs_fake_perms.c | 240 +++++----------------------------------
 1 file changed, 29 insertions(+), 211 deletions(-)

(limited to 'source3')

diff --git a/source3/modules/vfs_fake_perms.c b/source3/modules/vfs_fake_perms.c
index 7fbf27e907..85515df21a 100644
--- a/source3/modules/vfs_fake_perms.c
+++ b/source3/modules/vfs_fake_perms.c
@@ -44,184 +44,41 @@
 static struct vfs_ops default_vfs_ops;   /* For passthrough operation */
 static struct smb_vfs_handle_struct *fake_perms_handle; /* use fake_perms_handle->data for storing per-instance private data */
 
-static int fake_perms_connect(struct connection_struct *conn, const char *service, const char *user)    
-{
-	return default_vfs_ops.connect(conn, service, user);
-}
-
-static void fake_perms_disconnect(struct connection_struct *conn)
-{
-	default_vfs_ops.disconnect(conn);
-}
-
-static SMB_BIG_UINT fake_perms_disk_free(struct connection_struct *conn, const char *path,
-	BOOL small_query, SMB_BIG_UINT *bsize,
-	SMB_BIG_UINT *dfree, SMB_BIG_UINT *dsize)
-{
-	return default_vfs_ops.disk_free(conn, path, small_query, bsize, 
-					 dfree, dsize);
-}
-
-static DIR *fake_perms_opendir(struct connection_struct *conn, const char *fname)
-{
-	return default_vfs_ops.opendir(conn, fname);
-}
-
-static struct dirent *fake_perms_readdir(struct connection_struct *conn, DIR *dirp)
-{
-	return default_vfs_ops.readdir(conn, dirp);
-}
-
-static int fake_perms_mkdir(struct connection_struct *conn, const char *path, mode_t mode)
-{
-	return default_vfs_ops.mkdir(conn, path, mode);
-}
-
-static int fake_perms_rmdir(struct connection_struct *conn, const char *path)
-{
-	return default_vfs_ops.rmdir(conn, path);
-}
-
-static int fake_perms_closedir(struct connection_struct *conn, DIR *dir)
-{
-	return default_vfs_ops.closedir(conn, dir);
-}
-
-static int fake_perms_open(struct connection_struct *conn, const char *fname, int flags, mode_t mode)
-{
-	return default_vfs_ops.open(conn, fname, flags, mode);
-}
-
-static int fake_perms_close(struct files_struct *fsp, int fd)
-{
-	return default_vfs_ops.close(fsp, fd);
-}
-
-static ssize_t fake_perms_read(struct files_struct *fsp, int fd, void *data, size_t n)
-{
-	return default_vfs_ops.read(fsp, fd, data, n);
-}
-
-static ssize_t fake_perms_write(struct files_struct *fsp, int fd, const void *data, size_t n)
-{
-	return default_vfs_ops.write(fsp, fd, data, n);
-}
-
-static SMB_OFF_T fake_perms_lseek(struct files_struct *fsp, int filedes, SMB_OFF_T offset, int whence)
-{
-	return default_vfs_ops.lseek(fsp, filedes, offset, whence);
-}
-
-static int fake_perms_rename(struct connection_struct *conn, const char *old, const char *new)
-{
-	return default_vfs_ops.rename(conn, old, new);
-}
-
-static int fake_perms_fsync(struct files_struct *fsp, int fd)
-{
-	return default_vfs_ops.fsync(fsp, fd);
-}
-
 static int fake_perms_stat(struct connection_struct *conn, const char *fname, SMB_STRUCT_STAT *sbuf)
 {
 	int ret = default_vfs_ops.stat(conn, fname, sbuf);
-	extern struct current_user current_user;
-	
-	if (S_ISDIR(sbuf->st_mode)) {
-		sbuf->st_mode = S_IFDIR | S_IRWXU;
-	} else {
-		sbuf->st_mode = S_IRWXU;
+	if (ret == 0) {
+		extern struct current_user current_user;
+		
+		if (S_ISDIR(sbuf->st_mode)) {
+			sbuf->st_mode = S_IFDIR | S_IRWXU;
+		} else {
+			sbuf->st_mode = S_IRWXU;
+		}
+		sbuf->st_uid = current_user.uid;
+		sbuf->st_gid = current_user.gid;
 	}
-	sbuf->st_uid = current_user.uid;
-	sbuf->st_gid = current_user.gid;
 	return ret;
 }
 
 static int fake_perms_fstat(struct files_struct *fsp, int fd, SMB_STRUCT_STAT *sbuf)
 {
-	return default_vfs_ops.fstat(fsp, fd, sbuf);
-}
-
-static int fake_perms_lstat(struct connection_struct *conn, const char *path, SMB_STRUCT_STAT *sbuf)
-{
-	return default_vfs_ops.lstat(conn, path, sbuf);
-}
-
-static int fake_perms_unlink(struct connection_struct *conn, const char *path)
-{
-	return default_vfs_ops.unlink(conn, path);
-}
-
-static int fake_perms_chmod(struct connection_struct *conn, const char *path, mode_t mode)
-{
-	return default_vfs_ops.chmod(conn, path, mode);
-}
-
-static int fake_perms_fchmod(struct files_struct *fsp, int fd, mode_t mode)
-{
-	return default_vfs_ops.fchmod(fsp, fd, mode);
-}
-
-static int fake_perms_chown(struct connection_struct *conn, const char *path, uid_t uid, gid_t gid)
-{
-	return default_vfs_ops.chown(conn, path, uid, gid);
-}
-
-static int fake_perms_fchown(struct files_struct *fsp, int fd, uid_t uid, gid_t gid)
-{
-	return default_vfs_ops.fchown(fsp, fd, uid, gid);
-}
-
-static int fake_perms_chdir(struct connection_struct *conn, const char *path)
-{
-	return default_vfs_ops.chdir(conn, path);
-}
-
-static char *fake_perms_getwd(struct connection_struct *conn, char *buf)
-{
-	return default_vfs_ops.getwd(conn, buf);
-}
-
-static int fake_perms_utime(struct connection_struct *conn, const char *path, struct utimbuf *times)
-{
-	return default_vfs_ops.utime(conn, path, times);
-}
-
-static int fake_perms_ftruncate(struct files_struct *fsp, int fd, SMB_OFF_T offset)
-{
-	return default_vfs_ops.ftruncate(fsp, fd, offset);
-}
-
-static BOOL fake_perms_lock(struct files_struct *fsp, int fd, int op, SMB_OFF_T offset, SMB_OFF_T count, int type)
-{
-	return default_vfs_ops.lock(fsp, fd, op, offset, count, type);
-}
-
-static BOOL fake_perms_symlink(struct connection_struct *conn, const char *oldpath, const char *newpath)
-{
-	return default_vfs_ops.symlink(conn, oldpath, newpath);
-}
-
-static BOOL fake_perms_readlink(struct connection_struct *conn, const char *path, char *buf, size_t bufsiz)
-{
-	return default_vfs_ops.readlink(conn, path, buf, bufsiz);
-}
-
-static int fake_perms_link(struct connection_struct *conn, const char *oldpath, const char *newpath)
-{
-	return default_vfs_ops.link(conn, oldpath, newpath);
-}
-
-static int fake_perms_mknod(struct connection_struct *conn, const char *path, mode_t mode, SMB_DEV_T dev)
-{
-	return default_vfs_ops.mknod(conn, path, mode, dev);
-}
-
-static char *fake_perms_realpath(struct connection_struct *conn, const char *path, char *resolved_path)
-{
-	return default_vfs_ops.realpath(conn, path, resolved_path);
+	int ret = default_vfs_ops.fstat(fsp, fd, sbuf);
+	if (ret == 0) {
+		extern struct current_user current_user;
+		
+		if (S_ISDIR(sbuf->st_mode)) {
+			sbuf->st_mode = S_IFDIR | S_IRWXU;
+		} else {
+			sbuf->st_mode = S_IRWXU;
+		}
+		sbuf->st_uid = current_user.uid;
+		sbuf->st_gid = current_user.gid;
+	}
+	return ret;
 }
 
+#if 0
 static size_t fake_perms_fget_nt_acl(struct files_struct *fsp, int fd, struct security_descriptor_info **ppdesc)
 {
 	return default_vfs_ops.fget_nt_acl(fsp, fd, ppdesc);
@@ -361,56 +218,14 @@ static int fake_perms_sys_acl_free_qualifier(struct connection_struct *conn, voi
 {
 	return default_vfs_ops.sys_acl_free_qualifier(conn, qualifier, tagtype);
 }
-
+#endif
 
 /* VFS operations structure */
 
 static vfs_op_tuple fake_perms_ops[] = {
 
-	/* Disk operations */
-
-	{fake_perms_connect,			SMB_VFS_OP_CONNECT, 		SMB_VFS_LAYER_TRANSPARENT},
-	{fake_perms_disconnect,		SMB_VFS_OP_DISCONNECT,		SMB_VFS_LAYER_TRANSPARENT},
-	{fake_perms_disk_free,		SMB_VFS_OP_DISK_FREE,		SMB_VFS_LAYER_TRANSPARENT},
-	
-	/* Directory operations */
-
-	{fake_perms_opendir,			SMB_VFS_OP_OPENDIR,		SMB_VFS_LAYER_TRANSPARENT},
-	{fake_perms_readdir,			SMB_VFS_OP_READDIR,		SMB_VFS_LAYER_TRANSPARENT},
-	{fake_perms_mkdir,			SMB_VFS_OP_MKDIR,		SMB_VFS_LAYER_TRANSPARENT},
-	{fake_perms_rmdir,			SMB_VFS_OP_RMDIR,		SMB_VFS_LAYER_TRANSPARENT},
-	{fake_perms_closedir,			SMB_VFS_OP_CLOSEDIR,		SMB_VFS_LAYER_TRANSPARENT},
-
-	/* File operations */
-
-	{fake_perms_open,			SMB_VFS_OP_OPEN,		SMB_VFS_LAYER_TRANSPARENT},
-	{fake_perms_close,			SMB_VFS_OP_CLOSE,		SMB_VFS_LAYER_TRANSPARENT},
-	{fake_perms_read,			SMB_VFS_OP_READ,		SMB_VFS_LAYER_TRANSPARENT},
-	{fake_perms_write,			SMB_VFS_OP_WRITE,		SMB_VFS_LAYER_TRANSPARENT},
-	{fake_perms_lseek,			SMB_VFS_OP_LSEEK,		SMB_VFS_LAYER_TRANSPARENT},
-	{fake_perms_rename,			SMB_VFS_OP_RENAME,		SMB_VFS_LAYER_TRANSPARENT},
-	{fake_perms_fsync,			SMB_VFS_OP_FSYNC,		SMB_VFS_LAYER_TRANSPARENT},
-	{fake_perms_stat,			SMB_VFS_OP_STAT,		SMB_VFS_LAYER_TRANSPARENT},
-	{fake_perms_fstat,			SMB_VFS_OP_FSTAT,		SMB_VFS_LAYER_TRANSPARENT},
-	{fake_perms_lstat,			SMB_VFS_OP_LSTAT,		SMB_VFS_LAYER_TRANSPARENT},
-	{fake_perms_unlink,			SMB_VFS_OP_UNLINK,		SMB_VFS_LAYER_TRANSPARENT},
-	{fake_perms_chmod,			SMB_VFS_OP_CHMOD,		SMB_VFS_LAYER_TRANSPARENT},
-	{fake_perms_fchmod,			SMB_VFS_OP_FCHMOD,		SMB_VFS_LAYER_TRANSPARENT},
-	{fake_perms_chown,			SMB_VFS_OP_CHOWN,		SMB_VFS_LAYER_TRANSPARENT},
-	{fake_perms_fchown,			SMB_VFS_OP_FCHOWN,		SMB_VFS_LAYER_TRANSPARENT},
-	{fake_perms_chdir,			SMB_VFS_OP_CHDIR,		SMB_VFS_LAYER_TRANSPARENT},
-	{fake_perms_getwd,			SMB_VFS_OP_GETWD,		SMB_VFS_LAYER_TRANSPARENT},
-	{fake_perms_utime,			SMB_VFS_OP_UTIME,		SMB_VFS_LAYER_TRANSPARENT},
-	{fake_perms_ftruncate,		SMB_VFS_OP_FTRUNCATE,		SMB_VFS_LAYER_TRANSPARENT},
-	{fake_perms_lock,			SMB_VFS_OP_LOCK,		SMB_VFS_LAYER_TRANSPARENT},
-	{fake_perms_symlink,			SMB_VFS_OP_SYMLINK,		SMB_VFS_LAYER_TRANSPARENT},
-	{fake_perms_readlink,			SMB_VFS_OP_READLINK,		SMB_VFS_LAYER_TRANSPARENT},
-	{fake_perms_link,			SMB_VFS_OP_LINK,		SMB_VFS_LAYER_TRANSPARENT},
-	{fake_perms_mknod,			SMB_VFS_OP_MKNOD,		SMB_VFS_LAYER_TRANSPARENT},
-	{fake_perms_realpath,			SMB_VFS_OP_REALPATH,		SMB_VFS_LAYER_TRANSPARENT},
-
 	/* NT File ACL operations */
-
+#if 0
 	{fake_perms_fget_nt_acl,		SMB_VFS_OP_FGET_NT_ACL,		SMB_VFS_LAYER_TRANSPARENT},
 	{fake_perms_get_nt_acl,		SMB_VFS_OP_GET_NT_ACL,		SMB_VFS_LAYER_TRANSPARENT},
 	{fake_perms_fset_nt_acl,		SMB_VFS_OP_FSET_NT_ACL,		SMB_VFS_LAYER_TRANSPARENT},
@@ -443,7 +258,10 @@ static vfs_op_tuple fake_perms_ops[] = {
 	{fake_perms_sys_acl_free_text,	SMB_VFS_OP_SYS_ACL_FREE_TEXT,		SMB_VFS_LAYER_TRANSPARENT},
 	{fake_perms_sys_acl_free_acl,		SMB_VFS_OP_SYS_ACL_FREE_ACL,		SMB_VFS_LAYER_TRANSPARENT},
 	{fake_perms_sys_acl_free_qualifier,	SMB_VFS_OP_SYS_ACL_FREE_QUALIFIER,	SMB_VFS_LAYER_TRANSPARENT},
+#endif
 	
+	{fake_perms_stat,	SMB_VFS_OP_STAT,	SMB_VFS_LAYER_TRANSPARENT},
+	{fake_perms_fstat,	SMB_VFS_OP_FSTAT,	SMB_VFS_LAYER_TRANSPARENT},
 	{NULL,	SMB_VFS_OP_NOOP,	SMB_VFS_LAYER_NOOP}
 };
 
-- 
cgit 


From 04efc2dcf7cad460edc5646c066afb1300ba962f Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 3 Mar 2003 09:16:21 +0000
Subject: Try the PASSWD environment variable if we don't have one from the
 command line. (This used to be commit
 14d7d8b22993ca7f1c273a7baaccb09c8fa04ef9)

---
 source3/utils/net.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'source3')

diff --git a/source3/utils/net.c b/source3/utils/net.c
index ada0ed53e1..c1285bc64b 100644
--- a/source3/utils/net.c
+++ b/source3/utils/net.c
@@ -636,6 +636,10 @@ static struct functable net_func[] = {
 			exit(1);
 		}
 	}
+
+	if (!opt_password) {
+		opt_password = getenv("PASSWD");
+	}
   	 
 	rc = net_run_function(argc_new-1, argv_new+1, net_func, net_help);
 	
-- 
cgit 


From 21be9e77761f56abf2b00d4faece2fae2f45e3b6 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Mon, 3 Mar 2003 16:34:19 +0000
Subject: * CR1868: only send a change notify message if we have something  
 that changed that the client is monitoring.

* couple of comments abnout how we need to validate driver names
  on SetPrinter() and AddPrinter()

* up the debug level on some overly verbose dev mode parsing messages
(This used to be commit 7377d671e8a95ac2ab0452f564b18b2a098699cb)
---
 source3/rpc_parse/parse_spoolss.c   |  2 +-
 source3/rpc_server/srv_spoolss_nt.c | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'source3')

diff --git a/source3/rpc_parse/parse_spoolss.c b/source3/rpc_parse/parse_spoolss.c
index 47737908f0..0545f89ff7 100644
--- a/source3/rpc_parse/parse_spoolss.c
+++ b/source3/rpc_parse/parse_spoolss.c
@@ -789,7 +789,7 @@ BOOL spoolss_io_devmode(const char *desc, prs_struct *ps, int depth, DEVICEMODE
 	
 	while ((available_space > 0)  && (i < DM_NUM_OPTIONAL_FIELDS))
 	{
-		DEBUG(10, ("spoolss_io_devmode: [%d] bytes left to parse in devmode\n", available_space));
+		DEBUG(11, ("spoolss_io_devmode: [%d] bytes left to parse in devmode\n", available_space));
 		if (!prs_uint32(opt_fields[i].name, ps, depth, opt_fields[i].field))
 			return False;
 		available_space -= sizeof(uint32);
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index b321832930..4090800fc9 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -900,7 +900,7 @@ static void send_notify2_changes( SPOOLSS_NOTIFY_MSG_CTR *ctr, uint32 idx )
 	TALLOC_CTX		 *mem_ctx = notify_ctr_getctx( ctr );
 	SPOOLSS_NOTIFY_MSG_GROUP *msg_group = notify_ctr_getgroup( ctr, idx );
 	SPOOLSS_NOTIFY_MSG       *messages;
-	
+	int			 sending_msg_count;
 	
 	if ( !msg_group ) {
 		DEBUG(5,("send_notify2_changes() called with no msg group!\n"));
@@ -949,6 +949,8 @@ static void send_notify2_changes( SPOOLSS_NOTIFY_MSG_CTR *ctr, uint32 idx )
 		
 		/* build the array of change notifications */
 		
+		sending_msg_count = 0;
+		
 		for ( i=0; i<msg_group->num_msgs; i++ ) {
 			SPOOLSS_NOTIFY_MSG	*msg = &messages[i];
 			
@@ -957,6 +959,8 @@ static void send_notify2_changes( SPOOLSS_NOTIFY_MSG_CTR *ctr, uint32 idx )
 			if (!is_monitoring_event(p, msg->type, msg->field))
 				continue;
 
+			sending_msg_count++;
+			
 			
 			DEBUG(10,("process_notify2_message: Sending message type [%x] field [%x] for printer [%s]\n",
 				msg->type, msg->field, p->dev.handlename));
@@ -1012,9 +1016,11 @@ static void send_notify2_changes( SPOOLSS_NOTIFY_MSG_CTR *ctr, uint32 idx )
 			data_len++;
 		}
 
+		if ( sending_msg_count ) {
 		cli_spoolss_rrpcn( &notify_cli, mem_ctx, &p->notify.client_hnd, 
 				data_len, data, p->notify.change, 0 );
 	}
+	}
 	
 done:
 	DEBUG(8,("send_notify2_changes: Exit...\n"));
@@ -5886,6 +5892,9 @@ static WERROR update_printer(pipes_struct *p, POLICY_HND *handle, uint32 level,
 		goto done;
 	}
 
+	/* FIXME!!! If the driver has changed we really should verify that 
+	   it is installed before doing much else   --jerry */
+
 	/* Check calling user has permission to update printer description */
 
 	if (Printer->access_granted != PRINTER_ACCESS_ADMINISTER) {
@@ -7177,6 +7186,9 @@ static WERROR spoolss_addprinterex_level_2( pipes_struct *p, const UNISTR2 *uni_
 		free_a_printer(&printer, 2);
 		return WERR_PRINTER_ALREADY_EXISTS;
 	}
+	
+	/* FIXME!!!  smbd should check to see if the driver is installed before
+	   trying to add a printer like this  --jerry */
 
 	if (*lp_addprinter_cmd() ) {
 		if ( !add_printer_hook(printer) ) {
-- 
cgit 


From 03a4c1907f93a2efb985ca69180f800be285926d Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Mon, 3 Mar 2003 17:33:57 +0000
Subject: * always report ourselves as a Windows 2000 print server (even  
 without ADS support) * add "MinorVersion" print server data key and comment
 on "OSVersion" (This used to be commit
 342734e3de71c7dc8e3d24fd66dae58cf647a569)

---
 source3/rpc_server/srv_spoolss_nt.c | 37 +++++++++++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 8 deletions(-)

(limited to 'source3')

diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 4090800fc9..8073e3cf28 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -2220,14 +2220,37 @@ static WERROR getprinterdata_printer_server(TALLOC_CTX *ctx, fstring value, uint
 		*type = 0x4;
 		if((*data = (uint8 *)talloc(ctx, 4*sizeof(uint8) )) == NULL)
 			return WERR_NOMEM;
-#ifdef HAVE_ADS
 		SIVAL(*data, 0, 3);
-#else
+		*needed = 0x4;
+		return WERR_OK;
+	}
+
+	if (!StrCaseCmp(value, "MinorVersion")) {
+		*type = 0x4;
+		if((*data = (uint8 *)talloc(ctx, 4*sizeof(uint8) )) == NULL)
+			return WERR_NOMEM;
+		SIVAL(*data, 0, 0);
+		*needed = 0x4;
+		return WERR_OK;
+	}
+
+#if 0	/* JERRY */	
+	/* REG_BINARY
+	 *  uint32 size	 	 = 0x114
+	 *  uint32 major	 = 5
+	 *  uint32 minor	 = [0|1]
+	 *  uint32 build 	 = [2195|2600]
+	 *  extra unicode string = e.g. "Service Pack 3"
+	 */
+	if (!StrCaseCmp(value, "OSVersion")) {
+		*type = 0x4;
+		if((*data = (uint8 *)talloc(ctx, 4*sizeof(uint8) )) == NULL)
+			return WERR_NOMEM;
 		SIVAL(*data, 0, 2);
-#endif
 		*needed = 0x4;
 		return WERR_OK;
 	}
+#endif
 
    	if (!StrCaseCmp(value, "DefaultSpoolDirectory")) {
 		fstring string;
@@ -3843,13 +3866,11 @@ static BOOL construct_printer_info_0(Printer_entry *print_hnd, PRINTER_INFO_0 *p
 
 	printer->global_counter = global_counter;
 	printer->total_pages = 0;
-#ifdef HAVE_ADS
+	
+	/* in 2.2 we reported ourselves as 0x0004 and 0x0565 */
 	printer->major_version = 0x0005; 	/* NT 5 */
 	printer->build_version = 0x0893; 	/* build 2195 */
-#else
-	printer->major_version = 0x0004; 	/* NT 4 */
-	printer->build_version = 0x0565; 	/* build 1381 */
-#endif
+	
 	printer->unknown7 = 0x1;
 	printer->unknown8 = 0x0;
 	printer->unknown9 = 0x0;
-- 
cgit 


From 3042cfb7fabe25cc06e5cf6c49c2716c1112b6d2 Mon Sep 17 00:00:00 2001
From: Richard Sharpe <sharpe@samba.org>
Date: Mon, 3 Mar 2003 17:43:33 +0000
Subject: Do my janitorial duties to encourage others to do so. Fix lingering
 large offset problems in smbtar etc. (This used to be commit
 c416eec2f2a38eebfcda5868999d474628037f1e)

---
 source3/client/clitar.c  | 13 +++++++------
 source3/libsmb/clifile.c |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'source3')

diff --git a/source3/client/clitar.c b/source3/client/clitar.c
index e8be5e04e7..74d901a2ca 100644
--- a/source3/client/clitar.c
+++ b/source3/client/clitar.c
@@ -959,9 +959,10 @@ static int skip_file(int skipsize)
 
 static int get_file(file_info2 finfo)
 {
-  int fnum = -1, pos = 0, dsize = 0, rsize = 0, bpos = 0;
+  int fnum = -1, pos = 0, dsize = 0, bpos = 0;
+  SMB_BIG_UINT rsize = 0;
 
-  DEBUG(5, ("get_file: file: %s, size %i\n", finfo.name, (int)finfo.size));
+  DEBUG(5, ("get_file: file: %s, size %.0f\n", finfo.name, (double)finfo.size));
 
   if (ensurepath(finfo.name) && 
       (fnum=cli_open(cli, finfo.name, O_RDWR|O_CREAT|O_TRUNC, DENY_NONE)) == -1) {
@@ -1052,7 +1053,7 @@ static int get_file(file_info2 finfo)
 
   ntarf++;
 
-  DEBUG(0, ("restore tar file %s of size %d bytes\n", finfo.name, (int)finfo.size));
+  DEBUG(0, ("restore tar file %s of size %.0f bytes\n", finfo.name, (double)finfo.size));
   
   return(True);
 }
@@ -1082,18 +1083,18 @@ static int get_dir(file_info2 finfo)
 */
 static char * get_longfilename(file_info2 finfo)
 {
-  int namesize = finfo.size + strlen(cur_dir) + 2;
+  int namesize = strlen(finfo.name) + strlen(cur_dir) + 2;
   char *longname = malloc(namesize);
   int offset = 0, left = finfo.size;
   BOOL first = True;
 
   DEBUG(5, ("Restoring a long file name: %s\n", finfo.name));
-  DEBUG(5, ("Len = %d\n", (int)finfo.size));
+  DEBUG(5, ("Len = %.0f\n", (double)finfo.size));
 
   if (longname == NULL) {
 
     DEBUG(0, ("could not allocate buffer of size %d for longname\n", 
-	      (int)(finfo.size + strlen(cur_dir) + 2)));
+	      namesize));
     return(NULL);
   }
 
diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c
index 07b1ff6b6f..31d7ea5911 100644
--- a/source3/libsmb/clifile.c
+++ b/source3/libsmb/clifile.c
@@ -805,7 +805,7 @@ BOOL cli_unlock64(struct cli_state *cli, int fnum, SMB_BIG_UINT offset, SMB_BIG_
 ****************************************************************************/
 
 BOOL cli_getattrE(struct cli_state *cli, int fd, 
-		  uint16 *attr, size_t *size, 
+		  uint16 *attr, SMB_BIG_UINT *size, 
 		  time_t *c_time, time_t *a_time, time_t *m_time)
 {
 	memset(cli->outbuf,'\0',smb_size);
-- 
cgit 


From 56d0621264b3e62d8672dbb1aa4422b7cb5afc59 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Mon, 3 Mar 2003 19:36:16 +0000
Subject: Fix "might be used uninitialised" warnings. Jeremy. (This used to be
 commit a670b57c563b220c2ede1dac4ce1e9c71c866498)

---
 source3/nsswitch/winbindd_rpc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3')

diff --git a/source3/nsswitch/winbindd_rpc.c b/source3/nsswitch/winbindd_rpc.c
index 9989f27109..9ec35617f1 100644
--- a/source3/nsswitch/winbindd_rpc.c
+++ b/source3/nsswitch/winbindd_rpc.c
@@ -344,7 +344,7 @@ static NTSTATUS query_user(struct winbindd_domain *domain,
 			   DOM_SID *user_sid, 
 			   WINBIND_USERINFO *user_info)
 {
-	CLI_POLICY_HND *hnd;
+	CLI_POLICY_HND *hnd = NULL;
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
 	POLICY_HND dom_pol, user_pol;
 	BOOL got_dom_pol = False, got_user_pol = False;
@@ -509,7 +509,7 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain *domain,
 				DOM_SID ***sid_mem, char ***names, 
 				uint32 **name_types)
 {
-        CLI_POLICY_HND *hnd;
+        CLI_POLICY_HND *hnd = NULL;
         NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
         uint32 i, total_names = 0;
         POLICY_HND dom_pol, group_pol;
-- 
cgit 


From f434f039e606c368eacb995e30c859daa85c64eb Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Mon, 3 Mar 2003 19:53:04 +0000
Subject: dlsym takes a const char *. Jeremy. (This used to be commit
 ff3827a62b37342b13fd8b4eafd256d91428c02b)

---
 source3/lib/system.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/lib/system.c b/source3/lib/system.c
index 18cccda935..6ff97b88da 100644
--- a/source3/lib/system.c
+++ b/source3/lib/system.c
@@ -1192,7 +1192,7 @@ void *sys_dlopen(const char *name, int flags)
 #endif
 }
 
-void *sys_dlsym(void *handle, char *symbol)
+void *sys_dlsym(void *handle, const char *symbol)
 {
 #if defined(HAVE_DLSYM)
     return dlsym(handle, symbol);
-- 
cgit 


From 6a58faf46225ffd4c977fe82b8b45374f65c1cec Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Mon, 3 Mar 2003 20:12:07 +0000
Subject: Const warning fixes. Jeremy. (This used to be commit
 3ad62ebe26d8c6b82f8618eea11d104b3ab0ec18)

---
 source3/smbd/vfs.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3')

diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index 6574a34eaa..533c64b229 100644
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -636,7 +636,7 @@ static BOOL handle_vfs_option(char *pszParmValue, char **ptr)
  A wrapper for vfs_chdir().
 ********************************************************************/
 
-int vfs_ChDir(connection_struct *conn, char *path)
+int vfs_ChDir(connection_struct *conn, const char *path)
 {
 	int res;
 	static pstring LastDir="";
@@ -784,7 +784,7 @@ char *vfs_GetWd(connection_struct *conn, char *path)
 /* check if the file 'nmae' is a symlink, in that case check that it point to
    a file that reside under the 'dir' tree */
 
-static BOOL readlink_check(connection_struct *conn, char *dir, char *name)
+static BOOL readlink_check(connection_struct *conn, const char *dir, char *name)
 {
 	BOOL ret = True;
 	pstring flink;
-- 
cgit 


From 7f15d5828f6683f2490ef864a2176919549880d7 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 3 Mar 2003 23:53:35 +0000
Subject: Another pstrcpy() into malloc()ed buffer fix.

Andrew Bartlett
(This used to be commit bd0c84d60b703e89081838a7cfa1eb1b4f45ad0a)
---
 source3/smbd/statcache.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3')

diff --git a/source3/smbd/statcache.c b/source3/smbd/statcache.c
index f4b613428a..b6e84ec9a5 100644
--- a/source3/smbd/statcache.c
+++ b/source3/smbd/statcache.c
@@ -106,8 +106,8 @@ void stat_cache_add( char *full_orig_name, char *orig_translated_path)
         DEBUG(0,("stat_cache_add: Out of memory !\n"));
         return;
       }
-      pstrcpy(scp->names, orig_name);
-      pstrcpy((scp->names+namelen+1), translated_path);
+      safe_strcpy(scp->names, orig_name, namelen);
+      safe_strcpy((scp->names+namelen+1), translated_path, namelen);
       scp->name_len = namelen;
       hash_insert(&stat_cache, (char *)scp, orig_name);
     }
-- 
cgit 


From c502756113d53c7000c0f83a109ac36cb3a1020b Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 4 Mar 2003 09:33:34 +0000
Subject: Fix another 'off by one' bug with safe_strcpy().  It is unclear if
 the intent was to limit the string to 31 or 32 characters (excluding the null
 term), so I've assumed for now that 32 is fine, as this matches current
 behaviour (well, current behaviour would crash, but anyway...)

Jerry:  Can you look at this for me?

Andrew Bartlett
(This used to be commit 6c43327ea2b50820ea4f623c889dc4525d58baa3)
---
 source3/printing/nt_printing.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3')

diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index 0f5067c5a0..4c454ef111 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -2106,7 +2106,7 @@ done:
 NT_DEVICEMODE *construct_nt_devicemode(const fstring default_devicename)
 {
 
-	char adevice[32];
+	char adevice[33];
 	NT_DEVICEMODE *nt_devmode = (NT_DEVICEMODE *)malloc(sizeof(NT_DEVICEMODE));
 
 	if (nt_devmode == NULL) {
@@ -2116,7 +2116,7 @@ NT_DEVICEMODE *construct_nt_devicemode(const fstring default_devicename)
 
 	ZERO_STRUCTP(nt_devmode);
 
-	safe_strcpy(adevice, default_devicename, sizeof(adevice));
+	safe_strcpy(adevice, default_devicename, sizeof(adevice)-1);
 	fstrcpy(nt_devmode->devicename, adevice);	
 	
 	fstrcpy(nt_devmode->formname, "Letter");
-- 
cgit 


From fe45e6d79a61df5f25e461603ff93c563da186b7 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Wed, 5 Mar 2003 00:54:07 +0000
Subject: Connectathon fix. W2K -> W2K over port 445 doing a tconX does the
 full \\server\share syntax, not just a "share" tconX syntax. This broke
 interop with a vendor. Jeremy. (This used to be commit
 9d7ea5585c873156ede4b56e43a0d4d75077283a)

---
 source3/libsmb/cliconnect.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'source3')

diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 4962ffa3c9..49b0004ac2 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -780,13 +780,8 @@ BOOL cli_send_tconX(struct cli_state *cli,
 		}
 	}
 
-	if (cli->port == 445) {
-		slprintf(fullshare, sizeof(fullshare)-1,
-			 "%s", share);
-	} else {
-		slprintf(fullshare, sizeof(fullshare)-1,
-			 "\\\\%s\\%s", cli->desthost, share);
-	}
+	slprintf(fullshare, sizeof(fullshare)-1,
+		 "\\\\%s\\%s", cli->desthost, share);
 
 	set_message(cli->outbuf,4, 0, True);
 	SCVAL(cli->outbuf,smb_com,SMBtconX);
-- 
cgit 


From 1cdafbf17ebbcb1840cdb1bde3b49600406ed904 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Wed, 5 Mar 2003 01:30:26 +0000
Subject: Writable string const fixes. Jeremy. (This used to be commit
 60b0cfc8a5b6275d3460ebc6bf17d0f08e25b67e)

---
 source3/libsmb/namequery.c     |  2 +-
 source3/printing/lpq_parse.c   |  2 +-
 source3/printing/nt_printing.c | 18 ++++++++++++------
 3 files changed, 14 insertions(+), 8 deletions(-)

(limited to 'source3')

diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index 62b94761ad..18ce5e4bd9 100644
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -1263,7 +1263,7 @@ BOOL get_dc_list(const char *domain, struct in_addr **ip_list, int *count, int *
 	/* If it's our domain then use the 'password server' parameter. */
 
 	if (strequal(domain, lp_workgroup())) {
-		char *p;
+		const char *p;
 		char *pserver = lp_passwordserver(); /* UNIX charset. */
 		fstring name;
 		int num_addresses = 0;
diff --git a/source3/printing/lpq_parse.c b/source3/printing/lpq_parse.c
index 4b91b8ac9a..0b4ce4b4ca 100644
--- a/source3/printing/lpq_parse.c
+++ b/source3/printing/lpq_parse.c
@@ -592,7 +592,7 @@ static BOOL parse_lpq_qnx(char *line,print_queue_struct *buf,BOOL first)
 {
   fstring tok[7];
   int count=0;
-  const char *cline;
+  const char *cline = line;
 
   DEBUG(4,("antes [%s]\n", line));
 
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index 4c454ef111..6df2c6b445 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -1075,6 +1075,7 @@ static uint32 get_correct_cversion(fstring architecture, fstring driverpath_in,
 	NTSTATUS          nt_status;
  	pstring           driverpath;
 	DATA_BLOB         null_pw;
+	fstring           res_type;
 	files_struct      *fsp = NULL;
 	BOOL              bad_path;
 	SMB_STRUCT_STAT   st;
@@ -1098,8 +1099,9 @@ static uint32 get_correct_cversion(fstring architecture, fstring driverpath_in,
 
 	/* Null password is ok - we are already an authenticated user... */
 	null_pw = data_blob(NULL, 0);
+	fstrcpy(res_type, "A:");
  	become_root();
-	conn = make_connection_with_chdir("print$", null_pw, "A:", user->vuid, &nt_status);
+	conn = make_connection_with_chdir("print$", null_pw, res_type, user->vuid, &nt_status);
 	unbecome_root();
 
 	if (conn == NULL) {
@@ -1389,6 +1391,7 @@ BOOL move_driver_to_download_area(NT_PRINTER_DRIVER_INFO_LEVEL driver_abstract,
 	NTSTATUS nt_status;
 	pstring inbuf;
 	pstring outbuf;
+	fstring res_type;
 	int ver = 0;
 	int i;
 
@@ -1413,9 +1416,10 @@ BOOL move_driver_to_download_area(NT_PRINTER_DRIVER_INFO_LEVEL driver_abstract,
 	 * Note we must be root to do this.
 	 */
 
-	become_root();
 	null_pw = data_blob(NULL, 0);
-	conn = make_connection_with_chdir("print$", null_pw, "A:", user->vuid, &nt_status);
+	fstrcpy(res_type, "A:");
+	become_root();
+	conn = make_connection_with_chdir("print$", null_pw, res_type, user->vuid, &nt_status);
 	unbecome_root();
 
 	if (conn == NULL) {
@@ -4308,7 +4312,8 @@ static BOOL delete_driver_files( NT_PRINTER_DRIVER_INFO_LEVEL_3 *info_3, struct
 	connection_struct *conn;
 	DATA_BLOB null_pw;
 	NTSTATUS nt_status;
-	
+	fstring res_type;
+
 	if ( !info_3 )
 		return False;
 		
@@ -4320,9 +4325,10 @@ static BOOL delete_driver_files( NT_PRINTER_DRIVER_INFO_LEVEL_3 *info_3, struct
 	 * do this.
 	 */
 	 
-	become_root();
 	null_pw = data_blob( NULL, 0 );
-        conn = make_connection_with_chdir( "print$", null_pw, "A:", user->vuid, &nt_status );
+	fstrcpy(res_type, "A:");
+	become_root();
+        conn = make_connection_with_chdir( "print$", null_pw, res_type, user->vuid, &nt_status );
 	unbecome_root();
 	
 	if ( !conn ) {
-- 
cgit 


From 7a9987481e70676918488b05e5dda44754e825e1 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Wed, 5 Mar 2003 01:34:37 +0000
Subject: More const fixes. Jeremy. (This used to be commit
 7b945e10a6c636c0b0aabc841803bf44405cb2ae)

---
 source3/libads/krb5_setpw.c     | 4 ++--
 source3/registry/reg_printing.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'source3')

diff --git a/source3/libads/krb5_setpw.c b/source3/libads/krb5_setpw.c
index 9d8fb8d24c..ac7377cd2f 100644
--- a/source3/libads/krb5_setpw.c
+++ b/source3/libads/krb5_setpw.c
@@ -180,7 +180,7 @@ static krb5_error_code build_kpasswd_request(uint16 pversion,
 
 static krb5_error_code krb5_setpw_result_code_string(krb5_context context,
 						     int result_code,
-						     char **code_string)
+						     const char **code_string)
 {
    switch (result_code) {
    case KRB5_KPASSWD_MALFORMED:
@@ -318,7 +318,7 @@ static krb5_error_code parse_setpw_reply(krb5_context context,
 	if(res_code == KRB5_KPASSWD_SUCCESS)
 			return 0;
 	else {
-		char *errstr;
+		const char *errstr;
 		krb5_setpw_result_code_string(context, res_code, &errstr);
 		DEBUG(1, ("Error changing password: %s\n", errstr));
 
diff --git a/source3/registry/reg_printing.c b/source3/registry/reg_printing.c
index 619ffc7ee7..50ac81dcbb 100644
--- a/source3/registry/reg_printing.c
+++ b/source3/registry/reg_printing.c
@@ -33,7 +33,7 @@
 #define KEY_INDEX_FORMS		1
 #define KEY_INDEX_PRINTER	2
 
-static char *top_level_keys[MAX_TOP_LEVEL_KEYS] = { 
+static const char *top_level_keys[MAX_TOP_LEVEL_KEYS] = { 
 	"Environments", 
 	"Forms",
 	"Printers" 
-- 
cgit 


From 4c8091ef9cfa6b196355b007d6f280c90a15bae7 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Wed, 5 Mar 2003 05:14:19 +0000
Subject: Use PRINTER_ALL_ACCESS instead of MAXIMUM_ALLOWED_ACCESS in
 setprinter command.  From Ronan Waide <waider@waider.ie>. (This used to be
 commit 992b5eb4e05fbf99d91d7235b9a002957533f95b)

---
 source3/rpcclient/cmd_spoolss.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c
index 9f6f539e19..9686fd1e24 100644
--- a/source3/rpcclient/cmd_spoolss.c
+++ b/source3/rpcclient/cmd_spoolss.c
@@ -1362,7 +1362,7 @@ static NTSTATUS cmd_spoolss_setdriver(struct cli_state *cli,
 	/* Get a printer handle */
 
 	result = cli_spoolss_open_printer_ex(cli, mem_ctx, printername, "", 
-					     MAXIMUM_ALLOWED_ACCESS,
+					     PRINTER_ALL_ACCESS,
 					     servername, user, &pol);
 
 	if (!W_ERROR_IS_OK(result))
-- 
cgit 


From f98e4e24b1fd9353c6eb2c28d588e3c2fbc1f00d Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Wed, 5 Mar 2003 05:19:35 +0000
Subject: lp_string: Add note about dodgy StrnCpy use. (This used to be commit
 b32ae2d83fd0b4dd2c313cd0727bd276564cec0c)

---
 source3/param/loadparm.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'source3')

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 246023ba47..f7f12bbe80 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -1516,6 +1516,9 @@ static char *lp_string(const char *s)
 	if (!ret)
 		return NULL;
 
+	/* Note: StrnCpy touches len+1 bytes, but we allocate 100
+	 * extra bytes so we're OK. */
+
 	if (!s)
 		*ret = 0;
 	else
-- 
cgit 


From 7703af373d0b43d6ae2490aec9e7b4ba99ea64ea Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 5 Mar 2003 08:48:08 +0000
Subject: This file has not been maintained for a while - if we really want
 this behaviour we should seperate -g from --enable-developer, and allow
 developers to also select --enable-debug if they want.

Andrew Bartlett
(This used to be commit 96d1449c42597ea22c538a004960b26925c641fc)
---
 source3/configure.nodebug.developer | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100755 source3/configure.nodebug.developer

(limited to 'source3')

diff --git a/source3/configure.nodebug.developer b/source3/configure.nodebug.developer
deleted file mode 100755
index 65e21b4bdf..0000000000
--- a/source3/configure.nodebug.developer
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-CFLAGS="-Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual -Wcast-align -DDEBUG_PASSWORD"; export CFLAGS
-./configure $*
-- 
cgit 


From b4e60e5d7b1abcbf519fb2fdf4e6a5b121d32d60 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 5 Mar 2003 08:49:56 +0000
Subject: also ignore the autom4te-2.53.cache (This used to be commit
 243c9c37a53501b96df6286517e03eb09efcc620)

---
 source3/.cvsignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/.cvsignore b/source3/.cvsignore
index fef2453824..074a88cef2 100644
--- a/source3/.cvsignore
+++ b/source3/.cvsignore
@@ -6,7 +6,7 @@
 .proto.check
 .proto.stamp
 autom4te.cache
-ID
+autom4te-2.53.cache
 ID
 Makefile
 bin
-- 
cgit 


From ce7f54e953a4f6676c3569dc113e76147e19ef45 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 5 Mar 2003 09:33:43 +0000
Subject: Add a test for a useful property of the compiler - we can get
 link-time failures for some compile-time properties this way.

Andrew Bartlett
(This used to be commit ce618624b7df797e228f8ef0f19820b318c62ae9)
---
 source3/configure.in | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'source3')

diff --git a/source3/configure.in b/source3/configure.in
index 269d70c2fc..cc38e37f3f 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -652,6 +652,24 @@ if test x"$samba_cv_immediate_structures" = x"yes"; then
    AC_DEFINE(HAVE_IMMEDIATE_STRUCTURES,1,[Whether the compiler supports immediate structures])
 fi
 
+############################################
+# check if the compiler can do immediate structures
+AC_CACHE_CHECK([if the compiler will optimize out function calls],samba_cv_optimize_out_funcation_calls, [
+    AC_TRY_LINK([
+#include <stdio.h>],
+[
+		if (1) {
+		   this_function_does_not_exist();
+		} else {
+		  return 1;
+		}
+
+],
+	samba_cv_optimize_out_funcation_calls=yes,samba_cv_optimize_out_funcation_calls=no)])
+if test x"$samba_cv_optimize_out_funcation_calls" = x"yes"; then
+   AC_DEFINE(HAVE_COMPILER_WILL_OPTIMIZE_OUT_FNS,1,[Whether the compiler will optimize out function calls])
+fi
+
 ############################################
 # check for unix domain sockets
 AC_CACHE_CHECK([for unix domain sockets],samba_cv_unixsocket, [
-- 
cgit 


From d5da58df9c75214f2f8166baf0ec99360c69e63f Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 5 Mar 2003 09:36:41 +0000
Subject: A couple more fixes for fstrcpy() into a malloced region.  In this
 case it's all perfectly legit - the region is an fstring in length, but might
 not always be, and it is the last peice of code to fail my automated test.

Andrew Bartlett
(This used to be commit 762d61b37d053568b6346e249ba7ef594320153a)
---
 source3/nmbd/nmbd_become_lmb.c | 6 +++---
 source3/nmbd/nmbd_browsesync.c | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'source3')

diff --git a/source3/nmbd/nmbd_become_lmb.c b/source3/nmbd/nmbd_become_lmb.c
index bac5589566..829496c195 100644
--- a/source3/nmbd/nmbd_become_lmb.c
+++ b/source3/nmbd/nmbd_become_lmb.c
@@ -207,7 +207,7 @@ static void release_1d_name( struct subnet_record *subrec, char *workgroup_name,
   if((namerec = find_name_on_subnet( subrec, &nmbname, FIND_SELF_NAME))!=NULL)
   {
     struct userdata_struct *userdata;
-    int size = sizeof(struct userdata_struct) + sizeof(BOOL);
+    size_t size = sizeof(struct userdata_struct) + sizeof(BOOL);
 
     if((userdata = (struct userdata_struct *)malloc(size)) == NULL)
     {
@@ -518,7 +518,7 @@ workgroup %s on subnet %s. Couldn't register name %s.\n",
 void become_local_master_browser(struct subnet_record *subrec, struct work_record *work)
 {
   struct userdata_struct *userdata;
-  int size = sizeof(struct userdata_struct) + sizeof(fstring) + 1;
+  size_t size = sizeof(struct userdata_struct) + sizeof(fstring) + 1;
 
   /* Sanity check. */
   if (!lp_local_master())
@@ -563,7 +563,7 @@ in workgroup %s on subnet %s\n",
   userdata->copy_fn = NULL;
   userdata->free_fn = NULL;
   userdata->userdata_len = strlen(work->work_group)+1;
-  fstrcpy(userdata->data, work->work_group);
+  safe_strcpy(userdata->data, work->work_group, size - sizeof(*userdata) - 1);
 
   /* Register the special browser group name. */
   register_name(subrec, MSBROWSE, 0x01, samba_nb_type|NB_GROUP,
diff --git a/source3/nmbd/nmbd_browsesync.c b/source3/nmbd/nmbd_browsesync.c
index f27f42297f..84c6f43f57 100644
--- a/source3/nmbd/nmbd_browsesync.c
+++ b/source3/nmbd/nmbd_browsesync.c
@@ -288,7 +288,7 @@ static void find_domain_master_name_query_success(struct subnet_record *subrec,
   struct work_record *work;
   struct nmb_name nmbname;
   struct userdata_struct *userdata;
-  int size = sizeof(struct userdata_struct) + sizeof(fstring)+1;
+  size_t size = sizeof(struct userdata_struct) + sizeof(fstring)+1;
 
   if( !(work = find_workgroup_on_subnet(subrec, q_name->name)) )
   {
@@ -333,7 +333,7 @@ static void find_domain_master_name_query_success(struct subnet_record *subrec,
   userdata->copy_fn = NULL;
   userdata->free_fn = NULL;
   userdata->userdata_len = strlen(work->work_group)+1;
-  fstrcpy(userdata->data, work->work_group);
+  safe_strcpy(userdata->data, work->work_group, size - sizeof(*userdata) - 1);
 
   node_status( subrec, &nmbname, answer_ip, 
                domain_master_node_status_success,
-- 
cgit 


From 487a0562859e393e12b91eed17ab893236764763 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 5 Mar 2003 09:40:08 +0000
Subject: Use new configure test to turn on this automated test for correct
 string function usage.

Andrew Bartlett
(This used to be commit cdc6139a9646b267a9921fc11fa532640a2e4c7f)
---
 source3/include/safe_string.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/include/safe_string.h b/source3/include/safe_string.h
index 431dc400aa..6c2bd82bb9 100644
--- a/source3/include/safe_string.h
+++ b/source3/include/safe_string.h
@@ -50,7 +50,7 @@
 
 char * __unsafe_string_function_usage_here__(void);
 
-#if 0 && defined __GNUC__ && __GNUC__ >= 2 && defined __OPTIMIZE__
+#ifdef HAVE_COMPILER_WILL_OPTIMIZE_OUT_FNS
 
 #define pstrcpy(d,s) ((sizeof(d) != sizeof(pstring) && sizeof(d) != sizeof(char *)) ? __unsafe_string_function_usage_here__() : safe_strcpy((d), (s),sizeof(pstring)-1))
 #define pstrcat(d,s) ((sizeof(d) != sizeof(pstring) && sizeof(d) != sizeof(char *)) ? __unsafe_string_function_usage_here__() : safe_strcat((d), (s),sizeof(pstring)-1))
-- 
cgit 


From 48e3bf2e9579abcf8dc07d7a33a1e44b4abc1a12 Mon Sep 17 00:00:00 2001
From: Richard Sharpe <sharpe@samba.org>
Date: Wed, 5 Mar 2003 23:29:36 +0000
Subject: Add code to allow us to specify the port to connect on when
 performing a test ... (This used to be commit
 1128a2fb4c16681e669efe605ff7d7161a2f7acd)

---
 source3/torture/torture.c | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'source3')

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index fe53baae7e..1744d3109c 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -26,6 +26,7 @@ static fstring host, workgroup, share, password, username, myname;
 static int max_protocol = PROTOCOL_NT1;
 static const char *sockops="TCP_NODELAY";
 static int nprocs=1;
+static int port_to_use=0;
 int torture_numops=100;
 static int procnum; /* records process count number when forking */
 static struct cli_state current_cli;
@@ -104,7 +105,14 @@ static BOOL open_nbt_connection(struct cli_state *c)
 
         zero_ip(&ip);
 
-	if (!cli_initialise(c) || !cli_connect(c, host, &ip)) {
+	if (!cli_initialise(c)) {
+		printf("Failed initialize cli_struct to connect with %s\n", host);
+		return False;
+	}
+
+	c->port = port_to_use;
+
+	if (!cli_connect(c, host, &ip)) {
 		printf("Failed to connect with %s\n", host);
 		return False;
 	}
@@ -4191,6 +4199,7 @@ static void usage(void)
 	printf("\t-L use oplocks\n");
 	printf("\t-c CLIENT.TXT   specify client load file for NBENCH\n");
 	printf("\t-A showall\n");
+	printf("\t-p port\n");
 	printf("\t-s seed\n");
 	printf("\n\n");
 
@@ -4205,10 +4214,6 @@ static void usage(void)
 	exit(1);
 }
 
-
-
-
-
 /****************************************************************************
   main program
 ****************************************************************************/
@@ -4264,8 +4269,11 @@ static void usage(void)
 
 	fstrcpy(workgroup, lp_workgroup());
 
-	while ((opt = getopt(argc, argv, "hW:U:n:N:O:o:m:Ld:Ac:ks:")) != EOF) {
+	while ((opt = getopt(argc, argv, "p:hW:U:n:N:O:o:m:Ld:Ac:ks:")) != EOF) {
 		switch (opt) {
+		case 'p':
+			port_to_use = atoi(optarg);
+			break;
 		case 's':
 			srandom(atoi(optarg));
 			break;
-- 
cgit 


From 6149dfd3e7b9848720d18ad2c095b1f5e58ffd86 Mon Sep 17 00:00:00 2001
From: Richard Sharpe <sharpe@samba.org>
Date: Wed, 5 Mar 2003 23:55:11 +0000
Subject: Add *SMBSERVER fallback code to smbtorture ... (This used to be
 commit 460339db2246b0213252ee34f507eb8e55ecbecb)

---
 source3/torture/torture.c | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

(limited to 'source3')

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 1744d3109c..2f779b9c89 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -124,9 +124,23 @@ static BOOL open_nbt_connection(struct cli_state *c)
 	if (use_level_II_oplocks) c->use_level_II_oplocks = True;
 
 	if (!cli_session_request(c, &calling, &called)) {
-		printf("%s rejected the session\n",host);
-		cli_shutdown(c);
-		return False;
+		/*
+		 * Well, that failed, try *SMBSERVER ... 
+		 * However, we must reconnect as well ...
+		 */
+		if (!cli_connect(c, host, &ip)) {
+			printf("Failed to connect with %s\n", host);
+			return False;
+		}
+
+		make_nmb_name(&called, "*SMBSERVER", 0x20);
+		if (!cli_session_request(c, &calling, &called)) {
+			printf("%s rejected the session\n",host);
+			printf("We tried with a called name of %s & %s\n",
+				host, "*SMBSERVER");
+			cli_shutdown(c);
+			return False;
+		}
 	}
 
 	return True;
-- 
cgit 


From 7a3cc345e0508848b0e2bd492789973bcf2d5841 Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Thu, 6 Mar 2003 07:36:08 +0000
Subject: FIXME about crash on failure case. (This used to be commit
 a387c4209735f8e4c826cad7cb10c5349b2041ec)

---
 source3/torture/torture.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'source3')

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 2f779b9c89..60d7c2ba74 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -2922,12 +2922,15 @@ static BOOL run_deletetest(int dummy)
 	printf("finished delete test\n");
 
   fail:
-	
+	/* FIXME: This will crash if we aborted before cli2 got
+	 * intialized, because these functions don't handle
+	 * uninitialized connections. */
+		
 	cli_close(&cli1, fnum1);
 	cli_close(&cli1, fnum2);
 	cli_setatr(&cli1, fname, 0, 0);
 	cli_unlink(&cli1, fname);
-	
+
 	if (!torture_close_connection(&cli1)) {
 		correct = False;
 	}
-- 
cgit 


From 192148bab352697e625e78e7f2444e00453f35ff Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 6 Mar 2003 07:55:48 +0000
Subject: More safe_strcpy() off-by-one bug fixes. (mostly moves to
 pstrcpy()/fstrcpy())

Andrew Bartlett
(This used to be commit 42b5514404bc7e33306c11344c6c934a1f83d295)
---
 source3/client/client.c |  6 +++---
 source3/client/clitar.c | 48 ++++++++++++++++++++++++------------------------
 source3/utils/net.c     |  2 +-
 source3/utils/net_rap.c |  4 ++--
 4 files changed, 30 insertions(+), 30 deletions(-)

(limited to 'source3')

diff --git a/source3/client/client.c b/source3/client/client.c
index 5da12fd984..065cd2fcc9 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -2346,7 +2346,7 @@ static struct cli_state *do_connect(const char *server, const char *share)
 	char *sharename;
 	
 	/* make a copy so we don't modify the global string 'service' */
-	safe_strcpy(servicename, share, sizeof(servicename)-1);
+	fstrcpy(servicename, share);
 	sharename = servicename;
 	if (*sharename == '\\') {
 		server = sharename+2;
@@ -2621,9 +2621,9 @@ static int do_message_op(void)
 	make_nmb_name(&calling, global_myname(), 0x0);
 	make_nmb_name(&called , desthost, name_type);
 
-	safe_strcpy(server_name, desthost, sizeof(server_name));
+	fstrcpy(server_name, desthost);
 	snprintf(name_type_hex, sizeof(name_type_hex), "#%X", name_type);
-	safe_strcat(server_name, name_type_hex, sizeof(server_name));
+	fstrcat(server_name, name_type_hex);
 
         zero_ip(&ip);
 	if (have_ip) ip = dest_ip;
diff --git a/source3/client/clitar.c b/source3/client/clitar.c
index 74d901a2ca..dfda997ca2 100644
--- a/source3/client/clitar.c
+++ b/source3/client/clitar.c
@@ -202,7 +202,7 @@ static void writetarheader(int f, const char *aname, SMB_BIG_UINT size, time_t m
   /* write out a "standard" tar format header */
 
   hb.dbuf.name[NAMSIZ-1]='\0';
-  safe_strcpy(hb.dbuf.mode, amode, strlen(amode));
+  safe_strcpy(hb.dbuf.mode, amode, sizeof(hb.dbuf.mode)-1);
   oct_it((SMB_BIG_UINT)0, 8, hb.dbuf.uid);
   oct_it((SMB_BIG_UINT)0, 8, hb.dbuf.gid);
   oct_it((SMB_BIG_UINT) size, 13, hb.dbuf.size);
@@ -796,11 +796,11 @@ static void do_tar(file_info *finfo)
 
     DEBUG(5, ("Excl: strlen(cur_dir) = %d\n", (int)strlen(cur_dir)));
 
-    safe_strcpy(exclaim, cur_dir, sizeof(pstring));
+    pstrcpy(exclaim, cur_dir);
     *(exclaim+strlen(exclaim)-1)='\0';
 
-    safe_strcat(exclaim, "\\", sizeof(pstring));
-    safe_strcat(exclaim, finfo->name, sizeof(exclaim));
+    pstrcat(exclaim, "\\");
+    pstrcat(exclaim, finfo->name);
 
     DEBUG(5, ("...tar_re_search: %d\n", tar_re_search));
 
@@ -820,12 +820,12 @@ static void do_tar(file_info *finfo)
       pstring saved_curdir;
       pstring mtar_mask;
 
-      safe_strcpy(saved_curdir, cur_dir, sizeof(saved_curdir));
+      pstrcpy(saved_curdir, cur_dir);
 
       DEBUG(5, ("Sizeof(cur_dir)=%d, strlen(cur_dir)=%d, strlen(finfo->name)=%d\nname=%s,cur_dir=%s\n", (int)sizeof(cur_dir), (int)strlen(cur_dir), (int)strlen(finfo->name), finfo->name, cur_dir));
 
-      safe_strcat(cur_dir,finfo->name, sizeof(cur_dir));
-      safe_strcat(cur_dir,"\\", sizeof(cur_dir));
+      pstrcat(cur_dir,finfo->name);
+      pstrcat(cur_dir,"\\");
 
       DEBUG(5, ("Writing a dir, Name = %s\n", cur_dir));
 
@@ -836,16 +836,16 @@ static void do_tar(file_info *finfo)
           DEBUG(0,("                directory %s\n", cur_dir));
       }
       ntarf++;  /* Make sure we have a file on there */
-      safe_strcpy(mtar_mask,cur_dir, sizeof(pstring));
-      safe_strcat(mtar_mask,"*", sizeof(pstring));
+      pstrcpy(mtar_mask,cur_dir);
+      pstrcat(mtar_mask,"*");
       DEBUG(5, ("Doing list with mtar_mask: %s\n", mtar_mask));
       do_list(mtar_mask, attribute, do_tar, False, True);
-      safe_strcpy(cur_dir,saved_curdir, sizeof(pstring));
+      pstrcpy(cur_dir,saved_curdir);
     }
   else
     {
-      safe_strcpy(rname,cur_dir, sizeof(pstring));
-      safe_strcat(rname,finfo->name, sizeof(pstring));
+      pstrcpy(rname,cur_dir);
+      pstrcat(rname,finfo->name);
       do_atar(rname,finfo->name,finfo);
     }
 }
@@ -1362,8 +1362,8 @@ int cmd_setmode(void)
       return 1;
     }
 
-  safe_strcpy(fname, cur_dir, sizeof(pstring));
-  safe_strcat(fname, buf, sizeof(pstring));
+  pstrcpy(fname, cur_dir);
+  pstrcat(fname, buf);
 
   while (next_token_nr(NULL,buf,NULL,sizeof(buf))) {
     q=buf;
@@ -1459,32 +1459,32 @@ int process_tar(void)
 	if (strrchr_m(cliplist[i], '\\')) {
 	  pstring saved_dir;
 	  
-	  safe_strcpy(saved_dir, cur_dir, sizeof(pstring));
+	  pstrcpy(saved_dir, cur_dir);
 	  
 	  if (*cliplist[i]=='\\') {
-	    safe_strcpy(tarmac, cliplist[i], sizeof(pstring));
+	    pstrcpy(tarmac, cliplist[i]);
 	  } else {
-	    safe_strcpy(tarmac, cur_dir, sizeof(pstring));
-	    safe_strcat(tarmac, cliplist[i], sizeof(pstring));
+	    pstrcpy(tarmac, cur_dir);
+	    pstrcat(tarmac, cliplist[i]);
 	  }
-	  safe_strcpy(cur_dir, tarmac, sizeof(pstring));
+	  pstrcpy(cur_dir, tarmac);
 	  *(strrchr_m(cur_dir, '\\')+1)='\0';
 
 	  DEBUG(5, ("process_tar, do_list with tarmac: %s\n", tarmac));
 	  do_list(tarmac,attribute,do_tar, False, True);
-	  safe_strcpy(cur_dir,saved_dir, sizeof(pstring));
+	  pstrcpy(cur_dir,saved_dir);
 	} else {
-	  safe_strcpy(tarmac, cur_dir, sizeof(pstring));
-	  safe_strcat(tarmac, cliplist[i], sizeof(pstring));
+	  pstrcpy(tarmac, cur_dir);
+	  pstrcat(tarmac, cliplist[i]);
 	  DEBUG(5, ("process_tar, do_list with tarmac: %s\n", tarmac));
 	  do_list(tarmac,attribute,do_tar, False, True);
 	}
       }
     } else {
       pstring mask;
-      safe_strcpy(mask,cur_dir, sizeof(pstring));
+      pstrcpy(mask,cur_dir);
       DEBUG(5, ("process_tar, do_list with mask: %s\n", mask));
-      safe_strcat(mask,"\\*", sizeof(pstring));
+      pstrcat(mask,"\\*");
       do_list(mask,attribute,do_tar,False, True);
     }
     
diff --git a/source3/utils/net.c b/source3/utils/net.c
index c1285bc64b..f6b3c5c84c 100644
--- a/source3/utils/net.c
+++ b/source3/utils/net.c
@@ -241,7 +241,7 @@ BOOL net_find_dc(struct in_addr *server_ip, fstring server_name, const char *dom
 		if (!lookup_dc_name(global_myname(), domain_name, server_ip, dc_name))
 			return False;
 			
-		safe_strcpy(server_name, dc_name, FSTRING_LEN);
+		fstrcpy(server_name, dc_name);
 		return True;
 	} else
 		return False;
diff --git a/source3/utils/net_rap.c b/source3/utils/net_rap.c
index 8f3dd53fa6..f52eabf494 100644
--- a/source3/utils/net_rap.c
+++ b/source3/utils/net_rap.c
@@ -638,7 +638,7 @@ static int rap_user_add(int argc, const char **argv)
 	if (!(cli = net_make_ipc_connection(0)))
                 return -1;
 			
-	safe_strcpy(userinfo.user_name, argv[0], sizeof(userinfo.user_name));
+	safe_strcpy(userinfo.user_name, argv[0], sizeof(userinfo.user_name)-1);
 	if (opt_flags == -1) 
                 opt_flags = 0x21; 
 			
@@ -755,7 +755,7 @@ static int rap_group_add(int argc, const char **argv)
                 return -1;
 			
 	/* BB check for length 21 or smaller explicitly ? BB */
-	safe_strcpy(grinfo.group_name, argv[0], sizeof(grinfo.group_name));
+	safe_strcpy(grinfo.group_name, argv[0], sizeof(grinfo.group_name)-1);
 	grinfo.reserved1 = '\0';
 	grinfo.comment = smb_xstrdup(opt_comment);
 	
-- 
cgit 


From 6684c85714f3c30ba7cb56d71c2eddf5090c00af Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 6 Mar 2003 08:24:39 +0000
Subject: more off-by-one safe_strcpy() (This used to be commit
 d8d2d5e75503ae2b6532a25e4c9bbcdf20cc60af)

---
 source3/smbd/negprot.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source3')

diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c
index c8f023514e..db0694a840 100644
--- a/source3/smbd/negprot.c
+++ b/source3/smbd/negprot.c
@@ -167,7 +167,7 @@ static int reply_lanman2(char *inbuf, char *outbuf)
 static int negprot_spnego(char *p)
 {
 	DATA_BLOB blob;
-	uint8 guid[16];
+	uint8 guid[17];
 	const char *OIDs_krb5[] = {OID_KERBEROS5,
 				   OID_KERBEROS5_OLD,
 				   OID_NTLMSSP,
@@ -178,8 +178,8 @@ static int negprot_spnego(char *p)
 
 	global_spnego_negotiated = True;
 
-	memset(guid, 0, 16);
-	safe_strcpy((char *)guid, global_myname(), 16);
+	ZERO_STRUCT(guid);
+	safe_strcpy((char *)guid, global_myname(), sizeof(guid)-1);
 	strlower((char *)guid);
 
 #if 0
-- 
cgit 


From ca0d82b11c0b17e793801ccc5acdc8624c7f3f19 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 6 Mar 2003 10:37:51 +0000
Subject: Make smbtorture use the same cli_full_connection() framework as the
 rest of Samba.  This fixes things like not doing *SMBSERVER etc.

Andrew Bartlett
(This used to be commit 8863ff863c1da42aa6b8718f315c608d9d9067c6)
---
 source3/torture/denytest.c    |   54 +-
 source3/torture/mangle_test.c |   16 +-
 source3/torture/torture.c     | 1599 ++++++++++++++++++++---------------------
 source3/torture/utable.c      |   38 +-
 4 files changed, 842 insertions(+), 865 deletions(-)

(limited to 'source3')

diff --git a/source3/torture/denytest.c b/source3/torture/denytest.c
index 017bb1c06d..3a7906fb33 100644
--- a/source3/torture/denytest.c
+++ b/source3/torture/denytest.c
@@ -1408,7 +1408,7 @@ static void progress_bar(unsigned i, unsigned total)
  */
 BOOL torture_denytest1(int dummy)
 {
-	static struct cli_state cli1;
+	struct cli_state *cli1;
 	int fnum1, fnum2;
 	int i;
 	BOOL correct = True;
@@ -1421,10 +1421,10 @@ BOOL torture_denytest1(int dummy)
 	printf("starting denytest1\n");
 
 	for (i=0;i<2;i++) {
-		cli_unlink(&cli1, fnames[i]);
-		fnum1 = cli_open(&cli1, fnames[i], O_RDWR|O_CREAT, DENY_NONE);
-		cli_write(&cli1, fnum1, 0, fnames[i], 0, strlen(fnames[i]));
-		cli_close(&cli1, fnum1);
+		cli_unlink(cli1, fnames[i]);
+		fnum1 = cli_open(cli1, fnames[i], O_RDWR|O_CREAT, DENY_NONE);
+		cli_write(cli1, fnum1, 0, fnames[i], 0, strlen(fnames[i]));
+		cli_close(cli1, fnum1);
 	}
 
 	printf("testing %d entries\n", ARRAY_SIZE(denytable1));
@@ -1435,10 +1435,10 @@ BOOL torture_denytest1(int dummy)
 
 		progress_bar(i, ARRAY_SIZE(denytable1));
 
-		fnum1 = cli_open(&cli1, fname, 
+		fnum1 = cli_open(cli1, fname, 
 				 denytable1[i].mode1,
 				 denytable1[i].deny1);
-		fnum2 = cli_open(&cli1, fname, 
+		fnum2 = cli_open(cli1, fname, 
 				 denytable1[i].mode2,
 				 denytable1[i].deny2);
 
@@ -1449,10 +1449,10 @@ BOOL torture_denytest1(int dummy)
 		} else {
 			char x = 1;
 			res = A_0;
-			if (cli_read(&cli1, fnum2, (void *)&x, 0, 1) == 1) {
+			if (cli_read(cli1, fnum2, (void *)&x, 0, 1) == 1) {
 				res += A_R;
 			}
-			if (cli_write(&cli1, fnum2, 0, (void *)&x, 0, 1) == 1) {
+			if (cli_write(cli1, fnum2, 0, (void *)&x, 0, 1) == 1) {
 				res += A_W;
 			}
 		}
@@ -1472,15 +1472,15 @@ BOOL torture_denytest1(int dummy)
 			       resultstr(denytable1[i].result));
 		}
 
-		cli_close(&cli1, fnum1);
-		cli_close(&cli1, fnum2);
+		cli_close(cli1, fnum1);
+		cli_close(cli1, fnum2);
 	}
 
 	for (i=0;i<2;i++) {
-		cli_unlink(&cli1, fnames[i]);
+		cli_unlink(cli1, fnames[i]);
 	}
 		
-	if (!torture_close_connection(&cli1)) {
+	if (!torture_close_connection(cli1)) {
 		correct = False;
 	}
 	
@@ -1494,7 +1494,7 @@ BOOL torture_denytest1(int dummy)
  */
 BOOL torture_denytest2(int dummy)
 {
-	static struct cli_state cli1, cli2;
+	static struct cli_state *cli1, *cli2;
 	int fnum1, fnum2;
 	int i;
 	BOOL correct = True;
@@ -1507,10 +1507,10 @@ BOOL torture_denytest2(int dummy)
 	printf("starting denytest2\n");
 
 	for (i=0;i<2;i++) {
-		cli_unlink(&cli1, fnames[i]);
-		fnum1 = cli_open(&cli1, fnames[i], O_RDWR|O_CREAT, DENY_NONE);
-		cli_write(&cli1, fnum1, 0, fnames[i], 0, strlen(fnames[i]));
-		cli_close(&cli1, fnum1);
+		cli_unlink(cli1, fnames[i]);
+		fnum1 = cli_open(cli1, fnames[i], O_RDWR|O_CREAT, DENY_NONE);
+		cli_write(cli1, fnum1, 0, fnames[i], 0, strlen(fnames[i]));
+		cli_close(cli1, fnum1);
 	}
 
 	for (i=0; i<ARRAY_SIZE(denytable2); i++) {
@@ -1519,10 +1519,10 @@ BOOL torture_denytest2(int dummy)
 
 		progress_bar(i, ARRAY_SIZE(denytable1));
 
-		fnum1 = cli_open(&cli1, fname, 
+		fnum1 = cli_open(cli1, fname, 
 				 denytable2[i].mode1,
 				 denytable2[i].deny1);
-		fnum2 = cli_open(&cli2, fname, 
+		fnum2 = cli_open(cli2, fname, 
 				 denytable2[i].mode2,
 				 denytable2[i].deny2);
 
@@ -1533,10 +1533,10 @@ BOOL torture_denytest2(int dummy)
 		} else {
 			char x = 1;
 			res = A_0;
-			if (cli_read(&cli2, fnum2, (void *)&x, 0, 1) == 1) {
+			if (cli_read(cli2, fnum2, (void *)&x, 0, 1) == 1) {
 				res += A_R;
 			}
-			if (cli_write(&cli2, fnum2, 0, (void *)&x, 0, 1) == 1) {
+			if (cli_write(cli2, fnum2, 0, (void *)&x, 0, 1) == 1) {
 				res += A_W;
 			}
 		}
@@ -1556,18 +1556,18 @@ BOOL torture_denytest2(int dummy)
 			       resultstr(denytable2[i].result));
 		}
 
-		cli_close(&cli1, fnum1);
-		cli_close(&cli2, fnum2);
+		cli_close(cli1, fnum1);
+		cli_close(cli2, fnum2);
 	}
 		
 	for (i=0;i<2;i++) {
-		cli_unlink(&cli1, fnames[i]);
+		cli_unlink(cli1, fnames[i]);
 	}
 
-	if (!torture_close_connection(&cli1)) {
+	if (!torture_close_connection(cli1)) {
 		correct = False;
 	}
-	if (!torture_close_connection(&cli2)) {
+	if (!torture_close_connection(cli2)) {
 		correct = False;
 	}
 	
diff --git a/source3/torture/mangle_test.c b/source3/torture/mangle_test.c
index 6d127a918e..86030027ba 100644
--- a/source3/torture/mangle_test.c
+++ b/source3/torture/mangle_test.c
@@ -151,7 +151,7 @@ static void gen_name(char *name)
 BOOL torture_mangle(int dummy)
 {
 	extern int torture_numops;
-	static struct cli_state cli;
+	static struct cli_state *cli;
 	int i;
 
 	printf("starting mangle test\n");
@@ -167,10 +167,10 @@ BOOL torture_mangle(int dummy)
 		return False;
 	}
 
-	cli_unlink(&cli, "\\mangle_test\\*");
-	cli_rmdir(&cli, "\\mangle_test");
+	cli_unlink(cli, "\\mangle_test\\*");
+	cli_rmdir(cli, "\\mangle_test");
 
-	if (!cli_mkdir(&cli, "\\mangle_test")) {
+	if (!cli_mkdir(cli, "\\mangle_test")) {
 		printf("ERROR: Failed to make directory\n");
 		return False;
 	}
@@ -180,7 +180,7 @@ BOOL torture_mangle(int dummy)
 
 		gen_name(name);
 
-		if (!test_one(&cli, name)) {
+		if (!test_one(cli, name)) {
 			break;
 		}
 		if (total && total % 100 == 0) {
@@ -189,8 +189,8 @@ BOOL torture_mangle(int dummy)
 		}
 	}
 
-	cli_unlink(&cli, "\\mangle_test\\*");
-	if (!cli_rmdir(&cli, "\\mangle_test")) {
+	cli_unlink(cli, "\\mangle_test\\*");
+	if (!cli_rmdir(cli, "\\mangle_test")) {
 		printf("ERROR: Failed to remove directory\n");
 		return False;
 	}
@@ -198,7 +198,7 @@ BOOL torture_mangle(int dummy)
 	printf("\nTotal collisions %u/%u  - %.2f%%   (%u failures)\n",
 	       collisions, total, (100.0*collisions) / total, failures);
 
-	torture_close_connection(&cli);
+	torture_close_connection(cli);
 
 	printf("mangle test finished\n");
 	return (failures == 0);
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 60d7c2ba74..ca4dbed1d8 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -29,7 +29,7 @@ static int nprocs=1;
 static int port_to_use=0;
 int torture_numops=100;
 static int procnum; /* records process count number when forking */
-static struct cli_state current_cli;
+static struct cli_state *current_cli;
 static fstring randomfname;
 static BOOL use_oplocks;
 static BOOL use_level_II_oplocks;
@@ -146,37 +146,19 @@ static BOOL open_nbt_connection(struct cli_state *c)
 	return True;
 }
 
-BOOL torture_open_connection(struct cli_state *c)
+BOOL torture_open_connection(struct cli_state **c)
 {
-	ZERO_STRUCTP(c);
-
-	if (!open_nbt_connection(c)) {
-		return False;
-	}
-
-	if (!cli_negprot(c)) {
-		printf("%s rejected the negprot (%s)\n",host, cli_errstr(c));
-		cli_shutdown(c);
-		return False;
-	}
-
-	if (!cli_session_setup(c, username, 
-			       password, strlen(password),
-			       password, strlen(password),
-			       workgroup)) {
-		printf("%s rejected the sessionsetup (%s)\n", host, cli_errstr(c));
-		cli_shutdown(c);
-		return False;
-	}
-
-	if (!cli_send_tconX(c, share, "?????",
-			    password, strlen(password)+1)) {
-		printf("%s refused tree connect (%s)\n", host, cli_errstr(c));
-		cli_shutdown(c);
-		return False;
-	}
-
-	return True;
+	BOOL retry;
+	int flags = 0;
+	if (use_kerberos)
+		flags |= CLI_FULL_CONNECTION_USE_KERBEROS;
+	
+	return (NT_STATUS_IS_OK(
+			cli_full_connection(c, myname,
+					    host, NULL, port_to_use, 
+					    share, "?????", 
+					    username, workgroup, 
+					    password, flags, &retry)));
 }
 
 
@@ -332,16 +314,16 @@ static BOOL rw_torture(struct cli_state *c)
 
 static BOOL run_torture(int dummy)
 {
-	struct cli_state cli;
+	struct cli_state *cli;
         BOOL ret;
 
 	cli = current_cli;
 
-	cli_sockopt(&cli, sockops);
+	cli_sockopt(cli, sockops);
 
-	ret = rw_torture(&cli);
+	ret = rw_torture(cli);
 	
-	if (!torture_close_connection(&cli)) {
+	if (!torture_close_connection(cli)) {
 		ret = False;
 	}
 
@@ -351,7 +333,7 @@ static BOOL run_torture(int dummy)
 static BOOL rw_torture3(struct cli_state *c, char *lockfname)
 {
 	int fnum = -1;
-	int i = 0;
+	unsigned int i = 0;
 	char buf[131072];
 	char buf_rd[131072];
 	unsigned count;
@@ -525,28 +507,28 @@ static BOOL rw_torture2(struct cli_state *c1, struct cli_state *c2)
 
 static BOOL run_readwritetest(int dummy)
 {
-	static struct cli_state cli1, cli2;
+	static struct cli_state *cli1, *cli2;
 	BOOL test1, test2;
 
 	if (!torture_open_connection(&cli1) || !torture_open_connection(&cli2)) {
 		return False;
 	}
-	cli_sockopt(&cli1, sockops);
-	cli_sockopt(&cli2, sockops);
+	cli_sockopt(cli1, sockops);
+	cli_sockopt(cli2, sockops);
 
 	printf("starting readwritetest\n");
 
-	test1 = rw_torture2(&cli1, &cli2);
+	test1 = rw_torture2(cli1, cli2);
 	printf("Passed readwritetest v1: %s\n", BOOLSTR(test1));
 
-	test2 = rw_torture2(&cli1, &cli1);
+	test2 = rw_torture2(cli1, cli1);
 	printf("Passed readwritetest v2: %s\n", BOOLSTR(test2));
 
-	if (!torture_close_connection(&cli1)) {
+	if (!torture_close_connection(cli1)) {
 		test1 = False;
 	}
 
-	if (!torture_close_connection(&cli2)) {
+	if (!torture_close_connection(cli2)) {
 		test2 = False;
 	}
 
@@ -555,7 +537,7 @@ static BOOL run_readwritetest(int dummy)
 
 static BOOL run_readwritemulti(int dummy)
 {
-	static struct cli_state cli;
+	struct cli_state *cli;
 	BOOL test;
 
 	cli = current_cli;
@@ -574,7 +556,7 @@ static BOOL run_readwritemulti(int dummy)
 
 static BOOL run_readwritelarge(int dummy)
 {
-	static struct cli_state cli1;
+	static struct cli_state *cli1;
 	int fnum1;
 	const char *lockfname = "\\large.dat";
 	size_t fsize;
@@ -584,25 +566,25 @@ static BOOL run_readwritelarge(int dummy)
 	if (!torture_open_connection(&cli1)) {
 		return False;
 	}
-	cli_sockopt(&cli1, sockops);
+	cli_sockopt(cli1, sockops);
 	memset(buf,'\0',sizeof(buf));
 	
-	cli1.max_xmit = 128*1024;
+	cli1->max_xmit = 128*1024;
 	
 	printf("starting readwritelarge\n");
  
-	cli_unlink(&cli1, lockfname);
+	cli_unlink(cli1, lockfname);
 
-	fnum1 = cli_open(&cli1, lockfname, O_RDWR | O_CREAT | O_EXCL, DENY_NONE);
+	fnum1 = cli_open(cli1, lockfname, O_RDWR | O_CREAT | O_EXCL, DENY_NONE);
 	if (fnum1 == -1) {
-		printf("open read/write of %s failed (%s)\n", lockfname, cli_errstr(&cli1));
+		printf("open read/write of %s failed (%s)\n", lockfname, cli_errstr(cli1));
 		return False;
 	}
    
-	cli_write(&cli1, fnum1, 0, buf, 0, sizeof(buf));
+	cli_write(cli1, fnum1, 0, buf, 0, sizeof(buf));
 
-	if (!cli_qfileinfo(&cli1, fnum1, NULL, &fsize, NULL, NULL, NULL, NULL, NULL)) {
-		printf("qfileinfo failed (%s)\n", cli_errstr(&cli1));
+	if (!cli_qfileinfo(cli1, fnum1, NULL, &fsize, NULL, NULL, NULL, NULL, NULL)) {
+		printf("qfileinfo failed (%s)\n", cli_errstr(cli1));
 		correct = False;
 	}
 
@@ -613,28 +595,28 @@ static BOOL run_readwritelarge(int dummy)
 		correct = False;
 	}
 
-	if (!cli_close(&cli1, fnum1)) {
-		printf("close failed (%s)\n", cli_errstr(&cli1));
+	if (!cli_close(cli1, fnum1)) {
+		printf("close failed (%s)\n", cli_errstr(cli1));
 		correct = False;
 	}
 
-	if (!cli_unlink(&cli1, lockfname)) {
-		printf("unlink failed (%s)\n", cli_errstr(&cli1));
+	if (!cli_unlink(cli1, lockfname)) {
+		printf("unlink failed (%s)\n", cli_errstr(cli1));
 		correct = False;
 	}
 
-	fnum1 = cli_open(&cli1, lockfname, O_RDWR | O_CREAT | O_EXCL, DENY_NONE);
+	fnum1 = cli_open(cli1, lockfname, O_RDWR | O_CREAT | O_EXCL, DENY_NONE);
 	if (fnum1 == -1) {
-		printf("open read/write of %s failed (%s)\n", lockfname, cli_errstr(&cli1));
+		printf("open read/write of %s failed (%s)\n", lockfname, cli_errstr(cli1));
 		return False;
 	}
 	
-	cli1.max_xmit = 4*1024;
+	cli1->max_xmit = 4*1024;
 	
-	cli_smbwrite(&cli1, fnum1, buf, 0, sizeof(buf));
+	cli_smbwrite(cli1, fnum1, buf, 0, sizeof(buf));
 	
-	if (!cli_qfileinfo(&cli1, fnum1, NULL, &fsize, NULL, NULL, NULL, NULL, NULL)) {
-		printf("qfileinfo failed (%s)\n", cli_errstr(&cli1));
+	if (!cli_qfileinfo(cli1, fnum1, NULL, &fsize, NULL, NULL, NULL, NULL, NULL)) {
+		printf("qfileinfo failed (%s)\n", cli_errstr(cli1));
 		correct = False;
 	}
 
@@ -647,28 +629,28 @@ static BOOL run_readwritelarge(int dummy)
 
 #if 0
 	/* ToDo - set allocation. JRA */
-	if(!cli_set_allocation_size(&cli1, fnum1, 0)) {
+	if(!cli_set_allocation_size(cli1, fnum1, 0)) {
 		printf("set allocation size to zero failed (%s)\n", cli_errstr(&cli1));
 		return False;
 	}
-	if (!cli_qfileinfo(&cli1, fnum1, NULL, &fsize, NULL, NULL, NULL, NULL, NULL)) {
-		printf("qfileinfo failed (%s)\n", cli_errstr(&cli1));
+	if (!cli_qfileinfo(cli1, fnum1, NULL, &fsize, NULL, NULL, NULL, NULL, NULL)) {
+		printf("qfileinfo failed (%s)\n", cli_errstr(cli1));
 		correct = False;
 	}
 	if (fsize != 0)
 		printf("readwritelarge test 3 (truncate test) succeeded (size = %x)\n", fsize);
 #endif
 
-	if (!cli_close(&cli1, fnum1)) {
-		printf("close failed (%s)\n", cli_errstr(&cli1));
+	if (!cli_close(cli1, fnum1)) {
+		printf("close failed (%s)\n", cli_errstr(cli1));
 		correct = False;
 	}
 	
-	if (!torture_close_connection(&cli1)) {
+	if (!torture_close_connection(cli1)) {
 		correct = False;
 	}
 	return correct;
-	}
+}
 
 int line_count = 0;
 int nbio_id;
@@ -678,7 +660,7 @@ int nbio_id;
 /* run a test that simulates an approximate netbench client load */
 static BOOL run_netbench(int client)
 {
-	struct cli_state cli;
+	struct cli_state *cli;
 	int i;
 	fstring fname;
 	pstring line;
@@ -691,9 +673,9 @@ static BOOL run_netbench(int client)
 
 	nbio_id = client;
 
-	cli_sockopt(&cli, sockops);
+	cli_sockopt(cli, sockops);
 
-	nb_setup(&cli);
+	nb_setup(cli);
 
 	slprintf(cname,sizeof(fname), "client%d", client);
 
@@ -765,7 +747,7 @@ static BOOL run_netbench(int client)
 
 	nb_cleanup();
 
-	if (!torture_close_connection(&cli)) {
+	if (!torture_close_connection(cli)) {
 		correct = False;
 	}
 	
@@ -803,7 +785,7 @@ static BOOL run_nbench(int dummy)
  */
 static BOOL run_locktest1(int dummy)
 {
-	static struct cli_state cli1, cli2;
+	struct cli_state *cli1, *cli2;
 	const char *fname = "\\lockt1.lck";
 	int fnum1, fnum2, fnum3;
 	time_t t1, t2;
@@ -812,40 +794,40 @@ static BOOL run_locktest1(int dummy)
 	if (!torture_open_connection(&cli1) || !torture_open_connection(&cli2)) {
 		return False;
 	}
-	cli_sockopt(&cli1, sockops);
-	cli_sockopt(&cli2, sockops);
+	cli_sockopt(cli1, sockops);
+	cli_sockopt(cli2, sockops);
 
 	printf("starting locktest1\n");
 
-	cli_unlink(&cli1, fname);
+	cli_unlink(cli1, fname);
 
-	fnum1 = cli_open(&cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
+	fnum1 = cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
 	if (fnum1 == -1) {
-		printf("open of %s failed (%s)\n", fname, cli_errstr(&cli1));
+		printf("open of %s failed (%s)\n", fname, cli_errstr(cli1));
 		return False;
 	}
-	fnum2 = cli_open(&cli1, fname, O_RDWR, DENY_NONE);
+	fnum2 = cli_open(cli1, fname, O_RDWR, DENY_NONE);
 	if (fnum2 == -1) {
-		printf("open2 of %s failed (%s)\n", fname, cli_errstr(&cli1));
+		printf("open2 of %s failed (%s)\n", fname, cli_errstr(cli1));
 		return False;
 	}
-	fnum3 = cli_open(&cli2, fname, O_RDWR, DENY_NONE);
+	fnum3 = cli_open(cli2, fname, O_RDWR, DENY_NONE);
 	if (fnum3 == -1) {
-		printf("open3 of %s failed (%s)\n", fname, cli_errstr(&cli2));
+		printf("open3 of %s failed (%s)\n", fname, cli_errstr(cli2));
 		return False;
 	}
 
-	if (!cli_lock(&cli1, fnum1, 0, 4, 0, WRITE_LOCK)) {
-		printf("lock1 failed (%s)\n", cli_errstr(&cli1));
+	if (!cli_lock(cli1, fnum1, 0, 4, 0, WRITE_LOCK)) {
+		printf("lock1 failed (%s)\n", cli_errstr(cli1));
 		return False;
 	}
 
 
-	if (cli_lock(&cli2, fnum3, 0, 4, 0, WRITE_LOCK)) {
+	if (cli_lock(cli2, fnum3, 0, 4, 0, WRITE_LOCK)) {
 		printf("lock2 succeeded! This is a locking bug\n");
 		return False;
 	} else {
-		if (!check_error(__LINE__, &cli2, ERRDOS, ERRlock, 
+		if (!check_error(__LINE__, cli2, ERRDOS, ERRlock, 
 				 NT_STATUS_LOCK_NOT_GRANTED)) return False;
 	}
 
@@ -853,11 +835,11 @@ static BOOL run_locktest1(int dummy)
 	lock_timeout = (1 + (random() % 20));
 	printf("Testing lock timeout with timeout=%u\n", lock_timeout);
 	t1 = time(NULL);
-	if (cli_lock(&cli2, fnum3, 0, 4, lock_timeout * 1000, WRITE_LOCK)) {
+	if (cli_lock(cli2, fnum3, 0, 4, lock_timeout * 1000, WRITE_LOCK)) {
 		printf("lock3 succeeded! This is a locking bug\n");
 		return False;
 	} else {
-		if (!check_error(__LINE__, &cli2, ERRDOS, ERRlock, 
+		if (!check_error(__LINE__, cli2, ERRDOS, ERRlock, 
 				 NT_STATUS_FILE_LOCK_CONFLICT)) return False;
 	}
 	t2 = time(NULL);
@@ -868,40 +850,40 @@ static BOOL run_locktest1(int dummy)
 	printf("server slept for %u seconds for a %u second timeout\n",
 	       (unsigned int)(t2-t1), lock_timeout);
 
-	if (!cli_close(&cli1, fnum2)) {
-		printf("close1 failed (%s)\n", cli_errstr(&cli1));
+	if (!cli_close(cli1, fnum2)) {
+		printf("close1 failed (%s)\n", cli_errstr(cli1));
 		return False;
 	}
 
-	if (cli_lock(&cli2, fnum3, 0, 4, 0, WRITE_LOCK)) {
+	if (cli_lock(cli2, fnum3, 0, 4, 0, WRITE_LOCK)) {
 		printf("lock4 succeeded! This is a locking bug\n");
 		return False;
 	} else {
-		if (!check_error(__LINE__, &cli2, ERRDOS, ERRlock, 
+		if (!check_error(__LINE__, cli2, ERRDOS, ERRlock, 
 				 NT_STATUS_FILE_LOCK_CONFLICT)) return False;
 	}
 
-	if (!cli_close(&cli1, fnum1)) {
-		printf("close2 failed (%s)\n", cli_errstr(&cli1));
+	if (!cli_close(cli1, fnum1)) {
+		printf("close2 failed (%s)\n", cli_errstr(cli1));
 		return False;
 	}
 
-	if (!cli_close(&cli2, fnum3)) {
-		printf("close3 failed (%s)\n", cli_errstr(&cli2));
+	if (!cli_close(cli2, fnum3)) {
+		printf("close3 failed (%s)\n", cli_errstr(cli2));
 		return False;
 	}
 
-	if (!cli_unlink(&cli1, fname)) {
-		printf("unlink failed (%s)\n", cli_errstr(&cli1));
+	if (!cli_unlink(cli1, fname)) {
+		printf("unlink failed (%s)\n", cli_errstr(cli1));
 		return False;
 	}
 
 
-	if (!torture_close_connection(&cli1)) {
+	if (!torture_close_connection(cli1)) {
 		return False;
 	}
 
-	if (!torture_close_connection(&cli2)) {
+	if (!torture_close_connection(cli2)) {
 		return False;
 	}
 
@@ -914,7 +896,7 @@ static BOOL run_locktest1(int dummy)
  */
 static BOOL run_tcon_test(int dummy)
 {
-	static struct cli_state cli1;
+	static struct cli_state *cli1;
 	const char *fname = "\\tcontest.tmp";
 	int fnum1;
 	uint16 cnum;
@@ -923,59 +905,59 @@ static BOOL run_tcon_test(int dummy)
 	if (!torture_open_connection(&cli1)) {
 		return False;
 	}
-	cli_sockopt(&cli1, sockops);
+	cli_sockopt(cli1, sockops);
 
 	printf("starting tcontest\n");
 
-	cli_unlink(&cli1, fname);
+	cli_unlink(cli1, fname);
 
-	fnum1 = cli_open(&cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
+	fnum1 = cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
 	if (fnum1 == -1)
 	{
-		printf("open of %s failed (%s)\n", fname, cli_errstr(&cli1));
+		printf("open of %s failed (%s)\n", fname, cli_errstr(cli1));
 		return False;
 	}
 
-	cnum = cli1.cnum;
+	cnum = cli1->cnum;
 
-	if (cli_write(&cli1, fnum1, 0, buf, 130, 4) != 4)
+	if (cli_write(cli1, fnum1, 0, buf, 130, 4) != 4)
 	{
-		printf("write failed (%s)", cli_errstr(&cli1));
+		printf("write failed (%s)", cli_errstr(cli1));
 		return False;
 	}
 
-	if (!cli_send_tconX(&cli1, share, "?????",
+	if (!cli_send_tconX(cli1, share, "?????",
 			    password, strlen(password)+1)) {
 		printf("%s refused 2nd tree connect (%s)\n", host,
-		           cli_errstr(&cli1));
-		cli_shutdown(&cli1);
+		           cli_errstr(cli1));
+		cli_shutdown(cli1);
 		return False;
 	}
 
-	if (cli_write(&cli1, fnum1, 0, buf, 130, 4) == 4)
+	if (cli_write(cli1, fnum1, 0, buf, 130, 4) == 4)
 	{
-		printf("write succeeded (%s)", cli_errstr(&cli1));
+		printf("write succeeded (%s)", cli_errstr(cli1));
 		return False;
 	}
 
-	if (cli_close(&cli1, fnum1)) {
-		printf("close2 succeeded (%s)\n", cli_errstr(&cli1));
+	if (cli_close(cli1, fnum1)) {
+		printf("close2 succeeded (%s)\n", cli_errstr(cli1));
 		return False;
 	}
 
-	if (!cli_tdis(&cli1)) {
-		printf("tdis failed (%s)\n", cli_errstr(&cli1));
+	if (!cli_tdis(cli1)) {
+		printf("tdis failed (%s)\n", cli_errstr(cli1));
 		return False;
 	}
 
-	cli1.cnum = cnum;
+	cli1->cnum = cnum;
 
-	if (!cli_close(&cli1, fnum1)) {
-		printf("close2 failed (%s)\n", cli_errstr(&cli1));
+	if (!cli_close(cli1, fnum1)) {
+		printf("close2 failed (%s)\n", cli_errstr(cli1));
 		return False;
 	}
 
-	if (!torture_close_connection(&cli1)) {
+	if (!torture_close_connection(cli1)) {
 		return False;
 	}
 
@@ -997,7 +979,7 @@ static BOOL run_tcon_test(int dummy)
 */
 static BOOL run_locktest2(int dummy)
 {
-	static struct cli_state cli;
+	static struct cli_state *cli;
 	const char *fname = "\\lockt2.lck";
 	int fnum1, fnum2, fnum3;
 	BOOL correct = True;
@@ -1006,117 +988,117 @@ static BOOL run_locktest2(int dummy)
 		return False;
 	}
 
-	cli_sockopt(&cli, sockops);
+	cli_sockopt(cli, sockops);
 
 	printf("starting locktest2\n");
 
-	cli_unlink(&cli, fname);
+	cli_unlink(cli, fname);
 
-	cli_setpid(&cli, 1);
+	cli_setpid(cli, 1);
 
-	fnum1 = cli_open(&cli, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
+	fnum1 = cli_open(cli, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
 	if (fnum1 == -1) {
-		printf("open of %s failed (%s)\n", fname, cli_errstr(&cli));
+		printf("open of %s failed (%s)\n", fname, cli_errstr(cli));
 		return False;
 	}
 
-	fnum2 = cli_open(&cli, fname, O_RDWR, DENY_NONE);
+	fnum2 = cli_open(cli, fname, O_RDWR, DENY_NONE);
 	if (fnum2 == -1) {
-		printf("open2 of %s failed (%s)\n", fname, cli_errstr(&cli));
+		printf("open2 of %s failed (%s)\n", fname, cli_errstr(cli));
 		return False;
 	}
 
-	cli_setpid(&cli, 2);
+	cli_setpid(cli, 2);
 
-	fnum3 = cli_open(&cli, fname, O_RDWR, DENY_NONE);
+	fnum3 = cli_open(cli, fname, O_RDWR, DENY_NONE);
 	if (fnum3 == -1) {
-		printf("open3 of %s failed (%s)\n", fname, cli_errstr(&cli));
+		printf("open3 of %s failed (%s)\n", fname, cli_errstr(cli));
 		return False;
 	}
 
-	cli_setpid(&cli, 1);
+	cli_setpid(cli, 1);
 
-	if (!cli_lock(&cli, fnum1, 0, 4, 0, WRITE_LOCK)) {
-		printf("lock1 failed (%s)\n", cli_errstr(&cli));
+	if (!cli_lock(cli, fnum1, 0, 4, 0, WRITE_LOCK)) {
+		printf("lock1 failed (%s)\n", cli_errstr(cli));
 		return False;
 	}
 
-	if (cli_lock(&cli, fnum1, 0, 4, 0, WRITE_LOCK)) {
+	if (cli_lock(cli, fnum1, 0, 4, 0, WRITE_LOCK)) {
 		printf("WRITE lock1 succeeded! This is a locking bug\n");
 		correct = False;
 	} else {
-		if (!check_error(__LINE__, &cli, ERRDOS, ERRlock, 
+		if (!check_error(__LINE__, cli, ERRDOS, ERRlock, 
 				 NT_STATUS_LOCK_NOT_GRANTED)) return False;
 	}
 
-	if (cli_lock(&cli, fnum2, 0, 4, 0, WRITE_LOCK)) {
+	if (cli_lock(cli, fnum2, 0, 4, 0, WRITE_LOCK)) {
 		printf("WRITE lock2 succeeded! This is a locking bug\n");
 		correct = False;
 	} else {
-		if (!check_error(__LINE__, &cli, ERRDOS, ERRlock, 
+		if (!check_error(__LINE__, cli, ERRDOS, ERRlock, 
 				 NT_STATUS_LOCK_NOT_GRANTED)) return False;
 	}
 
-	if (cli_lock(&cli, fnum2, 0, 4, 0, READ_LOCK)) {
+	if (cli_lock(cli, fnum2, 0, 4, 0, READ_LOCK)) {
 		printf("READ lock2 succeeded! This is a locking bug\n");
 		correct = False;
 	} else {
-		if (!check_error(__LINE__, &cli, ERRDOS, ERRlock, 
+		if (!check_error(__LINE__, cli, ERRDOS, ERRlock, 
 				 NT_STATUS_FILE_LOCK_CONFLICT)) return False;
 	}
 
-	if (!cli_lock(&cli, fnum1, 100, 4, 0, WRITE_LOCK)) {
-		printf("lock at 100 failed (%s)\n", cli_errstr(&cli));
+	if (!cli_lock(cli, fnum1, 100, 4, 0, WRITE_LOCK)) {
+		printf("lock at 100 failed (%s)\n", cli_errstr(cli));
 	}
-	cli_setpid(&cli, 2);
-	if (cli_unlock(&cli, fnum1, 100, 4)) {
+	cli_setpid(cli, 2);
+	if (cli_unlock(cli, fnum1, 100, 4)) {
 		printf("unlock at 100 succeeded! This is a locking bug\n");
 		correct = False;
 	}
 
-	if (cli_unlock(&cli, fnum1, 0, 4)) {
+	if (cli_unlock(cli, fnum1, 0, 4)) {
 		printf("unlock1 succeeded! This is a locking bug\n");
 		correct = False;
 	} else {
-		if (!check_error(__LINE__, &cli, 
+		if (!check_error(__LINE__, cli, 
 				 ERRDOS, ERRlock, 
 				 NT_STATUS_RANGE_NOT_LOCKED)) return False;
 	}
 
-	if (cli_unlock(&cli, fnum1, 0, 8)) {
+	if (cli_unlock(cli, fnum1, 0, 8)) {
 		printf("unlock2 succeeded! This is a locking bug\n");
 		correct = False;
 	} else {
-		if (!check_error(__LINE__, &cli, 
+		if (!check_error(__LINE__, cli, 
 				 ERRDOS, ERRlock, 
 				 NT_STATUS_RANGE_NOT_LOCKED)) return False;
 	}
 
-	if (cli_lock(&cli, fnum3, 0, 4, 0, WRITE_LOCK)) {
+	if (cli_lock(cli, fnum3, 0, 4, 0, WRITE_LOCK)) {
 		printf("lock3 succeeded! This is a locking bug\n");
 		correct = False;
 	} else {
-		if (!check_error(__LINE__, &cli, ERRDOS, ERRlock, NT_STATUS_LOCK_NOT_GRANTED)) return False;
+		if (!check_error(__LINE__, cli, ERRDOS, ERRlock, NT_STATUS_LOCK_NOT_GRANTED)) return False;
 	}
 
-	cli_setpid(&cli, 1);
+	cli_setpid(cli, 1);
 
-	if (!cli_close(&cli, fnum1)) {
-		printf("close1 failed (%s)\n", cli_errstr(&cli));
+	if (!cli_close(cli, fnum1)) {
+		printf("close1 failed (%s)\n", cli_errstr(cli));
 		return False;
 	}
 
-	if (!cli_close(&cli, fnum2)) {
-		printf("close2 failed (%s)\n", cli_errstr(&cli));
+	if (!cli_close(cli, fnum2)) {
+		printf("close2 failed (%s)\n", cli_errstr(cli));
 		return False;
 	}
 
-	if (!cli_close(&cli, fnum3)) {
-		printf("close3 failed (%s)\n", cli_errstr(&cli));
+	if (!cli_close(cli, fnum3)) {
+		printf("close3 failed (%s)\n", cli_errstr(cli));
 		return False;
 	}
 
-	if (!torture_close_connection(&cli)) {
+	if (!torture_close_connection(cli)) {
 		correct = False;
 	}
 
@@ -1133,7 +1115,7 @@ static BOOL run_locktest2(int dummy)
 */
 static BOOL run_locktest3(int dummy)
 {
-	static struct cli_state cli1, cli2;
+	static struct cli_state *cli1, *cli2;
 	const char *fname = "\\lockt3.lck";
 	int fnum1, fnum2, i;
 	uint32 offset;
@@ -1144,37 +1126,37 @@ static BOOL run_locktest3(int dummy)
 	if (!torture_open_connection(&cli1) || !torture_open_connection(&cli2)) {
 		return False;
 	}
-	cli_sockopt(&cli1, sockops);
-	cli_sockopt(&cli2, sockops);
+	cli_sockopt(cli1, sockops);
+	cli_sockopt(cli2, sockops);
 
 	printf("starting locktest3\n");
 
-	cli_unlink(&cli1, fname);
+	cli_unlink(cli1, fname);
 
-	fnum1 = cli_open(&cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
+	fnum1 = cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
 	if (fnum1 == -1) {
-		printf("open of %s failed (%s)\n", fname, cli_errstr(&cli1));
+		printf("open of %s failed (%s)\n", fname, cli_errstr(cli1));
 		return False;
 	}
-	fnum2 = cli_open(&cli2, fname, O_RDWR, DENY_NONE);
+	fnum2 = cli_open(cli2, fname, O_RDWR, DENY_NONE);
 	if (fnum2 == -1) {
-		printf("open2 of %s failed (%s)\n", fname, cli_errstr(&cli2));
+		printf("open2 of %s failed (%s)\n", fname, cli_errstr(cli2));
 		return False;
 	}
 
 	for (offset=i=0;i<torture_numops;i++) {
 		NEXT_OFFSET;
-		if (!cli_lock(&cli1, fnum1, offset-1, 1, 0, WRITE_LOCK)) {
+		if (!cli_lock(cli1, fnum1, offset-1, 1, 0, WRITE_LOCK)) {
 			printf("lock1 %d failed (%s)\n", 
 			       i,
-			       cli_errstr(&cli1));
+			       cli_errstr(cli1));
 			return False;
 		}
 
-		if (!cli_lock(&cli2, fnum2, offset-2, 1, 0, WRITE_LOCK)) {
+		if (!cli_lock(cli2, fnum2, offset-2, 1, 0, WRITE_LOCK)) {
 			printf("lock2 %d failed (%s)\n", 
 			       i,
-			       cli_errstr(&cli1));
+			       cli_errstr(cli1));
 			return False;
 		}
 	}
@@ -1182,22 +1164,22 @@ static BOOL run_locktest3(int dummy)
 	for (offset=i=0;i<torture_numops;i++) {
 		NEXT_OFFSET;
 
-		if (cli_lock(&cli1, fnum1, offset-2, 1, 0, WRITE_LOCK)) {
+		if (cli_lock(cli1, fnum1, offset-2, 1, 0, WRITE_LOCK)) {
 			printf("error: lock1 %d succeeded!\n", i);
 			return False;
 		}
 
-		if (cli_lock(&cli2, fnum2, offset-1, 1, 0, WRITE_LOCK)) {
+		if (cli_lock(cli2, fnum2, offset-1, 1, 0, WRITE_LOCK)) {
 			printf("error: lock2 %d succeeded!\n", i);
 			return False;
 		}
 
-		if (cli_lock(&cli1, fnum1, offset-1, 1, 0, WRITE_LOCK)) {
+		if (cli_lock(cli1, fnum1, offset-1, 1, 0, WRITE_LOCK)) {
 			printf("error: lock3 %d succeeded!\n", i);
 			return False;
 		}
 
-		if (cli_lock(&cli2, fnum2, offset-2, 1, 0, WRITE_LOCK)) {
+		if (cli_lock(cli2, fnum2, offset-2, 1, 0, WRITE_LOCK)) {
 			printf("error: lock4 %d succeeded!\n", i);
 			return False;
 		}
@@ -1206,41 +1188,41 @@ static BOOL run_locktest3(int dummy)
 	for (offset=i=0;i<torture_numops;i++) {
 		NEXT_OFFSET;
 
-		if (!cli_unlock(&cli1, fnum1, offset-1, 1)) {
+		if (!cli_unlock(cli1, fnum1, offset-1, 1)) {
 			printf("unlock1 %d failed (%s)\n", 
 			       i,
-			       cli_errstr(&cli1));
+			       cli_errstr(cli1));
 			return False;
 		}
 
-		if (!cli_unlock(&cli2, fnum2, offset-2, 1)) {
+		if (!cli_unlock(cli2, fnum2, offset-2, 1)) {
 			printf("unlock2 %d failed (%s)\n", 
 			       i,
-			       cli_errstr(&cli1));
+			       cli_errstr(cli1));
 			return False;
 		}
 	}
 
-	if (!cli_close(&cli1, fnum1)) {
-		printf("close1 failed (%s)\n", cli_errstr(&cli1));
+	if (!cli_close(cli1, fnum1)) {
+		printf("close1 failed (%s)\n", cli_errstr(cli1));
 		return False;
 	}
 
-	if (!cli_close(&cli2, fnum2)) {
-		printf("close2 failed (%s)\n", cli_errstr(&cli2));
+	if (!cli_close(cli2, fnum2)) {
+		printf("close2 failed (%s)\n", cli_errstr(cli2));
 		return False;
 	}
 
-	if (!cli_unlink(&cli1, fname)) {
-		printf("unlink failed (%s)\n", cli_errstr(&cli1));
+	if (!cli_unlink(cli1, fname)) {
+		printf("unlink failed (%s)\n", cli_errstr(cli1));
 		return False;
 	}
 
-	if (!torture_close_connection(&cli1)) {
+	if (!torture_close_connection(cli1)) {
 		correct = False;
 	}
 	
-	if (!torture_close_connection(&cli2)) {
+	if (!torture_close_connection(cli2)) {
 		correct = False;
 	}
 
@@ -1258,7 +1240,7 @@ static BOOL run_locktest3(int dummy)
 */
 static BOOL run_locktest4(int dummy)
 {
-	static struct cli_state cli1, cli2;
+	static struct cli_state *cli1, *cli2;
 	const char *fname = "\\lockt4.lck";
 	int fnum1, fnum2, f;
 	BOOL ret;
@@ -1269,156 +1251,156 @@ static BOOL run_locktest4(int dummy)
 		return False;
 	}
 
-	cli_sockopt(&cli1, sockops);
-	cli_sockopt(&cli2, sockops);
+	cli_sockopt(cli1, sockops);
+	cli_sockopt(cli2, sockops);
 
 	printf("starting locktest4\n");
 
-	cli_unlink(&cli1, fname);
+	cli_unlink(cli1, fname);
 
-	fnum1 = cli_open(&cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
-	fnum2 = cli_open(&cli2, fname, O_RDWR, DENY_NONE);
+	fnum1 = cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
+	fnum2 = cli_open(cli2, fname, O_RDWR, DENY_NONE);
 
 	memset(buf, 0, sizeof(buf));
 
-	if (cli_write(&cli1, fnum1, 0, buf, 0, sizeof(buf)) != sizeof(buf)) {
+	if (cli_write(cli1, fnum1, 0, buf, 0, sizeof(buf)) != sizeof(buf)) {
 		printf("Failed to create file\n");
 		correct = False;
 		goto fail;
 	}
 
-	ret = cli_lock(&cli1, fnum1, 0, 4, 0, WRITE_LOCK) &&
-	      cli_lock(&cli1, fnum1, 2, 4, 0, WRITE_LOCK);
+	ret = cli_lock(cli1, fnum1, 0, 4, 0, WRITE_LOCK) &&
+	      cli_lock(cli1, fnum1, 2, 4, 0, WRITE_LOCK);
 	EXPECTED(ret, False);
 	printf("the same process %s set overlapping write locks\n", ret?"can":"cannot");
 	    
-	ret = cli_lock(&cli1, fnum1, 10, 4, 0, READ_LOCK) &&
-	      cli_lock(&cli1, fnum1, 12, 4, 0, READ_LOCK);
+	ret = cli_lock(cli1, fnum1, 10, 4, 0, READ_LOCK) &&
+	      cli_lock(cli1, fnum1, 12, 4, 0, READ_LOCK);
 	EXPECTED(ret, True);
 	printf("the same process %s set overlapping read locks\n", ret?"can":"cannot");
 
-	ret = cli_lock(&cli1, fnum1, 20, 4, 0, WRITE_LOCK) &&
-	      cli_lock(&cli2, fnum2, 22, 4, 0, WRITE_LOCK);
+	ret = cli_lock(cli1, fnum1, 20, 4, 0, WRITE_LOCK) &&
+	      cli_lock(cli2, fnum2, 22, 4, 0, WRITE_LOCK);
 	EXPECTED(ret, False);
 	printf("a different connection %s set overlapping write locks\n", ret?"can":"cannot");
 	    
-	ret = cli_lock(&cli1, fnum1, 30, 4, 0, READ_LOCK) &&
-	      cli_lock(&cli2, fnum2, 32, 4, 0, READ_LOCK);
+	ret = cli_lock(cli1, fnum1, 30, 4, 0, READ_LOCK) &&
+	      cli_lock(cli2, fnum2, 32, 4, 0, READ_LOCK);
 	EXPECTED(ret, True);
 	printf("a different connection %s set overlapping read locks\n", ret?"can":"cannot");
 	
-	ret = (cli_setpid(&cli1, 1), cli_lock(&cli1, fnum1, 40, 4, 0, WRITE_LOCK)) &&
-	      (cli_setpid(&cli1, 2), cli_lock(&cli1, fnum1, 42, 4, 0, WRITE_LOCK));
+	ret = (cli_setpid(cli1, 1), cli_lock(cli1, fnum1, 40, 4, 0, WRITE_LOCK)) &&
+	      (cli_setpid(cli1, 2), cli_lock(cli1, fnum1, 42, 4, 0, WRITE_LOCK));
 	EXPECTED(ret, False);
 	printf("a different pid %s set overlapping write locks\n", ret?"can":"cannot");
 	    
-	ret = (cli_setpid(&cli1, 1), cli_lock(&cli1, fnum1, 50, 4, 0, READ_LOCK)) &&
-	      (cli_setpid(&cli1, 2), cli_lock(&cli1, fnum1, 52, 4, 0, READ_LOCK));
+	ret = (cli_setpid(cli1, 1), cli_lock(cli1, fnum1, 50, 4, 0, READ_LOCK)) &&
+	      (cli_setpid(cli1, 2), cli_lock(cli1, fnum1, 52, 4, 0, READ_LOCK));
 	EXPECTED(ret, True);
 	printf("a different pid %s set overlapping read locks\n", ret?"can":"cannot");
 
-	ret = cli_lock(&cli1, fnum1, 60, 4, 0, READ_LOCK) &&
-	      cli_lock(&cli1, fnum1, 60, 4, 0, READ_LOCK);
+	ret = cli_lock(cli1, fnum1, 60, 4, 0, READ_LOCK) &&
+	      cli_lock(cli1, fnum1, 60, 4, 0, READ_LOCK);
 	EXPECTED(ret, True);
 	printf("the same process %s set the same read lock twice\n", ret?"can":"cannot");
 
-	ret = cli_lock(&cli1, fnum1, 70, 4, 0, WRITE_LOCK) &&
-	      cli_lock(&cli1, fnum1, 70, 4, 0, WRITE_LOCK);
+	ret = cli_lock(cli1, fnum1, 70, 4, 0, WRITE_LOCK) &&
+	      cli_lock(cli1, fnum1, 70, 4, 0, WRITE_LOCK);
 	EXPECTED(ret, False);
 	printf("the same process %s set the same write lock twice\n", ret?"can":"cannot");
 
-	ret = cli_lock(&cli1, fnum1, 80, 4, 0, READ_LOCK) &&
-	      cli_lock(&cli1, fnum1, 80, 4, 0, WRITE_LOCK);
+	ret = cli_lock(cli1, fnum1, 80, 4, 0, READ_LOCK) &&
+	      cli_lock(cli1, fnum1, 80, 4, 0, WRITE_LOCK);
 	EXPECTED(ret, False);
 	printf("the same process %s overlay a read lock with a write lock\n", ret?"can":"cannot");
 
-	ret = cli_lock(&cli1, fnum1, 90, 4, 0, WRITE_LOCK) &&
-	      cli_lock(&cli1, fnum1, 90, 4, 0, READ_LOCK);
+	ret = cli_lock(cli1, fnum1, 90, 4, 0, WRITE_LOCK) &&
+	      cli_lock(cli1, fnum1, 90, 4, 0, READ_LOCK);
 	EXPECTED(ret, True);
 	printf("the same process %s overlay a write lock with a read lock\n", ret?"can":"cannot");
 
-	ret = (cli_setpid(&cli1, 1), cli_lock(&cli1, fnum1, 100, 4, 0, WRITE_LOCK)) &&
-	      (cli_setpid(&cli1, 2), cli_lock(&cli1, fnum1, 100, 4, 0, READ_LOCK));
+	ret = (cli_setpid(cli1, 1), cli_lock(cli1, fnum1, 100, 4, 0, WRITE_LOCK)) &&
+	      (cli_setpid(cli1, 2), cli_lock(cli1, fnum1, 100, 4, 0, READ_LOCK));
 	EXPECTED(ret, False);
 	printf("a different pid %s overlay a write lock with a read lock\n", ret?"can":"cannot");
 
-	ret = cli_lock(&cli1, fnum1, 110, 4, 0, READ_LOCK) &&
-	      cli_lock(&cli1, fnum1, 112, 4, 0, READ_LOCK) &&
-	      cli_unlock(&cli1, fnum1, 110, 6);
+	ret = cli_lock(cli1, fnum1, 110, 4, 0, READ_LOCK) &&
+	      cli_lock(cli1, fnum1, 112, 4, 0, READ_LOCK) &&
+	      cli_unlock(cli1, fnum1, 110, 6);
 	EXPECTED(ret, False);
 	printf("the same process %s coalesce read locks\n", ret?"can":"cannot");
 
 
-	ret = cli_lock(&cli1, fnum1, 120, 4, 0, WRITE_LOCK) &&
-	      (cli_read(&cli2, fnum2, buf, 120, 4) == 4);
+	ret = cli_lock(cli1, fnum1, 120, 4, 0, WRITE_LOCK) &&
+	      (cli_read(cli2, fnum2, buf, 120, 4) == 4);
 	EXPECTED(ret, False);
 	printf("this server %s strict write locking\n", ret?"doesn't do":"does");
 
-	ret = cli_lock(&cli1, fnum1, 130, 4, 0, READ_LOCK) &&
-	      (cli_write(&cli2, fnum2, 0, buf, 130, 4) == 4);
+	ret = cli_lock(cli1, fnum1, 130, 4, 0, READ_LOCK) &&
+	      (cli_write(cli2, fnum2, 0, buf, 130, 4) == 4);
 	EXPECTED(ret, False);
 	printf("this server %s strict read locking\n", ret?"doesn't do":"does");
 
 
-	ret = cli_lock(&cli1, fnum1, 140, 4, 0, READ_LOCK) &&
-	      cli_lock(&cli1, fnum1, 140, 4, 0, READ_LOCK) &&
-	      cli_unlock(&cli1, fnum1, 140, 4) &&
-	      cli_unlock(&cli1, fnum1, 140, 4);
+	ret = cli_lock(cli1, fnum1, 140, 4, 0, READ_LOCK) &&
+	      cli_lock(cli1, fnum1, 140, 4, 0, READ_LOCK) &&
+	      cli_unlock(cli1, fnum1, 140, 4) &&
+	      cli_unlock(cli1, fnum1, 140, 4);
 	EXPECTED(ret, True);
 	printf("this server %s do recursive read locking\n", ret?"does":"doesn't");
 
 
-	ret = cli_lock(&cli1, fnum1, 150, 4, 0, WRITE_LOCK) &&
-	      cli_lock(&cli1, fnum1, 150, 4, 0, READ_LOCK) &&
-	      cli_unlock(&cli1, fnum1, 150, 4) &&
-	      (cli_read(&cli2, fnum2, buf, 150, 4) == 4) &&
-	      !(cli_write(&cli2, fnum2, 0, buf, 150, 4) == 4) &&
-	      cli_unlock(&cli1, fnum1, 150, 4);
+	ret = cli_lock(cli1, fnum1, 150, 4, 0, WRITE_LOCK) &&
+	      cli_lock(cli1, fnum1, 150, 4, 0, READ_LOCK) &&
+	      cli_unlock(cli1, fnum1, 150, 4) &&
+	      (cli_read(cli2, fnum2, buf, 150, 4) == 4) &&
+	      !(cli_write(cli2, fnum2, 0, buf, 150, 4) == 4) &&
+	      cli_unlock(cli1, fnum1, 150, 4);
 	EXPECTED(ret, True);
 	printf("this server %s do recursive lock overlays\n", ret?"does":"doesn't");
 
-	ret = cli_lock(&cli1, fnum1, 160, 4, 0, READ_LOCK) &&
-	      cli_unlock(&cli1, fnum1, 160, 4) &&
-	      (cli_write(&cli2, fnum2, 0, buf, 160, 4) == 4) &&		
-	      (cli_read(&cli2, fnum2, buf, 160, 4) == 4);		
+	ret = cli_lock(cli1, fnum1, 160, 4, 0, READ_LOCK) &&
+	      cli_unlock(cli1, fnum1, 160, 4) &&
+	      (cli_write(cli2, fnum2, 0, buf, 160, 4) == 4) &&		
+	      (cli_read(cli2, fnum2, buf, 160, 4) == 4);		
 	EXPECTED(ret, True);
 	printf("the same process %s remove a read lock using write locking\n", ret?"can":"cannot");
 
-	ret = cli_lock(&cli1, fnum1, 170, 4, 0, WRITE_LOCK) &&
-	      cli_unlock(&cli1, fnum1, 170, 4) &&
-	      (cli_write(&cli2, fnum2, 0, buf, 170, 4) == 4) &&		
-	      (cli_read(&cli2, fnum2, buf, 170, 4) == 4);		
+	ret = cli_lock(cli1, fnum1, 170, 4, 0, WRITE_LOCK) &&
+	      cli_unlock(cli1, fnum1, 170, 4) &&
+	      (cli_write(cli2, fnum2, 0, buf, 170, 4) == 4) &&		
+	      (cli_read(cli2, fnum2, buf, 170, 4) == 4);		
 	EXPECTED(ret, True);
 	printf("the same process %s remove a write lock using read locking\n", ret?"can":"cannot");
 
-	ret = cli_lock(&cli1, fnum1, 190, 4, 0, WRITE_LOCK) &&
-	      cli_lock(&cli1, fnum1, 190, 4, 0, READ_LOCK) &&
-	      cli_unlock(&cli1, fnum1, 190, 4) &&
-	      !(cli_write(&cli2, fnum2, 0, buf, 190, 4) == 4) &&		
-	      (cli_read(&cli2, fnum2, buf, 190, 4) == 4);		
+	ret = cli_lock(cli1, fnum1, 190, 4, 0, WRITE_LOCK) &&
+	      cli_lock(cli1, fnum1, 190, 4, 0, READ_LOCK) &&
+	      cli_unlock(cli1, fnum1, 190, 4) &&
+	      !(cli_write(cli2, fnum2, 0, buf, 190, 4) == 4) &&		
+	      (cli_read(cli2, fnum2, buf, 190, 4) == 4);		
 	EXPECTED(ret, True);
 	printf("the same process %s remove the first lock first\n", ret?"does":"doesn't");
 
-	cli_close(&cli1, fnum1);
-	cli_close(&cli2, fnum2);
-	fnum1 = cli_open(&cli1, fname, O_RDWR, DENY_NONE);
-	f = cli_open(&cli1, fname, O_RDWR, DENY_NONE);
-	ret = cli_lock(&cli1, fnum1, 0, 8, 0, READ_LOCK) &&
-	      cli_lock(&cli1, f, 0, 1, 0, READ_LOCK) &&
-	      cli_close(&cli1, fnum1) &&
-	      ((fnum1 = cli_open(&cli1, fname, O_RDWR, DENY_NONE)) != -1) &&
-	      cli_lock(&cli1, fnum1, 7, 1, 0, WRITE_LOCK);
-        cli_close(&cli1, f);
-	cli_close(&cli1, fnum1);
+	cli_close(cli1, fnum1);
+	cli_close(cli2, fnum2);
+	fnum1 = cli_open(cli1, fname, O_RDWR, DENY_NONE);
+	f = cli_open(cli1, fname, O_RDWR, DENY_NONE);
+	ret = cli_lock(cli1, fnum1, 0, 8, 0, READ_LOCK) &&
+	      cli_lock(cli1, f, 0, 1, 0, READ_LOCK) &&
+	      cli_close(cli1, fnum1) &&
+	      ((fnum1 = cli_open(cli1, fname, O_RDWR, DENY_NONE)) != -1) &&
+	      cli_lock(cli1, fnum1, 7, 1, 0, WRITE_LOCK);
+        cli_close(cli1, f);
+	cli_close(cli1, fnum1);
 	EXPECTED(ret, True);
 	printf("the server %s have the NT byte range lock bug\n", !ret?"does":"doesn't");
 
  fail:
-	cli_close(&cli1, fnum1);
-	cli_close(&cli2, fnum2);
-	cli_unlink(&cli1, fname);
-	torture_close_connection(&cli1);
-	torture_close_connection(&cli2);
+	cli_close(cli1, fnum1);
+	cli_close(cli2, fnum2);
+	cli_unlink(cli1, fname);
+	torture_close_connection(cli1);
+	torture_close_connection(cli2);
 
 	printf("finished locktest4\n");
 	return correct;
@@ -1429,7 +1411,7 @@ static BOOL run_locktest4(int dummy)
 */
 static BOOL run_locktest5(int dummy)
 {
-	static struct cli_state cli1, cli2;
+	static struct cli_state *cli1, *cli2;
 	const char *fname = "\\lockt5.lck";
 	int fnum1, fnum2, fnum3;
 	BOOL ret;
@@ -1440,61 +1422,61 @@ static BOOL run_locktest5(int dummy)
 		return False;
 	}
 
-	cli_sockopt(&cli1, sockops);
-	cli_sockopt(&cli2, sockops);
+	cli_sockopt(cli1, sockops);
+	cli_sockopt(cli2, sockops);
 
 	printf("starting locktest5\n");
 
-	cli_unlink(&cli1, fname);
+	cli_unlink(cli1, fname);
 
-	fnum1 = cli_open(&cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
-	fnum2 = cli_open(&cli2, fname, O_RDWR, DENY_NONE);
-	fnum3 = cli_open(&cli1, fname, O_RDWR, DENY_NONE);
+	fnum1 = cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
+	fnum2 = cli_open(cli2, fname, O_RDWR, DENY_NONE);
+	fnum3 = cli_open(cli1, fname, O_RDWR, DENY_NONE);
 
 	memset(buf, 0, sizeof(buf));
 
-	if (cli_write(&cli1, fnum1, 0, buf, 0, sizeof(buf)) != sizeof(buf)) {
+	if (cli_write(cli1, fnum1, 0, buf, 0, sizeof(buf)) != sizeof(buf)) {
 		printf("Failed to create file\n");
 		correct = False;
 		goto fail;
 	}
 
 	/* Check for NT bug... */
-	ret = cli_lock(&cli1, fnum1, 0, 8, 0, READ_LOCK) &&
-		  cli_lock(&cli1, fnum3, 0, 1, 0, READ_LOCK);
-	cli_close(&cli1, fnum1);
-	fnum1 = cli_open(&cli1, fname, O_RDWR, DENY_NONE);
-	ret = cli_lock(&cli1, fnum1, 7, 1, 0, WRITE_LOCK);
+	ret = cli_lock(cli1, fnum1, 0, 8, 0, READ_LOCK) &&
+		  cli_lock(cli1, fnum3, 0, 1, 0, READ_LOCK);
+	cli_close(cli1, fnum1);
+	fnum1 = cli_open(cli1, fname, O_RDWR, DENY_NONE);
+	ret = cli_lock(cli1, fnum1, 7, 1, 0, WRITE_LOCK);
 	EXPECTED(ret, True);
 	printf("this server %s the NT locking bug\n", ret ? "doesn't have" : "has");
-	cli_close(&cli1, fnum1);
-	fnum1 = cli_open(&cli1, fname, O_RDWR, DENY_NONE);
-	cli_unlock(&cli1, fnum3, 0, 1);
+	cli_close(cli1, fnum1);
+	fnum1 = cli_open(cli1, fname, O_RDWR, DENY_NONE);
+	cli_unlock(cli1, fnum3, 0, 1);
 
-	ret = cli_lock(&cli1, fnum1, 0, 4, 0, WRITE_LOCK) &&
-	      cli_lock(&cli1, fnum1, 1, 1, 0, READ_LOCK);
+	ret = cli_lock(cli1, fnum1, 0, 4, 0, WRITE_LOCK) &&
+	      cli_lock(cli1, fnum1, 1, 1, 0, READ_LOCK);
 	EXPECTED(ret, True);
 	printf("the same process %s overlay a write with a read lock\n", ret?"can":"cannot");
 
-	ret = cli_lock(&cli2, fnum2, 0, 4, 0, READ_LOCK);
+	ret = cli_lock(cli2, fnum2, 0, 4, 0, READ_LOCK);
 	EXPECTED(ret, False);
 
 	printf("a different processs %s get a read lock on the first process lock stack\n", ret?"can":"cannot");
 
 	/* Unlock the process 2 lock. */
-	cli_unlock(&cli2, fnum2, 0, 4);
+	cli_unlock(cli2, fnum2, 0, 4);
 
-	ret = cli_lock(&cli1, fnum3, 0, 4, 0, READ_LOCK);
+	ret = cli_lock(cli1, fnum3, 0, 4, 0, READ_LOCK);
 	EXPECTED(ret, False);
 
 	printf("the same processs on a different fnum %s get a read lock\n", ret?"can":"cannot");
 
 	/* Unlock the process 1 fnum3 lock. */
-	cli_unlock(&cli1, fnum3, 0, 4);
+	cli_unlock(cli1, fnum3, 0, 4);
 
 	/* Stack 2 more locks here. */
-	ret = cli_lock(&cli1, fnum1, 0, 4, 0, READ_LOCK) &&
-		  cli_lock(&cli1, fnum1, 0, 4, 0, READ_LOCK);
+	ret = cli_lock(cli1, fnum1, 0, 4, 0, READ_LOCK) &&
+		  cli_lock(cli1, fnum1, 0, 4, 0, READ_LOCK);
 
 	EXPECTED(ret, True);
 	printf("the same process %s stack read locks\n", ret?"can":"cannot");
@@ -1502,44 +1484,44 @@ static BOOL run_locktest5(int dummy)
 	/* Unlock the first process lock, then check this was the WRITE lock that was
 		removed. */
 
-	ret = cli_unlock(&cli1, fnum1, 0, 4) &&
-			cli_lock(&cli2, fnum2, 0, 4, 0, READ_LOCK);
+	ret = cli_unlock(cli1, fnum1, 0, 4) &&
+			cli_lock(cli2, fnum2, 0, 4, 0, READ_LOCK);
 
 	EXPECTED(ret, True);
 	printf("the first unlock removes the %s lock\n", ret?"WRITE":"READ");
 
 	/* Unlock the process 2 lock. */
-	cli_unlock(&cli2, fnum2, 0, 4);
+	cli_unlock(cli2, fnum2, 0, 4);
 
 	/* We should have 3 stacked locks here. Ensure we need to do 3 unlocks. */
 
-	ret = cli_unlock(&cli1, fnum1, 1, 1) &&
-		  cli_unlock(&cli1, fnum1, 0, 4) &&
-		  cli_unlock(&cli1, fnum1, 0, 4);
+	ret = cli_unlock(cli1, fnum1, 1, 1) &&
+		  cli_unlock(cli1, fnum1, 0, 4) &&
+		  cli_unlock(cli1, fnum1, 0, 4);
 
 	EXPECTED(ret, True);
 	printf("the same process %s unlock the stack of 4 locks\n", ret?"can":"cannot"); 
 
 	/* Ensure the next unlock fails. */
-	ret = cli_unlock(&cli1, fnum1, 0, 4);
+	ret = cli_unlock(cli1, fnum1, 0, 4);
 	EXPECTED(ret, False);
 	printf("the same process %s count the lock stack\n", !ret?"can":"cannot"); 
 
 	/* Ensure connection 2 can get a write lock. */
-	ret = cli_lock(&cli2, fnum2, 0, 4, 0, WRITE_LOCK);
+	ret = cli_lock(cli2, fnum2, 0, 4, 0, WRITE_LOCK);
 	EXPECTED(ret, True);
 
 	printf("a different processs %s get a write lock on the unlocked stack\n", ret?"can":"cannot");
 
 
  fail:
-	cli_close(&cli1, fnum1);
-	cli_close(&cli2, fnum2);
-	cli_unlink(&cli1, fname);
-	if (!torture_close_connection(&cli1)) {
+	cli_close(cli1, fnum1);
+	cli_close(cli2, fnum2);
+	cli_unlink(cli1, fname);
+	if (!torture_close_connection(cli1)) {
 		correct = False;
 	}
-	if (!torture_close_connection(&cli2)) {
+	if (!torture_close_connection(cli2)) {
 		correct = False;
 	}
 
@@ -1553,7 +1535,7 @@ static BOOL run_locktest5(int dummy)
 */
 static BOOL run_locktest6(int dummy)
 {
-	static struct cli_state cli;
+	static struct cli_state *cli;
 	const char *fname[1] = { "\\lock6.txt" };
 	int i;
 	int fnum;
@@ -1563,29 +1545,29 @@ static BOOL run_locktest6(int dummy)
 		return False;
 	}
 
-	cli_sockopt(&cli, sockops);
+	cli_sockopt(cli, sockops);
 
 	printf("starting locktest6\n");
 
 	for (i=0;i<1;i++) {
 		printf("Testing %s\n", fname[i]);
 
-		cli_unlink(&cli, fname[i]);
+		cli_unlink(cli, fname[i]);
 
-		fnum = cli_open(&cli, fname[i], O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
-		status = cli_locktype(&cli, fnum, 0, 8, 0, LOCKING_ANDX_CHANGE_LOCKTYPE);
-		cli_close(&cli, fnum);
+		fnum = cli_open(cli, fname[i], O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
+		status = cli_locktype(cli, fnum, 0, 8, 0, LOCKING_ANDX_CHANGE_LOCKTYPE);
+		cli_close(cli, fnum);
 		printf("CHANGE_LOCKTYPE gave %s\n", nt_errstr(status));
 
-		fnum = cli_open(&cli, fname[i], O_RDWR, DENY_NONE);
-		status = cli_locktype(&cli, fnum, 0, 8, 0, LOCKING_ANDX_CANCEL_LOCK);
-		cli_close(&cli, fnum);
+		fnum = cli_open(cli, fname[i], O_RDWR, DENY_NONE);
+		status = cli_locktype(cli, fnum, 0, 8, 0, LOCKING_ANDX_CANCEL_LOCK);
+		cli_close(cli, fnum);
 		printf("CANCEL_LOCK gave %s\n", nt_errstr(status));
 
-		cli_unlink(&cli, fname[i]);
+		cli_unlink(cli, fname[i]);
 	}
 
-	torture_close_connection(&cli);
+	torture_close_connection(cli);
 
 	printf("finished locktest6\n");
 	return True;
@@ -1593,7 +1575,7 @@ static BOOL run_locktest6(int dummy)
 
 static BOOL run_locktest7(int dummy)
 {
-	static struct cli_state cli1;
+	struct cli_state *cli1;
 	const char *fname = "\\lockt7.lck";
 	int fnum1;
 	char buf[200];
@@ -1603,40 +1585,40 @@ static BOOL run_locktest7(int dummy)
 		return False;
 	}
 
-	cli_sockopt(&cli1, sockops);
+	cli_sockopt(cli1, sockops);
 
 	printf("starting locktest7\n");
 
-	cli_unlink(&cli1, fname);
+	cli_unlink(cli1, fname);
 
-	fnum1 = cli_open(&cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
+	fnum1 = cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
 
 	memset(buf, 0, sizeof(buf));
 
-	if (cli_write(&cli1, fnum1, 0, buf, 0, sizeof(buf)) != sizeof(buf)) {
+	if (cli_write(cli1, fnum1, 0, buf, 0, sizeof(buf)) != sizeof(buf)) {
 		printf("Failed to create file\n");
 		goto fail;
 	}
 
-	cli_setpid(&cli1, 1);
+	cli_setpid(cli1, 1);
 
-	if (!cli_lock(&cli1, fnum1, 130, 4, 0, READ_LOCK)) {
-		printf("Unable to apply read lock on range 130:4, error was %s\n", cli_errstr(&cli1));
+	if (!cli_lock(cli1, fnum1, 130, 4, 0, READ_LOCK)) {
+		printf("Unable to apply read lock on range 130:4, error was %s\n", cli_errstr(cli1));
 		goto fail;
 	} else {
 		printf("pid1 successfully locked range 130:4 for READ\n");
 	}
 
-	if (cli_read(&cli1, fnum1, buf, 130, 4) != 4) {
-		printf("pid1 unable to read the range 130:4, error was %s\n", cli_errstr(&cli1));
+	if (cli_read(cli1, fnum1, buf, 130, 4) != 4) {
+		printf("pid1 unable to read the range 130:4, error was %s\n", cli_errstr(cli1));
 		goto fail;
 	} else {
 		printf("pid1 successfully read the range 130:4\n");
 	}
 
-	if (cli_write(&cli1, fnum1, 0, buf, 130, 4) != 4) {
-		printf("pid1 unable to write to the range 130:4, error was %s\n", cli_errstr(&cli1));
-		if (NT_STATUS_V(cli_nt_error(&cli1)) != NT_STATUS_V(NT_STATUS_FILE_LOCK_CONFLICT)) {
+	if (cli_write(cli1, fnum1, 0, buf, 130, 4) != 4) {
+		printf("pid1 unable to write to the range 130:4, error was %s\n", cli_errstr(cli1));
+		if (NT_STATUS_V(cli_nt_error(cli1)) != NT_STATUS_V(NT_STATUS_FILE_LOCK_CONFLICT)) {
 			printf("Incorrect error (should be NT_STATUS_FILE_LOCK_CONFLICT)\n");
 			goto fail;
 		}
@@ -1645,17 +1627,17 @@ static BOOL run_locktest7(int dummy)
 		goto fail;
 	}
 
-	cli_setpid(&cli1, 2);
+	cli_setpid(cli1, 2);
 
-	if (cli_read(&cli1, fnum1, buf, 130, 4) != 4) {
-		printf("pid2 unable to read the range 130:4, error was %s\n", cli_errstr(&cli1));
+	if (cli_read(cli1, fnum1, buf, 130, 4) != 4) {
+		printf("pid2 unable to read the range 130:4, error was %s\n", cli_errstr(cli1));
 	} else {
 		printf("pid2 successfully read the range 130:4\n");
 	}
 
-	if (cli_write(&cli1, fnum1, 0, buf, 130, 4) != 4) {
-		printf("pid2 unable to write to the range 130:4, error was %s\n", cli_errstr(&cli1));
-		if (NT_STATUS_V(cli_nt_error(&cli1)) != NT_STATUS_V(NT_STATUS_FILE_LOCK_CONFLICT)) {
+	if (cli_write(cli1, fnum1, 0, buf, 130, 4) != 4) {
+		printf("pid2 unable to write to the range 130:4, error was %s\n", cli_errstr(cli1));
+		if (NT_STATUS_V(cli_nt_error(cli1)) != NT_STATUS_V(NT_STATUS_FILE_LOCK_CONFLICT)) {
 			printf("Incorrect error (should be NT_STATUS_FILE_LOCK_CONFLICT)\n");
 			goto fail;
 		}
@@ -1664,35 +1646,35 @@ static BOOL run_locktest7(int dummy)
 		goto fail;
 	}
 
-	cli_setpid(&cli1, 1);
-	cli_unlock(&cli1, fnum1, 130, 4);
+	cli_setpid(cli1, 1);
+	cli_unlock(cli1, fnum1, 130, 4);
 
-	if (!cli_lock(&cli1, fnum1, 130, 4, 0, WRITE_LOCK)) {
-		printf("Unable to apply write lock on range 130:4, error was %s\n", cli_errstr(&cli1));
+	if (!cli_lock(cli1, fnum1, 130, 4, 0, WRITE_LOCK)) {
+		printf("Unable to apply write lock on range 130:4, error was %s\n", cli_errstr(cli1));
 		goto fail;
 	} else {
 		printf("pid1 successfully locked range 130:4 for WRITE\n");
 	}
 
-	if (cli_read(&cli1, fnum1, buf, 130, 4) != 4) {
-		printf("pid1 unable to read the range 130:4, error was %s\n", cli_errstr(&cli1));
+	if (cli_read(cli1, fnum1, buf, 130, 4) != 4) {
+		printf("pid1 unable to read the range 130:4, error was %s\n", cli_errstr(cli1));
 		goto fail;
 	} else {
 		printf("pid1 successfully read the range 130:4\n");
 	}
 
-	if (cli_write(&cli1, fnum1, 0, buf, 130, 4) != 4) {
-		printf("pid1 unable to write to the range 130:4, error was %s\n", cli_errstr(&cli1));
+	if (cli_write(cli1, fnum1, 0, buf, 130, 4) != 4) {
+		printf("pid1 unable to write to the range 130:4, error was %s\n", cli_errstr(cli1));
 		goto fail;
 	} else {
 		printf("pid1 successfully wrote to the range 130:4\n");
 	}
 
-	cli_setpid(&cli1, 2);
+	cli_setpid(cli1, 2);
 
-	if (cli_read(&cli1, fnum1, buf, 130, 4) != 4) {
-		printf("pid2 unable to read the range 130:4, error was %s\n", cli_errstr(&cli1));
-		if (NT_STATUS_V(cli_nt_error(&cli1)) != NT_STATUS_V(NT_STATUS_FILE_LOCK_CONFLICT)) {
+	if (cli_read(cli1, fnum1, buf, 130, 4) != 4) {
+		printf("pid2 unable to read the range 130:4, error was %s\n", cli_errstr(cli1));
+		if (NT_STATUS_V(cli_nt_error(cli1)) != NT_STATUS_V(NT_STATUS_FILE_LOCK_CONFLICT)) {
 			printf("Incorrect error (should be NT_STATUS_FILE_LOCK_CONFLICT)\n");
 			goto fail;
 		}
@@ -1701,9 +1683,9 @@ static BOOL run_locktest7(int dummy)
 		goto fail;
 	}
 
-	if (cli_write(&cli1, fnum1, 0, buf, 130, 4) != 4) {
-		printf("pid2 unable to write to the range 130:4, error was %s\n", cli_errstr(&cli1));
-		if (NT_STATUS_V(cli_nt_error(&cli1)) != NT_STATUS_V(NT_STATUS_FILE_LOCK_CONFLICT)) {
+	if (cli_write(cli1, fnum1, 0, buf, 130, 4) != 4) {
+		printf("pid2 unable to write to the range 130:4, error was %s\n", cli_errstr(cli1));
+		if (NT_STATUS_V(cli_nt_error(cli1)) != NT_STATUS_V(NT_STATUS_FILE_LOCK_CONFLICT)) {
 			printf("Incorrect error (should be NT_STATUS_FILE_LOCK_CONFLICT)\n");
 			goto fail;
 		}
@@ -1712,13 +1694,13 @@ static BOOL run_locktest7(int dummy)
 		goto fail;
 	}
 
-	cli_unlock(&cli1, fnum1, 130, 0);
+	cli_unlock(cli1, fnum1, 130, 0);
 	correct = True;
 
 fail:
-	cli_close(&cli1, fnum1);
-	cli_unlink(&cli1, fname);
-	torture_close_connection(&cli1);
+	cli_close(cli1, fnum1);
+	cli_unlink(cli1, fname);
+	torture_close_connection(cli1);
 
 	printf("finished locktest7\n");
 	return correct;
@@ -1730,7 +1712,7 @@ security hole)
 */
 static BOOL run_fdpasstest(int dummy)
 {
-	static struct cli_state cli1, cli2, cli3;
+	struct cli_state *cli1, *cli2;
 	const char *fname = "\\fdpass.tst";
 	int fnum1;
 	pstring buf;
@@ -1738,40 +1720,39 @@ static BOOL run_fdpasstest(int dummy)
 	if (!torture_open_connection(&cli1) || !torture_open_connection(&cli2)) {
 		return False;
 	}
-	cli_sockopt(&cli1, sockops);
-	cli_sockopt(&cli2, sockops);
+	cli_sockopt(cli1, sockops);
+	cli_sockopt(cli2, sockops);
 
 	printf("starting fdpasstest\n");
 
-	cli_unlink(&cli1, fname);
+	cli_unlink(cli1, fname);
 
-	fnum1 = cli_open(&cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
+	fnum1 = cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
 	if (fnum1 == -1) {
-		printf("open of %s failed (%s)\n", fname, cli_errstr(&cli1));
+		printf("open of %s failed (%s)\n", fname, cli_errstr(cli1));
 		return False;
 	}
 
-	if (cli_write(&cli1, fnum1, 0, "hello world\n", 0, 13) != 13) {
-		printf("write failed (%s)\n", cli_errstr(&cli1));
+	if (cli_write(cli1, fnum1, 0, "hello world\n", 0, 13) != 13) {
+		printf("write failed (%s)\n", cli_errstr(cli1));
 		return False;
 	}
 
-	cli3 = cli2;
-	cli3.vuid = cli1.vuid;
-	cli3.cnum = cli1.cnum;
-	cli3.pid = cli1.pid;
+	cli2->vuid = cli1->vuid;
+	cli2->cnum = cli1->cnum;
+	cli2->pid = cli1->pid;
 
-	if (cli_read(&cli3, fnum1, buf, 0, 13) == 13) {
+	if (cli_read(cli2, fnum1, buf, 0, 13) == 13) {
 		printf("read succeeded! nasty security hole [%s]\n",
 		       buf);
 		return False;
 	}
 
-	cli_close(&cli1, fnum1);
-	cli_unlink(&cli1, fname);
+	cli_close(cli1, fnum1);
+	cli_unlink(cli1, fname);
 
-	torture_close_connection(&cli1);
-	torture_close_connection(&cli2);
+	torture_close_connection(cli1);
+	torture_close_connection(cli2);
 
 	printf("finished fdpasstest\n");
 	return True;
@@ -1785,7 +1766,7 @@ static BOOL run_fdpasstest(int dummy)
 */
 static BOOL run_unlinktest(int dummy)
 {
-	static struct cli_state cli;
+	struct cli_state *cli;
 	const char *fname = "\\unlink.tst";
 	int fnum;
 	BOOL correct = True;
@@ -1794,32 +1775,32 @@ static BOOL run_unlinktest(int dummy)
 		return False;
 	}
 
-	cli_sockopt(&cli, sockops);
+	cli_sockopt(cli, sockops);
 
 	printf("starting unlink test\n");
 
-	cli_unlink(&cli, fname);
+	cli_unlink(cli, fname);
 
-	cli_setpid(&cli, 1);
+	cli_setpid(cli, 1);
 
-	fnum = cli_open(&cli, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
+	fnum = cli_open(cli, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
 	if (fnum == -1) {
-		printf("open of %s failed (%s)\n", fname, cli_errstr(&cli));
+		printf("open of %s failed (%s)\n", fname, cli_errstr(cli));
 		return False;
 	}
 
-	if (cli_unlink(&cli, fname)) {
+	if (cli_unlink(cli, fname)) {
 		printf("error: server allowed unlink on an open file\n");
 		correct = False;
 	} else {
-		correct = check_error(__LINE__, &cli, ERRDOS, ERRbadshare, 
+		correct = check_error(__LINE__, cli, ERRDOS, ERRbadshare, 
 				      NT_STATUS_SHARING_VIOLATION);
 	}
 
-	cli_close(&cli, fnum);
-	cli_unlink(&cli, fname);
+	cli_close(cli, fnum);
+	cli_unlink(cli, fname);
 
-	if (!torture_close_connection(&cli)) {
+	if (!torture_close_connection(cli)) {
 		correct = False;
 	}
 
@@ -1834,7 +1815,7 @@ test how many open files this server supports on the one socket
 */
 static BOOL run_maxfidtest(int dummy)
 {
-	static struct cli_state cli;
+	struct cli_state *cli;
 	const char *template = "\\maxfid.%d.%d";
 	fstring fname;
 	int fnums[0x11000], i;
@@ -1848,15 +1829,15 @@ static BOOL run_maxfidtest(int dummy)
 		return False;
 	}
 
-	cli_sockopt(&cli, sockops);
+	cli_sockopt(cli, sockops);
 
 	for (i=0; i<0x11000; i++) {
 		slprintf(fname,sizeof(fname)-1,template, i,(int)getpid());
-		if ((fnums[i] = cli_open(&cli, fname, 
+		if ((fnums[i] = cli_open(cli, fname, 
 					O_RDWR|O_CREAT|O_TRUNC, DENY_NONE)) ==
 		    -1) {
 			printf("open of %s failed (%s)\n", 
-			       fname, cli_errstr(&cli));
+			       fname, cli_errstr(cli));
 			printf("maximum fnum is %d\n", i);
 			break;
 		}
@@ -1868,10 +1849,10 @@ static BOOL run_maxfidtest(int dummy)
 	printf("cleaning up\n");
 	for (;i>=0;i--) {
 		slprintf(fname,sizeof(fname)-1,template, i,(int)getpid());
-		cli_close(&cli, fnums[i]);
-		if (!cli_unlink(&cli, fname)) {
+		cli_close(cli, fnums[i]);
+		if (!cli_unlink(cli, fname)) {
 			printf("unlink of %s failed (%s)\n", 
-			       fname, cli_errstr(&cli));
+			       fname, cli_errstr(cli));
 			correct = False;
 		}
 		printf("%6d\r", i);
@@ -1879,7 +1860,7 @@ static BOOL run_maxfidtest(int dummy)
 	printf("%6d\n", 0);
 
 	printf("maxfid test finished\n");
-	if (!torture_close_connection(&cli)) {
+	if (!torture_close_connection(cli)) {
 		correct = False;
 	}
 	return correct;
@@ -1929,7 +1910,7 @@ static BOOL run_randomipc(int dummy)
 	int rdrcnt,rprcnt;
 	pstring param;
 	int api, param_len, i;
-	static struct cli_state cli;
+	struct cli_state *cli;
 	BOOL correct = True;
 	int count = 50000;
 
@@ -1947,7 +1928,7 @@ static BOOL run_randomipc(int dummy)
   
 		SSVAL(param,0,api); 
 
-		cli_api(&cli, 
+		cli_api(cli, 
 			param, param_len, 8,  
 			NULL, 0, BUFFER_SIZE, 
 			&rparam, &rprcnt,     
@@ -1958,7 +1939,7 @@ static BOOL run_randomipc(int dummy)
 	}
 	printf("%d/%d\n", i, count);
 
-	if (!torture_close_connection(&cli)) {
+	if (!torture_close_connection(cli)) {
 		correct = False;
 	}
 
@@ -1983,7 +1964,7 @@ static void browse_callback(const char *sname, uint32 stype,
 */
 static BOOL run_browsetest(int dummy)
 {
-	static struct cli_state cli;
+	static struct cli_state *cli;
 	BOOL correct = True;
 
 	printf("starting browse test\n");
@@ -1993,16 +1974,16 @@ static BOOL run_browsetest(int dummy)
 	}
 
 	printf("domain list:\n");
-	cli_NetServerEnum(&cli, cli.server_domain, 
+	cli_NetServerEnum(cli, cli->server_domain, 
 			  SV_TYPE_DOMAIN_ENUM,
 			  browse_callback, NULL);
 
 	printf("machine list:\n");
-	cli_NetServerEnum(&cli, cli.server_domain, 
+	cli_NetServerEnum(cli, cli->server_domain, 
 			  SV_TYPE_ALL,
 			  browse_callback, NULL);
 
-	if (!torture_close_connection(&cli)) {
+	if (!torture_close_connection(cli)) {
 		correct = False;
 	}
 
@@ -2018,7 +1999,7 @@ static BOOL run_browsetest(int dummy)
 */
 static BOOL run_attrtest(int dummy)
 {
-	static struct cli_state cli;
+	struct cli_state *cli;
 	int fnum;
 	time_t t, t2;
 	const char *fname = "\\attrib.tst";
@@ -2030,12 +2011,12 @@ static BOOL run_attrtest(int dummy)
 		return False;
 	}
 
-	cli_unlink(&cli, fname);
-	fnum = cli_open(&cli, fname, 
+	cli_unlink(cli, fname);
+	fnum = cli_open(cli, fname, 
 			O_RDWR | O_CREAT | O_TRUNC, DENY_NONE);
-	cli_close(&cli, fnum);
-	if (!cli_getatr(&cli, fname, NULL, NULL, &t)) {
-		printf("getatr failed (%s)\n", cli_errstr(&cli));
+	cli_close(cli, fnum);
+	if (!cli_getatr(cli, fname, NULL, NULL, &t)) {
+		printf("getatr failed (%s)\n", cli_errstr(cli));
 		correct = False;
 	}
 
@@ -2048,13 +2029,13 @@ static BOOL run_attrtest(int dummy)
 
 	t2 = t-60*60*24; /* 1 day ago */
 
-	if (!cli_setatr(&cli, fname, 0, t2)) {
-		printf("setatr failed (%s)\n", cli_errstr(&cli));
+	if (!cli_setatr(cli, fname, 0, t2)) {
+		printf("setatr failed (%s)\n", cli_errstr(cli));
 		correct = True;
 	}
 
-	if (!cli_getatr(&cli, fname, NULL, NULL, &t)) {
-		printf("getatr failed (%s)\n", cli_errstr(&cli));
+	if (!cli_getatr(cli, fname, NULL, NULL, &t)) {
+		printf("getatr failed (%s)\n", cli_errstr(cli));
 		correct = True;
 	}
 
@@ -2065,9 +2046,9 @@ static BOOL run_attrtest(int dummy)
 		correct = True;
 	}
 
-	cli_unlink(&cli, fname);
+	cli_unlink(cli, fname);
 
-	if (!torture_close_connection(&cli)) {
+	if (!torture_close_connection(cli)) {
 		correct = False;
 	}
 
@@ -2082,7 +2063,7 @@ static BOOL run_attrtest(int dummy)
 */
 static BOOL run_trans2test(int dummy)
 {
-	static struct cli_state cli;
+	struct cli_state *cli;
 	int fnum;
 	size_t size;
 	time_t c_time, a_time, m_time, w_time, m_time2;
@@ -2098,17 +2079,17 @@ static BOOL run_trans2test(int dummy)
 		return False;
 	}
 
-	cli_unlink(&cli, fname);
-	fnum = cli_open(&cli, fname, 
+	cli_unlink(cli, fname);
+	fnum = cli_open(cli, fname, 
 			O_RDWR | O_CREAT | O_TRUNC, DENY_NONE);
-	if (!cli_qfileinfo(&cli, fnum, NULL, &size, &c_time, &a_time, &m_time,
+	if (!cli_qfileinfo(cli, fnum, NULL, &size, &c_time, &a_time, &m_time,
 			   NULL, NULL)) {
-		printf("ERROR: qfileinfo failed (%s)\n", cli_errstr(&cli));
+		printf("ERROR: qfileinfo failed (%s)\n", cli_errstr(cli));
 		correct = False;
 	}
 
-	if (!cli_qfilename(&cli, fnum, pname)) {
-		printf("ERROR: qfilename failed (%s)\n", cli_errstr(&cli));
+	if (!cli_qfilename(cli, fnum, pname)) {
+		printf("ERROR: qfilename failed (%s)\n", cli_errstr(cli));
 		correct = False;
 	}
 
@@ -2118,21 +2099,21 @@ static BOOL run_trans2test(int dummy)
 		correct = False;
 	}
 
-	cli_close(&cli, fnum);
+	cli_close(cli, fnum);
 
 	sleep(2);
 
-	cli_unlink(&cli, fname);
-	fnum = cli_open(&cli, fname, 
+	cli_unlink(cli, fname);
+	fnum = cli_open(cli, fname, 
 			O_RDWR | O_CREAT | O_TRUNC, DENY_NONE);
 	if (fnum == -1) {
-		printf("open of %s failed (%s)\n", fname, cli_errstr(&cli));
+		printf("open of %s failed (%s)\n", fname, cli_errstr(cli));
 		return False;
 	}
-	cli_close(&cli, fnum);
+	cli_close(cli, fnum);
 
-	if (!cli_qpathinfo(&cli, fname, &c_time, &a_time, &m_time, &size, NULL)) {
-		printf("ERROR: qpathinfo failed (%s)\n", cli_errstr(&cli));
+	if (!cli_qpathinfo(cli, fname, &c_time, &a_time, &m_time, &size, NULL)) {
+		printf("ERROR: qpathinfo failed (%s)\n", cli_errstr(cli));
 		correct = False;
 	} else {
 		if (c_time != m_time) {
@@ -2154,13 +2135,13 @@ static BOOL run_trans2test(int dummy)
 	}
 
 
-	cli_unlink(&cli, fname);
-	fnum = cli_open(&cli, fname, 
+	cli_unlink(cli, fname);
+	fnum = cli_open(cli, fname, 
 			O_RDWR | O_CREAT | O_TRUNC, DENY_NONE);
-	cli_close(&cli, fnum);
-	if (!cli_qpathinfo2(&cli, fname, &c_time, &a_time, &m_time, 
+	cli_close(cli, fnum);
+	if (!cli_qpathinfo2(cli, fname, &c_time, &a_time, &m_time, 
 			    &w_time, &size, NULL, NULL)) {
-		printf("ERROR: qpathinfo2 failed (%s)\n", cli_errstr(&cli));
+		printf("ERROR: qpathinfo2 failed (%s)\n", cli_errstr(cli));
 		correct = False;
 	} else {
 		if (w_time < 60*60*24*2) {
@@ -2170,29 +2151,29 @@ static BOOL run_trans2test(int dummy)
 		}
 	}
 
-	cli_unlink(&cli, fname);
+	cli_unlink(cli, fname);
 
 
 	/* check if the server updates the directory modification time
            when creating a new file */
-	if (!cli_mkdir(&cli, dname)) {
-		printf("ERROR: mkdir failed (%s)\n", cli_errstr(&cli));
+	if (!cli_mkdir(cli, dname)) {
+		printf("ERROR: mkdir failed (%s)\n", cli_errstr(cli));
 		correct = False;
 	}
 	sleep(3);
-	if (!cli_qpathinfo2(&cli, "\\trans2\\", &c_time, &a_time, &m_time, 
+	if (!cli_qpathinfo2(cli, "\\trans2\\", &c_time, &a_time, &m_time, 
 			    &w_time, &size, NULL, NULL)) {
-		printf("ERROR: qpathinfo2 failed (%s)\n", cli_errstr(&cli));
+		printf("ERROR: qpathinfo2 failed (%s)\n", cli_errstr(cli));
 		correct = False;
 	}
 
-	fnum = cli_open(&cli, fname2, 
+	fnum = cli_open(cli, fname2, 
 			O_RDWR | O_CREAT | O_TRUNC, DENY_NONE);
-	cli_write(&cli, fnum,  0, (char *)&fnum, 0, sizeof(fnum));
-	cli_close(&cli, fnum);
-	if (!cli_qpathinfo2(&cli, "\\trans2\\", &c_time, &a_time, &m_time2, 
+	cli_write(cli, fnum,  0, (char *)&fnum, 0, sizeof(fnum));
+	cli_close(cli, fnum);
+	if (!cli_qpathinfo2(cli, "\\trans2\\", &c_time, &a_time, &m_time2, 
 			    &w_time, &size, NULL, NULL)) {
-		printf("ERROR: qpathinfo2 failed (%s)\n", cli_errstr(&cli));
+		printf("ERROR: qpathinfo2 failed (%s)\n", cli_errstr(cli));
 		correct = False;
 	} else {
 		if (m_time2 == m_time) {
@@ -2200,10 +2181,10 @@ static BOOL run_trans2test(int dummy)
 			correct = False;
 		}
 	}
-	cli_unlink(&cli, fname2);
-	cli_rmdir(&cli, dname);
+	cli_unlink(cli, fname2);
+	cli_rmdir(cli, dname);
 
-	if (!torture_close_connection(&cli)) {
+	if (!torture_close_connection(cli)) {
 		correct = False;
 	}
 
@@ -2236,7 +2217,7 @@ static BOOL new_trans(struct cli_state *pcli, int fnum, int level)
 
 static BOOL run_w2ktest(int dummy)
 {
-	static struct cli_state cli;
+	struct cli_state *cli;
 	int fnum;
 	const char *fname = "\\w2ktest\\w2k.tst";
 	int level;
@@ -2248,16 +2229,16 @@ static BOOL run_w2ktest(int dummy)
 		return False;
 	}
 
-	fnum = cli_open(&cli, fname, 
+	fnum = cli_open(cli, fname, 
 			O_RDWR | O_CREAT , DENY_NONE);
 
 	for (level = 1004; level < 1040; level++) {
-		new_trans(&cli, fnum, level);
+		new_trans(cli, fnum, level);
 	}
 
-	cli_close(&cli, fnum);
+	cli_close(cli, fnum);
 
-	if (!torture_close_connection(&cli)) {
+	if (!torture_close_connection(cli)) {
 		correct = False;
 	}
 
@@ -2272,7 +2253,7 @@ static BOOL run_w2ktest(int dummy)
  */
 static BOOL run_oplock1(int dummy)
 {
-	static struct cli_state cli1;
+	struct cli_state *cli1;
 	const char *fname = "\\lockt1.lck";
 	int fnum1;
 	BOOL correct = True;
@@ -2283,34 +2264,34 @@ static BOOL run_oplock1(int dummy)
 		return False;
 	}
 
-	cli_unlink(&cli1, fname);
+	cli_unlink(cli1, fname);
 
-	cli_sockopt(&cli1, sockops);
+	cli_sockopt(cli1, sockops);
 
-	cli1.use_oplocks = True;
+	cli1->use_oplocks = True;
 
-	fnum1 = cli_open(&cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
+	fnum1 = cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
 	if (fnum1 == -1) {
-		printf("open of %s failed (%s)\n", fname, cli_errstr(&cli1));
+		printf("open of %s failed (%s)\n", fname, cli_errstr(cli1));
 		return False;
 	}
 
-	cli1.use_oplocks = False;
+	cli1->use_oplocks = False;
 
-	cli_unlink(&cli1, fname);
-	cli_unlink(&cli1, fname);
+	cli_unlink(cli1, fname);
+	cli_unlink(cli1, fname);
 
-	if (!cli_close(&cli1, fnum1)) {
-		printf("close2 failed (%s)\n", cli_errstr(&cli1));
+	if (!cli_close(cli1, fnum1)) {
+		printf("close2 failed (%s)\n", cli_errstr(cli1));
 		return False;
 	}
 
-	if (!cli_unlink(&cli1, fname)) {
-		printf("unlink failed (%s)\n", cli_errstr(&cli1));
+	if (!cli_unlink(cli1, fname)) {
+		printf("unlink failed (%s)\n", cli_errstr(cli1));
 		return False;
 	}
 
-	if (!torture_close_connection(&cli1)) {
+	if (!torture_close_connection(cli1)) {
 		correct = False;
 	}
 
@@ -2321,7 +2302,7 @@ static BOOL run_oplock1(int dummy)
 
 static BOOL run_oplock2(int dummy)
 {
-	static struct cli_state cli1, cli2;
+	struct cli_state *cli1, *cli2;
 	const char *fname = "\\lockt2.lck";
 	int fnum1, fnum2;
 	int saved_use_oplocks = use_oplocks;
@@ -2343,8 +2324,8 @@ static BOOL run_oplock2(int dummy)
 		return False;
 	}
 
-	cli1.use_oplocks = True;
-	cli1.use_level_II_oplocks = True;
+	cli1->use_oplocks = True;
+	cli1->use_level_II_oplocks = True;
 
 	if (!torture_open_connection(&cli2)) {
 		use_level_II_oplocks = False;
@@ -2352,17 +2333,17 @@ static BOOL run_oplock2(int dummy)
 		return False;
 	}
 
-	cli2.use_oplocks = True;
-	cli2.use_level_II_oplocks = True;
+	cli2->use_oplocks = True;
+	cli2->use_level_II_oplocks = True;
 
-	cli_unlink(&cli1, fname);
+	cli_unlink(cli1, fname);
 
-	cli_sockopt(&cli1, sockops);
-	cli_sockopt(&cli2, sockops);
+	cli_sockopt(cli1, sockops);
+	cli_sockopt(cli2, sockops);
 
-	fnum1 = cli_open(&cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
+	fnum1 = cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
 	if (fnum1 == -1) {
-		printf("open of %s failed (%s)\n", fname, cli_errstr(&cli1));
+		printf("open of %s failed (%s)\n", fname, cli_errstr(cli1));
 		return False;
 	}
 
@@ -2372,17 +2353,17 @@ static BOOL run_oplock2(int dummy)
 
 	if (fork() == 0) {
 		/* Child code */
-		fnum2 = cli_open(&cli2, fname, O_RDWR, DENY_NONE);
+		fnum2 = cli_open(cli2, fname, O_RDWR, DENY_NONE);
 		if (fnum2 == -1) {
-			printf("second open of %s failed (%s)\n", fname, cli_errstr(&cli1));
+			printf("second open of %s failed (%s)\n", fname, cli_errstr(cli1));
 			*shared_correct = False;
 			exit(0);
 		}
 
 		sleep(2);
 
-		if (!cli_close(&cli2, fnum2)) {
-			printf("close2 failed (%s)\n", cli_errstr(&cli1));
+		if (!cli_close(cli2, fnum2)) {
+			printf("close2 failed (%s)\n", cli_errstr(cli1));
 			*shared_correct = False;
 		}
 
@@ -2393,54 +2374,54 @@ static BOOL run_oplock2(int dummy)
 
 	/* Ensure cli1 processes the break. */
 
-	if (cli_read(&cli1, fnum1, buf, 0, 4) != 4) {
-		printf("read on fnum1 failed (%s)\n", cli_errstr(&cli1));
+	if (cli_read(cli1, fnum1, buf, 0, 4) != 4) {
+		printf("read on fnum1 failed (%s)\n", cli_errstr(cli1));
 		correct = False;
 	}
 
 	/* Should now be at level II. */
 	/* Test if sending a write locks causes a break to none. */
 
-	if (!cli_lock(&cli1, fnum1, 0, 4, 0, READ_LOCK)) {
-		printf("lock failed (%s)\n", cli_errstr(&cli1));
+	if (!cli_lock(cli1, fnum1, 0, 4, 0, READ_LOCK)) {
+		printf("lock failed (%s)\n", cli_errstr(cli1));
 		correct = False;
 	}
 
-	cli_unlock(&cli1, fnum1, 0, 4);
+	cli_unlock(cli1, fnum1, 0, 4);
 
 	sleep(2);
 
-	if (!cli_lock(&cli1, fnum1, 0, 4, 0, WRITE_LOCK)) {
-		printf("lock failed (%s)\n", cli_errstr(&cli1));
+	if (!cli_lock(cli1, fnum1, 0, 4, 0, WRITE_LOCK)) {
+		printf("lock failed (%s)\n", cli_errstr(cli1));
 		correct = False;
 	}
 
-	cli_unlock(&cli1, fnum1, 0, 4);
+	cli_unlock(cli1, fnum1, 0, 4);
 
 	sleep(2);
 
-	cli_read(&cli1, fnum1, buf, 0, 4);
+	cli_read(cli1, fnum1, buf, 0, 4);
 
 #if 0
-	if (cli_write(&cli1, fnum1, 0, buf, 0, 4) != 4) {
-		printf("write on fnum1 failed (%s)\n", cli_errstr(&cli1));
+	if (cli_write(cli1, fnum1, 0, buf, 0, 4) != 4) {
+		printf("write on fnum1 failed (%s)\n", cli_errstr(cli1));
 		correct = False;
 	}
 #endif
 
-	if (!cli_close(&cli1, fnum1)) {
-		printf("close1 failed (%s)\n", cli_errstr(&cli1));
+	if (!cli_close(cli1, fnum1)) {
+		printf("close1 failed (%s)\n", cli_errstr(cli1));
 		correct = False;
 	}
 
 	sleep(4);
 
-	if (!cli_unlink(&cli1, fname)) {
-		printf("unlink failed (%s)\n", cli_errstr(&cli1));
+	if (!cli_unlink(cli1, fname)) {
+		printf("unlink failed (%s)\n", cli_errstr(cli1));
 		correct = False;
 	}
 
-	if (!torture_close_connection(&cli1)) {
+	if (!torture_close_connection(cli1)) {
 		correct = False;
 	}
 
@@ -2463,7 +2444,7 @@ static BOOL oplock3_handler(struct cli_state *cli, int fnum, unsigned char level
 
 static BOOL run_oplock3(int dummy)
 {
-	static struct cli_state cli;
+	struct cli_state *cli;
 	const char *fname = "\\oplockt3.dat";
 	int fnum;
 	char buf[4] = "abcd";
@@ -2485,8 +2466,8 @@ static BOOL run_oplock3(int dummy)
 		} 
 		sleep(2);
 		/* try to trigger a oplock break in parent */
-		fnum = cli_open(&cli, fname, O_RDWR, DENY_NONE);
-		cli_write(&cli, fnum, 0, buf, 0, 4);
+		fnum = cli_open(cli, fname, O_RDWR, DENY_NONE);
+		cli_write(cli, fnum, 0, buf, 0, 4);
 		exit(0);
 	}
 
@@ -2496,13 +2477,13 @@ static BOOL run_oplock3(int dummy)
 	if (!torture_open_connection(&cli)) { 
 		return False;
 	}
-	cli_oplock_handler(&cli, oplock3_handler);
-	fnum = cli_open(&cli, fname, O_RDWR|O_CREAT, DENY_NONE);
-	cli_write(&cli, fnum, 0, buf, 0, 4);
-	cli_close(&cli, fnum);
-	fnum = cli_open(&cli, fname, O_RDWR, DENY_NONE);
-	cli.timeout = 20000;
-	cli_receive_smb(&cli);
+	cli_oplock_handler(cli, oplock3_handler);
+	fnum = cli_open(cli, fname, O_RDWR|O_CREAT, DENY_NONE);
+	cli_write(cli, fnum, 0, buf, 0, 4);
+	cli_close(cli, fnum);
+	fnum = cli_open(cli, fname, O_RDWR, DENY_NONE);
+	cli->timeout = 20000;
+	cli_receive_smb(cli);
 	printf("finished oplock test 3\n");
 
 	return (correct && *shared_correct);
@@ -2517,8 +2498,8 @@ static BOOL run_oplock3(int dummy)
  */
 static BOOL run_deletetest(int dummy)
 {
-	static struct cli_state cli1;
-	static struct cli_state cli2;
+	struct cli_state *cli1;
+	struct cli_state *cli2;
 	const char *fname = "\\delete.file";
 	int fnum1 = -1;
 	int fnum2 = -1;
@@ -2526,37 +2507,34 @@ static BOOL run_deletetest(int dummy)
 	
 	printf("starting delete test\n");
 	
-	ZERO_STRUCT(cli1);
-	ZERO_STRUCT(cli2);
-
 	if (!torture_open_connection(&cli1)) {
 		return False;
 	}
 	
-	cli_sockopt(&cli1, sockops);
+	cli_sockopt(cli1, sockops);
 
 	/* Test 1 - this should delete the file on close. */
 	
-	cli_setatr(&cli1, fname, 0, 0);
-	cli_unlink(&cli1, fname);
+	cli_setatr(cli1, fname, 0, 0);
+	cli_unlink(cli1, fname);
 	
-	fnum1 = cli_nt_create_full(&cli1, fname, GENERIC_ALL_ACCESS, FILE_ATTRIBUTE_NORMAL,
+	fnum1 = cli_nt_create_full(cli1, fname, GENERIC_ALL_ACCESS, FILE_ATTRIBUTE_NORMAL,
 				   FILE_SHARE_DELETE, FILE_OVERWRITE_IF, 
 				   FILE_DELETE_ON_CLOSE);
 	
 	if (fnum1 == -1) {
-		printf("[1] open of %s failed (%s)\n", fname, cli_errstr(&cli1));
+		printf("[1] open of %s failed (%s)\n", fname, cli_errstr(cli1));
 		correct = False;
 		goto fail;
 	}
 	
-	if (!cli_close(&cli1, fnum1)) {
-		printf("[1] close failed (%s)\n", cli_errstr(&cli1));
+	if (!cli_close(cli1, fnum1)) {
+		printf("[1] close failed (%s)\n", cli_errstr(cli1));
 		correct = False;
 		goto fail;
 	}
 
-	fnum1 = cli_open(&cli1, fname, O_RDWR, DENY_NONE);
+	fnum1 = cli_open(cli1, fname, O_RDWR, DENY_NONE);
 	if (fnum1 != -1) {
 		printf("[1] open of %s succeeded (should fail)\n", fname);
 		correct = False;
@@ -2567,52 +2545,52 @@ static BOOL run_deletetest(int dummy)
 	
 	/* Test 2 - this should delete the file on close. */
 	
-	cli_setatr(&cli1, fname, 0, 0);
-	cli_unlink(&cli1, fname);
+	cli_setatr(cli1, fname, 0, 0);
+	cli_unlink(cli1, fname);
 	
-	fnum1 = cli_nt_create_full(&cli1, fname, GENERIC_ALL_ACCESS,
+	fnum1 = cli_nt_create_full(cli1, fname, GENERIC_ALL_ACCESS,
 				   FILE_ATTRIBUTE_NORMAL, FILE_SHARE_NONE, 
 				   FILE_OVERWRITE_IF, 0);
 	
 	if (fnum1 == -1) {
-		printf("[2] open of %s failed (%s)\n", fname, cli_errstr(&cli1));
+		printf("[2] open of %s failed (%s)\n", fname, cli_errstr(cli1));
 		correct = False;
 		goto fail;
 	}
 	
-	if (!cli_nt_delete_on_close(&cli1, fnum1, True)) {
-		printf("[2] setting delete_on_close failed (%s)\n", cli_errstr(&cli1));
+	if (!cli_nt_delete_on_close(cli1, fnum1, True)) {
+		printf("[2] setting delete_on_close failed (%s)\n", cli_errstr(cli1));
 		correct = False;
 		goto fail;
 	}
 	
-	if (!cli_close(&cli1, fnum1)) {
-		printf("[2] close failed (%s)\n", cli_errstr(&cli1));
+	if (!cli_close(cli1, fnum1)) {
+		printf("[2] close failed (%s)\n", cli_errstr(cli1));
 		correct = False;
 		goto fail;
 	}
 	
-	fnum1 = cli_open(&cli1, fname, O_RDONLY, DENY_NONE);
+	fnum1 = cli_open(cli1, fname, O_RDONLY, DENY_NONE);
 	if (fnum1 != -1) {
 		printf("[2] open of %s succeeded should have been deleted on close !\n", fname);
-		if (!cli_close(&cli1, fnum1)) {
-			printf("[2] close failed (%s)\n", cli_errstr(&cli1));
+		if (!cli_close(cli1, fnum1)) {
+			printf("[2] close failed (%s)\n", cli_errstr(cli1));
 			correct = False;
 			goto fail;
 		}
-		cli_unlink(&cli1, fname);
+		cli_unlink(cli1, fname);
 	} else
 		printf("second delete on close test succeeded.\n");
 	
 	/* Test 3 - ... */
-	cli_setatr(&cli1, fname, 0, 0);
-	cli_unlink(&cli1, fname);
+	cli_setatr(cli1, fname, 0, 0);
+	cli_unlink(cli1, fname);
 
-	fnum1 = cli_nt_create_full(&cli1, fname, GENERIC_ALL_ACCESS, FILE_ATTRIBUTE_NORMAL,
+	fnum1 = cli_nt_create_full(cli1, fname, GENERIC_ALL_ACCESS, FILE_ATTRIBUTE_NORMAL,
 				   FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OVERWRITE_IF, 0);
 
 	if (fnum1 == -1) {
-		printf("[3] open - 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
+		printf("[3] open - 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
 		correct = False;
 		goto fail;
 	}
@@ -2620,7 +2598,7 @@ static BOOL run_deletetest(int dummy)
 	/* This should fail with a sharing violation - open for delete is only compatible
 	   with SHARE_DELETE. */
 
-	fnum2 = cli_nt_create_full(&cli1, fname, GENERIC_READ_ACCESS, FILE_ATTRIBUTE_NORMAL,
+	fnum2 = cli_nt_create_full(cli1, fname, GENERIC_READ_ACCESS, FILE_ATTRIBUTE_NORMAL,
 			FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, 0);
 
 	if (fnum2 != -1) {
@@ -2631,83 +2609,83 @@ static BOOL run_deletetest(int dummy)
 
 	/* This should succeed. */
 
-	fnum2 = cli_nt_create_full(&cli1, fname, GENERIC_READ_ACCESS, FILE_ATTRIBUTE_NORMAL,
+	fnum2 = cli_nt_create_full(cli1, fname, GENERIC_READ_ACCESS, FILE_ATTRIBUTE_NORMAL,
 			FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN, 0);
 
 	if (fnum2 == -1) {
-		printf("[3] open  - 2 of %s failed (%s)\n", fname, cli_errstr(&cli1));
+		printf("[3] open  - 2 of %s failed (%s)\n", fname, cli_errstr(cli1));
 		correct = False;
 		goto fail;
 	}
 
-	if (!cli_nt_delete_on_close(&cli1, fnum1, True)) {
-		printf("[3] setting delete_on_close failed (%s)\n", cli_errstr(&cli1));
+	if (!cli_nt_delete_on_close(cli1, fnum1, True)) {
+		printf("[3] setting delete_on_close failed (%s)\n", cli_errstr(cli1));
 		correct = False;
 		goto fail;
 	}
 	
-	if (!cli_close(&cli1, fnum1)) {
-		printf("[3] close 1 failed (%s)\n", cli_errstr(&cli1));
+	if (!cli_close(cli1, fnum1)) {
+		printf("[3] close 1 failed (%s)\n", cli_errstr(cli1));
 		correct = False;
 		goto fail;
 	}
 	
-	if (!cli_close(&cli1, fnum2)) {
-		printf("[3] close 2 failed (%s)\n", cli_errstr(&cli1));
+	if (!cli_close(cli1, fnum2)) {
+		printf("[3] close 2 failed (%s)\n", cli_errstr(cli1));
 		correct = False;
 		goto fail;
 	}
 	
 	/* This should fail - file should no longer be there. */
 
-	fnum1 = cli_open(&cli1, fname, O_RDONLY, DENY_NONE);
+	fnum1 = cli_open(cli1, fname, O_RDONLY, DENY_NONE);
 	if (fnum1 != -1) {
 		printf("[3] open of %s succeeded should have been deleted on close !\n", fname);
-		if (!cli_close(&cli1, fnum1)) {
-			printf("[3] close failed (%s)\n", cli_errstr(&cli1));
+		if (!cli_close(cli1, fnum1)) {
+			printf("[3] close failed (%s)\n", cli_errstr(cli1));
 		}
-		cli_unlink(&cli1, fname);
+		cli_unlink(cli1, fname);
 		correct = False;
 		goto fail;
 	} else
 		printf("third delete on close test succeeded.\n");
 
 	/* Test 4 ... */
-	cli_setatr(&cli1, fname, 0, 0);
-	cli_unlink(&cli1, fname);
+	cli_setatr(cli1, fname, 0, 0);
+	cli_unlink(cli1, fname);
 
-	fnum1 = cli_nt_create_full(&cli1, fname, FILE_READ_DATA|FILE_WRITE_DATA|DELETE_ACCESS,
+	fnum1 = cli_nt_create_full(cli1, fname, FILE_READ_DATA|FILE_WRITE_DATA|DELETE_ACCESS,
 			FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OVERWRITE_IF, 0);
 								
 	if (fnum1 == -1) {
-		printf("[4] open of %s failed (%s)\n", fname, cli_errstr(&cli1));
+		printf("[4] open of %s failed (%s)\n", fname, cli_errstr(cli1));
 		correct = False;
 		goto fail;
 	}
 
 	/* This should succeed. */
-	fnum2 = cli_nt_create_full(&cli1, fname, GENERIC_READ_ACCESS,
+	fnum2 = cli_nt_create_full(cli1, fname, GENERIC_READ_ACCESS,
 			FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN, 0);
 	if (fnum2 == -1) {
-		printf("[4] open  - 2 of %s failed (%s)\n", fname, cli_errstr(&cli1));
+		printf("[4] open  - 2 of %s failed (%s)\n", fname, cli_errstr(cli1));
 		correct = False;
 		goto fail;
 	}
 	
-	if (!cli_close(&cli1, fnum2)) {
-		printf("[4] close - 1 failed (%s)\n", cli_errstr(&cli1));
+	if (!cli_close(cli1, fnum2)) {
+		printf("[4] close - 1 failed (%s)\n", cli_errstr(cli1));
 		correct = False;
 		goto fail;
 	}
 	
-	if (!cli_nt_delete_on_close(&cli1, fnum1, True)) {
-		printf("[4] setting delete_on_close failed (%s)\n", cli_errstr(&cli1));
+	if (!cli_nt_delete_on_close(cli1, fnum1, True)) {
+		printf("[4] setting delete_on_close failed (%s)\n", cli_errstr(cli1));
 		correct = False;
 		goto fail;
 	}
 	
 	/* This should fail - no more opens once delete on close set. */
-	fnum2 = cli_nt_create_full(&cli1, fname, GENERIC_READ_ACCESS,
+	fnum2 = cli_nt_create_full(cli1, fname, GENERIC_READ_ACCESS,
 				   FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN, 0);
 	if (fnum2 != -1) {
 		printf("[4] open  - 3 of %s succeeded ! Should have failed.\n", fname );
@@ -2716,33 +2694,33 @@ static BOOL run_deletetest(int dummy)
 	} else
 		printf("fourth delete on close test succeeded.\n");
 	
-	if (!cli_close(&cli1, fnum1)) {
-		printf("[4] close - 2 failed (%s)\n", cli_errstr(&cli1));
+	if (!cli_close(cli1, fnum1)) {
+		printf("[4] close - 2 failed (%s)\n", cli_errstr(cli1));
 		correct = False;
 		goto fail;
 	}
 	
 	/* Test 5 ... */
-	cli_setatr(&cli1, fname, 0, 0);
-	cli_unlink(&cli1, fname);
+	cli_setatr(cli1, fname, 0, 0);
+	cli_unlink(cli1, fname);
 	
-	fnum1 = cli_open(&cli1, fname, O_RDWR|O_CREAT, DENY_NONE);
+	fnum1 = cli_open(cli1, fname, O_RDWR|O_CREAT, DENY_NONE);
 	if (fnum1 == -1) {
-		printf("[5] open of %s failed (%s)\n", fname, cli_errstr(&cli1));
+		printf("[5] open of %s failed (%s)\n", fname, cli_errstr(cli1));
 		correct = False;
 		goto fail;
 	}
 
 	/* This should fail - only allowed on NT opens with DELETE access. */
 
-	if (cli_nt_delete_on_close(&cli1, fnum1, True)) {
+	if (cli_nt_delete_on_close(cli1, fnum1, True)) {
 		printf("[5] setting delete_on_close on OpenX file succeeded - should fail !\n");
 		correct = False;
 		goto fail;
 	}
 
-	if (!cli_close(&cli1, fnum1)) {
-		printf("[5] close - 2 failed (%s)\n", cli_errstr(&cli1));
+	if (!cli_close(cli1, fnum1)) {
+		printf("[5] close - 2 failed (%s)\n", cli_errstr(cli1));
 		correct = False;
 		goto fail;
 	}
@@ -2750,29 +2728,29 @@ static BOOL run_deletetest(int dummy)
 	printf("fifth delete on close test succeeded.\n");
 	
 	/* Test 6 ... */
-	cli_setatr(&cli1, fname, 0, 0);
-	cli_unlink(&cli1, fname);
+	cli_setatr(cli1, fname, 0, 0);
+	cli_unlink(cli1, fname);
 	
-	fnum1 = cli_nt_create_full(&cli1, fname, FILE_READ_DATA|FILE_WRITE_DATA,
+	fnum1 = cli_nt_create_full(cli1, fname, FILE_READ_DATA|FILE_WRITE_DATA,
 				   FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE,
 				   FILE_OVERWRITE_IF, 0);
 	
 	if (fnum1 == -1) {
-		printf("[6] open of %s failed (%s)\n", fname, cli_errstr(&cli1));
+		printf("[6] open of %s failed (%s)\n", fname, cli_errstr(cli1));
 		correct = False;
 		goto fail;
 	}
 	
 	/* This should fail - only allowed on NT opens with DELETE access. */
 	
-	if (cli_nt_delete_on_close(&cli1, fnum1, True)) {
+	if (cli_nt_delete_on_close(cli1, fnum1, True)) {
 		printf("[6] setting delete_on_close on file with no delete access succeeded - should fail !\n");
 		correct = False;
 		goto fail;
 	}
 
-	if (!cli_close(&cli1, fnum1)) {
-		printf("[6] close - 2 failed (%s)\n", cli_errstr(&cli1));
+	if (!cli_close(cli1, fnum1)) {
+		printf("[6] close - 2 failed (%s)\n", cli_errstr(cli1));
 		correct = False;
 		goto fail;
 	}
@@ -2780,47 +2758,47 @@ static BOOL run_deletetest(int dummy)
 	printf("sixth delete on close test succeeded.\n");
 	
 	/* Test 7 ... */
-	cli_setatr(&cli1, fname, 0, 0);
-	cli_unlink(&cli1, fname);
+	cli_setatr(cli1, fname, 0, 0);
+	cli_unlink(cli1, fname);
 	
-	fnum1 = cli_nt_create_full(&cli1, fname, FILE_READ_DATA|FILE_WRITE_DATA|DELETE_ACCESS,
+	fnum1 = cli_nt_create_full(cli1, fname, FILE_READ_DATA|FILE_WRITE_DATA|DELETE_ACCESS,
 				   FILE_ATTRIBUTE_NORMAL, 0, FILE_OVERWRITE_IF, 0);
 								
 	if (fnum1 == -1) {
-		printf("[7] open of %s failed (%s)\n", fname, cli_errstr(&cli1));
+		printf("[7] open of %s failed (%s)\n", fname, cli_errstr(cli1));
 		correct = False;
 		goto fail;
 	}
 
-	if (!cli_nt_delete_on_close(&cli1, fnum1, True)) {
+	if (!cli_nt_delete_on_close(cli1, fnum1, True)) {
 		printf("[7] setting delete_on_close on file failed !\n");
 		correct = False;
 		goto fail;
 	}
 	
-	if (!cli_nt_delete_on_close(&cli1, fnum1, False)) {
+	if (!cli_nt_delete_on_close(cli1, fnum1, False)) {
 		printf("[7] unsetting delete_on_close on file failed !\n");
 		correct = False;
 		goto fail;
 	}
 
-	if (!cli_close(&cli1, fnum1)) {
-		printf("[7] close - 2 failed (%s)\n", cli_errstr(&cli1));
+	if (!cli_close(cli1, fnum1)) {
+		printf("[7] close - 2 failed (%s)\n", cli_errstr(cli1));
 		correct = False;
 		goto fail;
 	}
 	
 	/* This next open should succeed - we reset the flag. */
 	
-	fnum1 = cli_open(&cli1, fname, O_RDONLY, DENY_NONE);
+	fnum1 = cli_open(cli1, fname, O_RDONLY, DENY_NONE);
 	if (fnum1 == -1) {
-		printf("[5] open of %s failed (%s)\n", fname, cli_errstr(&cli1));
+		printf("[5] open of %s failed (%s)\n", fname, cli_errstr(cli1));
 		correct = False;
 		goto fail;
 	}
 
-	if (!cli_close(&cli1, fnum1)) {
-		printf("[7] close - 2 failed (%s)\n", cli_errstr(&cli1));
+	if (!cli_close(cli1, fnum1)) {
+		printf("[7] close - 2 failed (%s)\n", cli_errstr(cli1));
 		correct = False;
 		goto fail;
 	}
@@ -2828,8 +2806,8 @@ static BOOL run_deletetest(int dummy)
 	printf("seventh delete on close test succeeded.\n");
 	
 	/* Test 7 ... */
-	cli_setatr(&cli1, fname, 0, 0);
-	cli_unlink(&cli1, fname);
+	cli_setatr(cli1, fname, 0, 0);
+	cli_unlink(cli1, fname);
 	
 	if (!torture_open_connection(&cli2)) {
 		printf("[8] failed to open second connection.\n");
@@ -2837,46 +2815,46 @@ static BOOL run_deletetest(int dummy)
 		goto fail;
 	}
 
-	cli_sockopt(&cli1, sockops);
+	cli_sockopt(cli1, sockops);
 	
-	fnum1 = cli_nt_create_full(&cli1, fname, FILE_READ_DATA|FILE_WRITE_DATA|DELETE_ACCESS,
+	fnum1 = cli_nt_create_full(cli1, fname, FILE_READ_DATA|FILE_WRITE_DATA|DELETE_ACCESS,
 				   FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OVERWRITE_IF, 0);
 	
 	if (fnum1 == -1) {
-		printf("[8] open of %s failed (%s)\n", fname, cli_errstr(&cli1));
+		printf("[8] open of %s failed (%s)\n", fname, cli_errstr(cli1));
 		correct = False;
 		goto fail;
 	}
 
-	fnum2 = cli_nt_create_full(&cli2, fname, FILE_READ_DATA|FILE_WRITE_DATA|DELETE_ACCESS,
+	fnum2 = cli_nt_create_full(cli2, fname, FILE_READ_DATA|FILE_WRITE_DATA|DELETE_ACCESS,
 				   FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN, 0);
 	
 	if (fnum2 == -1) {
-		printf("[8] open of %s failed (%s)\n", fname, cli_errstr(&cli1));
+		printf("[8] open of %s failed (%s)\n", fname, cli_errstr(cli1));
 		correct = False;
 		goto fail;
 	}
 
-	if (!cli_nt_delete_on_close(&cli1, fnum1, True)) {
+	if (!cli_nt_delete_on_close(cli1, fnum1, True)) {
 		printf("[8] setting delete_on_close on file failed !\n");
 		correct = False;
 		goto fail;
 	}
 	
-	if (!cli_close(&cli1, fnum1)) {
-		printf("[8] close - 1 failed (%s)\n", cli_errstr(&cli1));
+	if (!cli_close(cli1, fnum1)) {
+		printf("[8] close - 1 failed (%s)\n", cli_errstr(cli1));
 		correct = False;
 		goto fail;
 	}
 
-	if (!cli_close(&cli2, fnum2)) {
-		printf("[8] close - 2 failed (%s)\n", cli_errstr(&cli2));
+	if (!cli_close(cli2, fnum2)) {
+		printf("[8] close - 2 failed (%s)\n", cli_errstr(cli2));
 		correct = False;
 		goto fail;
 	}
 
 	/* This should fail.. */
-	fnum1 = cli_open(&cli1, fname, O_RDONLY, DENY_NONE);
+	fnum1 = cli_open(cli1, fname, O_RDONLY, DENY_NONE);
 	if (fnum1 != -1) {
 		printf("[8] open of %s succeeded should have been deleted on close !\n", fname);
 		goto fail;
@@ -2885,7 +2863,7 @@ static BOOL run_deletetest(int dummy)
 		printf("eighth delete on close test succeeded.\n");
 
 	/* This should fail - we need to set DELETE_ACCESS. */
-	fnum1 = cli_nt_create_full(&cli1, fname, FILE_READ_DATA|FILE_WRITE_DATA,
+	fnum1 = cli_nt_create_full(cli1, fname, FILE_READ_DATA|FILE_WRITE_DATA,
 				   FILE_ATTRIBUTE_NORMAL, FILE_SHARE_NONE, FILE_OVERWRITE_IF, FILE_DELETE_ON_CLOSE);
 	
 	if (fnum1 != -1) {
@@ -2896,23 +2874,23 @@ static BOOL run_deletetest(int dummy)
 
 	printf("ninth delete on close test succeeded.\n");
 
-	fnum1 = cli_nt_create_full(&cli1, fname, FILE_READ_DATA|FILE_WRITE_DATA|DELETE_ACCESS,
+	fnum1 = cli_nt_create_full(cli1, fname, FILE_READ_DATA|FILE_WRITE_DATA|DELETE_ACCESS,
 				   FILE_ATTRIBUTE_NORMAL, FILE_SHARE_NONE, FILE_OVERWRITE_IF, FILE_DELETE_ON_CLOSE);
 	if (fnum1 == -1) {
-		printf("[10] open of %s failed (%s)\n", fname, cli_errstr(&cli1));
+		printf("[10] open of %s failed (%s)\n", fname, cli_errstr(cli1));
 		correct = False;
 		goto fail;
 	}
 
 	/* This should delete the file. */
-	if (!cli_close(&cli1, fnum1)) {
-		printf("[10] close failed (%s)\n", cli_errstr(&cli1));
+	if (!cli_close(cli1, fnum1)) {
+		printf("[10] close failed (%s)\n", cli_errstr(cli1));
 		correct = False;
 		goto fail;
 	}
 
 	/* This should fail.. */
-	fnum1 = cli_open(&cli1, fname, O_RDONLY, DENY_NONE);
+	fnum1 = cli_open(cli1, fname, O_RDONLY, DENY_NONE);
 	if (fnum1 != -1) {
 		printf("[10] open of %s succeeded should have been deleted on close !\n", fname);
 		goto fail;
@@ -2926,15 +2904,15 @@ static BOOL run_deletetest(int dummy)
 	 * intialized, because these functions don't handle
 	 * uninitialized connections. */
 		
-	cli_close(&cli1, fnum1);
-	cli_close(&cli1, fnum2);
-	cli_setatr(&cli1, fname, 0, 0);
-	cli_unlink(&cli1, fname);
+	cli_close(cli1, fnum1);
+	cli_close(cli1, fnum2);
+	cli_setatr(cli1, fname, 0, 0);
+	cli_unlink(cli1, fname);
 
-	if (!torture_close_connection(&cli1)) {
+	if (!torture_close_connection(cli1)) {
 		correct = False;
 	}
-	if (!torture_close_connection(&cli2)) {
+	if (!torture_close_connection(cli2)) {
 		correct = False;
 	}
 	return correct;
@@ -2946,7 +2924,7 @@ static BOOL run_deletetest(int dummy)
  */
 static BOOL run_properties(int dummy)
 {
-	static struct cli_state cli;
+	static struct cli_state *cli;
 	BOOL correct = True;
 	
 	printf("starting properties test\n");
@@ -2957,11 +2935,11 @@ static BOOL run_properties(int dummy)
 		return False;
 	}
 	
-	cli_sockopt(&cli, sockops);
+	cli_sockopt(cli, sockops);
 
-	d_printf("Capabilities 0x%08x\n", cli.capabilities);
+	d_printf("Capabilities 0x%08x\n", cli->capabilities);
 
-	if (!torture_close_connection(&cli)) {
+	if (!torture_close_connection(cli)) {
 		correct = False;
 	}
 
@@ -2994,7 +2972,7 @@ static BOOL run_properties(int dummy)
  */
 static BOOL run_xcopy(int dummy)
 {
-	static struct cli_state cli1;
+	static struct cli_state *cli1;
 	const char *fname = "\\test.txt";
 	BOOL correct = True;
 	int fnum1, fnum2;
@@ -3005,26 +2983,26 @@ static BOOL run_xcopy(int dummy)
 		return False;
 	}
 	
-	fnum1 = cli_nt_create_full(&cli1, fname, 
+	fnum1 = cli_nt_create_full(cli1, fname, 
 				   FIRST_DESIRED_ACCESS, FILE_ATTRIBUTE_ARCHIVE,
 				   FILE_SHARE_NONE, FILE_OVERWRITE_IF, 
 				   0x4044);
 
 	if (fnum1 == -1) {
-		printf("First open failed - %s\n", cli_errstr(&cli1));
+		printf("First open failed - %s\n", cli_errstr(cli1));
 		return False;
 	}
 
-	fnum2 = cli_nt_create_full(&cli1, fname, 
+	fnum2 = cli_nt_create_full(cli1, fname, 
 				   SECOND_DESIRED_ACCESS, 0,
 				   FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN, 
 				   0x200000);
 	if (fnum2 == -1) {
-		printf("second open failed - %s\n", cli_errstr(&cli1));
+		printf("second open failed - %s\n", cli_errstr(cli1));
 		return False;
 	}
 	
-	if (!torture_close_connection(&cli1)) {
+	if (!torture_close_connection(cli1)) {
 		correct = False;
 	}
 	
@@ -3036,7 +3014,7 @@ static BOOL run_xcopy(int dummy)
  */
 static BOOL run_rename(int dummy)
 {
-	static struct cli_state cli1;
+	static struct cli_state *cli1;
 	const char *fname = "\\test.txt";
 	const char *fname1 = "\\test1.txt";
 	BOOL correct = True;
@@ -3048,31 +3026,31 @@ static BOOL run_rename(int dummy)
 		return False;
 	}
 	
-	cli_unlink(&cli1, fname);
-	cli_unlink(&cli1, fname1);
-	fnum1 = cli_nt_create_full(&cli1, fname, GENERIC_READ_ACCESS, FILE_ATTRIBUTE_NORMAL,
+	cli_unlink(cli1, fname);
+	cli_unlink(cli1, fname1);
+	fnum1 = cli_nt_create_full(cli1, fname, GENERIC_READ_ACCESS, FILE_ATTRIBUTE_NORMAL,
 				   FILE_SHARE_READ, FILE_OVERWRITE_IF, 0);
 
 	if (fnum1 == -1) {
-		printf("First open failed - %s\n", cli_errstr(&cli1));
+		printf("First open failed - %s\n", cli_errstr(cli1));
 		return False;
 	}
 
-	if (!cli_rename(&cli1, fname, fname1)) {
-		printf("First rename failed (this is correct) - %s\n", cli_errstr(&cli1));
+	if (!cli_rename(cli1, fname, fname1)) {
+		printf("First rename failed (this is correct) - %s\n", cli_errstr(cli1));
 	} else {
 		printf("First rename succeeded - this should have failed !\n");
 		correct = False;
 	}
 
-	if (!cli_close(&cli1, fnum1)) {
-		printf("close - 1 failed (%s)\n", cli_errstr(&cli1));
+	if (!cli_close(cli1, fnum1)) {
+		printf("close - 1 failed (%s)\n", cli_errstr(cli1));
 		return False;
 	}
 
-	cli_unlink(&cli1, fname);
-	cli_unlink(&cli1, fname1);
-	fnum1 = cli_nt_create_full(&cli1, fname,GENERIC_READ_ACCESS, FILE_ATTRIBUTE_NORMAL,
+	cli_unlink(cli1, fname);
+	cli_unlink(cli1, fname1);
+	fnum1 = cli_nt_create_full(cli1, fname,GENERIC_READ_ACCESS, FILE_ATTRIBUTE_NORMAL,
 #if 0
 				   FILE_SHARE_DELETE|FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0);
 #else
@@ -3080,30 +3058,30 @@ static BOOL run_rename(int dummy)
 #endif
 
 	if (fnum1 == -1) {
-		printf("Second open failed - %s\n", cli_errstr(&cli1));
+		printf("Second open failed - %s\n", cli_errstr(cli1));
 		return False;
 	}
 
-	if (!cli_rename(&cli1, fname, fname1)) {
-		printf("Second rename failed - this should have succeeded - %s\n", cli_errstr(&cli1));
+	if (!cli_rename(cli1, fname, fname1)) {
+		printf("Second rename failed - this should have succeeded - %s\n", cli_errstr(cli1));
 		correct = False;
 	} else {
 		printf("Second rename succeeded\n");
 	}
 
-	if (!cli_close(&cli1, fnum1)) {
-		printf("close - 2 failed (%s)\n", cli_errstr(&cli1));
+	if (!cli_close(cli1, fnum1)) {
+		printf("close - 2 failed (%s)\n", cli_errstr(cli1));
 		return False;
 	}
 
-	cli_unlink(&cli1, fname);
-	cli_unlink(&cli1, fname1);
+	cli_unlink(cli1, fname);
+	cli_unlink(cli1, fname1);
 
-	fnum1 = cli_nt_create_full(&cli1, fname,READ_CONTROL_ACCESS, FILE_ATTRIBUTE_NORMAL,
+	fnum1 = cli_nt_create_full(cli1, fname,READ_CONTROL_ACCESS, FILE_ATTRIBUTE_NORMAL,
 				   FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0);
 
 	if (fnum1 == -1) {
-		printf("Third open failed - %s\n", cli_errstr(&cli1));
+		printf("Third open failed - %s\n", cli_errstr(cli1));
 		return False;
 	}
 
@@ -3112,41 +3090,41 @@ static BOOL run_rename(int dummy)
   {
   int fnum2;
 
-	fnum2 = cli_nt_create_full(&cli1, fname,DELETE_ACCESS, FILE_ATTRIBUTE_NORMAL,
+	fnum2 = cli_nt_create_full(cli1, fname,DELETE_ACCESS, FILE_ATTRIBUTE_NORMAL,
 				   FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0);
 
 	if (fnum2 == -1) {
-		printf("Fourth open failed - %s\n", cli_errstr(&cli1));
+		printf("Fourth open failed - %s\n", cli_errstr(cli1));
 		return False;
 	}
-	if (!cli_nt_delete_on_close(&cli1, fnum2, True)) {
+	if (!cli_nt_delete_on_close(cli1, fnum2, True)) {
 		printf("[8] setting delete_on_close on file failed !\n");
 		return False;
 	}
 	
-	if (!cli_close(&cli1, fnum2)) {
-		printf("close - 4 failed (%s)\n", cli_errstr(&cli1));
+	if (!cli_close(cli1, fnum2)) {
+		printf("close - 4 failed (%s)\n", cli_errstr(cli1));
 		return False;
 	}
   }
 #endif
 
-	if (!cli_rename(&cli1, fname, fname1)) {
-		printf("Third rename failed - this should have succeeded - %s\n", cli_errstr(&cli1));
+	if (!cli_rename(cli1, fname, fname1)) {
+		printf("Third rename failed - this should have succeeded - %s\n", cli_errstr(cli1));
 		correct = False;
 	} else {
 		printf("Third rename succeeded\n");
 	}
 
-	if (!cli_close(&cli1, fnum1)) {
-		printf("close - 3 failed (%s)\n", cli_errstr(&cli1));
+	if (!cli_close(cli1, fnum1)) {
+		printf("close - 3 failed (%s)\n", cli_errstr(cli1));
 		return False;
 	}
 
-	cli_unlink(&cli1, fname);
-	cli_unlink(&cli1, fname1);
+	cli_unlink(cli1, fname);
+	cli_unlink(cli1, fname1);
 
-	if (!torture_close_connection(&cli1)) {
+	if (!torture_close_connection(cli1)) {
 		correct = False;
 	}
 	
@@ -3155,7 +3133,7 @@ static BOOL run_rename(int dummy)
 
 static BOOL run_pipe_number(int dummy)
 {
-	static struct cli_state cli1;
+	struct cli_state *cli1;
 	const char *pipe_name = "\\SPOOLSS";
 	int fnum;
 	int num_pipes = 0;
@@ -3165,20 +3143,20 @@ static BOOL run_pipe_number(int dummy)
 		return False;
 	}
 
-	cli_sockopt(&cli1, sockops);
+	cli_sockopt(cli1, sockops);
 	while(1) {
-		fnum = cli_nt_create_full(&cli1, pipe_name,FILE_READ_DATA, FILE_ATTRIBUTE_NORMAL,
+		fnum = cli_nt_create_full(cli1, pipe_name,FILE_READ_DATA, FILE_ATTRIBUTE_NORMAL,
 				   FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN_IF, 0);
 
 		if (fnum == -1) {
-			printf("Open of pipe %s failed with error (%s)\n", pipe_name, cli_errstr(&cli1));
+			printf("Open of pipe %s failed with error (%s)\n", pipe_name, cli_errstr(cli1));
 			break;
 		}
 		num_pipes++;
 	}
 
 	printf("pipe_number test - we can open %d %s pipes.\n", num_pipes, pipe_name );
-	torture_close_connection(&cli1);
+	torture_close_connection(cli1);
 	return True;
 }
 
@@ -3187,8 +3165,8 @@ static BOOL run_pipe_number(int dummy)
  */
 static BOOL run_opentest(int dummy)
 {
-	static struct cli_state cli1;
-	static struct cli_state cli2;
+	static struct cli_state *cli1;
+	static struct cli_state *cli2;
 	const char *fname = "\\readonly.file";
 	int fnum1, fnum2;
 	char buf[20];
@@ -3202,77 +3180,77 @@ static BOOL run_opentest(int dummy)
 		return False;
 	}
 	
-	cli_setatr(&cli1, fname, 0, 0);
-	cli_unlink(&cli1, fname);
+	cli_setatr(cli1, fname, 0, 0);
+	cli_unlink(cli1, fname);
 	
-	cli_sockopt(&cli1, sockops);
+	cli_sockopt(cli1, sockops);
 	
-	fnum1 = cli_open(&cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
+	fnum1 = cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
 	if (fnum1 == -1) {
-		printf("open of %s failed (%s)\n", fname, cli_errstr(&cli1));
+		printf("open of %s failed (%s)\n", fname, cli_errstr(cli1));
 		return False;
 	}
 
-	if (!cli_close(&cli1, fnum1)) {
-		printf("close2 failed (%s)\n", cli_errstr(&cli1));
+	if (!cli_close(cli1, fnum1)) {
+		printf("close2 failed (%s)\n", cli_errstr(cli1));
 		return False;
 	}
 	
-	if (!cli_setatr(&cli1, fname, aRONLY, 0)) {
-		printf("cli_setatr failed (%s)\n", cli_errstr(&cli1));
+	if (!cli_setatr(cli1, fname, aRONLY, 0)) {
+		printf("cli_setatr failed (%s)\n", cli_errstr(cli1));
 		return False;
 	}
 	
-	fnum1 = cli_open(&cli1, fname, O_RDONLY, DENY_WRITE);
+	fnum1 = cli_open(cli1, fname, O_RDONLY, DENY_WRITE);
 	if (fnum1 == -1) {
-		printf("open of %s failed (%s)\n", fname, cli_errstr(&cli1));
+		printf("open of %s failed (%s)\n", fname, cli_errstr(cli1));
 		return False;
 	}
 	
 	/* This will fail - but the error should be ERRnoaccess, not ERRbadshare. */
-	fnum2 = cli_open(&cli1, fname, O_RDWR, DENY_ALL);
+	fnum2 = cli_open(cli1, fname, O_RDWR, DENY_ALL);
 	
-        if (check_error(__LINE__, &cli1, ERRDOS, ERRnoaccess, 
+        if (check_error(__LINE__, cli1, ERRDOS, ERRnoaccess, 
 			NT_STATUS_ACCESS_DENIED)) {
 		printf("correct error code ERRDOS/ERRnoaccess returned\n");
 	}
 	
 	printf("finished open test 1\n");
 	
-	cli_close(&cli1, fnum1);
+	cli_close(cli1, fnum1);
 	
 	/* Now try not readonly and ensure ERRbadshare is returned. */
 	
-	cli_setatr(&cli1, fname, 0, 0);
+	cli_setatr(cli1, fname, 0, 0);
 	
-	fnum1 = cli_open(&cli1, fname, O_RDONLY, DENY_WRITE);
+	fnum1 = cli_open(cli1, fname, O_RDONLY, DENY_WRITE);
 	if (fnum1 == -1) {
-		printf("open of %s failed (%s)\n", fname, cli_errstr(&cli1));
+		printf("open of %s failed (%s)\n", fname, cli_errstr(cli1));
 		return False;
 	}
 	
 	/* This will fail - but the error should be ERRshare. */
-	fnum2 = cli_open(&cli1, fname, O_RDWR, DENY_ALL);
+	fnum2 = cli_open(cli1, fname, O_RDWR, DENY_ALL);
 	
-	if (check_error(__LINE__, &cli1, ERRDOS, ERRbadshare, 
+	if (check_error(__LINE__, cli1, ERRDOS, ERRbadshare, 
 			NT_STATUS_SHARING_VIOLATION)) {
 		printf("correct error code ERRDOS/ERRbadshare returned\n");
 	}
 	
-	if (!cli_close(&cli1, fnum1)) {
-		printf("close2 failed (%s)\n", cli_errstr(&cli1));
+	if (!cli_close(cli1, fnum1)) {
+		printf("close2 failed (%s)\n", cli_errstr(cli1));
 		return False;
 	}
 	
-	cli_unlink(&cli1, fname);
+	cli_unlink(cli1, fname);
 	
 	printf("finished open test 2\n");
 	
 	/* Test truncate open disposition on file opened for read. */
 	
-	fnum1 = cli_open(&cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
+	fnum1 = cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
 	if (fnum1 == -1) {
-		printf("(3) open (1) of %s failed (%s)\n", fname, cli_errstr(&cli1));
+		printf("(3) open (1) of %s failed (%s)\n", fname, cli_errstr(cli1));
 		return False;
 	}
 	
@@ -3280,19 +3258,19 @@ static BOOL run_opentest(int dummy)
 	
 	memset(buf, '\0', 20);
 
-	if (cli_write(&cli1, fnum1, 0, buf, 0, 20) != 20) {
-		printf("write failed (%s)\n", cli_errstr(&cli1));
+	if (cli_write(cli1, fnum1, 0, buf, 0, 20) != 20) {
+		printf("write failed (%s)\n", cli_errstr(cli1));
 		correct = False;
 	}
 
-	if (!cli_close(&cli1, fnum1)) {
-		printf("(3) close1 failed (%s)\n", cli_errstr(&cli1));
+	if (!cli_close(cli1, fnum1)) {
+		printf("(3) close1 failed (%s)\n", cli_errstr(cli1));
 		return False;
 	}
 	
 	/* Ensure size == 20. */
-	if (!cli_getatr(&cli1, fname, NULL, &fsize, NULL)) {
-		printf("(3) getatr failed (%s)\n", cli_errstr(&cli1));
+	if (!cli_getatr(cli1, fname, NULL, &fsize, NULL)) {
+		printf("(3) getatr failed (%s)\n", cli_errstr(cli1));
 		return False;
 	}
 	
@@ -3303,20 +3281,20 @@ static BOOL run_opentest(int dummy)
 
 	/* Now test if we can truncate a file opened for readonly. */
 	
-	fnum1 = cli_open(&cli1, fname, O_RDONLY|O_TRUNC, DENY_NONE);
+	fnum1 = cli_open(cli1, fname, O_RDONLY|O_TRUNC, DENY_NONE);
 	if (fnum1 == -1) {
-		printf("(3) open (2) of %s failed (%s)\n", fname, cli_errstr(&cli1));
+		printf("(3) open (2) of %s failed (%s)\n", fname, cli_errstr(cli1));
 		return False;
 	}
 	
-	if (!cli_close(&cli1, fnum1)) {
-		printf("close2 failed (%s)\n", cli_errstr(&cli1));
+	if (!cli_close(cli1, fnum1)) {
+		printf("close2 failed (%s)\n", cli_errstr(cli1));
 		return False;
 	}
 
 	/* Ensure size == 0. */
-	if (!cli_getatr(&cli1, fname, NULL, &fsize, NULL)) {
-		printf("(3) getatr failed (%s)\n", cli_errstr(&cli1));
+	if (!cli_getatr(cli1, fname, NULL, &fsize, NULL)) {
+		printf("(3) getatr failed (%s)\n", cli_errstr(cli1));
 		return False;
 	}
 
@@ -3326,21 +3304,21 @@ static BOOL run_opentest(int dummy)
 	}
 	printf("finished open test 3\n");
 	
-	cli_unlink(&cli1, fname);
+	cli_unlink(cli1, fname);
 
 
 	printf("testing ctemp\n");
-	fnum1 = cli_ctemp(&cli1, "\\", &tmp_path);
+	fnum1 = cli_ctemp(cli1, "\\", &tmp_path);
 	if (fnum1 == -1) {
-		printf("ctemp failed (%s)\n", cli_errstr(&cli1));
+		printf("ctemp failed (%s)\n", cli_errstr(cli1));
 		return False;
 	}
 	printf("ctemp gave path %s\n", tmp_path);
-	if (!cli_close(&cli1, fnum1)) {
-		printf("close of temp failed (%s)\n", cli_errstr(&cli1));
+	if (!cli_close(cli1, fnum1)) {
+		printf("close of temp failed (%s)\n", cli_errstr(cli1));
 	}
-	if (!cli_unlink(&cli1, tmp_path)) {
-		printf("unlink of temp failed (%s)\n", cli_errstr(&cli1));
+	if (!cli_unlink(cli1, tmp_path)) {
+		printf("unlink of temp failed (%s)\n", cli_errstr(cli1));
 	}
 	
 	/* Test the non-io opens... */
@@ -3349,158 +3327,158 @@ static BOOL run_opentest(int dummy)
 		return False;
 	}
 	
-	cli_setatr(&cli2, fname, 0, 0);
-	cli_unlink(&cli2, fname);
+	cli_setatr(cli2, fname, 0, 0);
+	cli_unlink(cli2, fname);
 	
-	cli_sockopt(&cli2, sockops);
+	cli_sockopt(cli2, sockops);
 
 	printf("TEST #1 testing 2 non-io opens (no delete)\n");
 	
-	fnum1 = cli_nt_create_full(&cli1, fname,FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
+	fnum1 = cli_nt_create_full(cli1, fname,FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
 				   FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0);
 
 	if (fnum1 == -1) {
-		printf("test 1 open 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
+		printf("test 1 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
 		return False;
 	}
 
-	fnum2 = cli_nt_create_full(&cli2, fname,FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
+	fnum2 = cli_nt_create_full(cli2, fname,FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
 				   FILE_SHARE_NONE, FILE_OPEN_IF, 0);
 
 	if (fnum2 == -1) {
-		printf("test 1 open 2 of %s failed (%s)\n", fname, cli_errstr(&cli2));
+		printf("test 1 open 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
 		return False;
 	}
 
-	if (!cli_close(&cli1, fnum1)) {
-		printf("test 1 close 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
+	if (!cli_close(cli1, fnum1)) {
+		printf("test 1 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
 		return False;
 	}
-	if (!cli_close(&cli2, fnum2)) {
-		printf("test 1 close 2 of %s failed (%s)\n", fname, cli_errstr(&cli2));
+	if (!cli_close(cli2, fnum2)) {
+		printf("test 1 close 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
 		return False;
 	}
 
 	printf("non-io open test #1 passed.\n");
 
-	cli_unlink(&cli1, fname);
+	cli_unlink(cli1, fname);
 
 	printf("TEST #2 testing 2 non-io opens (first with delete)\n");
 	
-	fnum1 = cli_nt_create_full(&cli1, fname,DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
+	fnum1 = cli_nt_create_full(cli1, fname,DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
 				   FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0);
 
 	if (fnum1 == -1) {
-		printf("test 2 open 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
+		printf("test 2 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
 		return False;
 	}
 
-	fnum2 = cli_nt_create_full(&cli2, fname,FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
+	fnum2 = cli_nt_create_full(cli2, fname,FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
 				   FILE_SHARE_NONE, FILE_OPEN_IF, 0);
 
 	if (fnum2 == -1) {
-		printf("test 2 open 2 of %s failed (%s)\n", fname, cli_errstr(&cli2));
+		printf("test 2 open 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
 		return False;
 	}
 
-	if (!cli_close(&cli1, fnum1)) {
-		printf("test 1 close 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
+	if (!cli_close(cli1, fnum1)) {
+		printf("test 1 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
 		return False;
 	}
-	if (!cli_close(&cli2, fnum2)) {
-		printf("test 1 close 2 of %s failed (%s)\n", fname, cli_errstr(&cli1));
+	if (!cli_close(cli2, fnum2)) {
+		printf("test 1 close 2 of %s failed (%s)\n", fname, cli_errstr(cli1));
 		return False;
 	}
 
 	printf("non-io open test #2 passed.\n");
 
-	cli_unlink(&cli1, fname);
+	cli_unlink(cli1, fname);
 
 	printf("TEST #3 testing 2 non-io opens (second with delete)\n");
 	
-	fnum1 = cli_nt_create_full(&cli1, fname,FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
+	fnum1 = cli_nt_create_full(cli1, fname,FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
 				   FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0);
 
 	if (fnum1 == -1) {
-		printf("test 3 open 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
+		printf("test 3 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
 		return False;
 	}
 
-	fnum2 = cli_nt_create_full(&cli2, fname,DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
+	fnum2 = cli_nt_create_full(cli2, fname,DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
 				   FILE_SHARE_NONE, FILE_OPEN_IF, 0);
 
 	if (fnum2 == -1) {
-		printf("test 3 open 2 of %s failed (%s)\n", fname, cli_errstr(&cli2));
+		printf("test 3 open 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
 		return False;
 	}
 
-	if (!cli_close(&cli1, fnum1)) {
-		printf("test 3 close 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
+	if (!cli_close(cli1, fnum1)) {
+		printf("test 3 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
 		return False;
 	}
-	if (!cli_close(&cli2, fnum2)) {
-		printf("test 3 close 2 of %s failed (%s)\n", fname, cli_errstr(&cli2));
+	if (!cli_close(cli2, fnum2)) {
+		printf("test 3 close 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
 		return False;
 	}
 
 	printf("non-io open test #3 passed.\n");
 
-	cli_unlink(&cli1, fname);
+	cli_unlink(cli1, fname);
 
 	printf("TEST #4 testing 2 non-io opens (both with delete)\n");
 	
-	fnum1 = cli_nt_create_full(&cli1, fname,DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
+	fnum1 = cli_nt_create_full(cli1, fname,DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
 				   FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0);
 
 	if (fnum1 == -1) {
-		printf("test 4 open 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
+		printf("test 4 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
 		return False;
 	}
 
-	fnum2 = cli_nt_create_full(&cli2, fname,DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
+	fnum2 = cli_nt_create_full(cli2, fname,DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
 				   FILE_SHARE_NONE, FILE_OPEN_IF, 0);
 
 	if (fnum2 != -1) {
-		printf("test 4 open 2 of %s SUCCEEDED - should have failed (%s)\n", fname, cli_errstr(&cli2));
+		printf("test 4 open 2 of %s SUCCEEDED - should have failed (%s)\n", fname, cli_errstr(cli2));
 		return False;
 	}
 
-	printf("test 3 open 2 of %s gave %s (correct error should be %s)\n", fname, cli_errstr(&cli2), "sharing violation");
+	printf("test 3 open 2 of %s gave %s (correct error should be %s)\n", fname, cli_errstr(cli2), "sharing violation");
 
-	if (!cli_close(&cli1, fnum1)) {
-		printf("test 4 close 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
+	if (!cli_close(cli1, fnum1)) {
+		printf("test 4 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
 		return False;
 	}
 
 	printf("non-io open test #4 passed.\n");
 
-	cli_unlink(&cli1, fname);
+	cli_unlink(cli1, fname);
 
 	printf("TEST #5 testing 2 non-io opens (both with delete - both with file share delete)\n");
 	
-	fnum1 = cli_nt_create_full(&cli1, fname,DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
+	fnum1 = cli_nt_create_full(cli1, fname,DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
 				   FILE_SHARE_DELETE, FILE_OVERWRITE_IF, 0);
 
 	if (fnum1 == -1) {
-		printf("test 5 open 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
+		printf("test 5 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
 		return False;
 	}
 
-	fnum2 = cli_nt_create_full(&cli2, fname,DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
+	fnum2 = cli_nt_create_full(cli2, fname,DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
 				   FILE_SHARE_DELETE, FILE_OPEN_IF, 0);
 
 	if (fnum2 == -1) {
-		printf("test 5 open 2 of %s failed (%s)\n", fname, cli_errstr(&cli2));
+		printf("test 5 open 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
 		return False;
 	}
 
-	if (!cli_close(&cli1, fnum1)) {
-		printf("test 5 close 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
+	if (!cli_close(cli1, fnum1)) {
+		printf("test 5 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
 		return False;
 	}
 
-	if (!cli_close(&cli2, fnum2)) {
-		printf("test 5 close 2 of %s failed (%s)\n", fname, cli_errstr(&cli2));
+	if (!cli_close(cli2, fnum2)) {
+		printf("test 5 close 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
 		return False;
 	}
 
@@ -3508,31 +3486,31 @@ static BOOL run_opentest(int dummy)
 
 	printf("TEST #6 testing 1 non-io open, one io open\n");
 	
-	cli_unlink(&cli1, fname);
+	cli_unlink(cli1, fname);
 
-	fnum1 = cli_nt_create_full(&cli1, fname,FILE_READ_DATA, FILE_ATTRIBUTE_NORMAL,
+	fnum1 = cli_nt_create_full(cli1, fname,FILE_READ_DATA, FILE_ATTRIBUTE_NORMAL,
 				   FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0);
 
 	if (fnum1 == -1) {
-		printf("test 6 open 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
+		printf("test 6 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
 		return False;
 	}
 
-	fnum2 = cli_nt_create_full(&cli2, fname,FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
+	fnum2 = cli_nt_create_full(cli2, fname,FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
 				   FILE_SHARE_READ, FILE_OPEN_IF, 0);
 
 	if (fnum2 == -1) {
-		printf("test 6 open 2 of %s failed (%s)\n", fname, cli_errstr(&cli2));
+		printf("test 6 open 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
 		return False;
 	}
 
-	if (!cli_close(&cli1, fnum1)) {
-		printf("test 6 close 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
+	if (!cli_close(cli1, fnum1)) {
+		printf("test 6 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
 		return False;
 	}
 
-	if (!cli_close(&cli2, fnum2)) {
-		printf("test 6 close 2 of %s failed (%s)\n", fname, cli_errstr(&cli2));
+	if (!cli_close(cli2, fnum2)) {
+		printf("test 6 close 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
 		return False;
 	}
 
@@ -3540,39 +3518,39 @@ static BOOL run_opentest(int dummy)
 
 	printf("TEST #7 testing 1 non-io open, one io open with delete\n");
 
-	cli_unlink(&cli1, fname);
+	cli_unlink(cli1, fname);
 
-	fnum1 = cli_nt_create_full(&cli1, fname,FILE_READ_DATA, FILE_ATTRIBUTE_NORMAL,
+	fnum1 = cli_nt_create_full(cli1, fname,FILE_READ_DATA, FILE_ATTRIBUTE_NORMAL,
 				   FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0);
 
 	if (fnum1 == -1) {
-		printf("test 7 open 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
+		printf("test 7 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
 		return False;
 	}
 
-	fnum2 = cli_nt_create_full(&cli2, fname,DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
+	fnum2 = cli_nt_create_full(cli2, fname,DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
 				   FILE_SHARE_READ|FILE_SHARE_DELETE, FILE_OPEN_IF, 0);
 
 	if (fnum2 != -1) {
-		printf("test 7 open 2 of %s SUCCEEDED - should have failed (%s)\n", fname, cli_errstr(&cli2));
+		printf("test 7 open 2 of %s SUCCEEDED - should have failed (%s)\n", fname, cli_errstr(cli2));
 		return False;
 	}
 
-	printf("test 7 open 2 of %s gave %s (correct error should be %s)\n", fname, cli_errstr(&cli2), "sharing violation");
+	printf("test 7 open 2 of %s gave %s (correct error should be %s)\n", fname, cli_errstr(cli2), "sharing violation");
 
-	if (!cli_close(&cli1, fnum1)) {
-		printf("test 7 close 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
+	if (!cli_close(cli1, fnum1)) {
+		printf("test 7 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
 		return False;
 	}
 
 	printf("non-io open test #7 passed.\n");
 
-	cli_unlink(&cli1, fname);
+	cli_unlink(cli1, fname);
 
-	if (!torture_close_connection(&cli1)) {
+	if (!torture_close_connection(cli1)) {
 		correct = False;
 	}
-	if (!torture_close_connection(&cli2)) {
+	if (!torture_close_connection(cli2)) {
 		correct = False;
 	}
 	
@@ -3600,7 +3578,7 @@ static uint32 open_attrs_table[] = {
 };
 
 struct trunc_open_results {
-	int num;
+	unsigned int num;
 	uint32 init_attr;
 	uint32 trunc_attr;
 	uint32 result_attr;
@@ -3637,12 +3615,12 @@ static struct trunc_open_results attr_results[] = {
 
 static BOOL run_openattrtest(int dummy)
 {
-	static struct cli_state cli1;
+	static struct cli_state *cli1;
 	const char *fname = "\\openattr.file";
 	int fnum1;
 	BOOL correct = True;
 	uint16 attr;
-	int i, j, k, l;
+	unsigned int i, j, k, l;
 
 	printf("starting open attr test\n");
 	
@@ -3650,26 +3628,26 @@ static BOOL run_openattrtest(int dummy)
 		return False;
 	}
 	
-	cli_sockopt(&cli1, sockops);
+	cli_sockopt(cli1, sockops);
 
 	for (k = 0, i = 0; i < sizeof(open_attrs_table)/sizeof(uint32); i++) {
-		cli_setatr(&cli1, fname, 0, 0);
-		cli_unlink(&cli1, fname);
-		fnum1 = cli_nt_create_full(&cli1, fname,FILE_WRITE_DATA, open_attrs_table[i],
+		cli_setatr(cli1, fname, 0, 0);
+		cli_unlink(cli1, fname);
+		fnum1 = cli_nt_create_full(cli1, fname,FILE_WRITE_DATA, open_attrs_table[i],
 				   FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0);
 
 		if (fnum1 == -1) {
-			printf("open %d (1) of %s failed (%s)\n", i, fname, cli_errstr(&cli1));
+			printf("open %d (1) of %s failed (%s)\n", i, fname, cli_errstr(cli1));
 			return False;
 		}
 
-		if (!cli_close(&cli1, fnum1)) {
-			printf("close %d (1) of %s failed (%s)\n", i, fname, cli_errstr(&cli1));
+		if (!cli_close(cli1, fnum1)) {
+			printf("close %d (1) of %s failed (%s)\n", i, fname, cli_errstr(cli1));
 			return False;
 		}
 
 		for (j = 0; j < sizeof(open_attrs_table)/sizeof(uint32); j++) {
-			fnum1 = cli_nt_create_full(&cli1, fname,FILE_READ_DATA|FILE_WRITE_DATA, open_attrs_table[j],
+			fnum1 = cli_nt_create_full(cli1, fname,FILE_READ_DATA|FILE_WRITE_DATA, open_attrs_table[j],
 					   FILE_SHARE_NONE, FILE_OVERWRITE, 0);
 
 			if (fnum1 == -1) {
@@ -3678,14 +3656,14 @@ static BOOL run_openattrtest(int dummy)
 						printf("[%d] trunc open 0x%x -> 0x%x of %s failed - should have succeeded !(0x%x:%s)\n",
 								k, open_attrs_table[i],
 								open_attrs_table[j],
-								fname, NT_STATUS_V(cli_nt_error(&cli1)), cli_errstr(&cli1));
+								fname, NT_STATUS_V(cli_nt_error(cli1)), cli_errstr(cli1));
 						correct = False;
 					}
 				}
-				if (NT_STATUS_V(cli_nt_error(&cli1)) != NT_STATUS_V(NT_STATUS_ACCESS_DENIED)) {
+				if (NT_STATUS_V(cli_nt_error(cli1)) != NT_STATUS_V(NT_STATUS_ACCESS_DENIED)) {
 					printf("[%d] trunc open 0x%x -> 0x%x failed with wrong error code %s\n",
 							k, open_attrs_table[i], open_attrs_table[j],
-							cli_errstr(&cli1));
+							cli_errstr(cli1));
 					correct = False;
 				}
 #if 0
@@ -3695,13 +3673,13 @@ static BOOL run_openattrtest(int dummy)
 				continue;
 			}
 
-			if (!cli_close(&cli1, fnum1)) {
-				printf("close %d (2) of %s failed (%s)\n", j, fname, cli_errstr(&cli1));
+			if (!cli_close(cli1, fnum1)) {
+				printf("close %d (2) of %s failed (%s)\n", j, fname, cli_errstr(cli1));
 				return False;
 			}
 
-			if (!cli_getatr(&cli1, fname, &attr, NULL, NULL)) {
-				printf("getatr(2) failed (%s)\n", cli_errstr(&cli1));
+			if (!cli_getatr(cli1, fname, &attr, NULL, NULL)) {
+				printf("getatr(2) failed (%s)\n", cli_errstr(cli1));
 				return False;
 			}
 
@@ -3729,12 +3707,12 @@ static BOOL run_openattrtest(int dummy)
 		}
 	}
 
-	cli_setatr(&cli1, fname, 0, 0);
-	cli_unlink(&cli1, fname);
+	cli_setatr(cli1, fname, 0, 0);
+	cli_unlink(cli1, fname);
 
 	printf("open attr test %s.\n", correct ? "passed" : "failed");
 
-	if (!torture_close_connection(&cli1)) {
+	if (!torture_close_connection(cli1)) {
 		correct = False;
 	}
 	return correct;
@@ -3751,7 +3729,7 @@ static void list_fn(file_info *finfo, const char *name, void *state)
 static BOOL run_dirtest(int dummy)
 {
 	int i;
-	static struct cli_state cli;
+	static struct cli_state *cli;
 	int fnum;
 	double t1;
 	BOOL correct = True;
@@ -3762,25 +3740,25 @@ static BOOL run_dirtest(int dummy)
 		return False;
 	}
 
-	cli_sockopt(&cli, sockops);
+	cli_sockopt(cli, sockops);
 
 	srandom(0);
 	for (i=0;i<torture_numops;i++) {
 		fstring fname;
 		slprintf(fname, sizeof(fname), "\\%x", (int)random());
-		fnum = cli_open(&cli, fname, O_RDWR|O_CREAT, DENY_NONE);
+		fnum = cli_open(cli, fname, O_RDWR|O_CREAT, DENY_NONE);
 		if (fnum == -1) {
 			fprintf(stderr,"Failed to open %s\n", fname);
 			return False;
 		}
-		cli_close(&cli, fnum);
+		cli_close(cli, fnum);
 	}
 
 	t1 = end_timer();
 
-	printf("Matched %d\n", cli_list(&cli, "a*.*", 0, list_fn, NULL));
-	printf("Matched %d\n", cli_list(&cli, "b*.*", 0, list_fn, NULL));
-	printf("Matched %d\n", cli_list(&cli, "xyzabc", 0, list_fn, NULL));
+	printf("Matched %d\n", cli_list(cli, "a*.*", 0, list_fn, NULL));
+	printf("Matched %d\n", cli_list(cli, "b*.*", 0, list_fn, NULL));
+	printf("Matched %d\n", cli_list(cli, "xyzabc", 0, list_fn, NULL));
 
 	printf("dirtest core %g seconds\n", end_timer() - t1);
 
@@ -3788,10 +3766,10 @@ static BOOL run_dirtest(int dummy)
 	for (i=0;i<torture_numops;i++) {
 		fstring fname;
 		slprintf(fname, sizeof(fname), "\\%x", (int)random());
-		cli_unlink(&cli, fname);
+		cli_unlink(cli, fname);
 	}
 
-	if (!torture_close_connection(&cli)) {
+	if (!torture_close_connection(cli)) {
 		correct = False;
 	}
 
@@ -3821,7 +3799,7 @@ static void del_fn(file_info *finfo, const char *mask, void *state)
 static BOOL run_dirtest1(int dummy)
 {
 	int i;
-	static struct cli_state cli;
+	static struct cli_state *cli;
 	int fnum, num_seen;
 	BOOL correct = True;
 
@@ -3831,36 +3809,36 @@ static BOOL run_dirtest1(int dummy)
 		return False;
 	}
 
-	cli_sockopt(&cli, sockops);
+	cli_sockopt(cli, sockops);
 
-	cli_list(&cli, "\\LISTDIR\\*", 0, del_fn, &cli);
-	cli_list(&cli, "\\LISTDIR\\*", aDIR, del_fn, &cli);
-	cli_rmdir(&cli, "\\LISTDIR");
-	cli_mkdir(&cli, "\\LISTDIR");
+	cli_list(cli, "\\LISTDIR\\*", 0, del_fn, cli);
+	cli_list(cli, "\\LISTDIR\\*", aDIR, del_fn, cli);
+	cli_rmdir(cli, "\\LISTDIR");
+	cli_mkdir(cli, "\\LISTDIR");
 
 	/* Create 1000 files and 1000 directories. */
 	for (i=0;i<1000;i++) {
 		fstring fname;
 		slprintf(fname, sizeof(fname), "\\LISTDIR\\f%d", i);
-		fnum = cli_nt_create_full(&cli, fname, GENERIC_ALL_ACCESS, FILE_ATTRIBUTE_ARCHIVE,
+		fnum = cli_nt_create_full(cli, fname, GENERIC_ALL_ACCESS, FILE_ATTRIBUTE_ARCHIVE,
 				   FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OVERWRITE_IF, 0);
 		if (fnum == -1) {
 			fprintf(stderr,"Failed to open %s\n", fname);
 			return False;
 		}
-		cli_close(&cli, fnum);
+		cli_close(cli, fnum);
 	}
 	for (i=0;i<1000;i++) {
 		fstring fname;
 		slprintf(fname, sizeof(fname), "\\LISTDIR\\d%d", i);
-		if (!cli_mkdir(&cli, fname)) {
+		if (!cli_mkdir(cli, fname)) {
 			fprintf(stderr,"Failed to open %s\n", fname);
 			return False;
 		}
 	}
 
 	/* Now ensure that doing an old list sees both files and directories. */
-	num_seen = cli_list_old(&cli, "\\LISTDIR\\*", aDIR, list_fn, NULL);
+	num_seen = cli_list_old(cli, "\\LISTDIR\\*", aDIR, list_fn, NULL);
 	printf("num_seen = %d\n", num_seen );
 	/* We should see 100 files + 1000 directories + . and .. */
 	if (num_seen != 2002)
@@ -3869,28 +3847,28 @@ static BOOL run_dirtest1(int dummy)
 	/* Ensure if we have the "must have" bits we only see the
 	 * relevent entries.
 	 */
-	num_seen = cli_list_old(&cli, "\\LISTDIR\\*", (aDIR<<8)|aDIR, list_fn, NULL);
+	num_seen = cli_list_old(cli, "\\LISTDIR\\*", (aDIR<<8)|aDIR, list_fn, NULL);
 	printf("num_seen = %d\n", num_seen );
 	if (num_seen != 1002)
 		correct = False;
 
-	num_seen = cli_list_old(&cli, "\\LISTDIR\\*", (aARCH<<8)|aDIR, list_fn, NULL);
+	num_seen = cli_list_old(cli, "\\LISTDIR\\*", (aARCH<<8)|aDIR, list_fn, NULL);
 	printf("num_seen = %d\n", num_seen );
 	if (num_seen != 1000)
 		correct = False;
 
 	/* Delete everything. */
-	cli_list(&cli, "\\LISTDIR\\*", 0, del_fn, &cli);
-	cli_list(&cli, "\\LISTDIR\\*", aDIR, del_fn, &cli);
-	cli_rmdir(&cli, "\\LISTDIR");
+	cli_list(cli, "\\LISTDIR\\*", 0, del_fn, cli);
+	cli_list(cli, "\\LISTDIR\\*", aDIR, del_fn, cli);
+	cli_rmdir(cli, "\\LISTDIR");
 
 #if 0
-	printf("Matched %d\n", cli_list(&cli, "a*.*", 0, list_fn, NULL));
-	printf("Matched %d\n", cli_list(&cli, "b*.*", 0, list_fn, NULL));
-	printf("Matched %d\n", cli_list(&cli, "xyzabc", 0, list_fn, NULL));
+	printf("Matched %d\n", cli_list(cli, "a*.*", 0, list_fn, NULL));
+	printf("Matched %d\n", cli_list(cli, "b*.*", 0, list_fn, NULL));
+	printf("Matched %d\n", cli_list(cli, "xyzabc", 0, list_fn, NULL));
 #endif
 
-	if (!torture_close_connection(&cli)) {
+	if (!torture_close_connection(cli)) {
 		correct = False;
 	}
 
@@ -4044,7 +4022,6 @@ static double create_procs(BOOL (*fn)(int), BOOL *result)
 			slprintf(myname,sizeof(myname),"CLIENT%d", i);
 
 			while (1) {
-				memset(&current_cli, 0, sizeof(current_cli));
 				if (torture_open_connection(&current_cli)) break;
 				if (tries-- == 0) {
 					printf("pid %d failed to start\n", (int)getpid());
diff --git a/source3/torture/utable.c b/source3/torture/utable.c
index 2b5a912062..d9c1fcbafd 100644
--- a/source3/torture/utable.c
+++ b/source3/torture/utable.c
@@ -24,7 +24,7 @@
 
 BOOL torture_utable(int dummy)
 {
-	static struct cli_state cli;
+	struct cli_state *cli;
 	fstring fname, alt_name;
 	int fnum;
 	smb_ucs2_t c2;
@@ -40,8 +40,8 @@ BOOL torture_utable(int dummy)
 
 	memset(valid, 0, sizeof(valid));
 
-	cli_mkdir(&cli, "\\utable");
-	cli_unlink(&cli, "\\utable\\*");
+	cli_mkdir(cli, "\\utable");
+	cli_unlink(cli, "\\utable\\*");
 
 	for (c=1; c < 0x10000; c++) {
 		char *p;
@@ -55,13 +55,13 @@ BOOL torture_utable(int dummy)
 		p[len] = 0;
 		fstrcat(fname,"_a_long_extension");
 
-		fnum = cli_open(&cli, fname, O_RDWR | O_CREAT | O_TRUNC, 
+		fnum = cli_open(cli, fname, O_RDWR | O_CREAT | O_TRUNC, 
 				DENY_NONE);
 		if (fnum == -1) continue;
 
 		chars_allowed++;
 
-		cli_qpathinfo_alt_name(&cli, fname, alt_name);
+		cli_qpathinfo_alt_name(cli, fname, alt_name);
 
 		if (strncmp(alt_name, "X_A_L", 5) != 0) {
 			alt_allowed++;
@@ -69,8 +69,8 @@ BOOL torture_utable(int dummy)
 			d_printf("fname=[%s] alt_name=[%s]\n", fname, alt_name);
 		}
 
-		cli_close(&cli, fnum);
-		cli_unlink(&cli, fname);
+		cli_close(cli, fnum);
+		cli_unlink(cli, fname);
 
 		if (c % 100 == 0) {
 			printf("%d (%d/%d)\r", c, chars_allowed, alt_allowed);
@@ -78,7 +78,7 @@ BOOL torture_utable(int dummy)
 	}
 	printf("%d (%d/%d)\n", c, chars_allowed, alt_allowed);
 
-	cli_rmdir(&cli, "\\utable");
+	cli_rmdir(cli, "\\utable");
 
 	d_printf("%d chars allowed   %d alt chars allowed\n", chars_allowed, alt_allowed);
 
@@ -115,7 +115,7 @@ static char *form_name(int c)
 
 BOOL torture_casetable(int dummy)
 {
-	static struct cli_state cli;
+	static struct cli_state *cli;
 	char *fname;
 	int fnum;
 	int c, i;
@@ -129,8 +129,8 @@ BOOL torture_casetable(int dummy)
 
 	memset(equiv, 0, sizeof(equiv));
 
-	cli_mkdir(&cli, "\\utable");
-	cli_unlink(&cli, "\\utable\\*");
+	cli_mkdir(cli, "\\utable");
+	cli_unlink(cli, "\\utable\\*");
 
 	for (c=1; c < 0x10000; c++) {
 		size_t size;
@@ -140,7 +140,7 @@ BOOL torture_casetable(int dummy)
 		printf("%04x\n", c);
 
 		fname = form_name(c);
-		fnum = cli_nt_create_full(&cli, fname, 
+		fnum = cli_nt_create_full(cli, fname, 
 					  GENERIC_ALL_ACCESS, 
 					  FILE_ATTRIBUTE_NORMAL,
 					  FILE_SHARE_NONE,
@@ -150,7 +150,7 @@ BOOL torture_casetable(int dummy)
 
 		size = 0;
 
-		if (!cli_qfileinfo(&cli, fnum, NULL, &size, 
+		if (!cli_qfileinfo(cli, fnum, NULL, &size, 
 				   NULL, NULL, NULL, NULL, NULL)) continue;
 
 		if (size > 0) {
@@ -160,11 +160,11 @@ BOOL torture_casetable(int dummy)
 			if (size/sizeof(int) >= MAX_EQUIVALENCE) {
 				printf("too many chars match?? size=%d c=0x%04x\n",
 				       size, c);
-				cli_close(&cli, fnum);
+				cli_close(cli, fnum);
 				return False;
 			}
 
-			cli_read(&cli, fnum, (char *)c2, 0, size);
+			cli_read(cli, fnum, (char *)c2, 0, size);
 			printf("%04x: ", c);
 			equiv[c][0] = c;
 			for (i=0; i<size/sizeof(int); i++) {
@@ -175,12 +175,12 @@ BOOL torture_casetable(int dummy)
 			fflush(stdout);
 		}
 
-		cli_write(&cli, fnum, 0, (char *)&c, size, sizeof(c));
-		cli_close(&cli, fnum);
+		cli_write(cli, fnum, 0, (char *)&c, size, sizeof(c));
+		cli_close(cli, fnum);
 	}
 
-	cli_unlink(&cli, "\\utable\\*");
-	cli_rmdir(&cli, "\\utable");
+	cli_unlink(cli, "\\utable\\*");
+	cli_rmdir(cli, "\\utable");
 
 	return True;
 }
-- 
cgit 


From 26b1ed7cc05e3bfd9f83bdb664cc6ca0a9883c4a Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Thu, 6 Mar 2003 16:06:12 +0000
Subject: add #define for the max device name length in a DEVICEMODE (This used
 to be commit 21ec2b6ba3ddba6964f6ddb53f8494e4a8b48a83)

---
 source3/include/nt_printing.h     | 2 ++
 source3/printing/nt_printing.c    | 2 +-
 source3/rpc_parse/parse_spoolss.c | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'source3')

diff --git a/source3/include/nt_printing.h b/source3/include/nt_printing.h
index ca65a40d48..762b1c6917 100644
--- a/source3/include/nt_printing.h
+++ b/source3/include/nt_printing.h
@@ -255,6 +255,8 @@ typedef struct {
 	NT_PRINTER_KEY	*keys;
 } NT_PRINTER_DATA;
 
+#define MAXDEVICENAME	32
+
 typedef struct ntdevicemode
 {
 	fstring	devicename;
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index 6df2c6b445..a486fb9c00 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -2110,7 +2110,7 @@ done:
 NT_DEVICEMODE *construct_nt_devicemode(const fstring default_devicename)
 {
 
-	char adevice[33];
+	char adevice[MAXDEVICENAME];
 	NT_DEVICEMODE *nt_devmode = (NT_DEVICEMODE *)malloc(sizeof(NT_DEVICEMODE));
 
 	if (nt_devmode == NULL) {
diff --git a/source3/rpc_parse/parse_spoolss.c b/source3/rpc_parse/parse_spoolss.c
index 0545f89ff7..a5d2087a3a 100644
--- a/source3/rpc_parse/parse_spoolss.c
+++ b/source3/rpc_parse/parse_spoolss.c
@@ -684,7 +684,7 @@ BOOL spoolss_io_devmode(const char *desc, prs_struct *ps, int depth, DEVICEMODE
 			return False;
 	}
 
-	if (!prs_uint16uni(True,"devicename", ps, depth, devmode->devicename.buffer, 32))
+	if (!prs_uint16uni(True,"devicename", ps, depth, devmode->devicename.buffer, MAXDEVICENAME))
 		return False;
 	
 	if (!prs_uint16("specversion",      ps, depth, &devmode->specversion))
-- 
cgit 


From 3327f13795c10bac2f2c38b22826a54a40e1a945 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Fri, 7 Mar 2003 00:30:29 +0000
Subject: Found at Connectathon, .NET RC1 arranges trans/trans2/nttrans
 parameters differently to W2K, cope with this. Jeremy. (This used to be
 commit 172f415c9eaa4d310a52794e3dc1a6bc92206ce4)

---
 source3/smbd/ipc.c     | 101 +++++++++++++++++++++++++++++++++++-------------
 source3/smbd/nttrans.c | 102 ++++++++++++++++++++++++++++++++++++++-----------
 source3/smbd/trans2.c  |  93 ++++++++++++++++++++++++++++++++++----------
 3 files changed, 227 insertions(+), 69 deletions(-)

(limited to 'source3')

diff --git a/source3/smbd/ipc.c b/source3/smbd/ipc.c
index 7fe02dbccf..08337c2901 100644
--- a/source3/smbd/ipc.c
+++ b/source3/smbd/ipc.c
@@ -360,52 +360,66 @@ int reply_trans(connection_struct *conn, char *inbuf,char *outbuf, int size, int
 	uint16 *setup=NULL;
 	int outsize = 0;
 	uint16 vuid = SVAL(inbuf,smb_uid);
-	int tpscnt = SVAL(inbuf,smb_vwv0);
-	int tdscnt = SVAL(inbuf,smb_vwv1);
-	int mprcnt = SVAL(inbuf,smb_vwv2);
-	int mdrcnt = SVAL(inbuf,smb_vwv3);
-	int msrcnt = CVAL(inbuf,smb_vwv4);
+	unsigned int tpscnt = SVAL(inbuf,smb_vwv0);
+	unsigned int tdscnt = SVAL(inbuf,smb_vwv1);
+	unsigned int mprcnt = SVAL(inbuf,smb_vwv2);
+	unsigned int mdrcnt = SVAL(inbuf,smb_vwv3);
+	unsigned int msrcnt = CVAL(inbuf,smb_vwv4);
 	BOOL close_on_completion = BITSETW(inbuf+smb_vwv5,0);
 	BOOL one_way = BITSETW(inbuf+smb_vwv5,1);
-	int pscnt = SVAL(inbuf,smb_vwv9);
-	int psoff = SVAL(inbuf,smb_vwv10);
-	int dscnt = SVAL(inbuf,smb_vwv11);
-	int dsoff = SVAL(inbuf,smb_vwv12);
-	int suwcnt = CVAL(inbuf,smb_vwv13);
+	unsigned int pscnt = SVAL(inbuf,smb_vwv9);
+	unsigned int psoff = SVAL(inbuf,smb_vwv10);
+	unsigned int dscnt = SVAL(inbuf,smb_vwv11);
+	unsigned int dsoff = SVAL(inbuf,smb_vwv12);
+	unsigned int suwcnt = CVAL(inbuf,smb_vwv13);
 	START_PROFILE(SMBtrans);
 
 	memset(name, '\0',sizeof(name));
 	srvstr_pull_buf(inbuf, name, smb_buf(inbuf), sizeof(name), STR_TERMINATE);
 
-	if (dscnt > tdscnt || pscnt > tpscnt) {
-		exit_server("invalid trans parameters");
-	}
+	if (dscnt > tdscnt || pscnt > tpscnt)
+		goto bad_param;
   
 	if (tdscnt)  {
 		if((data = (char *)malloc(tdscnt)) == NULL) {
-			DEBUG(0,("reply_trans: data malloc fail for %d bytes !\n", tdscnt));
+			DEBUG(0,("reply_trans: data malloc fail for %u bytes !\n", tdscnt));
 			END_PROFILE(SMBtrans);
 			return(ERROR_DOS(ERRDOS,ERRnomem));
 		} 
+		if ((dsoff+dscnt < dsoff) || (dsoff+dscnt < dscnt))
+			goto bad_param;
+		if (smb_base(inbuf)+dsoff+dscnt > inbuf + size)
+			goto bad_param;
+
 		memcpy(data,smb_base(inbuf)+dsoff,dscnt);
 	}
 
 	if (tpscnt) {
 		if((params = (char *)malloc(tpscnt)) == NULL) {
-			DEBUG(0,("reply_trans: param malloc fail for %d bytes !\n", tpscnt));
+			DEBUG(0,("reply_trans: param malloc fail for %u bytes !\n", tpscnt));
 			END_PROFILE(SMBtrans);
 			return(ERROR_DOS(ERRDOS,ERRnomem));
 		} 
+		if ((psoff+pscnt < psoff) || (psoff+pscnt < pscnt))
+			 goto bad_param;
+		if (smb_base(inbuf)+psoff+pscnt > inbuf + size)
+			goto bad_param;
+
 		memcpy(params,smb_base(inbuf)+psoff,pscnt);
 	}
 
 	if (suwcnt) {
 		int i;
 		if((setup = (uint16 *)malloc(suwcnt*sizeof(uint16))) == NULL) {
-          DEBUG(0,("reply_trans: setup malloc fail for %d bytes !\n", (int)(suwcnt * sizeof(uint16))));
-		  END_PROFILE(SMBtrans);
-		  return(ERROR_DOS(ERRDOS,ERRnomem));
-        } 
+			DEBUG(0,("reply_trans: setup malloc fail for %u bytes !\n", (unsigned int)(suwcnt * sizeof(uint16))));
+			END_PROFILE(SMBtrans);
+			return(ERROR_DOS(ERRDOS,ERRnomem));
+		} 
+		if (inbuf+smb_vwv14+(suwcnt*SIZEOFWORD) > inbuf + size)
+			goto bad_param;
+		if ((smb_vwv14+(suwcnt*SIZEOFWORD) < smb_vwv14) || (smb_vwv14+(suwcnt*SIZEOFWORD) < (suwcnt*SIZEOFWORD)))
+			goto bad_param;
+
 		for (i=0;i<suwcnt;i++)
 			setup[i] = SVAL(inbuf,smb_vwv14+i*SIZEOFWORD);
 	}
@@ -423,7 +437,7 @@ int reply_trans(connection_struct *conn, char *inbuf,char *outbuf, int size, int
 	/* receive the rest of the trans packet */
 	while (pscnt < tpscnt || dscnt < tdscnt) {
 		BOOL ret;
-		int pcnt,poff,dcnt,doff,pdisp,ddisp;
+		unsigned int pcnt,poff,dcnt,doff,pdisp,ddisp;
       
 		ret = receive_next_smb(inbuf,bufsize,SMB_SECONDARY_WAIT);
 
@@ -443,8 +457,11 @@ int reply_trans(connection_struct *conn, char *inbuf,char *outbuf, int size, int
 
 		show_msg(inbuf);
       
-		tpscnt = SVAL(inbuf,smb_vwv0);
-		tdscnt = SVAL(inbuf,smb_vwv1);
+		/* Revise total_params and total_data in case they have changed downwards */
+		if (SVAL(inbuf,smb_vwv0) < tpscnt)
+			tpscnt = SVAL(inbuf,smb_vwv0);
+		if (SVAL(inbuf,smb_vwv1) < tdscnt)
+			tdscnt = SVAL(inbuf,smb_vwv1);
 
 		pcnt = SVAL(inbuf,smb_vwv2);
 		poff = SVAL(inbuf,smb_vwv3);
@@ -457,14 +474,34 @@ int reply_trans(connection_struct *conn, char *inbuf,char *outbuf, int size, int
 		pscnt += pcnt;
 		dscnt += dcnt;
 		
-		if (dscnt > tdscnt || pscnt > tpscnt) {
-			exit_server("invalid trans parameters");
-		}
+		if (dscnt > tdscnt || pscnt > tpscnt)
+			goto bad_param;
 		
-		if (pcnt)
+		if (pcnt) {
+			if (pdisp+pcnt >= tpscnt)
+				goto bad_param;
+			if ((pdisp+pcnt < pdisp) || (pdisp+pcnt < pcnt))
+				 goto bad_param;
+			if (smb_base(inbuf) + poff + pcnt >= inbuf + bufsize)
+				goto bad_param;
+			if (params + pdisp < params)
+				goto bad_param;
+
 			memcpy(params+pdisp,smb_base(inbuf)+poff,pcnt);
-		if (dcnt)
+		}
+
+		if (dcnt) {
+			if (ddisp+dcnt >= tdscnt)
+				goto bad_param;
+			if ((ddisp+dcnt < ddisp) || (ddisp+dcnt < dcnt))
+				goto bad_param;
+			if (smb_base(inbuf) + doff + dcnt >= inbuf + bufsize)
+				goto bad_param;
+			if (data + ddisp < data)
+				goto bad_param;
+
 			memcpy(data+ddisp,smb_base(inbuf)+doff,dcnt);      
+		}
 	}
 	
 	
@@ -517,4 +554,14 @@ int reply_trans(connection_struct *conn, char *inbuf,char *outbuf, int size, int
 	
 	END_PROFILE(SMBtrans);
 	return(outsize);
+
+
+  bad_param:
+
+	DEBUG(0,("reply_trans: invalid trans parameters\n"));
+	SAFE_FREE(data);
+	SAFE_FREE(params);
+	SAFE_FREE(setup);
+	END_PROFILE(SMBtrans);
+	return ERROR_DOS(ERRDOS,ERRinvalidparam);
 }
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index bfac4e82e3..375c6c44f6 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -1771,8 +1771,7 @@ due to being in oplock break state.\n", (unsigned int)function_code ));
 	if(CVAL(inbuf, smb_wct) != 19 + (setup_count/2)) {
 		DEBUG(2,("Invalid smb_wct %d in nttrans call (should be %d)\n",
 			CVAL(inbuf, smb_wct), 19 + (setup_count/2)));
-		END_PROFILE(SMBnttrans);
-		return ERROR_DOS(ERRSRV,ERRerror);
+		goto bad_param;
 	}
     
 	/* Allocate the space for the setup, the maximum needed parameters and data */
@@ -1799,21 +1798,38 @@ due to being in oplock break state.\n", (unsigned int)function_code ));
 	num_data_sofar = data_count;
 
 	if (parameter_count > total_parameter_count || data_count > total_data_count)
-		exit_server("reply_nttrans: invalid sizes in packet.");
+		goto bad_param;
 
 	if(setup) {
-		memcpy( setup, &inbuf[smb_nt_SetupStart], setup_count);
 		DEBUG(10,("reply_nttrans: setup_count = %d\n", setup_count));
+		if ((smb_nt_SetupStart + setup_count < smb_nt_SetupStart) ||
+				(smb_nt_SetupStart + setup_count < setup_count))
+			goto bad_param;
+		if (smb_nt_SetupStart + setup_count > length)
+			goto bad_param;
+
+		memcpy( setup, &inbuf[smb_nt_SetupStart], setup_count);
 		dump_data(10, setup, setup_count);
 	}
 	if(params) {
-		memcpy( params, smb_base(inbuf) + parameter_offset, parameter_count);
 		DEBUG(10,("reply_nttrans: parameter_count = %d\n", parameter_count));
+		if ((parameter_offset + parameter_count < parameter_offset) ||
+				(parameter_offset + parameter_count < parameter_count))
+			goto bad_param;
+		if (smb_base(inbuf) + parameter_offset + parameter_count > inbuf + length)
+			goto bad_param;
+
+		memcpy( params, smb_base(inbuf) + parameter_offset, parameter_count);
 		dump_data(10, params, parameter_count);
 	}
 	if(data) {
-		memcpy( data, smb_base(inbuf) + data_offset, data_count);
 		DEBUG(10,("reply_nttrans: data_count = %d\n",data_count));
+		if ((data_offset + data_count < data_offset) || (data_offset + data_count < data_count))
+			goto bad_param;
+		if (smb_base(inbuf) + data_offset + data_count > inbuf + length)
+			goto bad_param;
+
+		memcpy( data, smb_base(inbuf) + data_offset, data_count);
 		dump_data(10, data, data_count);
 	}
 
@@ -1826,6 +1842,8 @@ due to being in oplock break state.\n", (unsigned int)function_code ));
 
 		while( num_data_sofar < total_data_count || num_params_sofar < total_parameter_count) {
 			BOOL ret;
+			uint32 parameter_displacement;
+			uint32 data_displacement;
 
 			ret = receive_next_smb(inbuf,bufsize,SMB_SECONDARY_WAIT);
 
@@ -1837,25 +1855,57 @@ due to being in oplock break state.\n", (unsigned int)function_code ));
 					DEBUG(0,("reply_nttrans: %s in getting secondary nttrans response.\n",
 						(smb_read_error == READ_ERROR) ? "error" : "timeout" ));
 				}
-				SAFE_FREE(params);
-				SAFE_FREE(data);
-				SAFE_FREE(setup);
-				END_PROFILE(SMBnttrans);
-				return ERROR_DOS(ERRSRV,ERRerror);
+				goto bad_param;
 			}
       
 			/* Revise total_params and total_data in case they have changed downwards */
-			total_parameter_count = IVAL(inbuf, smb_nts_TotalParameterCount);
-			total_data_count = IVAL(inbuf, smb_nts_TotalDataCount);
-			num_params_sofar += (parameter_count = IVAL(inbuf,smb_nts_ParameterCount));
-			num_data_sofar += ( data_count = IVAL(inbuf, smb_nts_DataCount));
-			if (num_params_sofar > total_parameter_count || num_data_sofar > total_data_count)
-				exit_server("reply_nttrans2: data overflow in secondary nttrans packet");
-
-			memcpy( &params[ IVAL(inbuf, smb_nts_ParameterDisplacement)], 
-				smb_base(inbuf) + IVAL(inbuf, smb_nts_ParameterOffset), parameter_count);
-			memcpy( &data[IVAL(inbuf, smb_nts_DataDisplacement)],
-				smb_base(inbuf)+ IVAL(inbuf, smb_nts_DataOffset), data_count);
+			if (IVAL(inbuf, smb_nts_TotalParameterCount) < total_parameter_count)
+				total_parameter_count = IVAL(inbuf, smb_nts_TotalParameterCount);
+			if (IVAL(inbuf, smb_nts_TotalDataCount) < total_data_count)
+				total_data_count = IVAL(inbuf, smb_nts_TotalDataCount);
+
+			parameter_count = IVAL(inbuf,smb_nts_ParameterCount);
+			parameter_offset = IVAL(inbuf, smb_nts_ParameterOffset);
+			parameter_displacement = IVAL(inbuf, smb_nts_ParameterDisplacement);
+			num_params_sofar += parameter_count;
+
+			data_count = IVAL(inbuf, smb_nts_DataCount);
+			data_displacement = IVAL(inbuf, smb_nts_DataDisplacement);
+			data_offset = IVAL(inbuf, smb_nts_DataDisplacement);
+			num_data_sofar += data_count;
+
+			if (num_params_sofar > total_parameter_count || num_data_sofar > total_data_count) {
+				DEBUG(0,("reply_nttrans2: data overflow in secondary nttrans packet"));
+				goto bad_param;
+			}
+
+			if (parameter_count) {
+				if (parameter_displacement + parameter_count >= total_parameter_count)
+					goto bad_param;
+				if ((parameter_displacement + parameter_count < parameter_displacement) ||
+						(parameter_displacement + parameter_count < parameter_count))
+					goto bad_param;
+				if (smb_base(inbuf) + parameter_offset + parameter_count >= inbuf + bufsize)
+					goto bad_param;
+				if (parameter_displacement + params < params)
+					goto bad_param;
+
+				memcpy( &params[parameter_displacement], smb_base(inbuf) + parameter_offset, parameter_count);
+			}
+
+			if (data_count) {
+				if (data_displacement + data_count >= total_data_count)
+					goto bad_param;
+				if ((data_displacement + data_count < data_displacement) ||
+						(data_displacement + data_count < data_count))
+					goto bad_param;
+				if (smb_base(inbuf) + data_offset + data_count >= inbuf + bufsize)
+					goto bad_param;
+				if (data_displacement + data < data)
+					goto bad_param;
+
+				memcpy( &data[data_displacement], smb_base(inbuf)+ data_offset, data_count);
+			}
 		}
 	}
 
@@ -1933,4 +1983,12 @@ due to being in oplock break state.\n", (unsigned int)function_code ));
 	return outsize; /* If a correct response was needed the call_nt_transact_xxxx 
 				calls have already sent it. If outsize != -1 then it is
 				returning an error packet. */
+
+ bad_param:
+
+	SAFE_FREE(params);
+	SAFE_FREE(data);
+	SAFE_FREE(setup);
+	END_PROFILE(SMBnttrans);
+	return ERROR_DOS(ERRDOS,ERRinvalidparam);
 }
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 155c996314..d57a29ff77 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -3094,7 +3094,7 @@ int reply_trans2(connection_struct *conn,
 	unsigned int suwcnt = SVAL(inbuf, smb_suwcnt);
 	unsigned int tran_call = SVAL(inbuf, smb_setup0);
 	char *params = NULL, *data = NULL;
-	int num_params, num_params_sofar, num_data, num_data_sofar;
+	unsigned int num_params, num_params_sofar, num_data, num_data_sofar;
 	START_PROFILE(SMBtrans2);
 
 	if(global_oplock_break && (tran_call == TRANSACT2_OPEN)) {
@@ -3133,10 +3133,10 @@ int reply_trans2(connection_struct *conn,
 				(SVAL(inbuf,(smb_setup+6)) == LMFUNC_GETJOBID)) {
 			DEBUG(2,("Got Trans2 DevIOctl jobid\n"));
 		} else {
-			DEBUG(2,("Invalid smb_sucnt in trans2 call(%d)\n",suwcnt));
+			DEBUG(2,("Invalid smb_sucnt in trans2 call(%u)\n",suwcnt));
 			DEBUG(2,("Transaction is %d\n",tran_call));
 			END_PROFILE(SMBtrans2);
-			return ERROR_DOS(ERRSRV,ERRerror);
+			ERROR_DOS(ERRDOS,ERRinvalidparam);
 		}
 	}
     
@@ -3162,10 +3162,22 @@ int reply_trans2(connection_struct *conn,
 	if (num_params > total_params || num_data > total_data)
 		exit_server("invalid params in reply_trans2");
 
-	if(params)
-		memcpy( params, smb_base(inbuf) + SVAL(inbuf, smb_psoff), num_params);
-	if(data)
-		memcpy( data, smb_base(inbuf) + SVAL(inbuf, smb_dsoff), num_data);
+	if(params) {
+		unsigned int psoff = SVAL(inbuf, smb_psoff);
+		if ((psoff + num_params < psoff) || (psoff + num_params < num_params))
+			goto bad_param;
+		if (smb_base(inbuf) + psoff + num_params > inbuf + length)
+			goto bad_param;
+		memcpy( params, smb_base(inbuf) + psoff, num_params);
+	}
+	if(data) {
+		unsigned int dsoff = SVAL(inbuf, smb_dsoff);
+		if ((dsoff + num_data < dsoff) || (dsoff + num_data < num_data))
+			goto bad_param;
+		if (smb_base(inbuf) + dsoff + num_data > inbuf + length)
+			goto bad_param;
+		memcpy( data, smb_base(inbuf) + dsoff, num_data);
+	}
 
 	if(num_data_sofar < total_data || num_params_sofar < total_params)  {
 		/* We need to send an interim response then receive the rest
@@ -3177,6 +3189,10 @@ int reply_trans2(connection_struct *conn,
 		while (num_data_sofar < total_data || 
 		       num_params_sofar < total_params) {
 			BOOL ret;
+			unsigned int param_disp;
+			unsigned int param_off;
+			unsigned int data_disp;
+			unsigned int data_off;
 
 			ret = receive_next_smb(inbuf,bufsize,SMB_SECONDARY_WAIT);
 			
@@ -3188,25 +3204,55 @@ int reply_trans2(connection_struct *conn,
 				else
 					DEBUG(0,("reply_trans2: %s in getting secondary trans2 response.\n",
 						 (smb_read_error == READ_ERROR) ? "error" : "timeout" ));
-				SAFE_FREE(params);
-				SAFE_FREE(data);
-				END_PROFILE(SMBtrans2);
-				return ERROR_DOS(ERRSRV,ERRerror);
+				goto bad_param;
 			}
       
 			/* Revise total_params and total_data in case
                            they have changed downwards */
-			total_params = SVAL(inbuf, smb_tpscnt);
-			total_data = SVAL(inbuf, smb_tdscnt);
-			num_params_sofar += (num_params = SVAL(inbuf,smb_spscnt));
-			num_data_sofar += ( num_data = SVAL(inbuf, smb_sdscnt));
+			if (SVAL(inbuf, smb_tpscnt) < total_params)
+				total_params = SVAL(inbuf, smb_tpscnt);
+			if (SVAL(inbuf, smb_tdscnt) < total_data)
+				total_data = SVAL(inbuf, smb_tdscnt);
+
+			num_params = SVAL(inbuf,smb_spscnt);
+			param_off = SVAL(inbuf, smb_spsoff);
+			param_disp = SVAL(inbuf, smb_spsdisp);
+			num_params_sofar += num_params;
+
+			num_data = SVAL(inbuf, smb_sdscnt);
+			data_off = SVAL(inbuf, smb_sdsoff);
+			data_disp = SVAL(inbuf, smb_sdsdisp);
+			num_data_sofar += num_data;
+
 			if (num_params_sofar > total_params || num_data_sofar > total_data)
-				exit_server("data overflow in trans2");
+				goto bad_param;
 			
-			memcpy( &params[ SVAL(inbuf, smb_spsdisp)], 
-				smb_base(inbuf) + SVAL(inbuf, smb_spsoff), num_params);
-			memcpy( &data[SVAL(inbuf, smb_sdsdisp)],
-				smb_base(inbuf)+ SVAL(inbuf, smb_sdsoff), num_data);
+			if (num_params) {
+				if (param_disp + num_params >= total_params)
+					goto bad_param;
+				if ((param_disp + num_params < param_disp) ||
+						(param_disp + num_params < num_params))
+					goto bad_param;
+				if (smb_base(inbuf) + param_off + num_params >= inbuf + bufsize)
+					goto bad_param;
+				if (params + param_disp < params)
+					goto bad_param;
+
+				memcpy( &params[param_disp], smb_base(inbuf) + param_off, num_params);
+			}
+			if (num_data) {
+				if (data_disp + num_data >= total_data)
+					goto bad_param;
+				if ((data_disp + num_data < data_disp) ||
+						(data_disp + num_data < num_data))
+					goto bad_param;
+				if (smb_base(inbuf) + data_off + num_data >= inbuf + bufsize)
+					goto bad_param;
+				if (data + data_disp < data)
+					goto bad_param;
+
+				memcpy( &data[data_disp], smb_base(inbuf) + data_off, num_data);
+			}
 		}
 	}
 	
@@ -3320,4 +3366,11 @@ int reply_trans2(connection_struct *conn,
 	return outsize; /* If a correct response was needed the
 			   call_trans2xxx calls have already sent
 			   it. If outsize != -1 then it is returning */
+
+  bad_param:
+
+	SAFE_FREE(params);
+	SAFE_FREE(data);
+	END_PROFILE(SMBtrans2);
+	return ERROR_DOS(ERRDOS,ERRinvalidparam);
 }
-- 
cgit 


From cea6fd0b0ae4131e8cb9e541a5c2e91ce226e5cd Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Fri, 7 Mar 2003 00:34:43 +0000
Subject: Fix noticed by Corny.Bondad@hp.com. Ensure we free up memory on error
 exit. Jeremy. (This used to be commit
 1cbd53dc3cd2d56f5e62d42fed5d589efcecb8f8)

---
 source3/smbd/ipc.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'source3')

diff --git a/source3/smbd/ipc.c b/source3/smbd/ipc.c
index 08337c2901..67c5da01f3 100644
--- a/source3/smbd/ipc.c
+++ b/source3/smbd/ipc.c
@@ -397,6 +397,7 @@ int reply_trans(connection_struct *conn, char *inbuf,char *outbuf, int size, int
 	if (tpscnt) {
 		if((params = (char *)malloc(tpscnt)) == NULL) {
 			DEBUG(0,("reply_trans: param malloc fail for %u bytes !\n", tpscnt));
+			SAFE_FREE(data);
 			END_PROFILE(SMBtrans);
 			return(ERROR_DOS(ERRDOS,ERRnomem));
 		} 
@@ -412,6 +413,8 @@ int reply_trans(connection_struct *conn, char *inbuf,char *outbuf, int size, int
 		int i;
 		if((setup = (uint16 *)malloc(suwcnt*sizeof(uint16))) == NULL) {
 			DEBUG(0,("reply_trans: setup malloc fail for %u bytes !\n", (unsigned int)(suwcnt * sizeof(uint16))));
+			SAFE_FREE(data);
+			SAFE_FREE(params);
 			END_PROFILE(SMBtrans);
 			return(ERROR_DOS(ERRDOS,ERRnomem));
 		} 
-- 
cgit 


From 80087e6cfed8f6aa55ed396e1690dff2dc32ece7 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 7 Mar 2003 09:25:48 +0000
Subject: safe_strcpy() -> fstrcpy() fix, and a cleanup to how rpcclient calls
 the IP address resolving code. (This used to be commit
 1f605fe77c56ee2a7838c9f87eedf4bb91ebf688)

---
 source3/rpcclient/cmd_reg.c   |  2 +-
 source3/rpcclient/rpcclient.c | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

(limited to 'source3')

diff --git a/source3/rpcclient/cmd_reg.c b/source3/rpcclient/cmd_reg.c
index 19c0e7f71f..8943331dab 100644
--- a/source3/rpcclient/cmd_reg.c
+++ b/source3/rpcclient/cmd_reg.c
@@ -914,7 +914,7 @@ static NTSTATUS cmd_reg_shutdown(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 		switch (opt)
 		{
 			case 'm':
-				safe_strcpy(msg, optarg, sizeof(msg)-1);
+				fstrcpy(msg, optarg);
 				/*fprintf (stderr, "[%s|%s]\n", optarg, msg);*/
 				break;
 
diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c
index 127506fb39..c3b2cd4ea1 100644
--- a/source3/rpcclient/rpcclient.c
+++ b/source3/rpcclient/rpcclient.c
@@ -592,6 +592,8 @@ out_free:
 		{ NULL }
 	};
 
+	ZERO_STRUCT(server_ip);
+
 	setlinebuf(stdout);
 
 	/* Parse options */
@@ -674,13 +676,6 @@ out_free:
 	if (!init_names())
 		return 1;
 
-	/* Resolve the IP address */
-
-	if (!opt_ipaddr && !resolve_name(server, &server_ip, 0x20))  {
-		fprintf(stderr, "Unable to resolve %s\n", server);
-		return 1;
-	}
-	
 	/*
 	 * Get password
 	 * from stdin if necessary
@@ -697,7 +692,7 @@ out_free:
 		get_username(username);
 		
 	nt_status = cli_full_connection(&cli, global_myname(), server, 
-					&server_ip, 0,
+					opt_ipaddr ? &server_ip : NULL, 0,
 					"IPC$", "IPC",  
 					username, domain,
 					password, 0, NULL);
-- 
cgit 


From 04858cd7025bb4c3fdb34a2795568a6b52004c3b Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 7 Mar 2003 09:29:56 +0000
Subject: Limit the number of SIDs that may be looked up, in line with existing
 code for name->sid. (This used to be commit
 0ebccc0dbeecc10d423529909a2563fbc3bf9857)

---
 source3/rpc_server/srv_lsa_nt.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'source3')

diff --git a/source3/rpc_server/srv_lsa_nt.c b/source3/rpc_server/srv_lsa_nt.c
index 1b42c5f141..fb6538db39 100644
--- a/source3/rpc_server/srv_lsa_nt.c
+++ b/source3/rpc_server/srv_lsa_nt.c
@@ -641,6 +641,11 @@ NTSTATUS _lsa_lookup_sids(pipes_struct *p, LSA_Q_LOOKUP_SIDS *q_u, LSA_R_LOOKUP_
 	LSA_TRANS_NAME_ENUM *names = NULL;
 	uint32 mapped_count = 0;
 
+	if (num_entries >  MAX_LOOKUP_SIDS) {
+		num_entries = MAX_LOOKUP_SIDS;
+		DEBUG(5,("_lsa_lookup_sids: truncating SID lookup list to %d\n", num_entries));
+	}
+		
 	ref = (DOM_R_REF *)talloc_zero(p->mem_ctx, sizeof(DOM_R_REF));
 	names = (LSA_TRANS_NAME_ENUM *)talloc_zero(p->mem_ctx, sizeof(LSA_TRANS_NAME_ENUM));
 
-- 
cgit 


From 8a751c019c21b1925fd352639f8237cf0a6ebac9 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Fri, 7 Mar 2003 18:26:24 +0000
Subject: Some progress towards gums and tdbsam2 genparser works fine, and it
 is a marvelous tool to store objects in tdb :) (This used to be commit
 4c6d461a8572f03cd33cba95500cc837638b732c)

---
 source3/include/gums.h        | 102 ++---
 source3/include/includes.h    |   2 +
 source3/include/tdbsam2.h     |  11 +-
 source3/lib/util_sid.c        |  18 +
 source3/rpc_parse/parse_sec.c |  18 -
 source3/sam/gumm_tdb.c        | 891 ++++++++++++++++++++++++++++++++++++------
 source3/sam/gums.c            |  38 +-
 source3/sam/gums_api.c        | 310 ++++++++++++---
 source3/sam/gums_helper.c     |  47 +--
 source3/script/genstruct.pl   |  15 +-
 10 files changed, 1166 insertions(+), 286 deletions(-)

(limited to 'source3')

diff --git a/source3/include/gums.h b/source3/include/gums.h
index ca124d7442..789acc269f 100644
--- a/source3/include/gums.h
+++ b/source3/include/gums.h
@@ -21,8 +21,8 @@
 #ifndef _GUMS_H
 #define _GUMS_H
 
-#define GUMS_VERSION_MAJOR 0
-#define GUMS_VERSION_MINOR 1
+#define GUMS_VERSION_MAJOR	0
+#define GUMS_VERSION_MINOR	1
 #define GUMS_OBJECT_VERSION	1
 
 #define GUMS_OBJ_DOMAIN			1
@@ -74,10 +74,17 @@ typedef struct gums_group
 
 } GUMS_GROUP;
 
+typedef struct gums_domain
+{
+	uint32 next_rid;
+
+} GUMS_DOMAIN;
+
 union gums_obj_p {
-	gums_user *user;
-	gums_group *group;
-}
+	GUMS_USER *user;
+	GUMS_GROUP *group;
+	GUMS_DOMAIN *domain;
+};
 
 typedef struct gums_object
 {
@@ -112,6 +119,7 @@ typedef struct gums_commit_set
 	DOM_SID sid;			/* Object Sid */
 	uint32 count;			/* number of changes */
 	GUMS_DATA_SET **data;
+
 } GUMS_COMMIT_SET;
 
 typedef struct gums_privilege
@@ -145,7 +153,7 @@ typedef struct gums_functions
 	NTSTATUS (*delete_object) (const DOM_SID *sid);
 
 	NTSTATUS (*get_object_from_sid) (GUMS_OBJECT **object, const DOM_SID *sid, const int obj_type);
-	NTSTATUS (*get_sid_from_name) (GUMS_OBJECT **object, const char *name);
+	NTSTATUS (*get_object_from_name) (GUMS_OBJECT **object, const char *name, const int onj_type);
 	/* This function is used to get the list of all objects changed since b_time, it is
 	   used to support PDC<->BDC synchronization */
 	NTSTATUS (*get_updated_objects) (GUMS_OBJECT **objects, const NTTIME base_time);
@@ -159,10 +167,10 @@ typedef struct gums_functions
 	NTSTATUS (*set_object) (const GUMS_OBJECT *object);
 
 	/* set object values function */
-	NTSTATUS (*set_object_values) (DOM_SID *sid, uint32 count, GUMS_DATA_SET *data_set);
+	NTSTATUS (*set_object_values) (DOM_SID *sid, uint32 count, GUMS_DATA_SET **data_set);
 
 	/* Group related functions */
-	NTSTATUS (*add_memberss_to_group) (const DOM_SID *group, const DOM_SID **members);
+	NTSTATUS (*add_members_to_group) (const DOM_SID *group, const DOM_SID **members);
 	NTSTATUS (*delete_members_from_group) (const DOM_SID *group, const DOM_SID **members);
 	NTSTATUS (*enumerate_group_members) (DOM_SID **members, const DOM_SID *sid, const int type);
 
@@ -177,54 +185,56 @@ typedef struct gums_functions
 	NTSTATUS (*delete_members_from_privilege) (const LUID_ATTR *priv, const DOM_SID **members);
 	NTSTATUS (*enumerate_privilege_members) (DOM_SID **members, const LUID_ATTR *priv);
 	NTSTATUS (*get_sid_privileges) (DOM_SID **privs, const DOM_SID *sid);
+
 	/* warning!: set_privilege will overwrite a prior existing privilege if such exist */
 	NTSTATUS (*set_privilege) (GUMS_PRIVILEGE *priv);
 
 } GUMS_FUNCTIONS;
 
 /* define value types */
+#define GUMS_SET_PRIMARY_GROUP		0x1
+#define GUMS_SET_SEC_DESC		0x2
 
-#define GUMS_SET_PRIMARY_GROUP		1
-#define GUMS_SET_SEC_DESC		2
+#define GUMS_SET_NAME			0x10
+#define GUMS_SET_DESCRIPTION		0x11
+#define GUMS_SET_FULL_NAME		0x12
 
 /* user specific type values */
-#define GUMS_SET_LOGON_TIME		10  /* keep NTTIME consecutive */
-#define GUMS_SET_LOGOFF_TIME		11 /* too ease checking */
-#define GUMS_SET_KICKOFF_TIME		13
-#define GUMS_SET_PASS_LAST_SET_TIME	14
-#define GUMS_SET_PASS_CAN_CHANGE_TIME	15
-#define GUMS_SET_PASS_MUST_CHANGE_TIME	16 /* NTTIME end */
-
-#define GUMS_SET_NAME			20 /* keep strings consecutive */
-#define GUMS_SET_DESCRIPTION		21 /* too ease checking */
-#define GUMS_SET_FULL_NAME		22
-#define GUMS_SET_HOME_DIRECTORY		23
-#define GUMS_SET_DRIVE			24
-#define GUMS_SET_LOGON_SCRIPT		25
-#define GUMS_SET_PROFILE_PATH		26
-#define GUMS_SET_WORKSTATIONS		27
-#define GUMS_SET_UNKNOWN_STRING		28
-#define GUMS_SET_MUNGED_DIAL		29 /* strings end */
-
-#define GUMS_SET_LM_PASSWORD		40
-#define GUMS_SET_NT_PASSWORD		41
-#define GUMS_SET_PLAINTEXT_PASSWORD	42
-#define GUMS_SET_UNKNOWN_3		43
-#define GUMS_SET_LOGON_DIVS		44
-#define GUMS_SET_HOURS_LEN		45
-#define GUMS_SET_HOURS			46
-#define GUMS_SET_UNKNOWN_5		47
-#define GUMS_SET_UNKNOWN_6		48
-
-#define GUMS_SET_MUST_CHANGE_PASS	50
-#define GUMS_SET_CANNOT_CHANGE_PASS	51
-#define GUMS_SET_PASS_NEVER_EXPIRE	52
-#define GUMS_SET_ACCOUNT_DISABLED	53
-#define GUMS_SET_ACCOUNT_LOCKOUT	54
+#define GUMS_SET_LOGON_TIME		0x20
+#define GUMS_SET_LOGOFF_TIME		0x21
+#define GUMS_SET_KICKOFF_TIME		0x23
+#define GUMS_SET_PASS_LAST_SET_TIME	0x24
+#define GUMS_SET_PASS_CAN_CHANGE_TIME	0x25
+#define GUMS_SET_PASS_MUST_CHANGE_TIME	0x26
+
+
+#define GUMS_SET_HOME_DIRECTORY		0x31
+#define GUMS_SET_DRIVE			0x32
+#define GUMS_SET_LOGON_SCRIPT		0x33
+#define GUMS_SET_PROFILE_PATH		0x34
+#define GUMS_SET_WORKSTATIONS		0x35
+#define GUMS_SET_UNKNOWN_STRING		0x36
+#define GUMS_SET_MUNGED_DIAL		0x37
+
+#define GUMS_SET_LM_PASSWORD		0x40
+#define GUMS_SET_NT_PASSWORD		0x41
+#define GUMS_SET_PLAINTEXT_PASSWORD	0x42
+#define GUMS_SET_UNKNOWN_3		0x43
+#define GUMS_SET_LOGON_DIVS		0x44
+#define GUMS_SET_HOURS_LEN		0x45
+#define GUMS_SET_HOURS			0x46
+#define GUMS_SET_UNKNOWN_5		0x47
+#define GUMS_SET_UNKNOWN_6		0x48
+
+#define GUMS_SET_MUST_CHANGE_PASS	0x50
+#define GUMS_SET_CANNOT_CHANGE_PASS	0x51
+#define GUMS_SET_PASS_NEVER_EXPIRE	0x52
+#define GUMS_SET_ACCOUNT_DISABLED	0x53
+#define GUMS_SET_ACCOUNT_LOCKOUT	0x54
 
 /*group specific type values */
-#define GUMS_ADD_SID_LIST		60
-#define GUMS_DEL_SID_LIST		61
-#define GUMS_SET_SID_LIST		62
+#define GUMS_ADD_SID_LIST		0x60
+#define GUMS_DEL_SID_LIST		0x61
+#define GUMS_SET_SID_LIST		0x62
 
 #endif /* _GUMS_H */
diff --git a/source3/include/includes.h b/source3/include/includes.h
index fab02141cb..b9ba4b84d5 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -775,6 +775,8 @@ extern int errno;
 
 #include "sam.h"
 
+#include "gums.h"
+
 #include "session.h"
 
 #include "asn_1.h"
diff --git a/source3/include/tdbsam2.h b/source3/include/tdbsam2.h
index 0ca9d34618..047b4e7c90 100644
--- a/source3/include/tdbsam2.h
+++ b/source3/include/tdbsam2.h
@@ -18,16 +18,17 @@
  * Mass Ave, Cambridge, MA 02139, USA.
  */
 
-
 /* ALL strings assumes UTF8 as encoding */
 
 GENSTRUCT struct tdbsam2_domain_data {
 	uint32 xcounter;		/* counter to be updated at any change */
 
 	SEC_DESC *sec_desc;		/* Security Descriptor */
-	DOM_SID *user_sid;		/* The User SID */
-	char *name; _NULLTERM		/* NT User Name */
+	DOM_SID *dom_sid;		/* The Domain SID */
+	char *name; _NULLTERM		/* NT Domain Name */
 	char *description; _NULLTERM	/* Descritpion (Gecos) */
+
+	uint32 next_rid;		/* The Next free RID */
 };
 
 GENSTRUCT struct tdbsam2_user_data {
@@ -67,14 +68,14 @@ GENSTRUCT struct tdbsam2_user_data {
 	uint32 unknown_3;		/* 0x00ff ffff */
 	uint32 unknown_5;		/* 0x0002 0000 */
 	uint32 unknown_6;		/* 0x0000 04ec */
-};	
+};
 
 GENSTRUCT struct tdbsam2_group_data {
 	uint32 xcounter;		/* counter to be updated at any change */
 
 	SEC_DESC *sec_desc;		/* Security Descriptor */
 	DOM_SID *group_sid;		/* The Group SID */
-	char *name; _NULLTERM		/* NT User Name */
+	char *name; _NULLTERM		/* NT Group Name */
 	char *description; _NULLTERM	/* Descritpion (Gecos) */
 
 	uint32 count;			/* number of sids */
diff --git a/source3/lib/util_sid.c b/source3/lib/util_sid.c
index 824987f189..81d17ae3f2 100644
--- a/source3/lib/util_sid.c
+++ b/source3/lib/util_sid.c
@@ -629,3 +629,21 @@ void print_guid(GUID *guid)
 		d_printf("%02x", guid->info[i]);
 	d_printf("\n");
 }
+
+/*******************************************************************
+ Tallocs a duplicate SID. 
+********************************************************************/ 
+
+DOM_SID *sid_dup_talloc(TALLOC_CTX *ctx, DOM_SID *src)
+{
+  DOM_SID *dst;
+
+  if(!src)
+    return NULL;
+
+  if((dst = talloc_zero(ctx, sizeof(DOM_SID))) != NULL) {
+    sid_copy( dst, src);
+  }
+
+  return dst;
+}
diff --git a/source3/rpc_parse/parse_sec.c b/source3/rpc_parse/parse_sec.c
index dbd72e5250..10b0ff86ae 100644
--- a/source3/rpc_parse/parse_sec.c
+++ b/source3/rpc_parse/parse_sec.c
@@ -569,24 +569,6 @@ SEC_DESC_BUF *sec_desc_merge(TALLOC_CTX *ctx, SEC_DESC_BUF *new_sdb, SEC_DESC_BU
 	return(return_sdb);
 }
 
-/*******************************************************************
- Tallocs a duplicate SID. 
-********************************************************************/ 
-
-static DOM_SID *sid_dup_talloc(TALLOC_CTX *ctx, DOM_SID *src)
-{
-  DOM_SID *dst;
-
-  if(!src)
-    return NULL;
-
-  if((dst = talloc_zero(ctx, sizeof(DOM_SID))) != NULL) {
-    sid_copy( dst, src);
-  }
-
-  return dst;
-}
-
 /*******************************************************************
  Creates a SEC_DESC structure
 ********************************************************************/
diff --git a/source3/sam/gumm_tdb.c b/source3/sam/gumm_tdb.c
index 52eaab9e17..53ea872a11 100644
--- a/source3/sam/gumm_tdb.c
+++ b/source3/sam/gumm_tdb.c
@@ -23,7 +23,6 @@
  */
 
 #include "includes.h"
-#include "gums.h"
 #include "tdbsam2.h"
 #include "tdbsam2_parse_info.h"
 
@@ -31,15 +30,25 @@ static int tdbgumm_debug_level = DBGC_ALL;
 #undef DBGC_CLASS
 #define DBGC_CLASS tdbgumm_debug_level
 
-#define TDBSAM_VERSION		"20021215"
+#define TDBSAM_VERSION		20021215
 #define TDB_FILE_NAME		"tdbsam2.tdb"
-#define DOMAINPREFIX		"DOMAIN_"
-#define OBJECTPREFIX		"OBJECT_"
+#define NAMEPREFIX		"NAME_"
 #define SIDPREFIX		"SID_"
 #define PRIVILEGEPREFIX		"PRIV_"
 
 #define TDB_FORMAT_STRING	"ddB"
 
+#define TALLOC_CHECK(ptr, err, label) do { if ((ptr) == NULL) { DEBUG(0, ("%s: Out of memory!\n", __FUNCTION__)); err = NT_STATUS_NO_MEMORY; goto label; } } while(0)
+#define SET_OR_FAIL(func, label) do { if (NT_STATUS_IS_ERR(func)) { DEBUG(0, ("%s: Setting gums object data failed!\n", __FUNCTION__)); goto label; } } while(0)
+
+struct tdbsam2_enum_objs {
+	uint32 type;
+	fstring dom_sid;
+	TDB_CONTEXT *db;
+	TDB_DATA key;
+	struct tdbsam2_enum_objs *next;
+};
+
 union tdbsam2_data {
 	struct tdbsam2_domain_data *domain;
 	struct tdbsam2_user_data *user;
@@ -48,86 +57,363 @@ union tdbsam2_data {
 
 struct tdbsam2_object {
 	uint32 type;
+	uint32 version;
 	union tdbsam2_data data;
 };
 
 static TDB_CONTEXT *tdbsam2_db;
 
-#define TALLOC_CHECK(ptr, err, label) do { if ((ptr) == NULL) { DEBUG(0, ("%s: Out of memory!\n", __FUNCTION__)); err = NT_STATUS_NO_MEMORY; goto label; } } while(0)
-#define SET_OR_FAIL(func, label) do { if (NT_STATUS_IS_ERR(func)) { DEBUG(0, ("%s: Setting gums object data failed!\n", __FUNCTION__)); goto label; } } while(0)
+struct tdbsam2_enum_objs **teo_handlers;
+
+static NTSTATUS init_tdbsam2_object_from_buffer(struct tdbsam2_object *object, TALLOC_CTX *mem_ctx, char *buffer, int size)
+{
+
+	NTSTATUS ret = NT_STATUS_UNSUCCESSFUL;
+	int iret;
+	char *obj_data;
+	int data_size = 0;
+	int len;
+	
+	len = tdb_unpack (buffer, size, TDB_FORMAT_STRING,
+			  &(object->version),
+			  &(object->type),
+			  &data_size, &obj_data);
+
+	if (len == -1)
+		goto done;
+
+	/* version is checked inside this function so that backward compatibility code can be
+	   called eventually.
+	   this way we can easily handle database format upgrades */
+	if (object->version != TDBSAM_VERSION) {
+		DEBUG(3,("init_tdbsam2_object_from_buffer: Error, db object has wrong tdbsam version!\n"));
+		goto done;
+	}
+
+	/* be sure the string is terminated before trying to parse it */
+	if (obj_data[data_size - 1] != '\0')
+		obj_data[data_size - 1] = '\0';
+
+	switch (object->type) {
+		case GUMS_OBJ_DOMAIN:
+			object->data.domain = (struct tdbsam2_domain_data *)talloc(mem_ctx, sizeof(struct tdbsam2_domain_data));
+			TALLOC_CHECK(object->data.domain, ret, done);
+			memset(object->data.domain, 0, sizeof(struct tdbsam2_domain_data));
+
+			iret = gen_parse(mem_ctx, pinfo_tdbsam2_domain_data, (char *)(object->data.domain), obj_data);
+			break;
+		case GUMS_OBJ_GROUP:
+		case GUMS_OBJ_ALIAS:
+			object->data.group = (struct tdbsam2_group_data *)talloc(mem_ctx, sizeof(struct tdbsam2_group_data));
+			TALLOC_CHECK(object->data.group, ret, done);
+			memset(object->data.group, 0, sizeof(struct tdbsam2_group_data));
+
+			iret = gen_parse(mem_ctx, pinfo_tdbsam2_group_data, (char *)(object->data.group), obj_data);
+			break;
+		case GUMS_OBJ_NORMAL_USER:
+			object->data.user = (struct tdbsam2_user_data *)talloc(mem_ctx, sizeof(struct tdbsam2_user_data));
+			TALLOC_CHECK(object->data.user, ret, done);
+			memset(object->data.user, 0, sizeof(struct tdbsam2_user_data));
 
-static NTSTATUS init_tdbsam2_object_from_buffer(struct tdbsam2_object *object, TALLOC_CTX *mem_ctx, char *buffer, int size) {
+			iret = gen_parse(mem_ctx, pinfo_tdbsam2_user_data, (char *)(object->data.user), obj_data);
+			break;
+		default:
+			DEBUG(3,("init_tdbsam2_object_from_buffer: Error, wrong object type number!\n"));
+			goto done;
+	}
+
+	if (iret != 0) {
+		DEBUG(0,("init_tdbsam2_object_from_buffer: Fatal Error! Unable to parse object!\n"));
+		DEBUG(0,("init_tdbsam2_object_from_buffer: DB Corrupted ?"));
+		goto done;
+	}
+
+	ret = NT_STATUS_OK;
+done:
+	SAFE_FREE(obj_data);
+	return ret;
+}
+
+static NTSTATUS init_buffer_from_tdbsam2_object(char **buffer, size_t *len, TALLOC_CTX *mem_ctx, struct tdbsam2_object *object)
+{
+
+	NTSTATUS ret;
+	char *buf1 = NULL;
+	size_t buflen;
+
+	if (!buffer)
+		return NT_STATUS_INVALID_PARAMETER;
+
+	switch (object->type) {
+		case GUMS_OBJ_DOMAIN:
+			buf1 = gen_dump(mem_ctx, pinfo_tdbsam2_domain_data, (char *)(object->data.domain), 0);
+			break;
+		case GUMS_OBJ_GROUP:
+		case GUMS_OBJ_ALIAS:
+			buf1 = gen_dump(mem_ctx, pinfo_tdbsam2_group_data, (char *)(object->data.group), 0);
+			break;
+		case GUMS_OBJ_NORMAL_USER:
+			buf1 = gen_dump(mem_ctx, pinfo_tdbsam2_user_data, (char *)(object->data.user), 0);
+			break;
+		default:
+			DEBUG(3,("init_buffer_from_tdbsam2_object: Error, wrong object type number!\n"));
+			return NT_STATUS_UNSUCCESSFUL;	
+	}
+	
+	if (buf1 == NULL) {
+		DEBUG(0, ("init_buffer_from_tdbsam2_object: Fatal Error! Unable to dump object!\n"));
+		return NT_STATUS_UNSUCCESSFUL;
+	}
+
+	buflen = tdb_pack(NULL, 0,  TDB_FORMAT_STRING,
+			TDBSAM_VERSION,
+			object->type,
+			strlen(buf1) + 1, buf1);
+
+	*buffer = talloc(mem_ctx, buflen);
+	TALLOC_CHECK(*buffer, ret, done);
+
+	*len = tdb_pack(*buffer, buflen, TDB_FORMAT_STRING,
+			TDBSAM_VERSION,
+			object->type,
+			strlen(buf1) + 1, buf1);
+
+	if (*len != buflen) {
+		DEBUG(0, ("init_tdb_data_from_tdbsam2_object: somthing odd is going on here: bufflen (%d) != len (%d) in tdb_pack operations!\n", 
+			  buflen, *len));
+		*buffer = NULL;
+		ret = NT_STATUS_UNSUCCESSFUL;
+		goto done;
+	}
+
+	ret = NT_STATUS_OK;
+done:
+	return ret;
+}
+
+static NTSTATUS opentdb(void)
+{
+	if (!tdbsam2_db) {
+		pstring tdbfile;
+		get_private_directory(tdbfile);
+		pstrcat(tdbfile, "/");
+		pstrcat(tdbfile, TDB_FILE_NAME);
+
+		tdbsam2_db = tdb_open_log(tdbfile, 0, TDB_DEFAULT, O_RDWR | O_CREAT, 0600);
+  		if (!tdbsam2_db)
+		{
+			DEBUG(0, ("opentdb: Unable to open database (%s)!\n", tdbfile));
+			return NT_STATUS_UNSUCCESSFUL;
+		}
+	}
 
 	return NT_STATUS_OK;
 }
 
-static NTSTATUS tdbsam2_opentdb(void) {
+static NTSTATUS get_object_by_sid(TALLOC_CTX *mem_ctx, struct tdbsam2_object *obj, const DOM_SID *sid)
+{
+	NTSTATUS ret;
+	TDB_DATA data, key;
+	fstring keystr;
+
+	if (!obj || !mem_ctx || !sid)
+		return NT_STATUS_INVALID_PARAMETER;
+
+	if (NT_STATUS_IS_ERR(ret = opentdb())) {
+		return ret;
+	}
+
+	slprintf(keystr, sizeof(keystr)-1, "%s%s", SIDPREFIX, sid_string_static(sid));
+	key.dptr = keystr;
+	key.dsize = strlen(keystr) + 1;
+
+	data = tdb_fetch(tdbsam2_db, key);
+	if (!data.dptr) {
+		DEBUG(5, ("get_object_by_sid: Error fetching database, domain entry not found!\n"));
+		DEBUGADD(5, (" Error: %s\n", tdb_errorstr(tdbsam2_db)));
+		DEBUGADD(5, (" Key: %s\n", keystr));
+		return NT_STATUS_UNSUCCESSFUL;
+	}
+
+	if (NT_STATUS_IS_ERR(init_tdbsam2_object_from_buffer(obj, mem_ctx, data.dptr, data.dsize))) {
+		SAFE_FREE(data.dptr);
+		DEBUG(0, ("get_object_by_sid: Error fetching database, malformed entry!\n"));
+		return NT_STATUS_UNSUCCESSFUL;
+	}
+	SAFE_FREE(data.dptr);
 
 	return NT_STATUS_OK;
+	
 }
 
-static NTSTATUS tdbsam2_get_object_by_name(struct tdbsam2_object *obj, TALLOC_CTX *mem_ctx, const char* name) {
+static NTSTATUS get_object_by_name(TALLOC_CTX *mem_ctx, struct tdbsam2_object *obj, const char* name)
+{
 
 	NTSTATUS ret;
 	TDB_DATA data, key;
 	fstring keystr;
 	fstring objname;
+	DOM_SID sid;
+	char *obj_sidstr;
+	int obj_version, obj_type, obj_sidstr_len, len;
 
 	if (!obj || !mem_ctx || !name)
 		return NT_STATUS_INVALID_PARAMETER;
 
-	if (tdbsam2_db == NULL) {
-		if (NT_STATUS_IS_ERR(ret = tdbsam2_opentdb())) {
-			goto done;
-		}
+	if (NT_STATUS_IS_ERR(ret = opentdb())) {
+		return ret;
 	}
 
 	unix_strlower(name, -1, objname, sizeof(objname));
 
-	slprintf(keystr, sizeof(keystr)-1, "%s%s", OBJECTPREFIX, objname);
+	slprintf(keystr, sizeof(keystr)-1, "%s%s", NAMEPREFIX, objname);
 	key.dptr = keystr;
 	key.dsize = strlen(keystr) + 1;
 
 	data = tdb_fetch(tdbsam2_db, key);
 	if (!data.dptr) {
-		DEBUG(5, ("get_domain_sid: Error fetching database, domain entry not found!\n"));
+		DEBUG(5, ("get_object_by_name: Error fetching database, domain entry not found!\n"));
 		DEBUGADD(5, (" Error: %s\n", tdb_errorstr(tdbsam2_db)));
 		DEBUGADD(5, (" Key: %s\n", keystr));
-		ret = NT_STATUS_UNSUCCESSFUL;
-		goto done;
+		return NT_STATUS_UNSUCCESSFUL;
 	}
 
-	if (NT_STATUS_IS_ERR(init_tdbsam2_object_from_buffer(obj, mem_ctx, data.dptr, data.dsize))) {
-		SAFE_FREE(data.dptr);
-		DEBUG(0, ("get_domain_sid: Error fetching database, malformed entry!\n"));
-		ret = NT_STATUS_UNSUCCESSFUL;
-		goto done;
-	}
+	len = tdb_unpack(data.dptr, data.dsize, TDB_FORMAT_STRING,
+		&obj_version,
+		&obj_type,
+		&obj_sidstr_len, &obj_sidstr);
+
 	SAFE_FREE(data.dptr);
 
-	ret = NT_STATUS_OK;
+	if (len == -1 || obj_version != TDBSAM_VERSION || obj_sidstr_len <= 0) {
+		DEBUG(5, ("get_object_by_name: Error unpacking database object!\n"));
+		return NT_STATUS_UNSUCCESSFUL;
+	}
 
-done:
-	return ret;
+	if (!string_to_sid(&sid, obj_sidstr)) {
+		DEBUG(5, ("get_object_by_name: Error invalid sid string found in database object!\n"));
+		SAFE_FREE(obj_sidstr);
+		return NT_STATUS_UNSUCCESSFUL;
+	}
+	SAFE_FREE(obj_sidstr);
+	
+	return get_object_by_sid(mem_ctx, obj, &sid);
 }
 
-
-static NTSTATUS tdbsam2_store(struct tdbsam2_object *object) {
+static NTSTATUS store_object(TALLOC_CTX *mem_ctx, struct tdbsam2_object *object, BOOL new_obj)
+{
 
 	NTSTATUS ret;
+	TDB_DATA data, key, key2;
+	fstring keystr;
+	fstring namestr;
+	int flag, r;
+
+	if (NT_STATUS_IS_ERR(ret = opentdb())) {
+		return ret;
+	}
+
+	if (new_obj) {
+		flag = TDB_INSERT;
+	} else {
+		flag = TDB_MODIFY;
+	}
+
+	ret = init_buffer_from_tdbsam2_object(&(data.dptr), &(data.dsize), mem_ctx, object);
+	if (NT_STATUS_IS_ERR(ret))
+		return ret;
+
+	switch (object->type) {
+		case GUMS_OBJ_DOMAIN:
+			slprintf(keystr, sizeof(keystr) - 1, "%s%s", SIDPREFIX, sid_string_static(object->data.domain->dom_sid));
+			slprintf(namestr, sizeof(namestr) - 1, "%s%s", NAMEPREFIX, object->data.domain->name);
+			break;
+		case GUMS_OBJ_GROUP:
+		case GUMS_OBJ_ALIAS:
+			slprintf(keystr, sizeof(keystr) - 1, "%s%s", SIDPREFIX, sid_string_static(object->data.group->group_sid));
+			slprintf(namestr, sizeof(namestr) - 1, "%s%s", NAMEPREFIX, object->data.group->name);
+			break;
+		case GUMS_OBJ_NORMAL_USER:
+			slprintf(keystr, sizeof(keystr) - 1, "%s%s", SIDPREFIX, sid_string_static(object->data.user->user_sid));
+			slprintf(namestr, sizeof(namestr) - 1, "%s%s", NAMEPREFIX, object->data.user->name);
+			break;
+		default:
+			return NT_STATUS_UNSUCCESSFUL;	
+	}
+
+	key.dptr = keystr;
+	key.dsize = strlen(keystr) + 1;
+
+	if ((r = tdb_store(tdbsam2_db, key, data, flag)) != TDB_SUCCESS) {
+		DEBUG(0, ("store_object: Unable to modify SAM!\n"));
+		DEBUGADD(0, (" Error: %s", tdb_errorstr(tdbsam2_db)));
+		DEBUGADD(0, (" occured while storing the main record (%s)\n", keystr));
+		if (r == TDB_ERR_EXISTS) return NT_STATUS_UNSUCCESSFUL;
+		return NT_STATUS_INTERNAL_DB_ERROR;
+	}
+
+	key2.dptr = namestr;
+	key2.dsize = strlen(namestr) + 1;
+
+	if ((r = tdb_store(tdbsam2_db, key2, key, flag)) != TDB_SUCCESS) {
+		DEBUG(0, ("store_object: Unable to modify SAM!\n"));
+		DEBUGADD(0, (" Error: %s", tdb_errorstr(tdbsam2_db)));
+		DEBUGADD(0, (" occured while storing the main record (%s)\n", keystr));
+		if (r == TDB_ERR_EXISTS) return NT_STATUS_UNSUCCESSFUL;
+		return NT_STATUS_INTERNAL_DB_ERROR;
+	}
+/* TODO: update the general database counter */
+/* TODO: update this entry counter too */
 
 	return NT_STATUS_OK;
 }
 
-static NTSTATUS tdbsam2_get_next_sid(TALLOC_CTX *mem_ctx, DOM_SID *sid) {
-
+static NTSTATUS get_next_sid(TALLOC_CTX *mem_ctx, DOM_SID **sid)
+{
 	NTSTATUS ret;
+	struct tdbsam2_object obj;
+	DOM_SID *dom_sid = get_global_sam_sid();
+	uint32 new_rid;
+
+/* TODO: LOCK DOMAIN OBJECT */
+	ret = get_object_by_sid(mem_ctx, &obj, dom_sid);
+	if (NT_STATUS_IS_ERR(ret)) {
+		DEBUG(0, ("get_next_sid: unable to get root Domain object!\n"));
+		ret = NT_STATUS_INTERNAL_DB_ERROR;
+		goto error;
+	}
+
+	new_rid = obj.data.domain->next_rid;
+	
+	/* Increment the RID Counter */
+	obj.data.domain->next_rid++;
+	
+	/* Store back Domain object */
+	ret = store_object(mem_ctx, &obj, False);
+	if (NT_STATUS_IS_ERR(ret)) {
+		DEBUG(0, ("get_next_sid: unable to update root Domain object!\n"));
+		ret = NT_STATUS_INTERNAL_DB_ERROR;
+		goto error;
+	}
+/* TODO: UNLOCK DOMAIN OBJECT */
+
+	*sid = sid_dup_talloc(mem_ctx, dom_sid);
+	TALLOC_CHECK(*sid, ret, error);
+	
+	if (!sid_append_rid(*sid, new_rid)) {
+		DEBUG(0, ("get_next_sid: unable to build new SID !?!\n"));
+		ret = NT_STATUS_UNSUCCESSFUL;
+		goto error;
+	}
 
 	return NT_STATUS_OK;
-}
 
-static NTSTATUS tdbsam2_user_data_to_gums_object(GUMS_OBJECT **object, struct tdbsam2_user_data *userdata, uint32 type) {
+error:
+	return ret;
+}
 
+static NTSTATUS user_data_to_gums_object(GUMS_OBJECT **object, struct tdbsam2_user_data *userdata)
+{
 	NTSTATUS ret;
 
 	if (!object || !userdata) {
@@ -180,12 +466,12 @@ static NTSTATUS tdbsam2_user_data_to_gums_object(GUMS_OBJECT **object, struct td
 	SET_OR_FAIL(gums_set_user_unknown_5(*object, userdata->unknown_5), error);
 	SET_OR_FAIL(gums_set_user_unknown_6(*object, userdata->unknown_6), error);
 
-	SET_OR_FAIL(gums_set_user_logon_time(*object, userdata->logon_time), error);
-	SET_OR_FAIL(gums_set_user_logoff_time(*object, userdata->logoff_time), error);
-	SET_OR_FAIL(gums_set_user_kickoff_time(*object, userdata->kickoff_time), error);
-	SET_OR_FAIL(gums_set_user_pass_last_set_time(*object, userdata->pass_last_set_time), error);
-	SET_OR_FAIL(gums_set_user_pass_can_change_time(*object, userdata->pass_can_change_time), error);
-	SET_OR_FAIL(gums_set_user_pass_must_change_time(*object, userdata->pass_must_change_time), error);
+	SET_OR_FAIL(gums_set_user_logon_time(*object, *(userdata->logon_time)), error);
+	SET_OR_FAIL(gums_set_user_logoff_time(*object, *(userdata->logoff_time)), error);
+	SET_OR_FAIL(gums_set_user_kickoff_time(*object, *(userdata->kickoff_time)), error);
+	SET_OR_FAIL(gums_set_user_pass_last_set_time(*object, *(userdata->pass_last_set_time)), error);
+	SET_OR_FAIL(gums_set_user_pass_can_change_time(*object, *(userdata->pass_can_change_time)), error);
+	SET_OR_FAIL(gums_set_user_pass_must_change_time(*object, *(userdata->pass_must_change_time)), error);
 
 	ret = NT_STATUS_OK;
 	return ret;
@@ -196,8 +482,8 @@ error:
 	return ret;
 }
 
-static NTSTATUS tdbsam2_group_data_to_gums_object(GUMS_OBJECT **object, struct tdbsam2_group_data *groupdata, uint32 type) {
-
+static NTSTATUS group_data_to_gums_object(GUMS_OBJECT **object, struct tdbsam2_group_data *groupdata)
+{
 	NTSTATUS ret;
 
 	if (!object || !groupdata) {
@@ -226,11 +512,12 @@ error:
 	return ret;
 }
 
-static NTSTATUS tdbsam2_domain_data_to_gums_object(GUMS_OBJECT **object, struct tdbsam2_domain_data *domdata, uint32 type) {
+static NTSTATUS domain_data_to_gums_object(GUMS_OBJECT **object, struct tdbsam2_domain_data *domdata)
+{
 
 	NTSTATUS ret;
 
-	if (!object || !domdata) {
+	if (!object || !*object || !domdata) {
 		DEBUG(0, ("tdbsam2_domain_data_to_gums_object: no NULL pointers are accepted here!\n"));
 		return NT_STATUS_UNSUCCESSFUL;
 	}
@@ -253,7 +540,8 @@ error:
 	return ret;
 }
 
-static NTSTATUS tdbsam2_data_to_gums_object(GUMS_OBJECT **object, struct tdbsam2_object *data) {
+static NTSTATUS data_to_gums_object(GUMS_OBJECT **object, struct tdbsam2_object *data)
+{
 
 	NTSTATUS ret;
 
@@ -271,16 +559,16 @@ static NTSTATUS tdbsam2_data_to_gums_object(GUMS_OBJECT **object, struct tdbsam2
 
 	switch (data->type) {
 		case GUMS_OBJ_DOMAIN:
-			ret = tdbsam2_domain_data_to_gums_object(object, data->data.domain, data->type);
+			ret = domain_data_to_gums_object(object, data->data.domain);
 			break;
 
 		case GUMS_OBJ_NORMAL_USER:
-			ret = tdbsam2_user_data_to_gums_object(object, data->data.user, data->type);
+			ret = user_data_to_gums_object(object, data->data.user);
 			break;
 
 		case GUMS_OBJ_GROUP:
 		case GUMS_OBJ_ALIAS:
-			ret = tdbsam2_group_data_to_gums_object(object, data->data.group, data->type);
+			ret = group_data_to_gums_object(object, data->data.group);
 			break;
 
 		default:
@@ -292,83 +580,118 @@ done:
 }
 
 
+/* GUMM object functions */
 
+static NTSTATUS tdbsam2_get_domain_sid(DOM_SID *sid, const char* name)
+{
 
+	NTSTATUS ret;
+	struct tdbsam2_object obj;
+	TALLOC_CTX *mem_ctx;
+	fstring domname;
 
-/* GUMM object functions */
+	if (!sid || !name)
+		return NT_STATUS_INVALID_PARAMETER;
 
-static NTSTATUS get_domain_sid(DOM_SID *sid, const char* name) {
+	mem_ctx = talloc_init("tdbsam2_get_domain_sid");
+	if (!mem_ctx) {
+		DEBUG(0, ("tdbsam2_new_object: Out of memory!\n"));
+		return NT_STATUS_NO_MEMORY;
+	}
+
+	if (NT_STATUS_IS_ERR(ret = opentdb())) {
+		goto done;
+	}
+
+	unix_strlower(name, -1, domname, sizeof(domname));
+
+	ret = get_object_by_name(mem_ctx, &obj, domname);
+
+	if (NT_STATUS_IS_ERR(ret)) {
+		DEBUG(0, ("tdbsam2_get_domain_sid: Error fetching database!\n"));
+		goto done;
+	}
+
+	if (obj.type != GUMS_OBJ_DOMAIN) {
+		DEBUG(5, ("tdbsam2_get_domain_sid: Requested object is not a domain!\n"));
+		ret = NT_STATUS_UNSUCCESSFUL;
+		goto done;
+	}
+
+	sid_copy(sid, obj.data.domain->dom_sid);
+
+	ret = NT_STATUS_OK;
+
+done:
+	talloc_destroy(mem_ctx);
+	return ret;
+}
+
+static NTSTATUS tdbsam2_set_domain_sid (const DOM_SID *sid, const char *name)
+{
 
 	NTSTATUS ret;
 	struct tdbsam2_object obj;
 	TALLOC_CTX *mem_ctx;
-	TDB_DATA data, key;
-	fstring keystr;
 	fstring domname;
 
 	if (!sid || !name)
 		return NT_STATUS_INVALID_PARAMETER;
 
-	mem_ctx = talloc_init("get_domain_sid");
+	mem_ctx = talloc_init("tdbsam2_set_domain_sid");
 	if (!mem_ctx) {
 		DEBUG(0, ("tdbsam2_new_object: Out of memory!\n"));
 		return NT_STATUS_NO_MEMORY;
 	}
 
 	if (tdbsam2_db == NULL) {
-		if (NT_STATUS_IS_ERR(ret = tdbsam2_opentdb())) {
+		if (NT_STATUS_IS_ERR(ret = opentdb())) {
 			goto done;
 		}
 	}
 
 	unix_strlower(name, -1, domname, sizeof(domname));
 
-	slprintf(keystr, sizeof(keystr)-1, "%s%s", DOMAINPREFIX, domname);
-	key.dptr = keystr;
-	key.dsize = strlen(keystr) + 1;
+/* TODO: we need to lock this entry until updated! */
 
-	data = tdb_fetch(tdbsam2_db, key);
-	if (!data.dptr) {
-		DEBUG(5, ("get_domain_sid: Error fetching database, domain entry not found!\n"));
-		DEBUGADD(5, (" Error: %s\n", tdb_errorstr(tdbsam2_db)));
-		DEBUGADD(5, (" Key: %s\n", keystr));
-		ret = NT_STATUS_UNSUCCESSFUL;
-		goto done;
-	}
+	ret = get_object_by_name(mem_ctx, &obj, domname);
 
-	if (NT_STATUS_IS_ERR(init_tdbsam2_object_from_buffer(&obj, mem_ctx, data.dptr, data.dsize))) {
-		SAFE_FREE(data.dptr);
-		DEBUG(0, ("get_domain_sid: Error fetching database, malformed entry!\n"));
-		ret = NT_STATUS_UNSUCCESSFUL;
+	if (NT_STATUS_IS_ERR(ret)) {
+		DEBUG(0, ("tdbsam2_get_domain_sid: Error fetching database!\n"));
 		goto done;
 	}
-	SAFE_FREE(data.dptr);
 
 	if (obj.type != GUMS_OBJ_DOMAIN) {
-		DEBUG(5, ("get_domain_sid: Requested object is not a domain!\n"));
+		DEBUG(5, ("tdbsam2_get_domain_sid: Requested object is not a domain!\n"));
 		ret = NT_STATUS_UNSUCCESSFUL;
 		goto done;
 	}
 
-	sid_copy(sid, obj.data.domain->dom_sid);
+	sid_copy(obj.data.domain->dom_sid, sid);
 
-	ret = NT_STATUS_OK;
+	ret = store_object(mem_ctx, &obj, False);
 
 done:
+/* TODO: unlock here */
 	if (mem_ctx) talloc_destroy(mem_ctx);
 	return ret;
 }
 
-	NTSTATUS (*set_domain_sid) (const DOM_SID *sid, const char *name);
-
+/* TODO */
 	NTSTATUS (*get_sequence_number) (void);
 
 
-static NTSTATUS tdbsam2_new_object(DOM_SID **sid, const char *name, const int obj_type) {
+extern DOM_SID global_sid_NULL;
+
+static NTSTATUS tdbsam2_new_object(DOM_SID *sid, const char *name, const int obj_type)
+{
 
 	NTSTATUS ret;
 	struct tdbsam2_object obj;
 	TALLOC_CTX *mem_ctx;
+	NTTIME zero_time = {0,0};
+	const char *defpw = "NOPASSWORDXXXXXX";
+	uint8 defhours[21] = {255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255};
 
 	if (!sid || !name) {
 		DEBUG(0, ("tdbsam2_new_object: no NULL pointers are accepted here!\n"));
@@ -381,19 +704,51 @@ static NTSTATUS tdbsam2_new_object(DOM_SID **sid, const char *name, const int ob
 		return NT_STATUS_NO_MEMORY;
 	}
 
+	obj.type = obj_type;
+	obj.version = TDBSAM_VERSION;
+
 	switch (obj_type) {
 		case GUMS_OBJ_NORMAL_USER:
 			obj.data.user = (struct tdbsam2_user_data *)talloc_zero(mem_ctx, sizeof(struct tdbsam2_user_data));
 			TALLOC_CHECK(obj.data.user, ret, done);
 
-			/*obj.data.user->sec_desc*/
-
-			tdbsam2_get_next_sid(mem_ctx, obj.data.user->user_sid);
+			get_next_sid(mem_ctx, &(obj.data.user->user_sid));
 			TALLOC_CHECK(obj.data.user->user_sid, ret, done);
+			sid_copy(sid, obj.data.user->user_sid);
 
 			obj.data.user->name = talloc_strdup(mem_ctx, name);
 			TALLOC_CHECK(obj.data.user, ret, done);
 
+			obj.data.user->xcounter = 1;
+			/*obj.data.user->sec_desc*/
+			obj.data.user->description = "";
+			obj.data.user->group_sid = &global_sid_NULL;
+			obj.data.user->logon_time = &zero_time;
+			obj.data.user->logoff_time = &zero_time;
+			obj.data.user->kickoff_time = &zero_time;
+			obj.data.user->pass_last_set_time = &zero_time;
+			obj.data.user->pass_can_change_time = &zero_time;
+			obj.data.user->pass_must_change_time = &zero_time;
+
+			obj.data.user->full_name = "";		
+			obj.data.user->home_dir = "";		
+			obj.data.user->dir_drive = "";		
+			obj.data.user->logon_script = "";		
+			obj.data.user->profile_path = "";		
+			obj.data.user->workstations = "";		
+			obj.data.user->unknown_str = "";		
+			obj.data.user->munged_dial = "";		
+
+			obj.data.user->lm_pw_ptr = defpw;
+			obj.data.user->nt_pw_ptr = defpw;
+
+			obj.data.user->logon_divs = 168;
+			obj.data.user->hours_len = 21;
+			obj.data.user->hours = &defhours;
+
+			obj.data.user->unknown_3 = 0x00ffffff;
+			obj.data.user->unknown_5 = 0x00020000;
+			obj.data.user->unknown_6 = 0x000004ec;
 			break;
 
 		case GUMS_OBJ_GROUP:
@@ -401,133 +756,373 @@ static NTSTATUS tdbsam2_new_object(DOM_SID **sid, const char *name, const int ob
 			obj.data.group = (struct tdbsam2_group_data *)talloc_zero(mem_ctx, sizeof(struct tdbsam2_group_data));
 			TALLOC_CHECK(obj.data.group, ret, done);
 
-			/*obj.data.user->sec_desc*/
-
-			tdbsam2_get_next_sid(mem_ctx, obj.data.group->group_sid);
+			get_next_sid(mem_ctx, &(obj.data.group->group_sid));
 			TALLOC_CHECK(obj.data.group->group_sid, ret, done);
+			sid_copy(sid, obj.data.group->group_sid);
 
 			obj.data.group->name = talloc_strdup(mem_ctx, name);
 			TALLOC_CHECK(obj.data.group, ret, done);
 
+			obj.data.group->xcounter = 1;
+			/*obj.data.group->sec_desc*/
+			obj.data.group->description = "";
+
 			break;
 
 		case GUMS_OBJ_DOMAIN:
-			/* TODO: SHOULD WE ALLOW TO CREATE NEW DOMAINS ? */
+
+			/* FIXME: should we check against global_sam_sid to make it impossible
+				  to store more than one domain ? */ 
+
+			obj.data.domain = (struct tdbsam2_domain_data *)talloc_zero(mem_ctx, sizeof(struct tdbsam2_domain_data));
+			TALLOC_CHECK(obj.data.domain, ret, done);
+
+			obj.data.domain->dom_sid = sid_dup_talloc(mem_ctx, get_global_sam_sid());
+			TALLOC_CHECK(obj.data.domain->dom_sid, ret, done);
+			sid_copy(sid, obj.data.domain->dom_sid);
+
+			obj.data.domain->name = talloc_strdup(mem_ctx, name);
+			TALLOC_CHECK(obj.data.domain, ret, done);
+
+			obj.data.domain->xcounter = 1;
+			/*obj.data.domain->sec_desc*/
+			obj.data.domain->next_rid = 0x3e9;
+			obj.data.domain->description = "";
+
+			ret = NT_STATUS_OK;
+			break;	
 
 		default:
 			ret = NT_STATUS_UNSUCCESSFUL;
 			goto done;
 	}
 
-	ret = tdbsam2_store(&obj);
+	ret = store_object(mem_ctx, &obj, True);
 
 done:
 	talloc_destroy(mem_ctx);
 	return ret;
 }
 
-static NTSTATUS tdbsam2_delete_object(const DOM_SID *sid) {
-
+static NTSTATUS tdbsam2_delete_object(const DOM_SID *sid)
+{
 	NTSTATUS ret;
 	struct tdbsam2_object obj;
 	TALLOC_CTX *mem_ctx;
 	TDB_DATA data, key;
 	fstring keystr;
-	fstring sidstr;
-	char *obj_name = NULL;
-	int obj_type, obj_version, len;
 
 	if (!sid) {
-		DEBUG(0, ("tdbsam2_new_object: no NULL pointers are accepted here!\n"));
+		DEBUG(0, ("tdbsam2_delete_object: no NULL pointers are accepted here!\n"));
 		return NT_STATUS_INVALID_PARAMETER;
 	}
 
 	mem_ctx = talloc_init("tdbsam2_delete_object");
 	if (!mem_ctx) {
-		DEBUG(0, ("tdbsam2_new_object: Out of memory!\n"));
+		DEBUG(0, ("tdbsam2_delete_object: Out of memory!\n"));
 		return NT_STATUS_NO_MEMORY;
 	}
 
 	if (tdbsam2_db == NULL) {
-		if (NT_STATUS_IS_ERR(ret = tdbsam2_opentdb())) {
+		if (NT_STATUS_IS_ERR(ret = opentdb())) {
 			goto done;
 		}
 	}
 
-	sid_to_string(sidstr, sid);
-
-	slprintf(keystr, sizeof(keystr)-1, "%s%s", SIDPREFIX, sidstr);
+	slprintf(keystr, sizeof(keystr)-1, "%s%s", SIDPREFIX, sid_string_static(sid));
 	key.dptr = keystr;
 	key.dsize = strlen(keystr) + 1;
 
 	data = tdb_fetch(tdbsam2_db, key);
 	if (!data.dptr) {
-		DEBUG(5, ("get_domain_sid: Error fetching database, SID entry not found!\n"));
+		DEBUG(5, ("tdbsam2_delete_object: Error fetching database, SID entry not found!\n"));
 		DEBUGADD(5, (" Error: %s\n", tdb_errorstr(tdbsam2_db)));
 		DEBUGADD(5, (" Key: %s\n", keystr));
 		ret = NT_STATUS_UNSUCCESSFUL;
 		goto done;
 	}
 
-	len = tdb_unpack(data.dptr, data.dsize, TDB_FORMAT_STRING,
-		&obj_version,
-		&obj_type,
-		&obj_name);
+	if (tdb_delete(tdbsam2_db, key) != TDB_SUCCESS) {
+		DEBUG(5, ("tdbsam2_delete_object: Error deleting object!\n"));
+		DEBUGADD(5, (" Error: %s\n", tdb_errorstr(tdbsam2_db)));
+		DEBUGADD(5, (" Key: %s\n", keystr));
+		ret = NT_STATUS_UNSUCCESSFUL;
+		goto done;
+	}	
 
-	if (len == -1) {
+	if (NT_STATUS_IS_ERR(init_tdbsam2_object_from_buffer(&obj, mem_ctx, data.dptr, data.dsize))) {
+		SAFE_FREE(data.dptr);
+		DEBUG(0, ("tdbsam2_delete_object: Error fetching database, malformed entry!\n"));
 		ret = NT_STATUS_UNSUCCESSFUL;
 		goto done;
 	}
 
+	switch (obj.type) {
+		case GUMS_OBJ_DOMAIN:
+			/* TODO: SHOULD WE ALLOW TO DELETE DOMAINS ? */
+			slprintf(keystr, sizeof(keystr) - 1, "%s%s", NAMEPREFIX, obj.data.domain->name);
+			break;
+		case GUMS_OBJ_GROUP:
+		case GUMS_OBJ_ALIAS:
+			slprintf(keystr, sizeof(keystr) - 1, "%s%s", NAMEPREFIX, obj.data.group->name);
+			break;
+		case GUMS_OBJ_NORMAL_USER:
+			slprintf(keystr, sizeof(keystr) - 1, "%s%s", NAMEPREFIX, obj.data.user->name);
+			break;
+		default:
+			ret = NT_STATUS_UNSUCCESSFUL;
+			goto done;
+	}
+
+	key.dptr = keystr;
+	key.dsize = strlen(keystr) + 1;
+
 	if (tdb_delete(tdbsam2_db, key) != TDB_SUCCESS) {
-		DEBUG(5, ("tdbsam2_object_delete: Error deleting object!\n"));
+		DEBUG(5, ("tdbsam2_delete_object: Error deleting object!\n"));
 		DEBUGADD(5, (" Error: %s\n", tdb_errorstr(tdbsam2_db)));
 		DEBUGADD(5, (" Key: %s\n", keystr));
 		ret = NT_STATUS_UNSUCCESSFUL;
 		goto done;
-	}	
+	}
 
-	switch (obj_type) {
-		case GUMS_OBJ_NORMAL_USER:
-		case GUMS_OBJ_GROUP:
-		case GUMS_OBJ_ALIAS:
-			
-			slprintf(keystr, sizeof(keystr)-1, "%s%s", OBJECTPREFIX, obj_name);
-			key.dptr = keystr;
-			key.dsize = strlen(keystr) + 1;
-
-			if (tdb_delete(tdbsam2_db, key) != TDB_SUCCESS) {
-				DEBUG(5, ("tdbsam2_object_delete: Error deleting object!\n"));
-				DEBUGADD(5, (" Error: %s\n", tdb_errorstr(tdbsam2_db)));
-				DEBUGADD(5, (" Key: %s\n", keystr));
-				ret = NT_STATUS_UNSUCCESSFUL;
-				goto done;
+/* TODO: update the general database counter */
+
+done:
+	SAFE_FREE(data.dptr);
+	talloc_destroy(mem_ctx);
+	return ret;
+}
+
+static NTSTATUS tdbsam2_get_object_from_sid(GUMS_OBJECT **object, const DOM_SID *sid, const int obj_type)
+{
+	NTSTATUS ret;
+	struct tdbsam2_object obj;
+	TALLOC_CTX *mem_ctx;
+
+	if (!object || !sid) {
+		DEBUG(0, ("tdbsam2_get_object_from_sid: no NULL pointers are accepted here!\n"));
+		return NT_STATUS_INVALID_PARAMETER;
+	}
+
+	mem_ctx = talloc_init("tdbsam2_get_object_from_sid");
+	if (!mem_ctx) {
+		DEBUG(0, ("tdbsam2_get_object_from_sid: Out of memory!\n"));
+		return NT_STATUS_NO_MEMORY;
+	}
+
+	ret = get_object_by_sid(mem_ctx, &obj, sid);
+	if (NT_STATUS_IS_ERR(ret) || (obj_type && obj.type != obj_type)) {
+		DEBUG(0, ("tdbsam2_get_object_from_sid: error fetching object or wrong object type!\n"));
+		goto done;
+	}
+
+	ret = data_to_gums_object(object, &obj);
+	if (NT_STATUS_IS_ERR(ret)) {
+		DEBUG(0, ("tdbsam2_get_object_from_sid: error setting object data!\n"));
+		goto done;
+	}
+	
+done:
+	talloc_destroy(mem_ctx);
+	return ret;
+}
+
+static NTSTATUS tdbsam2_get_object_from_name(GUMS_OBJECT **object, const char *name, const int obj_type)
+{
+	NTSTATUS ret;
+	struct tdbsam2_object obj;
+	TALLOC_CTX *mem_ctx;
+
+	if (!object || !name) {
+		DEBUG(0, ("tdbsam2_get_object_from_sid: no NULL pointers are accepted here!\n"));
+		return NT_STATUS_INVALID_PARAMETER;
+	}
+
+	mem_ctx = talloc_init("tdbsam2_get_object_from_sid");
+	if (!mem_ctx) {
+		DEBUG(0, ("tdbsam2_get_object_from_sid: Out of memory!\n"));
+		return NT_STATUS_NO_MEMORY;
+	}
+
+	ret = get_object_by_name(mem_ctx, &obj, name);
+	if (NT_STATUS_IS_ERR(ret) || (obj_type && obj.type != obj_type)) {
+		DEBUG(0, ("tdbsam2_get_object_from_sid: error fetching object or wrong object type!\n"));
+		goto done;
+	}
+
+	ret = data_to_gums_object(object, &obj);
+	if (NT_STATUS_IS_ERR(ret)) {
+		DEBUG(0, ("tdbsam2_get_object_from_sid: error setting object data!\n"));
+		goto done;
+	}
+	
+done:
+	talloc_destroy(mem_ctx);
+	return ret;
+}
+
+	/* This function is used to get the list of all objects changed since base_time, it is
+	   used to support PDC<->BDC synchronization */
+	NTSTATUS (*get_updated_objects) (GUMS_OBJECT **objects, const NTTIME base_time);
+
+static NTSTATUS tdbsam2_enumerate_objects_start(void *handle, const DOM_SID *sid, const int obj_type)
+{
+	struct tdbsam2_enum_objs *teo, *t;
+	pstring tdbfile;
+
+	teo = (struct tdbsam2_enum_objs *)calloc(1, sizeof(struct tdbsam2_enum_objs));
+	if (!teo) {
+		DEBUG(0, ("tdbsam2_enumerate_objects_start: Out of Memory!\n"));
+		return NT_STATUS_NO_MEMORY;
+	}
+
+	teo->type = obj_type;
+	if (sid) {
+		sid_to_string(teo->dom_sid, sid);
+	}
+
+	get_private_directory(tdbfile);
+	pstrcat(tdbfile, "/");
+	pstrcat(tdbfile, TDB_FILE_NAME);
+
+	teo->db = tdb_open_log(tdbfile, 0, TDB_DEFAULT, O_RDONLY, 0600);
+  	if (!teo->db)
+	{
+		DEBUG(0, ("tdbsam2_enumerate_objects_start: Unable to open database (%s)!\n", tdbfile));
+		SAFE_FREE(teo);
+		return NT_STATUS_UNSUCCESSFUL;
+	}
+
+	if (!teo_handlers) {
+		*teo_handlers = teo;
+	} else {
+		t = *teo_handlers;
+		while (t->next) {
+			t = t->next;
+		}
+		t->next = teo;
+	}
+
+	handle = teo;
+
+	teo->key = tdb_firstkey(teo->db);
+
+	return NT_STATUS_OK;	
+}
+
+static NTSTATUS tdbsam2_enumerate_objects_get_next(GUMS_OBJECT **object, void *handle)
+{
+	NTSTATUS ret;
+	TALLOC_CTX *mem_ctx;
+	TDB_DATA data;
+	struct tdbsam2_enum_objs *teo;
+	struct tdbsam2_object obj;
+	const char *prefix = SIDPREFIX;
+	const int preflen = strlen(prefix);
+
+	if (!object || !handle) {
+		DEBUG(0, ("tdbsam2_get_object_from_sid: no NULL pointers are accepted here!\n"));
+		return NT_STATUS_INVALID_PARAMETER;
+	}
+
+	teo = (struct tdbsam2_enum_objs *)handle;
+
+	mem_ctx = talloc_init("tdbsam2_enumerate_objects_get_next");
+	if (!mem_ctx) {
+		DEBUG(0, ("tdbsam2_enumerate_objects_get_next: Out of memory!\n"));
+		return NT_STATUS_NO_MEMORY;
+	}
+
+	while ((teo->key.dsize != 0)) {
+		int len, version, type, size;
+		char *ptr;
+
+		if (strncmp(teo->key.dptr, prefix, preflen)) {
+			teo->key = tdb_nextkey(teo->db, teo->key);
+			continue;
+		}
+
+		if (teo->dom_sid) {
+			if (strncmp(&(teo->key.dptr[preflen]), teo->dom_sid, strlen(teo->dom_sid))) {
+				teo->key = tdb_nextkey(teo->db, teo->key);
+				continue;
 			}
-			break;
+		}
 
-		case GUMS_OBJ_DOMAIN:
-			/* TODO: SHOULD WE ALLOW TO DELETE DOMAINS ? */
+		data = tdb_fetch(teo->db, teo->key);
+		if (!data.dptr) {
+			DEBUG(5, ("tdbsam2_enumerate_objects_get_next: Error fetching database, SID entry not found!\n"));
+			DEBUGADD(5, (" Error: %s\n", tdb_errorstr(teo->db)));
+			DEBUGADD(5, (" Key: %s\n", teo->key.dptr));
+			ret = NT_STATUS_UNSUCCESSFUL;
+			goto done;
+		}
 
-		default:
+		len = tdb_unpack (data.dptr, data.dsize, TDB_FORMAT_STRING,
+			  &version,
+			  &type,
+			  &size, &ptr);
+
+		if (len == -1) {
+			DEBUG(5, ("tdbsam2_enumerate_objects_get_next: Error unable to unpack data!\n"));
 			ret = NT_STATUS_UNSUCCESSFUL;
 			goto done;
+		}
+		SAFE_FREE(ptr);
+
+		if (teo->type && type != teo->type) {
+			SAFE_FREE(data.dptr);
+			data.dsize = 0;
+			teo->key = tdb_nextkey(teo->db, teo->key);
+			continue;
+		}
+		
+		break;
 	}
 
+	if (data.dsize != 0) {
+		if (NT_STATUS_IS_ERR(init_tdbsam2_object_from_buffer(&obj, mem_ctx, data.dptr, data.dsize))) {
+			SAFE_FREE(data.dptr);
+			DEBUG(0, ("tdbsam2_enumerate_objects_get_next: Error fetching database, malformed entry!\n"));
+			ret = NT_STATUS_UNSUCCESSFUL;
+			goto done;
+		}
+		SAFE_FREE(data.dptr);
+	}
+
+	ret = data_to_gums_object(object, &obj);
+
 done:
-	SAFE_FREE(obj_name);
 	talloc_destroy(mem_ctx);
 	return ret;
 }
 
-	NTSTATUS (*get_object_from_sid) (GUMS_OBJECT **object, const DOM_SID *sid, const int obj_type);
-	NTSTATUS (*get_sid_from_name) (GUMS_OBJECT **object, const char *name);
-	/* This function is used to get the list of all objects changed since b_time, it is
-	   used to support PDC<->BDC synchronization */
-	NTSTATUS (*get_updated_objects) (GUMS_OBJECT **objects, const NTTIME base_time);
+static NTSTATUS tdbsam2_enumerate_objects_stop(void *handle)
+{
+	struct tdbsam2_enum_objs *teo, *t, *p;
+
+	teo = (struct tdbsam2_enum_objs *)handle;
+
+	if (*teo_handlers == teo) {
+		*teo_handlers = teo->next;
+	} else {
+		t = *teo_handlers;
+		while (t != teo) {
+			p = t;
+			t = t->next;
+			if (t == NULL) {
+				DEBUG(0, ("tdbsam2_enumerate_objects_stop: Error, handle not found!\n"));
+				return NT_STATUS_UNSUCCESSFUL;
+			}
+		}
+		p = t->next;
+	}
+
+	tdb_close(teo->db);
+	SAFE_FREE(teo);
 
-	NTSTATUS (*enumerate_objects_start) (void *handle, const DOM_SID *sid, const int obj_type);
-	NTSTATUS (*enumerate_objects_get_next) (GUMS_OBJECT **object, void *handle);
-	NTSTATUS (*enumerate_objects_stop) (void *handle);
+	return NT_STATUS_OK;
+}
 
 	/* This function MUST be used ONLY by PDC<->BDC replication code or recovery tools.
 	   Never use this function to update an object in the database, use set_object_values() */
@@ -556,7 +1151,43 @@ done:
 	NTSTATUS (*set_privilege) (GUMS_PRIVILEGE *priv);
 
 
-int gumm_init(GUMS_FUNCTIONS **storage) {
+int gumm_init(GUMS_FUNCTIONS **storage)
+{
+	tdbsam2_db = NULL;
+	teo_handlers = 0;
 
 	return 0;
 }
+
+#if 0
+int main(int argc, char *argv[])
+{
+	NTSTATUS ret;
+	DOM_SID dsid;
+
+	if (argc < 2) {
+		printf ("not enough arguments!\n");
+		exit(0);
+	}
+
+	if (!lp_load(dyn_CONFIGFILE,True,False,False)) {
+		fprintf(stderr, "Can't load %s - run testparm to debug it\n", dyn_CONFIGFILE);
+		exit(1);
+	}
+
+	ret = tdbsam2_new_object(&dsid, "_domain_", GUMS_OBJ_DOMAIN);
+	if (NT_STATUS_IS_OK(ret)) {
+		printf ("_domain_ created, sid=%s\n", sid_string_static(&dsid));
+	} else {
+		printf ("_domain_ creation error n. 0x%08x\n", ret.v);
+	}
+	ret = tdbsam2_new_object(&dsid, argv[1], GUMS_OBJ_NORMAL_USER);
+	if (NT_STATUS_IS_OK(ret)) {
+		printf ("%s user created, sid=%s\n", argv[1], sid_string_static(&dsid));
+	} else {
+		printf ("%s user creation error n. 0x%08x\n", argv[1], ret.v);
+	}
+	
+	exit(0);
+}
+#endif
diff --git a/source3/sam/gums.c b/source3/sam/gums.c
index 3a20ef6fc9..a118740637 100644
--- a/source3/sam/gums.c
+++ b/source3/sam/gums.c
@@ -26,10 +26,40 @@
 #define GMV_MAJOR 0
 #define GMV_MINOR 1
 
+#define PRIV_NONE			0
+#define PRIV_CREATE_TOKEN		1
+#define PRIV_ASSIGNPRIMARYTOKEN		2
+#define PRIV_LOCK_MEMORY		3
+#define PRIV_INCREASE_QUOTA		4
+#define PRIV_MACHINE_ACCOUNT		5
+#define PRIV_TCB			6
+#define PRIV_SECURITY			7
+#define PRIV_TAKE_OWNERSHIP		8
+#define PRIV_LOAD_DRIVER		9
+#define PRIV_SYSTEM_PROFILE		10
+#define PRIV_SYSTEMTIME			11
+#define PRIV_PROF_SINGLE_PROCESS	12
+#define PRIV_INC_BASE_PRIORITY		13
+#define PRIV_CREATE_PAGEFILE		14
+#define PRIV_CREATE_PERMANENT		15
+#define PRIV_BACKUP			16
+#define PRIV_RESTORE			17
+#define PRIV_SHUTDOWN			18
+#define PRIV_DEBUG			19
+#define PRIV_AUDIT			20
+#define PRIV_SYSTEM_ENVIRONMENT		21
+#define PRIV_CHANGE_NOTIFY		22
+#define PRIV_REMOTE_SHUTDOWN		23
+#define PRIV_UNDOCK			24
+#define PRIV_SYNC_AGENT			25
+#define PRIV_ENABLE_DELEGATION		26
+#define PRIV_ALL			255
+
+
 GUMS_FUNCTIONS *gums_storage;
 static void *dl_handle;
 
-PRIVS privs[] = {
+static PRIVS gums_privs[] = {
 	{PRIV_NONE,			"no_privs",				"No privilege"}, /* this one MUST be first */
 	{PRIV_CREATE_TOKEN,		"SeCreateToken",			"Create Token"},
 	{PRIV_ASSIGNPRIMARYTOKEN,	"SeAssignPrimaryToken",			"Assign Primary Token"},
@@ -110,19 +140,19 @@ done:
 
 NTSTATUS gums_unload(void)
 {
-	NSTATUS ret;
+	NTSTATUS ret;
 	NTSTATUS (*module_finalize)();
 
 	if (!dl_handle)
 		return NT_STATUS_UNSUCCESSFUL;
 
-	module_close = sys_dlsym(dl_handle, "gumm_finalize");
+	module_finalize = sys_dlsym(dl_handle, "gumm_finalize");
 	if (!module_finalize) {
 		DEBUG(0, ("ERROR: Failed to find gums module's init function!\n"));
 		return NT_STATUS_UNSUCCESSFUL;
 	}
 
-	DEBUG(5, ("Finalizing module %s\n", module_name));
+	DEBUG(5, ("Finalizing module"));
 
 	ret = module_finalize();
 	sys_dlclose(dl_handle);
diff --git a/source3/sam/gums_api.c b/source3/sam/gums_api.c
index 75e32fa861..2e5dcd143a 100644
--- a/source3/sam/gums_api.c
+++ b/source3/sam/gums_api.c
@@ -20,6 +20,182 @@
 
 #include "includes.h"
 
+
+/*******************************************************************
+ Create a SEC_ACL structure.  
+********************************************************************/
+
+static SEC_ACL *make_sec_acl(TALLOC_CTX *ctx, uint16 revision, int num_aces, SEC_ACE *ace_list)
+{
+	SEC_ACL *dst;
+	int i;
+
+	if((dst = (SEC_ACL *)talloc_zero(ctx,sizeof(SEC_ACL))) == NULL)
+		return NULL;
+
+	dst->revision = revision;
+	dst->num_aces = num_aces;
+	dst->size = SEC_ACL_HEADER_SIZE;
+
+	/* Now we need to return a non-NULL address for the ace list even
+	   if the number of aces required is zero.  This is because there
+	   is a distinct difference between a NULL ace and an ace with zero
+	   entries in it.  This is achieved by checking that num_aces is a
+	   positive number. */
+
+	if ((num_aces) && 
+            ((dst->ace = (SEC_ACE *)talloc(ctx, sizeof(SEC_ACE) * num_aces)) 
+             == NULL)) {
+		return NULL;
+	}
+        
+	for (i = 0; i < num_aces; i++) {
+		dst->ace[i] = ace_list[i]; /* Structure copy. */
+		dst->size += ace_list[i].size;
+	}
+
+	return dst;
+}
+
+
+
+/*******************************************************************
+ Duplicate a SEC_ACL structure.  
+********************************************************************/
+
+static SEC_ACL *dup_sec_acl(TALLOC_CTX *ctx, SEC_ACL *src)
+{
+	if(src == NULL)
+		return NULL;
+
+	return make_sec_acl(ctx, src->revision, src->num_aces, src->ace);
+}
+
+
+
+/*******************************************************************
+ Creates a SEC_DESC structure
+********************************************************************/
+
+static SEC_DESC *make_sec_desc(TALLOC_CTX *ctx, uint16 revision, 
+			DOM_SID *owner_sid, DOM_SID *grp_sid,
+			SEC_ACL *sacl, SEC_ACL *dacl, size_t *sd_size)
+{
+	SEC_DESC *dst;
+	uint32 offset     = 0;
+	uint32 offset_sid = SEC_DESC_HEADER_SIZE;
+	uint32 offset_acl = 0;
+
+	*sd_size = 0;
+
+	if(( dst = (SEC_DESC *)talloc_zero(ctx, sizeof(SEC_DESC))) == NULL)
+		return NULL;
+
+	dst->revision = revision;
+	dst->type     = SEC_DESC_SELF_RELATIVE;
+
+	if (sacl) dst->type |= SEC_DESC_SACL_PRESENT;
+	if (dacl) dst->type |= SEC_DESC_DACL_PRESENT;
+
+	dst->off_owner_sid = 0;
+	dst->off_grp_sid   = 0;
+	dst->off_sacl      = 0;
+	dst->off_dacl      = 0;
+
+	if(owner_sid && ((dst->owner_sid = sid_dup_talloc(ctx,owner_sid)) == NULL))
+		goto error_exit;
+
+	if(grp_sid && ((dst->grp_sid = sid_dup_talloc(ctx,grp_sid)) == NULL))
+		goto error_exit;
+
+	if(sacl && ((dst->sacl = dup_sec_acl(ctx, sacl)) == NULL))
+		goto error_exit;
+
+	if(dacl && ((dst->dacl = dup_sec_acl(ctx, dacl)) == NULL))
+		goto error_exit;
+
+	offset = 0;
+
+	/*
+	 * Work out the linearization sizes.
+	 */
+	if (dst->owner_sid != NULL) {
+
+		if (offset == 0)
+			offset = SEC_DESC_HEADER_SIZE;
+
+		offset += sid_size(dst->owner_sid);
+	}
+
+	if (dst->grp_sid != NULL) {
+
+		if (offset == 0)
+			offset = SEC_DESC_HEADER_SIZE;
+
+		offset += sid_size(dst->grp_sid);
+	}
+
+	if (dst->sacl != NULL) {
+
+		offset_acl = SEC_DESC_HEADER_SIZE;
+
+		dst->off_sacl  = offset_acl;
+		offset_acl    += dst->sacl->size;
+		offset        += dst->sacl->size;
+		offset_sid    += dst->sacl->size;
+	}
+
+	if (dst->dacl != NULL) {
+
+		if (offset_acl == 0)
+			offset_acl = SEC_DESC_HEADER_SIZE;
+
+		dst->off_dacl  = offset_acl;
+		offset_acl    += dst->dacl->size;
+		offset        += dst->dacl->size;
+		offset_sid    += dst->dacl->size;
+	}
+
+	*sd_size = (size_t)((offset == 0) ? SEC_DESC_HEADER_SIZE : offset);
+
+	if (dst->owner_sid != NULL)
+		dst->off_owner_sid = offset_sid;
+		
+	/* sid_size() returns 0 if the sid is NULL so this is ok */
+		
+	if (dst->grp_sid != NULL)
+		dst->off_grp_sid = offset_sid + sid_size(dst->owner_sid);
+
+	return dst;
+
+error_exit:
+
+	*sd_size = 0;
+	return NULL;
+}
+
+/*******************************************************************
+ Duplicate a SEC_DESC structure.  
+********************************************************************/
+
+static SEC_DESC *dup_sec_desc( TALLOC_CTX *ctx, SEC_DESC *src)
+{
+	size_t dummy;
+
+	if(src == NULL)
+		return NULL;
+
+	return make_sec_desc( ctx, src->revision, 
+				src->owner_sid, src->grp_sid, src->sacl,
+				src->dacl, &dummy);
+}
+
+
+
+
+
+
+
 extern GUMS_FUNCTIONS *gums_storage;
 
 /* Functions to get/set info from a GUMS object */
@@ -37,7 +213,7 @@ NTSTATUS gums_create_object(GUMS_OBJECT **obj, uint32 type)
 {
 	TALLOC_CTX *mem_ctx = talloc_init("gums_create_object");
 	GUMS_OBJECT *go;
-	NT_STATUS ret;
+	NTSTATUS ret;
 	
 	go = talloc_zero(mem_ctx, sizeof(GUMS_OBJECT));
 	go->mem_ctx = mem_ctx;
@@ -54,12 +230,12 @@ NTSTATUS gums_create_object(GUMS_OBJECT **obj, uint32 type)
 		case GUMS_OBJ_DOMAIN_TRUST:
 */
 		case GUMS_OBJ_NORMAL_USER:
-			go->data = (GUMS_USER *)talloc_zero(mem_ctx, sizeof(GUMS_USER));
+			go->data.user = (GUMS_USER *)talloc_zero(mem_ctx, sizeof(GUMS_USER));
 			break;
 
 		case GUMS_OBJ_GROUP:
 		case GUMS_OBJ_ALIAS:
-			go->data = (GUMS_GROUP *)talloc_zero(mem_ctx, sizeof(GUMS_GROUP));
+			go->data.group = (GUMS_GROUP *)talloc_zero(mem_ctx, sizeof(GUMS_GROUP));
 			break;
 
 		default:
@@ -68,7 +244,7 @@ NTSTATUS gums_create_object(GUMS_OBJECT **obj, uint32 type)
 			goto error;
 	}
 
-	if (!(go->data)) {
+	if (!(go->data.user)) {
 		ret = NT_STATUS_NO_MEMORY;
 		DEBUG(0, ("gums_create_object: Out of memory!\n"));
 		goto error;
@@ -190,6 +366,30 @@ NTSTATUS gums_get_object_privileges(PRIVILEGE_SET **priv_set, const GUMS_OBJECT
 }
 */
 
+NTSTATUS gums_get_domain_next_rid(uint32 *rid, const GUMS_OBJECT *obj)
+{
+	if (!obj)
+		return NT_STATUS_INVALID_PARAMETER;
+
+	if (obj->type != GUMS_OBJ_DOMAIN)
+		return NT_STATUS_OBJECT_TYPE_MISMATCH;
+
+	*rid = obj->data.domain->next_rid;
+	return NT_STATUS_OK;
+}
+
+NTSTATUS gums_set_domain_next_rid(GUMS_OBJECT *obj, uint32 rid)
+{
+	if (!obj)
+		return NT_STATUS_INVALID_PARAMETER;
+
+	if (obj->type != GUMS_OBJ_DOMAIN)
+		return NT_STATUS_OBJECT_TYPE_MISMATCH;
+
+	obj->data.domain->next_rid = rid;
+	return NT_STATUS_OK;
+}
+
 NTSTATUS gums_get_user_pri_group(DOM_SID **sid, const GUMS_OBJECT *obj)
 {
 	if (!sid || !obj)
@@ -223,19 +423,19 @@ NTSTATUS gums_get_user_nt_pwd(DATA_BLOB **nt_pwd, const GUMS_OBJECT *obj)
 	if (obj->type != GUMS_OBJ_NORMAL_USER)
 		return NT_STATUS_OBJECT_TYPE_MISMATCH;
 
-	*nt_pwd = obj->data.user->nt_pw;
+	*nt_pwd = &(obj->data.user->nt_pw);
 	return NT_STATUS_OK;
 }
 
 NTSTATUS gums_set_user_nt_pwd(GUMS_OBJECT *obj, const DATA_BLOB nt_pwd)
 {
-	if (!obj || !nt_pwd || nt_pwd != NT_HASH_LEN)
+	if (!obj || nt_pwd.length != NT_HASH_LEN)
 		return NT_STATUS_INVALID_PARAMETER;
 
 	if (obj->type != GUMS_OBJ_NORMAL_USER)
 		return NT_STATUS_OBJECT_TYPE_MISMATCH;
 
-	obj->data.user->nt_pwd = data_blob_talloc(obj->mem_ctx, nt_pwd.data, nt_pwd.lenght);
+	obj->data.user->nt_pw = data_blob_talloc(obj->mem_ctx, nt_pwd.data, nt_pwd.length);
 	return NT_STATUS_OK;
 }
 
@@ -247,19 +447,19 @@ NTSTATUS gums_get_user_lm_pwd(DATA_BLOB **lm_pwd, const GUMS_OBJECT *obj)
 	if (obj->type != GUMS_OBJ_NORMAL_USER)
 		return NT_STATUS_OBJECT_TYPE_MISMATCH;
 
-	*lm_pwd = obj->data.user->lm_pw;
+	*lm_pwd = &(obj->data.user->lm_pw);
 	return NT_STATUS_OK;
 }
 
 NTSTATUS gums_set_user_lm_pwd(GUMS_OBJECT *obj, const DATA_BLOB lm_pwd)
 {
-	if (!obj || !lm_pwd || lm_pwd != LM_HASH_LEN)
+	if (!obj || lm_pwd.length != LM_HASH_LEN)
 		return NT_STATUS_INVALID_PARAMETER;
 
 	if (obj->type != GUMS_OBJ_NORMAL_USER)
 		return NT_STATUS_OBJECT_TYPE_MISMATCH;
 
-	obj->data.user->lm_pwd = data_blob_talloc(obj->mem_ctx, lm_pwd.data, lm_pwd.lenght);
+	obj->data.user->lm_pw = data_blob_talloc(obj->mem_ctx, lm_pwd.data, lm_pwd.length);
 	return NT_STATUS_OK;
 }
 
@@ -591,7 +791,7 @@ NTSTATUS gums_get_user_pass_must_change_time(NTTIME *pass_must_change_time, cons
 	if (obj->type != GUMS_OBJ_NORMAL_USER)
 		return NT_STATUS_OBJECT_TYPE_MISMATCH;
 
-	*pass_must_change_time = obj->data-user->pass_must_change_time;
+	*pass_must_change_time = obj->data.user->pass_must_change_time;
 	return NT_STATUS_OK;
 }
 
@@ -768,7 +968,7 @@ NTSTATUS gums_get_group_members(uint32 *count, DOM_SID **members, const GUMS_OBJ
 			return NT_STATUS_OBJECT_TYPE_MISMATCH;
 
 	*count = obj->data.group->count;
-	*members = obj->data.group->members;
+	*members = *(obj->data.group->members);
 	return NT_STATUS_OK;
 }
 
@@ -786,7 +986,7 @@ NTSTATUS gums_set_group_members(GUMS_OBJECT *obj, uint32 count, DOM_SID **member
 	obj->data.group->count = count;
 	n = 0;
 	do {
-		obj->data.group->members[n] = dup_sec_desc(obj->mem_ctx, members[n]);
+		obj->data.group->members[n] = sid_dup_talloc(obj->mem_ctx, members[n]);
 		if (!(obj->data.group->members[n])) return NT_STATUS_NO_MEMORY;
 		n++;
 	} while (n < count);
@@ -836,8 +1036,8 @@ NTSTATUS gums_cs_set_sec_desc(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_set, SEC
 	if (data_set == NULL)
 		return NT_STATUS_NO_MEMORY;
 
-	com_set->data = data_set;
-	data_set = &((com_set->data)[com_set->count - 1]);
+	com_set->data[0] = data_set;
+	data_set = ((com_set->data)[com_set->count - 1]);
 	
 	data_set->type = GUMS_SET_SEC_DESC;
 	new_sec_desc = dup_sec_desc(mem_ctx, sec_desc);
@@ -849,6 +1049,7 @@ NTSTATUS gums_cs_set_sec_desc(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_set, SEC
 	return NT_STATUS_OK;
 }
 
+/*
 NTSTATUS gums_cs_add_privilege(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_set, LUID_ATTR priv)
 {
 	GUMS_DATA_SET *data_set;
@@ -858,7 +1059,7 @@ NTSTATUS gums_cs_add_privilege(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_set, LU
 		return NT_STATUS_INVALID_PARAMETER;
 
 	com_set->count = com_set->count + 1;
-	if (com_set->count == 1) { /* first data set */
+	if (com_set->count == 1) {
 		data_set = (GUMS_DATA_SET *)talloc(mem_ctx, sizeof(GUMS_DATA_SET));
 	} else {
 		data_set = (GUMS_DATA_SET *)talloc_realloc(mem_ctx, com_set->data, sizeof(GUMS_DATA_SET) * com_set->count);
@@ -866,8 +1067,8 @@ NTSTATUS gums_cs_add_privilege(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_set, LU
 	if (data_set == NULL)
 		return NT_STATUS_NO_MEMORY;
 
-	com_set->data = data_set;
-	data_set = &((com_set->data)[com_set->count - 1]);
+	com_set->data[0] = data_set;
+	data_set = ((com_set->data)[com_set->count - 1]);
 	
 	data_set->type = GUMS_ADD_PRIVILEGE;
 	if (NT_STATUS_IS_ERR(dupalloc_luid_attr(mem_ctx, &new_priv, priv)))
@@ -887,7 +1088,7 @@ NTSTATUS gums_cs_del_privilege(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_set, LU
 		return NT_STATUS_INVALID_PARAMETER;
 
 	com_set->count = com_set->count + 1;
-	if (com_set->count == 1) { /* first data set */
+	if (com_set->count == 1) {
 		data_set = (GUMS_DATA_SET *)talloc(mem_ctx, sizeof(GUMS_DATA_SET));
 	} else {
 		data_set = (GUMS_DATA_SET *)talloc_realloc(mem_ctx, com_set->data, sizeof(GUMS_DATA_SET) * com_set->count);
@@ -895,8 +1096,8 @@ NTSTATUS gums_cs_del_privilege(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_set, LU
 	if (data_set == NULL)
 		return NT_STATUS_NO_MEMORY;
 
-	com_set->data = data_set;
-	data_set = &((com_set->data)[com_set->count - 1]);
+	com_set->data[0] = data_set;
+	data_set = ((com_set->data)[com_set->count - 1]);
 	
 	data_set->type = GUMS_DEL_PRIVILEGE;
 	if (NT_STATUS_IS_ERR(dupalloc_luid_attr(mem_ctx, &new_priv, priv)))
@@ -916,7 +1117,7 @@ NTSTATUS gums_cs_set_privilege_set(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_set
 		return NT_STATUS_INVALID_PARAMETER;
 
 	com_set->count = com_set->count + 1;
-	if (com_set->count == 1) { /* first data set */
+	if (com_set->count == 1) {
 		data_set = (GUMS_DATA_SET *)talloc(mem_ctx, sizeof(GUMS_DATA_SET));
 	} else {
 		data_set = (GUMS_DATA_SET *)talloc_realloc(mem_ctx, com_set->data, sizeof(GUMS_DATA_SET) * com_set->count);
@@ -924,10 +1125,10 @@ NTSTATUS gums_cs_set_privilege_set(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_set
 	if (data_set == NULL)
 		return NT_STATUS_NO_MEMORY;
 
-	com_set->data = data_set;
-	data_set = &((com_set->data)[com_set->count - 1]);
+	com_set->data[0] = data_set;
+	data_set = ((com_set->data)[com_set->count - 1]);
 	
-	data_set->type = GUMS_SET_SEC_DESC;
+	data_set->type = GUMS_SET_PRIVILEGE;
 	if (NT_STATUS_IS_ERR(dup_priv_set(&new_priv_set, mem_ctx, priv_set)))
 		return NT_STATUS_NO_MEMORY;
 
@@ -935,6 +1136,7 @@ NTSTATUS gums_cs_set_privilege_set(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_set
 
 	return NT_STATUS_OK;
 }
+*/
 
 NTSTATUS gums_cs_set_string(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_set, uint32 type, char *str)
 {
@@ -953,8 +1155,8 @@ NTSTATUS gums_cs_set_string(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_set, uint3
 	if (data_set == NULL)
 		return NT_STATUS_NO_MEMORY;
 
-	com_set->data = data_set;
-	data_set = &((com_set->data)[com_set->count - 1]);
+	com_set->data[0] = data_set;
+	data_set = ((com_set->data)[com_set->count - 1]);
 	
 	data_set->type = type;
 	new_str = talloc_strdup(mem_ctx, str);
@@ -968,12 +1170,12 @@ NTSTATUS gums_cs_set_string(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_set, uint3
 
 NTSTATUS gums_cs_set_name(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_set, char *name)
 {
-	return gums_set_string(mem_ctx, com_set, GUMS_SET_NAME, name);
+	return gums_cs_set_string(mem_ctx, com_set, GUMS_SET_NAME, name);
 }
 
 NTSTATUS gums_cs_set_description(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_set, char *desc)
 {
-	return gums_set_string(mem_ctx, com_set, GUMS_SET_DESCRIPTION, desc);
+	return gums_cs_set_string(mem_ctx, com_set, GUMS_SET_DESCRIPTION, desc);
 }
 
 NTSTATUS gums_cs_set_full_name(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_set, char *full_name)
@@ -981,7 +1183,7 @@ NTSTATUS gums_cs_set_full_name(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_set, ch
 	if (com_set->type != GUMS_OBJ_NORMAL_USER)
 		return NT_STATUS_INVALID_PARAMETER;
 
-	return gums_set_string(mem_ctx, com_set, GUMS_SET_NAME, full_name);
+	return gums_cs_set_string(mem_ctx, com_set, GUMS_SET_NAME, full_name);
 }
 
 NTSTATUS gums_cs_set_home_directory(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_set, char *home_dir)
@@ -989,7 +1191,7 @@ NTSTATUS gums_cs_set_home_directory(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_se
 	if (com_set->type != GUMS_OBJ_NORMAL_USER)
 		return NT_STATUS_INVALID_PARAMETER;
 
-	return gums_set_string(mem_ctx, com_set, GUMS_SET_NAME, home_dir);
+	return gums_cs_set_string(mem_ctx, com_set, GUMS_SET_NAME, home_dir);
 }
 
 NTSTATUS gums_cs_set_drive(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_set, char *drive)
@@ -997,7 +1199,7 @@ NTSTATUS gums_cs_set_drive(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_set, char *
 	if (com_set->type != GUMS_OBJ_NORMAL_USER)
 		return NT_STATUS_INVALID_PARAMETER;
 
-	return gums_set_string(mem_ctx, com_set, GUMS_SET_NAME, drive);
+	return gums_cs_set_string(mem_ctx, com_set, GUMS_SET_NAME, drive);
 }
 
 NTSTATUS gums_cs_set_logon_script(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_set, char *logon_script)
@@ -1005,7 +1207,7 @@ NTSTATUS gums_cs_set_logon_script(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_set,
 	if (com_set->type != GUMS_OBJ_NORMAL_USER)
 		return NT_STATUS_INVALID_PARAMETER;
 
-	return gums_set_string(mem_ctx, com_set, GUMS_SET_NAME, logon_script);
+	return gums_cs_set_string(mem_ctx, com_set, GUMS_SET_NAME, logon_script);
 }
 
 NTSTATUS gums_cs_set_profile_path(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_set, char *prof_path)
@@ -1013,7 +1215,7 @@ NTSTATUS gums_cs_set_profile_path(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_set,
 	if (com_set->type != GUMS_OBJ_NORMAL_USER)
 		return NT_STATUS_INVALID_PARAMETER;
 
-	return gums_set_string(mem_ctx, com_set, GUMS_SET_NAME, prof_path);
+	return gums_cs_set_string(mem_ctx, com_set, GUMS_SET_NAME, prof_path);
 }
 
 NTSTATUS gums_cs_set_workstations(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_set, char *wks)
@@ -1021,7 +1223,7 @@ NTSTATUS gums_cs_set_workstations(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_set,
 	if (com_set->type != GUMS_OBJ_NORMAL_USER)
 		return NT_STATUS_INVALID_PARAMETER;
 
-	return gums_set_string(mem_ctx, com_set, GUMS_SET_NAME, wks);
+	return gums_cs_set_string(mem_ctx, com_set, GUMS_SET_NAME, wks);
 }
 
 NTSTATUS gums_cs_set_unknown_string(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_set, char *unkn_str)
@@ -1029,7 +1231,7 @@ NTSTATUS gums_cs_set_unknown_string(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_se
 	if (com_set->type != GUMS_OBJ_NORMAL_USER)
 		return NT_STATUS_INVALID_PARAMETER;
 
-	return gums_set_string(mem_ctx, com_set, GUMS_SET_NAME, unkn_str);
+	return gums_cs_set_string(mem_ctx, com_set, GUMS_SET_NAME, unkn_str);
 }
 
 NTSTATUS gums_cs_set_munged_dial(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_set, char *munged_dial)
@@ -1037,7 +1239,7 @@ NTSTATUS gums_cs_set_munged_dial(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_set,
 	if (com_set->type != GUMS_OBJ_NORMAL_USER)
 		return NT_STATUS_INVALID_PARAMETER;
 
-	return gums_set_string(mem_ctx, com_set, GUMS_SET_NAME, munged_dial);
+	return gums_cs_set_string(mem_ctx, com_set, GUMS_SET_NAME, munged_dial);
 }
 
 NTSTATUS gums_cs_set_nttime(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_set, uint32 type, NTTIME *nttime)
@@ -1057,8 +1259,8 @@ NTSTATUS gums_cs_set_nttime(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_set, uint3
 	if (data_set == NULL)
 		return NT_STATUS_NO_MEMORY;
 
-	com_set->data = data_set;
-	data_set = &((com_set->data)[com_set->count - 1]);
+	com_set->data[0] = data_set;
+	data_set = ((com_set->data)[com_set->count - 1]);
 	
 	data_set->type = type;
 	new_time = talloc(mem_ctx, sizeof(NTTIME));
@@ -1077,7 +1279,7 @@ NTSTATUS gums_cs_set_logon_time(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_set, N
 	if (com_set->type != GUMS_OBJ_NORMAL_USER)
 		return NT_STATUS_INVALID_PARAMETER;
 
-	return gums_set_nttime(mem_ctx, com_set, GUMS_SET_LOGON_TIME, logon_time);
+	return gums_cs_set_nttime(mem_ctx, com_set, GUMS_SET_LOGON_TIME, logon_time);
 }
 
 NTSTATUS gums_cs_set_logoff_time(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_set, NTTIME *logoff_time)
@@ -1085,7 +1287,7 @@ NTSTATUS gums_cs_set_logoff_time(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_set,
 	if (com_set->type != GUMS_OBJ_NORMAL_USER)
 		return NT_STATUS_INVALID_PARAMETER;
 
-	return gums_set_nttime(mem_ctx, com_set, GUMS_SET_LOGOFF_TIME, logoff_time);
+	return gums_cs_set_nttime(mem_ctx, com_set, GUMS_SET_LOGOFF_TIME, logoff_time);
 }
 
 NTSTATUS gums_cs_set_kickoff_time(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_set, NTTIME *kickoff_time)
@@ -1093,7 +1295,7 @@ NTSTATUS gums_cs_set_kickoff_time(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_set,
 	if (com_set->type != GUMS_OBJ_NORMAL_USER)
 		return NT_STATUS_INVALID_PARAMETER;
 
-	return gums_set_nttime(mem_ctx, com_set, GUMS_SET_KICKOFF_TIME, kickoff_time);
+	return gums_cs_set_nttime(mem_ctx, com_set, GUMS_SET_KICKOFF_TIME, kickoff_time);
 }
 
 NTSTATUS gums_cs_set_pass_last_set_time(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_set, NTTIME *pls_time)
@@ -1101,7 +1303,7 @@ NTSTATUS gums_cs_set_pass_last_set_time(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *co
 	if (com_set->type != GUMS_OBJ_NORMAL_USER)
 		return NT_STATUS_INVALID_PARAMETER;
 
-	return gums_set_nttime(mem_ctx, com_set, GUMS_SET_LOGON_TIME, pls_time);
+	return gums_cs_set_nttime(mem_ctx, com_set, GUMS_SET_LOGON_TIME, pls_time);
 }
 
 NTSTATUS gums_cs_set_pass_can_change_time(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_set, NTTIME *pcc_time)
@@ -1109,7 +1311,7 @@ NTSTATUS gums_cs_set_pass_can_change_time(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *
 	if (com_set->type != GUMS_OBJ_NORMAL_USER)
 		return NT_STATUS_INVALID_PARAMETER;
 
-	return gums_set_nttime(mem_ctx, com_set, GUMS_SET_LOGON_TIME, pcc_time);
+	return gums_cs_set_nttime(mem_ctx, com_set, GUMS_SET_LOGON_TIME, pcc_time);
 }
 
 NTSTATUS gums_cs_set_pass_must_change_time(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_set, NTTIME *pmc_time)
@@ -1117,7 +1319,7 @@ NTSTATUS gums_cs_set_pass_must_change_time(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET
 	if (com_set->type != GUMS_OBJ_NORMAL_USER)
 		return NT_STATUS_INVALID_PARAMETER;
 
-	return gums_set_nttime(mem_ctx, com_set, GUMS_SET_LOGON_TIME, pmc_time);
+	return gums_cs_set_nttime(mem_ctx, com_set, GUMS_SET_LOGON_TIME, pmc_time);
 }
 
 NTSTATUS gums_cs_add_sids_to_group(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_set, const DOM_SID **sids, const uint32 count)
@@ -1138,8 +1340,8 @@ NTSTATUS gums_cs_add_sids_to_group(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_set
 	if (data_set == NULL)
 		return NT_STATUS_NO_MEMORY;
 
-	com_set->data = data_set;
-	data_set = &((com_set->data)[com_set->count - 1]);
+	com_set->data[0] = data_set;
+	data_set = ((com_set->data)[com_set->count - 1]);
 	
 	data_set->type = GUMS_ADD_SID_LIST;
 	new_sids = (DOM_SID **)talloc(mem_ctx, (sizeof(void *) * count));
@@ -1163,7 +1365,7 @@ NTSTATUS gums_cs_add_users_to_group(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_se
 	if (com_set->type != GUMS_OBJ_GROUP || com_set->type != GUMS_OBJ_ALIAS)
 		return NT_STATUS_INVALID_PARAMETER;
 
-	return gums_add_sids_to_group(mem_ctx, com_set, sids, count);	
+	return gums_cs_add_sids_to_group(mem_ctx, com_set, sids, count);	
 }
 
 NTSTATUS gums_cs_add_groups_to_group(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_set, const DOM_SID **sids, const uint32 count)
@@ -1173,7 +1375,7 @@ NTSTATUS gums_cs_add_groups_to_group(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_s
 	if (com_set->type != GUMS_OBJ_ALIAS)
 		return NT_STATUS_INVALID_PARAMETER;
 
-	return gums_add_sids_to_group(mem_ctx, com_set, sids, count);	
+	return gums_cs_add_sids_to_group(mem_ctx, com_set, sids, count);	
 }
 
 NTSTATUS gums_cs_del_sids_from_group(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_set, const DOM_SID **sids, const uint32 count)
@@ -1196,8 +1398,8 @@ NTSTATUS gums_cs_del_sids_from_group(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_s
 	if (data_set == NULL)
 		return NT_STATUS_NO_MEMORY;
 
-	com_set->data = data_set;
-	data_set = &((com_set->data)[com_set->count - 1]);
+	com_set->data[0] = data_set;
+	data_set = ((com_set->data)[com_set->count - 1]);
 	
 	data_set->type = GUMS_DEL_SID_LIST;
 	new_sids = (DOM_SID **)talloc(mem_ctx, (sizeof(void *) * count));
@@ -1234,8 +1436,8 @@ NTSTATUS gums_ds_set_sids_in_group(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_set
 	if (data_set == NULL)
 		return NT_STATUS_NO_MEMORY;
 
-	com_set->data = data_set;
-	data_set = &((com_set->data)[com_set->count - 1]);
+	com_set->data[0] = data_set;
+	data_set = ((com_set->data)[com_set->count - 1]);
 	
 	data_set->type = GUMS_SET_SID_LIST;
 	new_sids = (DOM_SID **)talloc(mem_ctx, (sizeof(void *) * count));
@@ -1255,7 +1457,7 @@ NTSTATUS gums_ds_set_sids_in_group(TALLOC_CTX *mem_ctx, GUMS_COMMIT_SET *com_set
 
 NTSTATUS gums_commit_data(GUMS_COMMIT_SET *set)
 {
-	return gums_storage->set_object_values(set->sid, set->count, set->data);
+	return gums_storage->set_object_values(&(set->sid), set->count, set->data);
 }
 
 NTSTATUS gums_destroy_commit_set(GUMS_COMMIT_SET **com_set)
diff --git a/source3/sam/gums_helper.c b/source3/sam/gums_helper.c
index 8526a2f1cc..c22e6cf7ff 100644
--- a/source3/sam/gums_helper.c
+++ b/source3/sam/gums_helper.c
@@ -57,13 +57,13 @@ extern DOM_SID global_sid_Builtin_Guests;
    loops with winbind may happen. 
  ****************************************************************************/
 
-/*
+#if 0
 NTSTATUS is_mapped_group(BOOL *mapped, const DOM_SID *sid)
 {
 	NTSTATUS result;
 	gid_t id;
 
-	/* look if mapping exist, do not make idmap alloc an uid if SID is not found * /
+	/* look if mapping exist, do not make idmap alloc an uid if SID is not found */
 	result = idmap_get_gid_from_sid(&id, sid, False);
 	if (NT_STATUS_IS_OK(result)) {
 		*mapped = gid_is_in_winbind_range(id);
@@ -73,7 +73,7 @@ NTSTATUS is_mapped_group(BOOL *mapped, const DOM_SID *sid)
 
 	return result;
 }
-*/
+#endif
 
 /****************************************************************************
  duplicate alloc luid_attr
@@ -96,7 +96,7 @@ NTSTATUS dupalloc_luid_attr(TALLOC_CTX *ctx, LUID_ATTR **new_la, LUID_ATTR old_l
 /****************************************************************************
  initialise a privilege list
  ****************************************************************************/
-void init_privilege(PRIVILEGE_SET *priv_set)
+void gums_init_privilege(PRIVILEGE_SET *priv_set)
 {
 	priv_set->count=0;
 	priv_set->control=0;
@@ -106,12 +106,12 @@ void init_privilege(PRIVILEGE_SET *priv_set)
 /****************************************************************************
  add a privilege to a privilege array
  ****************************************************************************/
-NTSTATUS add_privilege(PRIVILEGE_SET *priv_set, TALLOC_CTX *ctx, LUID_ATTR set)
+NTSTATUS gums_add_privilege(PRIVILEGE_SET *priv_set, TALLOC_CTX *ctx, LUID_ATTR set)
 {
 	LUID_ATTR *new_set;
 
 	/* check if the privilege is not already in the list */
-	if (check_priv_in_privilege(priv_set, set))
+	if (gums_check_priv_in_privilege(priv_set, set))
 		return NT_STATUS_UNSUCCESSFUL;
 
 	/* we can allocate memory to add the new privilege */
@@ -135,7 +135,7 @@ NTSTATUS add_privilege(PRIVILEGE_SET *priv_set, TALLOC_CTX *ctx, LUID_ATTR set)
 /****************************************************************************
  add all the privileges to a privilege array
  ****************************************************************************/
-NTSTATUS add_all_privilege(PRIVILEGE_SET *priv_set, TALLOC_CTX *ctx)
+NTSTATUS gums_add_all_privilege(PRIVILEGE_SET *priv_set, TALLOC_CTX *ctx)
 {
 	NTSTATUS result = NT_STATUS_OK;
 	LUID_ATTR set;
@@ -144,15 +144,15 @@ NTSTATUS add_all_privilege(PRIVILEGE_SET *priv_set, TALLOC_CTX *ctx)
 	set.luid.high=0;
 	
 	set.luid.low=SE_PRIV_ADD_USERS;
-	result = add_privilege(priv_set, ctx, set);
+	result = gums_add_privilege(priv_set, ctx, set);
 	NTSTATUS_CHECK("add_all_privilege", "add_privilege", result, done);
 	
 	set.luid.low=SE_PRIV_ADD_MACHINES;
-	result = add_privilege(priv_set, ctx, set);
+	result = gums_add_privilege(priv_set, ctx, set);
 	NTSTATUS_CHECK("add_all_privilege", "add_privilege", result, done);
 
 	set.luid.low=SE_PRIV_PRINT_OPERATOR;
-	result = add_privilege(priv_set, ctx, set);
+	result = gums_add_privilege(priv_set, ctx, set);
 	NTSTATUS_CHECK("add_all_privilege", "add_privilege", result, done);
 	
 done:
@@ -162,7 +162,7 @@ done:
 /****************************************************************************
  check if the privilege list is empty
  ****************************************************************************/
-BOOL check_empty_privilege(PRIVILEGE_SET *priv_set)
+BOOL gums_check_empty_privilege(PRIVILEGE_SET *priv_set)
 {
 	return (priv_set->count == 0);
 }
@@ -170,12 +170,12 @@ BOOL check_empty_privilege(PRIVILEGE_SET *priv_set)
 /****************************************************************************
  check if the privilege is in the privilege list
  ****************************************************************************/
-BOOL check_priv_in_privilege(PRIVILEGE_SET *priv_set, LUID_ATTR set)
+BOOL gums_check_priv_in_privilege(PRIVILEGE_SET *priv_set, LUID_ATTR set)
 {
 	int i;
 
 	/* if the list is empty, obviously we can't have it */
-	if (check_empty_privilege(priv_set))
+	if (gums_check_empty_privilege(priv_set))
 		return False;
 
 	for (i=0; i<priv_set->count; i++) {
@@ -193,19 +193,19 @@ BOOL check_priv_in_privilege(PRIVILEGE_SET *priv_set, LUID_ATTR set)
 /****************************************************************************
  remove a privilege from a privilege array
  ****************************************************************************/
-NTSTATUS remove_privilege(PRIVILEGE_SET *priv_set, TALLOC_CTX *ctx, LUID_ATTR set)
+NTSTATUS gums_remove_privilege(PRIVILEGE_SET *priv_set, TALLOC_CTX *ctx, LUID_ATTR set)
 {
 	LUID_ATTR *new_set;
 	LUID_ATTR *old_set;
 	int i,j;
 
 	/* check if the privilege is in the list */
-	if (!check_priv_in_privilege(priv_set, set))
+	if (!gums_check_priv_in_privilege(priv_set, set))
 		return NT_STATUS_UNSUCCESSFUL;
 
 	/* special case if it's the only privilege in the list */
 	if (priv_set->count==1) {
-		init_privilege(priv_set);	
+		gums_init_privilege(priv_set);	
 		return NT_STATUS_OK;
 	}
 
@@ -252,14 +252,14 @@ NTSTATUS remove_privilege(PRIVILEGE_SET *priv_set, TALLOC_CTX *ctx, LUID_ATTR se
 /****************************************************************************
  duplicates a privilege array
  ****************************************************************************/
-NTSTATUS dup_priv_set(PRIVILEGE_SET **new_priv_set, TALLOC_CTX *mem_ctx, PRIVILEGE_SET *priv_set)
+NTSTATUS gums_dup_priv_set(PRIVILEGE_SET **new_priv_set, TALLOC_CTX *mem_ctx, PRIVILEGE_SET *priv_set)
 {
 	LUID_ATTR *new_set;
 	LUID_ATTR *old_set;
 	int i;
 
 	*new_priv_set = (PRIVILEGE_SET *)talloc(mem_ctx, sizeof(PRIVILEGE_SET));
-	init_privilege(*new_priv_set);	
+	gums_init_privilege(*new_priv_set);	
 
 	/* special case if there are no privileges in the list */
 	if (priv_set->count == 0) {
@@ -301,6 +301,8 @@ NTSTATUS dup_priv_set(PRIVILEGE_SET **new_priv_set, TALLOC_CTX *mem_ctx, PRIVILE
 
 #define ALIAS_DEFAULT_SACL_SEC_ACE_FLAG (SEC_ACE_FLAG_FAILED_ACCESS | SEC_ACE_FLAG_SUCCESSFUL_ACCESS) /* 0xc0 */
 
+
+#if 0
 NTSTATUS create_builtin_alias_default_sec_desc(SEC_DESC **sec_desc, TALLOC_CTX *ctx)
 {
 	DOM_SID *world = &global_sid_World;
@@ -378,14 +380,14 @@ NTSTATUS gums_init_builtin_groups(void)
 		return NT_STATUS_NO_MEMORY;
 	}
 
-	/* Administrators */
+	/* Administrators * /
 
 	/* alloc group structure */
-	g_obj.data = (void *)talloc(g_obj.mem_ctx, sizeof(GUMS_OBJ_GROUP));
-	ALLOC_CHECK("gums_init_backend", g_obj.data, result, done);
+	g_obj.data.group = (GUMS_GROUP *)talloc(g_obj.mem_ctx, sizeof(GUMS_GROUP));
+	ALLOC_CHECK("gums_init_backend", g_obj.data.group, result, done);
 
 	/* make admins sid */
-	g_grp = (GUMS_GROUP *)g_obj.data;
+	g_grp = (GUMS_GROUP *)g_obj.data.group;
 	sid_copy(g_obj.sid, &global_sid_Builtin_Administrators);
 
 	/* make security descriptor */
@@ -604,4 +606,5 @@ done:
 	talloc_destroy(g_priv.mem_ctx);
 	return result;
 }
+#endif
 
diff --git a/source3/script/genstruct.pl b/source3/script/genstruct.pl
index 081b81f510..a6abd718c9 100755
--- a/source3/script/genstruct.pl
+++ b/source3/script/genstruct.pl
@@ -131,12 +131,13 @@ sub parse_elements($$)
 		print ", $name";
 	}
 
-	print OFILE "int gen_dump_struct_$name(struct parse_string *, const char *, unsigned);\n";
-	print OFILE "int gen_parse_struct_$name(char *, const char *);\n";
+	print OFILE "int gen_dump_struct_$name(TALLOC_CTX *mem_ctx, struct parse_string *, const char *, unsigned);\n";
+	print OFILE "int gen_parse_struct_$name(TALLOC_CTX *mem_ctx, char *, const char *);\n";
 
 	print OFILE "static const struct parse_struct pinfo_" . $name . "[] = {\n";
 
-	while ($elements =~ /^.*?([a-z].*?);\s*?(\S*?)\s*?\$(.*)/msi) {
+
+	while ($elements =~ /^.*?([a-z].*?);\s*?(\S*?)\s*?$(.*)/msi) {
 		my($element) = $1;
 		my($flags) = $2;
 		$elements = $3;
@@ -146,11 +147,11 @@ sub parse_elements($$)
 	print OFILE "{NULL, 0, 0, 0, 0, NULL, 0, NULL, NULL}};\n";
 
 	print OFILE "
-int gen_dump_struct_$name(struct parse_string *p, const char *ptr, unsigned indent) {
-	return gen_dump_struct(pinfo_$name, p, ptr, indent);
+int gen_dump_struct_$name(TALLOC_CTX *mem_ctx, struct parse_string *p, const char *ptr, unsigned indent) {
+	return gen_dump_struct(mem_ctx, pinfo_$name, p, ptr, indent);
 }
-int gen_parse_struct_$name(char *ptr, const char *str) {
-	return gen_parse_struct(pinfo_$name, ptr, str);
+int gen_parse_struct_$name(TALLOC_CTX *mem_ctx, char *ptr, const char *str) {
+	return gen_parse_struct(mem_ctx, pinfo_$name, ptr, str);
 }
 
 ";
-- 
cgit 


From 6a141b7963de61b1223031ea4012605aeca13bc7 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Fri, 7 Mar 2003 19:37:27 +0000
Subject: Patch from Michael Steffens. In his own words :
 ------------------------------------------------------------------------- I
 think there are basically two problem:

  1. Windows clients do not always send ACEs for SMB_ACL_USER_OBJ, SMB_ACL_GROUP_OBJ,
     and SMB_ACL_OTHER.
     The function ensure_canon_entry_valid() is prepared for that, but tries
     to "guess" values from group or other permissions, respectively, otherwise
     falling back to minimum r-- for the owner. Even if the owner had full
     permissions before setting ACL. This is the problem with W2k clients.

  2. Function set_nt_acl() always chowns *before* attempting to set POSIX ACLs.
     This is ok in a take-ownership situation, but must fail if the file is
     to be given away. This is the problem with XP clients, trying to transfer
     ownership of the original file to the temp file.

The problem with NT4 clients (no ACEs are transferred to the temp file, thus
are lost after moving the temp file to the original name) is a client problem.
It simply doesn't attempt to.

I have played around with that using posic_acls.c from 3.0 merged into 2.2.
As a result I can now present two patches, one for each branch. They
basically modify:

  1. Interpret missing SMB_ACL_USER_OBJ, SMB_ACL_GROUP_OBJ, or SMB_ACL_OTHER
     as "preserve current value" instead of attempting to build one ourself.
     The original code is still in, but only as fallback in case current values
     can't be retrieved.

  2. Rearrange set_nt_acl() such that chown is only done before setting
     ACLs if there is either no change of owning user, or change of owning
     user is towards the current user. Otherwise chown is done after setting
     ACLs.

It now seems to produce reasonable results. (Well, as far as it can. If
NT4 doesn't even try to transfer ACEs, only deliberate use of named default
ACEs and/or "force group" or the crystal ball can help :)
-------------------------------------------------------------------------
Jeremy.
(This used to be commit 8ec20cbae7ca7e685b1a4186d8482c7405915dc3)
---
 source3/smbd/posix_acls.c | 277 +++++++++++++++++++++++++++++++++-------------
 1 file changed, 199 insertions(+), 78 deletions(-)

(limited to 'source3')

diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 93a57925f1..2aea3a2c90 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -559,12 +559,18 @@ static BOOL uid_entry_in_group( canon_ace *uid_ace, canon_ace *group_ace )
 	extern DOM_SID global_sid_World;
 	fstring u_name;
 	fstring g_name;
+	extern struct current_user current_user;
 
 	/* "Everyone" always matches every uid. */
 
 	if (sid_equal(&group_ace->trustee, &global_sid_World))
 		return True;
 
+	/* Assume that the current user is in the current group (force group) */
+
+	if (uid_ace->unix_ug.uid == current_user.uid && group_ace->unix_ug.gid == current_user.gid)
+		return True;
+
 	fstrcpy(u_name, uidtoname(uid_ace->unix_ug.uid));
 	fstrcpy(g_name, gidtoname(group_ace->unix_ug.gid));
 
@@ -600,6 +606,14 @@ static BOOL ensure_canon_entry_valid(canon_ace **pp_ace,
 	BOOL got_other = False;
 	canon_ace *pace_other = NULL;
 	canon_ace *pace_group = NULL;
+	connection_struct *conn = fsp->conn;
+	SMB_ACL_T current_posix_acl = NULL;
+	mode_t current_user_perms = 0;
+	mode_t current_grp_perms = 0;
+	mode_t current_other_perms = 0;
+	BOOL got_current_user = False;
+	BOOL got_current_grp = False;
+	BOOL got_current_other = False;
 
 	for (pace = *pp_ace; pace; pace = pace->next) {
 		if (pace->type == SMB_ACL_USER_OBJ) {
@@ -632,6 +646,62 @@ static BOOL ensure_canon_entry_valid(canon_ace **pp_ace,
 		}
 	}
 
+	/*
+	 * When setting ACLs and missing one out of SMB_ACL_USER_OBJ,
+	 * SMB_ACL_GROUP_OBJ, SMB_ACL_OTHER, try to retrieve current
+	 * values. For user and other a simple vfs_stat would do, but
+	 * we would get mask instead of group. Let's do it via ACL.
+	 */
+
+	if (setting_acl && (!got_user || !got_grp || !got_other)) {
+
+		SMB_ACL_ENTRY_T entry;
+		int entry_id = SMB_ACL_FIRST_ENTRY;
+
+		if(fsp->is_directory || fsp->fd == -1) {
+			current_posix_acl = conn->vfs_ops.sys_acl_get_file(conn, fsp->fsp_name, SMB_ACL_TYPE_ACCESS);
+		} else {
+			current_posix_acl = conn->vfs_ops.sys_acl_get_fd(fsp, fsp->fd);
+		}
+
+		if (current_posix_acl) {
+			while (conn->vfs_ops.sys_acl_get_entry(conn, current_posix_acl, entry_id, &entry) == 1) {
+				SMB_ACL_TAG_T tagtype;
+				SMB_ACL_PERMSET_T permset;
+
+				/* get_next... */
+				if (entry_id == SMB_ACL_FIRST_ENTRY)
+					entry_id = SMB_ACL_NEXT_ENTRY;
+
+				/* Is this a MASK entry ? */
+				if (conn->vfs_ops.sys_acl_get_tag_type(conn, entry, &tagtype) == -1)
+					continue;
+
+				if (conn->vfs_ops.sys_acl_get_permset(conn, entry, &permset) == -1)
+					continue;
+
+				switch(tagtype) {
+					case SMB_ACL_USER_OBJ:
+						current_user_perms = convert_permset_to_mode_t(conn, permset);
+						got_current_user = True;
+						break;
+					case SMB_ACL_GROUP_OBJ:
+						current_grp_perms = convert_permset_to_mode_t(conn, permset);
+						got_current_grp = True;
+						break;
+					case SMB_ACL_OTHER:
+						current_other_perms = convert_permset_to_mode_t(conn, permset);
+						got_current_other = True;
+						break;
+				}
+			}
+			conn->vfs_ops.sys_acl_free_acl(conn, current_posix_acl);
+		} else {
+			DEBUG(10,("ensure_canon_entry_valid: failed to retrieve current ACL of %s\n",
+				fsp->fsp_name));
+		}
+	}
+
 	if (!got_user) {
 		if ((pace = (canon_ace *)malloc(sizeof(canon_ace))) == NULL) {
 			DEBUG(0,("ensure_canon_entry_valid: malloc fail.\n"));
@@ -646,13 +716,19 @@ static BOOL ensure_canon_entry_valid(canon_ace **pp_ace,
 		pace->attr = ALLOW_ACE;
 
 		if (setting_acl) {
-			/* If we only got an "everyone" perm, just use that. */
-			if (!got_grp && got_other)
-				pace->perms = pace_other->perms;
-			else if (got_grp && uid_entry_in_group(pace, pace_group))
-				pace->perms = pace_group->perms;
-			else
-				pace->perms = 0;
+			if (got_current_user) {
+				pace->perms = current_user_perms;
+			} else {
+				/* If we only got an "everyone" perm, just use that. */
+				if (!got_grp && got_other)
+					pace->perms = pace_other->perms;
+				else if (got_grp && uid_entry_in_group(pace, pace_group))
+					pace->perms = pace_group->perms;
+				else
+					pace->perms = 0;
+
+			}
+
 			apply_default_perms(fsp, pace, S_IRUSR);
 		} else {
 			pace->perms = unix_perms_to_acl_perms(pst->st_mode, S_IRUSR, S_IWUSR, S_IXUSR);
@@ -674,11 +750,15 @@ static BOOL ensure_canon_entry_valid(canon_ace **pp_ace,
 		pace->trustee = *pfile_grp_sid;
 		pace->attr = ALLOW_ACE;
 		if (setting_acl) {
-			/* If we only got an "everyone" perm, just use that. */
-			if (got_other)
-				pace->perms = pace_other->perms;
-			else
-				pace->perms = unix_perms_to_acl_perms(pst->st_mode, S_IRGRP, S_IWGRP, S_IXGRP);
+			if (got_current_grp) {
+				pace->perms = current_grp_perms;
+			} else {
+				/* If we only got an "everyone" perm, just use that. */
+				if (got_other)
+					pace->perms = pace_other->perms;
+				else
+					pace->perms = unix_perms_to_acl_perms(pst->st_mode, S_IRGRP, S_IWGRP, S_IXGRP);
+			}
 			apply_default_perms(fsp, pace, S_IRGRP);
 		} else {
 			pace->perms = unix_perms_to_acl_perms(pst->st_mode, S_IRGRP, S_IWGRP, S_IXGRP);
@@ -700,7 +780,10 @@ static BOOL ensure_canon_entry_valid(canon_ace **pp_ace,
 		pace->trustee = global_sid_World;
 		pace->attr = ALLOW_ACE;
 		if (setting_acl) {
-			pace->perms = 0;
+			if (got_current_other)
+				pace->perms = current_other_perms;
+			else
+				pace->perms = 0;
 			apply_default_perms(fsp, pace, S_IROTH);
 		} else
 			pace->perms = unix_perms_to_acl_perms(pst->st_mode, S_IROTH, S_IWOTH, S_IXOTH);
@@ -1734,6 +1817,11 @@ static BOOL set_canon_ace_list(files_struct *fsp, canon_ace *the_ace, BOOL defau
 	BOOL needs_mask = False;
 	mode_t mask_perms = 0;
 
+#if defined(POSIX_ACL_NEEDS_MASK)
+	/* HP-UX always wants to have a mask (called "class" there). */
+	needs_mask = True;
+#endif
+
 	if (the_acl == NULL) {
 
 		if (errno != ENOSYS) {
@@ -1748,6 +1836,13 @@ static BOOL set_canon_ace_list(files_struct *fsp, canon_ace *the_ace, BOOL defau
 		return False;
 	}
 
+	if( DEBUGLVL( 10 )) {
+		dbgtext("set_canon_ace_list: setting ACL:\n");
+		for (i = 0, p_ace = the_ace; p_ace; p_ace = p_ace->next, i++ ) {
+			print_canon_ace( p_ace, i);
+		}
+	}
+
 	for (i = 0, p_ace = the_ace; p_ace; p_ace = p_ace->next, i++ ) {
 		SMB_ACL_ENTRY_T the_entry;
 		SMB_ACL_PERMSET_T the_permset;
@@ -2460,6 +2555,8 @@ BOOL set_nt_acl(files_struct *fsp, uint32 security_info_sent, SEC_DESC *psd)
 	mode_t orig_mode = (mode_t)0;
 	uid_t orig_uid;
 	gid_t orig_gid;
+	BOOL need_chown = False;
+	extern struct current_user current_user;
 
 	DEBUG(10,("set_nt_acl: called for file %s\n", fsp->fsp_name ));
 
@@ -2496,7 +2593,15 @@ BOOL set_nt_acl(files_struct *fsp, uint32 security_info_sent, SEC_DESC *psd)
 	 * Do we need to chown ?
 	 */
 
-	if((user != (uid_t)-1 || grp != (uid_t)-1) && (orig_uid != user || orig_gid != grp)) {
+	need_chown = (user != (uid_t)-1 && orig_uid != user || grp != (uid_t)-1 && orig_gid != grp);
+
+	/*
+	 * Chown before setting ACL only if we don't change the user, or
+	 * if we change to the current user, but not if we want to give away
+	 * the file.
+	 */
+
+	if (need_chown && (user == (uid_t)-1 || user == current_user.uid)) {
 
 		DEBUG(3,("set_nt_acl: chown %s. uid = %u, gid = %u.\n",
 				fsp->fsp_name, (unsigned int)user, (unsigned int)grp ));
@@ -2533,6 +2638,9 @@ BOOL set_nt_acl(files_struct *fsp, uint32 security_info_sent, SEC_DESC *psd)
 		orig_mode = sbuf.st_mode;
 		orig_uid = sbuf.st_uid;
 		orig_gid = sbuf.st_gid;
+
+		/* We did it, don't try again */
+		need_chown = False;
 	}
 
 	create_file_sids(&sbuf, &file_owner_sid, &file_grp_sid);
@@ -2540,97 +2648,110 @@ BOOL set_nt_acl(files_struct *fsp, uint32 security_info_sent, SEC_DESC *psd)
 	acl_perms = unpack_canon_ace( fsp, &sbuf, &file_owner_sid, &file_grp_sid,
 									&file_ace_list, &dir_ace_list, security_info_sent, psd);
 
-	if ((file_ace_list == NULL) && (dir_ace_list == NULL)) {
-		/* W2K traverse DACL set - ignore. */
-		return True;
-    }
-
-	if (!acl_perms) {
-		DEBUG(3,("set_nt_acl: cannot set permissions\n"));
-		free_canon_ace_list(file_ace_list);
-		free_canon_ace_list(dir_ace_list); 
-		return False;
-	}
+	/* Ignore W2K traverse DACL set. */
+	if (file_ace_list || dir_ace_list) {
 
-	/*
-	 * Only change security if we got a DACL.
-	 */
-
-	if((security_info_sent & DACL_SECURITY_INFORMATION) && (psd->dacl != NULL)) {
-
-		BOOL acl_set_support = False;
-		BOOL ret = False;
+		if (!acl_perms) {
+			DEBUG(3,("set_nt_acl: cannot set permissions\n"));
+			free_canon_ace_list(file_ace_list);
+			free_canon_ace_list(dir_ace_list); 
+			return False;
+		}
 
 		/*
-		 * Try using the POSIX ACL set first. Fall back to chmod if
-		 * we have no ACL support on this filesystem.
+		 * Only change security if we got a DACL.
 		 */
 
-		if (acl_perms && file_ace_list) {
-			ret = set_canon_ace_list(fsp, file_ace_list, False, &acl_set_support);
-			if (acl_set_support && ret == False) {
-				DEBUG(3,("set_nt_acl: failed to set file acl on file %s (%s).\n", fsp->fsp_name, strerror(errno) ));
-				free_canon_ace_list(file_ace_list);
-				free_canon_ace_list(dir_ace_list); 
-				return False;
-			}
-		}
+		if((security_info_sent & DACL_SECURITY_INFORMATION) && (psd->dacl != NULL)) {
 
-		if (acl_perms && acl_set_support && fsp->is_directory) {
-			if (dir_ace_list) {
-				if (!set_canon_ace_list(fsp, dir_ace_list, True, &acl_set_support)) {
-					DEBUG(3,("set_nt_acl: failed to set default acl on directory %s (%s).\n", fsp->fsp_name, strerror(errno) ));
-					free_canon_ace_list(file_ace_list);
-					free_canon_ace_list(dir_ace_list); 
-					return False;
-				}
-			} else {
+			BOOL acl_set_support = False;
+			BOOL ret = False;
 
-				/*
-				 * No default ACL - delete one if it exists.
-				 */
+			/*
+			 * Try using the POSIX ACL set first. Fall back to chmod if
+			 * we have no ACL support on this filesystem.
+			 */
 
-				if (conn->vfs_ops.sys_acl_delete_def_file(conn, fsp->fsp_name) == -1) {
-					DEBUG(3,("set_nt_acl: sys_acl_delete_def_file failed (%s)\n", strerror(errno)));
+			if (acl_perms && file_ace_list) {
+				ret = set_canon_ace_list(fsp, file_ace_list, False, &acl_set_support);
+				if (acl_set_support && ret == False) {
+					DEBUG(3,("set_nt_acl: failed to set file acl on file %s (%s).\n", fsp->fsp_name, strerror(errno) ));
 					free_canon_ace_list(file_ace_list);
+					free_canon_ace_list(dir_ace_list); 
 					return False;
 				}
 			}
-		}
 
-		/*
-		 * If we cannot set using POSIX ACLs we fall back to checking if we need to chmod.
-		 */
+			if (acl_perms && acl_set_support && fsp->is_directory) {
+				if (dir_ace_list) {
+					if (!set_canon_ace_list(fsp, dir_ace_list, True, &acl_set_support)) {
+						DEBUG(3,("set_nt_acl: failed to set default acl on directory %s (%s).\n", fsp->fsp_name, strerror(errno) ));
+						free_canon_ace_list(file_ace_list);
+						free_canon_ace_list(dir_ace_list); 
+						return False;
+					}
+				} else {
 
-		if(!acl_set_support && acl_perms) {
-			mode_t posix_perms;
+					/*
+					 * No default ACL - delete one if it exists.
+					 */
 
-			if (!convert_canon_ace_to_posix_perms( fsp, file_ace_list, &posix_perms)) {
-				free_canon_ace_list(file_ace_list);
-				free_canon_ace_list(dir_ace_list);
-				DEBUG(3,("set_nt_acl: failed to convert file acl to posix permissions for file %s.\n",
-					fsp->fsp_name ));
-				return False;
+					if (conn->vfs_ops.sys_acl_delete_def_file(conn, fsp->fsp_name) == -1) {
+						DEBUG(3,("set_nt_acl: sys_acl_delete_def_file failed (%s)\n", strerror(errno)));
+						free_canon_ace_list(file_ace_list);
+						free_canon_ace_list(dir_ace_list);
+						return False;
+					}
+				}
 			}
 
-			if (orig_mode != posix_perms) {
+			/*
+			 * If we cannot set using POSIX ACLs we fall back to checking if we need to chmod.
+			 */
 
-				DEBUG(3,("set_nt_acl: chmod %s. perms = 0%o.\n",
-					fsp->fsp_name, (unsigned int)posix_perms ));
+			if(!acl_set_support && acl_perms) {
+				mode_t posix_perms;
 
-				if(conn->vfs_ops.chmod(conn,fsp->fsp_name, posix_perms) == -1) {
-					DEBUG(3,("set_nt_acl: chmod %s, 0%o failed. Error = %s.\n",
-							fsp->fsp_name, (unsigned int)posix_perms, strerror(errno) ));
+				if (!convert_canon_ace_to_posix_perms( fsp, file_ace_list, &posix_perms)) {
 					free_canon_ace_list(file_ace_list);
 					free_canon_ace_list(dir_ace_list);
+					DEBUG(3,("set_nt_acl: failed to convert file acl to posix permissions for file %s.\n",
+						fsp->fsp_name ));
 					return False;
 				}
+
+				if (orig_mode != posix_perms) {
+
+					DEBUG(3,("set_nt_acl: chmod %s. perms = 0%o.\n",
+						fsp->fsp_name, (unsigned int)posix_perms ));
+
+					if(conn->vfs_ops.chmod(conn,fsp->fsp_name, posix_perms) == -1) {
+						DEBUG(3,("set_nt_acl: chmod %s, 0%o failed. Error = %s.\n",
+								fsp->fsp_name, (unsigned int)posix_perms, strerror(errno) ));
+						free_canon_ace_list(file_ace_list);
+						free_canon_ace_list(dir_ace_list);
+						return False;
+					}
+				}
 			}
 		}
+
+		free_canon_ace_list(file_ace_list);
+		free_canon_ace_list(dir_ace_list); 
 	}
 
-	free_canon_ace_list(file_ace_list);
-	free_canon_ace_list(dir_ace_list); 
+	/* Any chown pending? */
+	if (need_chown) {
+
+		DEBUG(3,("set_nt_acl: chown %s. uid = %u, gid = %u.\n",
+			fsp->fsp_name, (unsigned int)user, (unsigned int)grp ));
+
+		if(try_chown( fsp->conn, fsp->fsp_name, user, grp) == -1) {
+			DEBUG(3,("set_nt_acl: chown %s, %u, %u failed. Error = %s.\n",
+				fsp->fsp_name, (unsigned int)user, (unsigned int)grp, strerror(errno) ));
+			return False;
+		}
+	}
 
 	return True;
 }
-- 
cgit 


From 24c95539d593ccb703a4c381060a0bcad5052458 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Fri, 7 Mar 2003 19:46:51 +0000
Subject: Missed parentheses around complex logic. Jeremy. (This used to be
 commit e81427c2d69be166afad94bc083e750e8f48fba7)

---
 source3/smbd/posix_acls.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 2aea3a2c90..01e3c31ba7 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -2593,7 +2593,8 @@ BOOL set_nt_acl(files_struct *fsp, uint32 security_info_sent, SEC_DESC *psd)
 	 * Do we need to chown ?
 	 */
 
-	need_chown = (user != (uid_t)-1 && orig_uid != user || grp != (uid_t)-1 && orig_gid != grp);
+	if (((user != (uid_t)-1) && (orig_uid != user)) || (( grp != (uid_t)-1) && (orig_gid != grp)))
+		need_chown = True;
 
 	/*
 	 * Chown before setting ACL only if we don't change the user, or
-- 
cgit 


From f944fd6975a598a154a943867c94f3dabc7a1139 Mon Sep 17 00:00:00 2001
From: Steve French <sfrench@samba.org>
Date: Fri, 7 Mar 2003 22:29:14 +0000
Subject: Add early prototype of cifs mount helper for Linux (This used to be
 commit b20bcf8d336b4b2079eb42342a96d1fe714709de)

---
 source3/client/mount.cifs.c | 389 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 389 insertions(+)
 create mode 100755 source3/client/mount.cifs.c

(limited to 'source3')

diff --git a/source3/client/mount.cifs.c b/source3/client/mount.cifs.c
new file mode 100755
index 0000000000..5b19752f8b
--- /dev/null
+++ b/source3/client/mount.cifs.c
@@ -0,0 +1,389 @@
+#define _GNU_SOURCE
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <pwd.h>
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <sys/stat.h>
+#include <sys/utsname.h>
+#include <sys/socket.h>
+#include <arpa/inet.h>
+#include <getopt.h>
+#include <errno.h>
+#include <netdb.h>
+#include <string.h>
+
+#define MOUNT_CIFS_VERSION "1"
+
+extern char *getusername(void);
+
+char * thisprogram;
+int verboseflag = 0;
+static int got_password = 0;
+static int got_user = 0;
+static char * user_name = NULL;
+char * mountpassword = NULL;
+
+
+void mount_cifs_usage()
+{
+	printf("\nUsage:  %s remotetarget dir\n", thisprogram);
+	printf("\nMount the remotetarget, specified as either a UNC name or ");
+	printf(" CIFS URL, to the local directory, dir.\n");
+
+	return;
+}
+
+/* caller frees username if necessary */
+char * getusername() {
+	char *username = NULL;
+	struct passwd *password = getpwuid(getuid());
+
+	if (password) {
+		username = password->pw_name;
+	}
+	return username;
+}
+
+char * parse_cifs_url(unc_name)
+{
+	printf("\ncifs url %s\n",unc_name);
+}
+
+char * parse_options(char * options)
+{
+	/* BB add missing code BB */
+}
+
+/* Note that caller frees the returned buffer if necessary */
+char * parse_server(char * unc_name)
+{
+	int length = strnlen(unc_name,1024);
+	char * share;
+	char * ipaddress_string = NULL;
+	struct hostent * host_entry;
+	struct in_addr server_ipaddr;
+	int rc,j;
+	char temp[64];
+
+
+	if(length > 1023) {
+		printf("mount error: UNC name too long");
+		return 0;
+	}
+	if (strncasecmp("cifs://",unc_name,7) == 0)
+		return parse_cifs_url(unc_name+7);
+	if (strncasecmp("smb://",unc_name,6) == 0) {
+		return parse_cifs_url(unc_name+6);
+	}
+
+	if(length < 3) {
+		/* BB add code to find DFS root here */
+		printf("\nMounting the DFS root for domain not implemented yet");
+		return 0;
+	} else {
+		/* BB add support for \\\\ not just // */
+		if(strncmp(unc_name,"//",2) && strncmp(unc_name,"\\\\",2)) {
+			printf("mount error: improperly formatted UNC name.");
+			printf(" %s does not begin with \\\\ or //\n",unc_name);
+			return 0;
+		} else {
+			unc_name += 2;
+			if (share = strchr(unc_name, '/')) {
+				*share = 0;  /* temporarily terminate the string */
+				share += 1;
+				host_entry = gethostbyname(unc_name);
+				*(share - 1) = '\\'; /* put the slash back */
+/*				rc = getipnodebyname(unc_name, AF_INET, AT_ADDRCONFIG ,&rc);*/
+				if(host_entry == NULL) {
+					printf("mount error: could not find target server. TCP name %s not found ", unc_name);
+					printf(" rc = %d\n",rc);
+					return 0;
+				}
+				else {
+					printf("Target server %s %x found\n",host_entry->h_name,host_entry->h_addr);	/* BB removeme */
+					/* BB should we pass an alternate version of the share name as Unicode */
+					/* BB what about ipv6? BB */
+					/* BB add retries with alternate servers in list */
+
+					memcpy(&server_ipaddr.s_addr, host_entry->h_addr, 4);
+
+					ipaddress_string = inet_ntoa(server_ipaddr);                                                                                     
+					if(ipaddress_string == NULL) {
+						printf("mount error: could not get valid ip address for target server\n");
+						return 0;
+					}
+					return ipaddress_string; 
+				}
+			} else {
+				/* BB add code to find DFS root (send null path on get DFS Referral to specified server here */
+				printf("Mounting the DFS root for a particular server not implemented yet\n");
+				return 0;
+			}
+		}
+	}
+}
+
+static struct option longopts[] = {
+	{ "all", 0, 0, 'a' },
+	{ "help", 0, 0, 'h' },
+	{ "read-only", 0, 0, 'r' },
+	{ "ro", 0, 0, 'r' },
+	{ "verbose", 0, 0, 'v' },
+	{ "version", 0, 0, 'V' },
+	{ "read-write", 0, 0, 'w' },
+	{ "rw", 0, 0, 'w' },
+	{ "options", 1, 0, 'o' },
+	{ "types", 1, 0, 't' },
+	{ "replace", 0, 0, 129 },
+	{ "after", 0, 0, 130 },
+	{ "before", 0, 0, 131 },
+	{ "over", 0, 0, 132 },
+	{ "move", 0, 0, 133 },
+	{ "rsize",1, 0, 136 },
+	{ "wsize",1, 0, 137 },
+	{ "uid", 1, 0, 138},
+	{ "gid", 1, 0, 139},
+	{ "uuid",1,0,'U' },
+	{ "user",1,0,140},
+	{ "username",1,0,140},
+	{ "dom",1,0,141},
+	{ "domain",1,0,141},
+	{ "password",1,0,142},
+	{ NULL, 0, 0, 0 }
+};
+
+int main(int argc, char ** argv)
+{
+	int c;
+	int flags = MS_MANDLOCK | MS_MGC_VAL;
+	char * orgoptions = NULL;
+	char * options;
+	char * share_name;
+	char * domain_name = NULL;
+	char * ipaddr;
+	char * mount_point;
+	char * uuid = NULL;
+	int rc,i;
+	int rsize = 0;
+	int wsize = 0;
+	int nomtab = 0;
+	int uid = 0;
+	int gid = 0;
+	int optlen = 0;
+	struct stat statbuf;
+	struct utsname sysinfo;
+
+	/* setlocale(LC_ALL, "");
+	bindtextdomain(PACKAGE, LOCALEDIR);
+	textdomain(PACKAGE); */
+
+	if(argc && argv) {
+		thisprogram = argv[0];
+	}
+	if(thisprogram == NULL)
+		thisprogram = "mount.cifs";
+
+	uname(&sysinfo);
+#ifdef _GNU_SOURCE
+	printf(" node: %s machine: %s\n", sysinfo.nodename,sysinfo.machine);
+#endif
+	mount_cifs_usage();
+	share_name = argv[1];
+	mount_point = argv[2];
+	/* add sharename in opts string as unc= parm */
+
+	while ((c = getopt_long (argc, argv, "afFhilL:no:O:rsU:vVwt:",
+			 longopts, NULL)) != -1) {
+		switch (c) {
+/*	case 'a':	       
+		++mount_all;
+		break;
+	case 'f':	       
+		++fake;
+		break;
+	case 'F':
+		++optfork;
+		break; */
+		case 'h':	 /* help */
+			mount_cifs_usage ();
+			break;
+/*	case 'i':
+		external_allowed = 0;
+		break;
+	case 'l':
+		list_with_volumelabel = 1;
+		break;
+	case 'L':
+		volumelabel = optarg;
+		break; */
+	case 'n':
+		++nomtab;
+		break;
+	case 'o':
+		if (orgoptions) {
+			orgoptions = strcat(orgoptions, ",");
+			orgoptions = strcat(orgoptions,optarg);
+		} else
+			orgoptions = strdup(optarg);
+		break;
+
+/*	case 'O':
+		if (test_opts)
+			test_opts = xstrconcat3(test_opts, ",", optarg);
+		else
+			test_opts = xstrdup(optarg);
+		break;*/
+		case 'r':  /* mount readonly */
+			flags |= MS_RDONLY;;
+			break;
+		case 'U':
+			uuid = optarg;
+			break;
+		case 'v':
+			++verboseflag;
+			break;
+/*	case 'V':	   
+		printf ("mount: %s\n", version);
+		exit (0);*/
+		case 'w':
+			flags &= ~MS_RDONLY;;
+			break;
+/*	case 0:
+		break;
+
+	case 128: 
+		mounttype = MS_BIND;
+		break;
+	case 129: 
+		mounttype = MS_REPLACE;
+		break;
+	case 130: 
+		mounttype = MS_AFTER;
+		break;
+	case 131: 
+		mounttype = MS_BEFORE;
+		break;
+	case 132: 
+		mounttype = MS_OVER;
+		break;
+	case 133: 
+		mounttype = MS_MOVE;
+		break;
+	case 135:
+		mounttype = (MS_BIND | MS_REC);
+		break; */
+		case 136:
+			rsize = atoi(optarg) ;
+			break;
+		case 137:
+			wsize = atoi(optarg);
+			break;
+		case 138:
+			uid = atoi(optarg);
+			break;
+		case 139:
+			gid = atoi(optarg);
+			break;
+		case 140:
+			got_user = 1;
+			user_name = optarg;
+			break;
+		case 141:
+			 domain_name = optarg;
+			break;
+		case 142:
+			got_password = 1;
+			 mountpassword = optarg;
+			break;
+		case '?':
+		default:
+			mount_cifs_usage ();
+		}
+	}
+
+	for(i = 0;i < argc;i++)  /* BB remove */
+		printf("\narg %d is %s",i,argv[i]);  /* BB remove */
+	printf("\n");  /* BB removeme */
+
+	/* canonicalize the path in argv[1]? */
+
+	if(stat (mount_point, &statbuf)) {
+		printf("mount error: mount point %s does not exist\n",mount_point);
+		return -1;
+	}
+	if (S_ISDIR(statbuf.st_mode) == 0) {
+		printf("mount error: mount point %s is not a directory\n",mount_point);
+		return -1;
+	}
+
+	if(geteuid()) {
+		printf("mount error: permission denied, not superuser and cifs.mount not installed SUID\n"); 
+		return -1;
+	}
+
+	ipaddr = parse_server(share_name);
+/*	if(share_name == NULL)
+		return 1; */
+	parse_options(orgoptions);
+
+	if(got_user == 0)
+		user_name = getusername();
+       
+/*	check username for user%password format */
+
+	if(got_password == 0) {
+		if (getenv("PASSWD")) {
+			mountpassword = malloc(33);
+			if(mountpassword) {
+				strncpy(mountpassword,getenv("PASSWD"),32);
+				got_password = 1;
+			}
+/*		} else if (getenv("PASSWD_FD") || getenv("PASSWD_FILE")) {
+			get_password_file();
+			got_password = 1;*/ /* BB add missing function */
+		} else {
+			mountpassword = getpass("Password: "); /* BB obsolete */
+			got_password = 1;
+		}
+	}
+
+	/* launch daemon (handles dfs name resolution and credential change) */
+	if(orgoptions)
+		optlen = strlen(orgoptions);
+	else
+		optlen = 0;
+	options = malloc(optlen + 25 + strlen(share_name) + strlen(user_name)
+			+ strlen(ipaddr) + 1);
+	strcpy(options,"unc=");
+	strcat(options,share_name);
+	strncat(options,",ip=",4);
+	strcat(options,ipaddr);
+	strncat(options,",user=",6);
+	strcat(options,user_name);
+	strncat(options,",pass=",6);
+	strcat(options,mountpassword);
+	strncat(options,",ver=",5);
+	strcat(options,MOUNT_CIFS_VERSION);
+	if(optlen)
+		strcat(options,orgoptions);
+	printf("\noptions %s \n",options);
+	if(mount(share_name, mount_point, "cifs", flags, options)) {
+	/* remember to kill daemon on error */
+		switch (errno) {
+		case 0:
+			printf(" success\n"); /* BB removeme */
+			return 0;
+		case ENODEV:
+			printf("mount error: cifs filesystem not supported by the system\n");
+			break;
+		default:
+			printf("mount error %d = %s",errno,strerror(errno));
+		}
+		printf("\nRefer to the mount.cifs(8) manual page (e.g.man mount.cifs)\n");
+		return -1;
+	} else
+		printf(" mount succeeded\n"); /* BB removeme */
+}
+
-- 
cgit 


From eed8772da109ecc6e9f35fd27b719795b28a47fb Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Fri, 7 Mar 2003 23:34:55 +0000
Subject: Use ERROR_NT, not ERROR_DOS as Andrew Bartlett pointed out. Jeremy.
 (This used to be commit c0930e6d15eb68f06453d9b67142ccd7fb1370a0)

---
 source3/smbd/ipc.c     | 2 +-
 source3/smbd/nttrans.c | 2 +-
 source3/smbd/trans2.c  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'source3')

diff --git a/source3/smbd/ipc.c b/source3/smbd/ipc.c
index 67c5da01f3..da30ec7440 100644
--- a/source3/smbd/ipc.c
+++ b/source3/smbd/ipc.c
@@ -566,5 +566,5 @@ int reply_trans(connection_struct *conn, char *inbuf,char *outbuf, int size, int
 	SAFE_FREE(params);
 	SAFE_FREE(setup);
 	END_PROFILE(SMBtrans);
-	return ERROR_DOS(ERRDOS,ERRinvalidparam);
+	return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
 }
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index 375c6c44f6..e6884cbb1e 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -1990,5 +1990,5 @@ due to being in oplock break state.\n", (unsigned int)function_code ));
 	SAFE_FREE(data);
 	SAFE_FREE(setup);
 	END_PROFILE(SMBnttrans);
-	return ERROR_DOS(ERRDOS,ERRinvalidparam);
+	return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
 }
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index d57a29ff77..bea09e9e37 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -3372,5 +3372,5 @@ int reply_trans2(connection_struct *conn,
 	SAFE_FREE(params);
 	SAFE_FREE(data);
 	END_PROFILE(SMBtrans2);
-	return ERROR_DOS(ERRDOS,ERRinvalidparam);
+	return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
 }
-- 
cgit 


From 64e49aa3c5392fd0ba5fc33ea21eff87c548995e Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Fri, 7 Mar 2003 23:47:59 +0000
Subject: initial work for the new idmpa interface (This used to be commit
 8338e74ac4e5f31150c96f459a67e52090dc6013)

---
 source3/include/idmap.h |  49 ++++++++++++++++
 source3/sam/idmap.c     | 145 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 194 insertions(+)
 create mode 100644 source3/include/idmap.h
 create mode 100644 source3/sam/idmap.c

(limited to 'source3')

diff --git a/source3/include/idmap.h b/source3/include/idmap.h
new file mode 100644
index 0000000000..0d358d3fbe
--- /dev/null
+++ b/source3/include/idmap.h
@@ -0,0 +1,49 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   Idmap headers
+
+   Copyright (C) Anthony Liguori 2003
+   Copyright (C) Simo Sorce 2003
+   
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+   
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+   
+   You should have received a copy of the GNU Library General Public
+   License along with this library; if not, write to the
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA  02111-1307, USA.   
+*/
+
+#define ID_USERID	1
+#define ID_GROUPID	2
+#define ID_OTHER	3
+
+typedef union id_t {
+	uid_t uid;
+	gid_t gid;
+} id_t;
+
+/* Filled out by IDMAP backends */
+struct idmap_methods {
+
+	/* Called when backend is first loaded */
+	NTSTATUS (*init)(void);
+
+	NTSTATUS (*get_sid_from_id)(DOM_SID *sid, id_t id, int id_type);
+	NTSTATUS (*get_id_from_sid)(id_t *id, int *id_type, DOM_SID *sid);
+
+	/* Called when backend is unloaded */
+	NTSTATUS (*close)(void);
+
+	/* Called to dump backend status */
+	void (*status)(void);
+};
+
diff --git a/source3/sam/idmap.c b/source3/sam/idmap.c
new file mode 100644
index 0000000000..617cbc9d28
--- /dev/null
+++ b/source3/sam/idmap.c
@@ -0,0 +1,145 @@
+/* 
+   Unix SMB/CIFS implementation.
+   Winbind ID Mapping
+   Copyright (C) Tim Potter 2000
+   Copyright (C) Anthony Liguori <aliguor@us.ibm.com>	2003
+   Copyright (C) Simo Sorce 2003
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "includes.h"
+#include "idmap.h"
+
+static struct {
+
+	const char *name;
+	/* Function to create a member of the idmap_methods list */
+	NTSTATUS (*reg_meth)(struct idmap_methods **methods);
+	struct idmap_methods *methods;
+} builtin_idmap_functions[] = {
+	{ "tdb", idmap_reg_tdb, NULL },
+	/* { "ldap", idmap_reg_ldap, NULL },*/
+	{ NULL, NULL, NULL }
+};
+
+/* singleton pattern: uberlazy evaluation */
+static struct idmap_methods *impl;
+
+static struct idmap_methods *get_impl(const char *name)
+{
+	int i = 0;
+	struct idmap_methods *ret = NULL;
+
+	while (builtin_idmap_functions[i].name && strcmp(builtin_idmap_functions[i].name, name)) {
+		i++;
+	}
+
+	if (builtin_idmap_functions[i].name) {
+
+		if (!builtin_idmap_functions[i].methods) {
+			builtin_idmap_functions[i].reg_meth(&builtin_idmap_functions[i].methods);
+		}
+
+		ret = builtin_idmap_functions[i].methods;
+	}
+
+	return ret;
+}
+
+/* Load idmap backend functions */
+BOOL set_impl(void)
+{
+	if (!impl) {
+		DEBUG(3, ("idmap_init: using '%s' as backend\n", lp_idmap_backend()));
+		
+		impl = get_impl(lp_idmap_backend());
+		if (!impl) {
+			DEBUG(0, ("set_impl: could not load backend '%s'\n", lp_idmap_backend()));
+			return False;
+		}
+	}
+	return True;
+}
+
+/* Initialize backend */
+NTSTATUS idmap_init(void)
+{
+	NTSTATUS ret;
+
+	if (!set_impl()) return NT_STATUS_UNSUCCESSFUL;
+
+	ret = impl->init();
+	if (NT_STATUS_IS_ERR(ret)) {
+		DEBUG(3, ("idmap_init: init failed!\n"));
+	}
+
+	return ret;
+}
+
+/* Get ID from SID */
+NTSTATUS idmap_get_id_from_sid(id_t *id, int *id_type, DOM_SID *sid)
+{
+	NTSTATUS ret;
+
+	if (!set_impl()) return NT_STATUS_UNSUCCESSFUL;
+
+	ret = impl->get_id_from_sid(id, id_type, sid);
+	if (NT_STATUS_IS_ERR(ret)) {
+		DEBUG(3, ("idmap_get_id_from_sid: error fetching id!\n"));
+	}
+
+	return ret;
+}
+
+/* Get SID from ID */
+NTSTATUS idmap_get_sid_from_id(DOM_SID *sid, id_t id, int id_type)
+{
+	NTSTATUS ret;
+
+	if (!set_impl()) return NT_STATUS_UNSUCCESSFUL;
+
+	ret = impl->get_sid_from_id(sid, id, id_type);
+	if (NT_STATUS_IS_ERR(ret)) {
+		DEBUG(3, ("idmap_get_sid_from_id: error fetching sid!\n"));
+	}
+
+	return ret;
+}
+
+
+/* Close backend */
+NTSTATUS idmap_close(void)
+{
+	NTSTATUS ret;
+
+	if (!set_impl()) return NT_STATUS_UNSUCCESSFUL;
+
+	ret = impl->close();
+	if (NT_STATUS_IS_ERR(ret)) {
+		DEBUG(3, ("idmap_close: close failed!\n"));
+	}
+
+	return ret;
+}
+
+/* Dump backend status */
+void idmap_status(void)
+{
+	if (!set_impl()) return;
+
+	impl->status();
+}
+
-- 
cgit 


From 4a1d2ddd48c1c06b1874ff473275d22a0038c2c8 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Sat, 8 Mar 2003 00:49:18 +0000
Subject: some more code (not tested yet) (This used to be commit
 0d6cec90c13731827abcbc61974efc993e794003)

---
 source3/include/debug.h |   1 +
 source3/include/idmap.h |   1 +
 source3/sam/idmap.c     |   3 +
 source3/sam/idmap_tdb.c | 469 ++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 474 insertions(+)
 create mode 100644 source3/sam/idmap_tdb.c

(limited to 'source3')

diff --git a/source3/include/debug.h b/source3/include/debug.h
index d4f45539f4..70f9f7706d 100644
--- a/source3/include/debug.h
+++ b/source3/include/debug.h
@@ -88,6 +88,7 @@ extern int DEBUGLEVEL;
 #define DBGC_AUTH		10
 #define DBGC_WINBIND		11
 #define DBGC_VFS		12
+#define DBGC_IDMAP		13
 
 /* So you can define DBGC_CLASS before including debug.h */
 #ifndef DBGC_CLASS
diff --git a/source3/include/idmap.h b/source3/include/idmap.h
index 0d358d3fbe..5a1f4fafc3 100644
--- a/source3/include/idmap.h
+++ b/source3/include/idmap.h
@@ -22,6 +22,7 @@
    Boston, MA  02111-1307, USA.   
 */
 
+#define	ID_EMPTY	0
 #define ID_USERID	1
 #define ID_GROUPID	2
 #define ID_OTHER	3
diff --git a/source3/sam/idmap.c b/source3/sam/idmap.c
index 617cbc9d28..96638b4723 100644
--- a/source3/sam/idmap.c
+++ b/source3/sam/idmap.c
@@ -23,6 +23,9 @@
 #include "includes.h"
 #include "idmap.h"
 
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_IDMAP
+
 static struct {
 
 	const char *name;
diff --git a/source3/sam/idmap_tdb.c b/source3/sam/idmap_tdb.c
new file mode 100644
index 0000000000..3aaab3ac42
--- /dev/null
+++ b/source3/sam/idmap_tdb.c
@@ -0,0 +1,469 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   idmap TDB backend
+
+   Copyright (C) Tim Potter 2000
+   Copyright (C) Anthony Liguori 2003
+   Copyright (C) Simo Sorce 2003
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "includes.h"
+#include "idmap.h"
+
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_IDMAP
+
+/* High water mark keys */
+#define HWM_GROUP  "GROUP HWM"
+#define HWM_USER   "USER HWM"
+
+/* idmap version determines auto-conversion */
+#define IDMAP_VERSION 2
+
+/* Globals */
+static TDB_CONTEXT *idmap_tdb;
+
+/* FIXME: let handle conversions when all things work ok.
+	  I think it is better to handle the conversion at
+	  upgrade time and leave the old db intact.
+	  That would also make easier to go back to 2.2 if needed
+	  ---SSS */
+#if 0
+
+/* convert one record to the new format */
+static int tdb_convert_fn(TDB_CONTEXT * tdb, TDB_DATA key, TDB_DATA data,
+			  void *ignored)
+{
+	struct winbindd_domain *domain;
+	char *p;
+	DOM_SID sid;
+	uint32 rid;
+	fstring keystr;
+	fstring dom_name;
+	TDB_DATA key2;
+
+	p = strchr(key.dptr, '/');
+	if (!p)
+		return 0;
+
+	*p = 0;
+	fstrcpy(dom_name, key.dptr);
+	*p++ = '/';
+
+	domain = find_domain_from_name(dom_name);
+	if (!domain) {
+		/* We must delete the old record. */
+		DEBUG(0,
+		      ("winbindd: tdb_convert_fn : Unable to find domain %s\n",
+		       dom_name));
+		DEBUG(0,
+		      ("winbindd: tdb_convert_fn : deleting record %s\n",
+		       key.dptr));
+		tdb_delete(idmap_tdb, key);
+		return 0;
+	}
+
+	rid = atoi(p);
+
+	sid_copy(&sid, &domain->sid);
+	sid_append_rid(&sid, rid);
+
+	sid_to_string(keystr, &sid);
+	key2.dptr = keystr;
+	key2.dsize = strlen(keystr) + 1;
+
+	if (tdb_store(idmap_tdb, key2, data, TDB_INSERT) != 0) {
+		/* not good! */
+		DEBUG(0,
+		      ("winbindd: tdb_convert_fn : Unable to update record %s\n",
+		       key2.dptr));
+		DEBUG(0,
+		      ("winbindd: tdb_convert_fn : conversion failed - idmap corrupt ?\n"));
+		return -1;
+	}
+
+	if (tdb_store(idmap_tdb, data, key2, TDB_REPLACE) != 0) {
+		/* not good! */
+		DEBUG(0,
+		      ("winbindd: tdb_convert_fn : Unable to update record %s\n",
+		       data.dptr));
+		DEBUG(0,
+		      ("winbindd: tdb_convert_fn : conversion failed - idmap corrupt ?\n"));
+		return -1;
+	}
+
+	tdb_delete(idmap_tdb, key);
+
+	return 0;
+}
+
+/*****************************************************************************
+ Convert the idmap database from an older version.
+*****************************************************************************/
+static BOOL tdb_idmap_convert(const char *idmap_name)
+{
+	int32 vers = tdb_fetch_int32(idmap_tdb, "IDMAP_VERSION");
+	BOOL bigendianheader =
+	    (idmap_tdb->flags & TDB_BIGENDIAN) ? True : False;
+
+	if (vers == IDMAP_VERSION)
+		return True;
+
+	if (((vers == -1) && bigendianheader)
+	    || (IREV(vers) == IDMAP_VERSION)) {
+		/* Arrggghh ! Bytereversed or old big-endian - make order independent ! */
+		/*
+		 * high and low records were created on a
+		 * big endian machine and will need byte-reversing.
+		 */
+
+		int32 wm;
+
+		wm = tdb_fetch_int32(idmap_tdb, HWM_USER);
+
+		if (wm != -1) {
+			wm = IREV(wm);
+		} else
+			wm = server_state.uid_low;
+
+		if (tdb_store_int32(idmap_tdb, HWM_USER, wm) == -1) {
+			DEBUG(0,
+			      ("tdb_idmap_convert: Unable to byteswap user hwm in idmap database\n"));
+			return False;
+		}
+
+		wm = tdb_fetch_int32(idmap_tdb, HWM_GROUP);
+		if (wm != -1) {
+			wm = IREV(wm);
+		} else
+			wm = server_state.gid_low;
+
+		if (tdb_store_int32(idmap_tdb, HWM_GROUP, wm) == -1) {
+			DEBUG(0,
+			      ("tdb_idmap_convert: Unable to byteswap group hwm in idmap database\n"));
+			return False;
+		}
+	}
+
+	/* the old format stored as DOMAIN/rid - now we store the SID direct */
+	tdb_traverse(idmap_tdb, tdb_convert_fn, NULL);
+
+	if (tdb_store_int32(idmap_tdb, "IDMAP_VERSION", IDMAP_VERSION) ==
+	    -1) {
+		DEBUG(0,
+		      ("tdb_idmap_convert: Unable to byteswap group hwm in idmap database\n"));
+		return False;
+	}
+
+	return True;
+}
+#endif
+
+/* Allocate either a user or group id from the pool */
+static NTSTATUS tdb_allocate_id(id_t *id, int id_type)
+{
+	int hwm;
+
+	if (!id) return NT_STATUS_INVALID_PARAMETER;
+
+	/* Get current high water mark */
+	switch (id_type) {
+		case ID_USERID:
+			if ((hwm = tdb_fetch_int32(idmap_tdb, HWM_USER)) == -1) {
+				return NT_STATUS_INTERNAL_DB_ERROR;
+			}
+
+			if (hwm > server_state.uid_high) {
+				DEBUG(0, ("idmap Fatal Error: UID range full!!\n"));
+				return NT_STATUS_UNSUCCESSFUL;
+			}
+
+			*id.uid = hwm++;
+
+			/* Store new high water mark */
+			tdb_store_int32(idmap_tdb, HWM_USER, hwm);
+			break;
+		case ID_GROUPID:
+			if ((hwm = tdb_fetch_int32(idmap_tdb, HWM_GROUP)) == -1) {
+				return NT_STATUS_INTERNAL_DB_ERROR;
+			}
+
+			if (hwm > server_state.gid_high) {
+				DEBUG(0, ("idmap Fatal Error: GID range full!!\n"));
+				return NT_STATUS_UNSUCCESSFUL;
+			}
+
+			*id.gid = hwm++;
+			
+			/* Store new high water mark */
+			tdb_store_int32(idmap_tdb, HWM_GROUP, hwm);
+			break;
+		default:
+			return NT_STATUS_INVALID_PARAMETER;
+	}
+
+	return NT_STATUS_OK;
+}
+
+/* Get a sid from an id */
+static NTSTATUS tdb_get_sid_from_id(DOM_SID *sid, id_t id, int id_type)
+{
+	TDB_DATA key, data;
+	fstring keystr;
+	NTSTATUS ret = NT_STATUS_UNSUCCESSFUL;
+
+	if (!sid) return NT_STATUS_INVALID_PARAMETER;
+
+	switch (id_type) {
+		case ID_USERID:
+		slprintf(keystr, sizeof(keystr), "UID %d", id.uid);
+		break;
+		case ID_GROUPID:
+		slprintf(keystr, sizeof(keystr), "GID %d", id.gid);
+		break;
+		default:
+		return NT_STATUS_UNSUCCESSFUL;
+	}
+
+	key.dptr = keystr;
+	key.dsize = strlen(keystr) + 1;
+
+	data = tdb_fetch(idmap_tdb, key);
+
+	if (data.dptr) {
+		if (string_to_sid(sid, data.dptr)) {
+			ret = NT_STATUS_OK;
+		}
+		SAFE_FREE(data.dptr);
+	}
+
+	return ret;
+}
+
+/* Get an id from a sid */
+static NTSTATUS tdb_get_id_from_sid(id_t *id, int *id_type, DOM_SID *sid)
+{
+	TDB_DATA data, key;
+	fstring keystr;
+	NTSTATUS ret = NT_STATUS_UNSUCCESSFUL;
+
+	if (!sid || !id || !id_type) return NT_STATUS_INVALID_PARAMETER;
+
+	/* Check if sid is present in database */
+	sid_to_string(keystr, sid);
+
+	key.dptr = keystr;
+	key.dsize = strlen(keystr) + 1;
+
+	data = tdb_fetch(idmap_tdb, key);
+
+	if (data.dptr) {
+		fstring scanstr;
+
+		if (*id_type == ID_EMPTY || *id_type == ID_USERID) {
+			/* Parse and return existing uid */
+			fstrcpy(scanstr, "UID %d");
+
+			if (sscanf(data.dptr, scanstr, *id.uid) == 1) {
+				/* uid ok? */
+				if (*id_type == ID_EMPTY) {
+					*id_type = ID_USERID;
+				}
+				ret = NT_STATUS_OK;
+				goto idok;
+			}
+		}
+
+		if (*id_type == ID_EMPTY || *id_type == ID_GROUPID) {
+			/* Parse and return existing gid */
+			fstrcpy(scanstr, "GID %d");
+
+			if (sscanf(data.dptr, scanstr, *id.gid) == 1) {
+				/* gid ok? */
+				if (*id_type == ID_EMPTY) {
+					*id_type = ID_GROUPID;
+				}
+				ret = NT_STATUS_OK;
+			}
+		}
+idok:
+		SAFE_FREE(data.dptr);
+
+	} else if (*id_type == ID_USERID || *id_type == ID_GROUPID) {
+
+		/* Allocate a new id for this sid */
+		ret = tdb_allocate_id(id, id_type);
+		if (NT_STATUS_IS_OK(ret)) {
+			fstring keystr2;
+
+			/* Store new id */
+			slprintf(keystr2, sizeof(keystr2), "%s %d",
+				 *id_type ? "GID" : "UID", *id);
+
+			data.dptr = keystr2;
+			data.dsize = strlen(keystr2) + 1;
+
+			if (tdb_store(idmap_tdb, key, data, TDB_INSERT) == -1)
+				return NT_STATUS_UNSUCCESSFUL;
+			if (tdb_store(idmap_tdb, data, key, TDB_INSERT) == -1)
+				return NT_STATUS_UNSUCCESSFUL;
+
+			ret = NT_STATUS_OK;
+		}
+	}
+
+	return ret;
+}
+
+/*****************************************************************************
+ Initialise idmap database. 
+*****************************************************************************/
+static NTSTATUS tdb_idmap_init(void)
+{
+	/* Open tdb cache */
+	if (!(idmap_tdb = tdb_open_log(lock_path("idmap.tdb"), 0,
+				       TDB_DEFAULT, O_RDWR | O_CREAT,
+				       0600))) {
+		DEBUG(0, ("idmap_init: Unable to open idmap database\n"));
+		return NT_STATUS_UNSUCCESSFUL;
+	}
+
+#if 0
+	/* possibly convert from an earlier version */
+	if (!tdb_idmap_convert(lock_path("winbind_idmap.tdb"))) {
+		DEBUG(0,
+		      ("idmap_init: Unable to open old idmap database\n"));
+		return False;
+	}
+#endif
+
+	/* Create high water marks for group and user id */
+	if (tdb_fetch_int32(idmap_tdb, HWM_USER) == -1) {
+		if (tdb_store_int32(idmap_tdb, HWM_USER, server_state.uid_low) == -1) {
+			DEBUG(0, ("idmap_init: Unable to initialise user hwm in idmap database\n"));
+			return NT_STATUS_INTERNAL_DB_ERROR;
+		}
+	}
+
+	if (tdb_fetch_int32(idmap_tdb, HWM_GROUP) == -1) {
+		if (tdb_store_int32(idmap_tdb, HWM_GROUP, server_state.gid_low) == -1) {
+			DEBUG(0, ("idmap_init: Unable to initialise group hwm in idmap database\n"));
+			return NT_STATUS_INTERNAL_DB_ERROR;
+		}
+	}
+
+	return NT_STATUS_OK;
+}
+
+/* Close the tdb */
+static NTSTATUS tdb_idmap_close(void)
+{
+	if (idmap_tdb)
+		if (tdb_close(idmap_tdb) == 0)
+			return NT_STATUS_OK;
+		else
+			retrun NT_STATUS_UNSUCCESSFUL;
+	return NT_STATUS_OK;
+}
+
+
+/* Dump status information to log file.  Display different stuff based on
+   the debug level:
+
+   Debug Level        Information Displayed
+   =================================================================
+   0                  Percentage of [ug]id range allocated
+   0                  High water marks (next allocated ids)
+*/
+
+#define DUMP_INFO 0
+
+static void tdb_idmap_status(void)
+{
+	int user_hwm, group_hwm;
+
+	DEBUG(0, ("winbindd idmap status:\n"));
+
+	/* Get current high water marks */
+
+	if ((user_hwm = tdb_fetch_int32(idmap_tdb, HWM_USER)) == -1) {
+		DEBUG(DUMP_INFO,
+		      ("\tCould not get userid high water mark!\n"));
+	}
+
+	if ((group_hwm = tdb_fetch_int32(idmap_tdb, HWM_GROUP)) == -1) {
+		DEBUG(DUMP_INFO,
+		      ("\tCould not get groupid high water mark!\n"));
+	}
+
+	/* Display next ids to allocate */
+
+	if (user_hwm != -1) {
+		DEBUG(DUMP_INFO,
+		      ("\tNext userid to allocate is %d\n", user_hwm));
+	}
+
+	if (group_hwm != -1) {
+		DEBUG(DUMP_INFO,
+		      ("\tNext groupid to allocate is %d\n", group_hwm));
+	}
+
+	/* Display percentage of id range already allocated. */
+
+	if (user_hwm != -1) {
+		int num_users = user_hwm - server_state.uid_low;
+		int total_users =
+		    server_state.uid_high - server_state.uid_low;
+
+		DEBUG(DUMP_INFO,
+		      ("\tUser id range is %d%% full (%d of %d)\n",
+		       num_users * 100 / total_users, num_users,
+		       total_users));
+	}
+
+	if (group_hwm != -1) {
+		int num_groups = group_hwm - server_state.gid_low;
+		int total_groups =
+		    server_state.gid_high - server_state.gid_low;
+
+		DEBUG(DUMP_INFO,
+		      ("\tGroup id range is %d%% full (%d of %d)\n",
+		       num_groups * 100 / total_groups, num_groups,
+		       total_groups));
+	}
+
+	/* Display complete mapping of users and groups to rids */
+}
+
+struct idmap_methods tdb_idmap_methods = {
+
+	tdb_idmap_init,
+	tdb_get_sid_from_id,
+	tdb_get_id_from_sid,
+	tdb_idmap_close,
+	tdb_idmap_status
+
+};
+
+NTSTATUS idmap_reg_tdb(struct idmap_methods **meth)
+{
+	*meth = &tdb_idmap_methods;
+
+	return NTSTATUS_OK;
+}
+
-- 
cgit 


From 7b2409214febbf7deaec434df50e7b090905e7f1 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Sat, 8 Mar 2003 01:16:30 +0000
Subject: Fix typo in earlier fix, caught by Ranjit @ HP. Jeremy. (This used to
 be commit 13ab94fa73dbaf54da0169bbcf4d027d5c07d207)

---
 source3/smbd/nttrans.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index e6884cbb1e..6d9c649045 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -1871,7 +1871,7 @@ due to being in oplock break state.\n", (unsigned int)function_code ));
 
 			data_count = IVAL(inbuf, smb_nts_DataCount);
 			data_displacement = IVAL(inbuf, smb_nts_DataDisplacement);
-			data_offset = IVAL(inbuf, smb_nts_DataDisplacement);
+			data_offset = IVAL(inbuf, smb_nts_DataOffset);
 			num_data_sofar += data_count;
 
 			if (num_params_sofar > total_parameter_count || num_data_sofar > total_data_count) {
-- 
cgit 


From bbf8961b284a877b5cfa4101e0fd677664a867f1 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 8 Mar 2003 05:18:08 +0000
Subject: Make it clear that this is a fstrcpy(). (This used to be commit
 c2a266b7b661d319e13982bfdbc3a86e8502b8a4)

---
 source3/libsmb/clientgen.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3')

diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
index 9598f4ac96..6ef7a7bd9c 100644
--- a/source3/libsmb/clientgen.c
+++ b/source3/libsmb/clientgen.c
@@ -200,8 +200,8 @@ void cli_setup_bcc(struct cli_state *cli, void *p)
 void cli_init_creds(struct cli_state *cli, const struct ntuser_creds *usr)
 {
         /* copy_nt_creds(&cli->usr, usr); */
-	safe_strcpy(cli->domain   , usr->domain   , sizeof(usr->domain   )-1);
-	safe_strcpy(cli->user_name, usr->user_name, sizeof(usr->user_name)-1);
+	fstrcpy(cli->domain   , usr->domain);
+	fstrcpy(cli->user_name, usr->user_name);
 	memcpy(&cli->pwd, &usr->pwd, sizeof(usr->pwd));
         cli->ntlmssp_flags = usr->ntlmssp_flags;
         cli->ntlmssp_cli_flgs = usr != NULL ? usr->ntlmssp_flags : 0;
-- 
cgit 


From 01289b14a7cbe0e1a1e135349037b0e7ba5fe70b Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 8 Mar 2003 10:22:50 +0000
Subject: Make sure that the 'remote' machine name can only be set once.  For
 some weird reason, during a Win2003 installation, when you select 'domain
 join' it sends one machine name in the name exchange, and litraly
 'machinename' during the NTLMSSP login.

Also fix up winbindd's logfile handling, so that it matches smbd and nmbd.

(This helps me, by seperating the logs by pid).

Andrew Bartlett
(This used to be commit afe5a3832f79131fb74461577f1db0e5e8bf4b6d)
---
 source3/auth/auth_ntlmssp.c |  2 +-
 source3/client/smbmount.c   |  2 +-
 source3/lib/substitute.c    | 31 +++++++++++++++++++++++++++++--
 source3/nmbd/nmbd.c         |  2 +-
 source3/nsswitch/winbindd.c | 11 ++---------
 source3/smbd/reply.c        |  4 ++--
 source3/smbd/server.c       |  4 ++--
 source3/wrepld/server.c     |  2 +-
 8 files changed, 39 insertions(+), 19 deletions(-)

(limited to 'source3')

diff --git a/source3/auth/auth_ntlmssp.c b/source3/auth/auth_ntlmssp.c
index d32d248296..a381219d74 100644
--- a/source3/auth/auth_ntlmssp.c
+++ b/source3/auth/auth_ntlmssp.c
@@ -50,7 +50,7 @@ static NTSTATUS auth_ntlmssp_check_password(struct ntlmssp_state *ntlmssp_state)
 	/* the client has given us its machine name (which we otherwise would not get on port 445).
 	   we need to possibly reload smb.conf if smb.conf includes depend on the machine name */
 
-	set_remote_machine_name(auth_ntlmssp_state->ntlmssp_state->workstation);
+	set_remote_machine_name(auth_ntlmssp_state->ntlmssp_state->workstation, True);
 
 	/* setup the string used by %U */
 	/* sub_set_smb_name checks for weird internally */
diff --git a/source3/client/smbmount.c b/source3/client/smbmount.c
index e2372d02b4..98302485e4 100644
--- a/source3/client/smbmount.c
+++ b/source3/client/smbmount.c
@@ -398,7 +398,7 @@ static void send_fs_socket(char *the_service, char *mount_point, struct cli_stat
 			}
 
 			/* here we are no longer interactive */
-			set_remote_machine_name("smbmount");	/* sneaky ... */
+			set_remote_machine_name("smbmount", False);	/* sneaky ... */
 			setup_logging("mount.smbfs", False);
 			reopen_logs();
 			DEBUG(0, ("mount.smbfs: entering daemon mode for service %s, pid=%d\n", the_service, sys_getpid()));
diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c
index 2d1b2ab1fa..1e3f51e2d8 100644
--- a/source3/lib/substitute.c
+++ b/source3/lib/substitute.c
@@ -29,9 +29,20 @@ fstring remote_proto="UNKNOWN";
 static fstring remote_machine;
 static fstring smb_user_name;
 
+/** 
+ * Set the 'local' machine name
+ * @param local_name the name we are being called
+ * @param if this is the 'final' name for us, not be be changed again
+ */
 
-void set_local_machine_name(const char* local_name)
+void set_local_machine_name(const char* local_name, BOOL perm)
 {
+	static BOOL already_perm = False;
+	if (already_perm)
+		return;
+
+	already_perm = perm;
+
 	fstring tmp_local_machine;
 
 	fstrcpy(tmp_local_machine,local_name);
@@ -40,8 +51,20 @@ void set_local_machine_name(const char* local_name)
 	alpha_strcpy(local_machine,tmp_local_machine,SAFE_NETBIOS_CHARS,sizeof(local_machine)-1);
 }
 
-void set_remote_machine_name(const char* remote_name)
+/** 
+ * Set the 'remote' machine name
+ * @param remote_name the name our client wants to be called by
+ * @param if this is the 'final' name for them, not be be changed again
+ */
+
+void set_remote_machine_name(const char* remote_name, BOOL perm)
 {
+	static BOOL already_perm = False;
+	if (already_perm)
+		return;
+
+	already_perm = perm;
+
 	fstring tmp_remote_machine;
 
 	fstrcpy(tmp_remote_machine,remote_name);
@@ -57,6 +80,10 @@ const char* get_remote_machine_name(void)
 
 const char* get_local_machine_name(void) 
 {
+	if (!*local_machine) {
+		return global_myname();
+	}
+
 	return local_machine;
 }
 
diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index 2b7d8033a2..fc08645f1d 100644
--- a/source3/nmbd/nmbd.c
+++ b/source3/nmbd/nmbd.c
@@ -292,7 +292,7 @@ static BOOL reload_nmbd_services(BOOL test)
 {
 	BOOL ret;
 
-	set_remote_machine_name("nmbd");
+	set_remote_machine_name("nmbd", False);
 
 	if ( lp_loaded() ) {
 		pstring fname;
diff --git a/source3/nsswitch/winbindd.c b/source3/nsswitch/winbindd.c
index ad37768c09..921f7d2864 100644
--- a/source3/nsswitch/winbindd.c
+++ b/source3/nsswitch/winbindd.c
@@ -43,15 +43,9 @@ static BOOL reload_services_file(BOOL test)
 		}
 	}
 
-	snprintf(logfile, sizeof(logfile), "%s/log.winbindd", dyn_LOGFILEBASE);
-	lp_set_logfile(logfile);
-
 	reopen_logs();
 	ret = lp_load(dyn_CONFIGFILE,False,False,True);
 
-	snprintf(logfile, sizeof(logfile), "%s/log.winbindd", dyn_LOGFILEBASE);
-	lp_set_logfile(logfile);
-
 	reopen_logs();
 	load_interfaces();
 
@@ -823,13 +817,12 @@ static void usage(void)
 
 	fault_setup((void (*)(void *))fault_quit );
 
-	snprintf(logfile, sizeof(logfile), "%s/log.winbindd", dyn_LOGFILEBASE);
-	lp_set_logfile(logfile);
-
 	/* Initialise for running in non-root mode */
 
 	sec_init();
 
+	set_remote_machine_name("winbindd", False);
+
 	/* Set environment variable so we don't recursively call ourselves.
 	   This may also be useful interactively. */
 
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 71e880476c..fb730bc625 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -87,8 +87,8 @@ int reply_special(char *inbuf,char *outbuf)
 			name2[15] = 0;
 		}
 
-		set_local_machine_name(name1);
-		set_remote_machine_name(name2);
+		set_local_machine_name(name1, True);
+		set_remote_machine_name(name2, True);
 
 		DEBUG(2,("netbios connect: local=%s remote=%s\n",
 			get_local_machine_name(), get_remote_machine_name() ));
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 0bcfcb9c78..aff402df66 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -398,7 +398,7 @@ static BOOL open_sockets_smbd(BOOL is_daemon, BOOL interactive, const char *smb_
 				
 				/* this is needed so that we get decent entries
 				   in smbstatus for port 445 connects */
-				set_remote_machine_name(get_socket_addr(smbd_server_fd()));
+				set_remote_machine_name(get_socket_addr(smbd_server_fd()), False);
 				
 				/* Reset global variables in util.c so
 				   that client substitutions will be
@@ -706,7 +706,7 @@ static BOOL init_structs(void )
 
 	load_case_tables();
 
-	set_remote_machine_name("smbd");
+	set_remote_machine_name("smbd", False);
 
 	if (interactive) {
 		Fork = False;
diff --git a/source3/wrepld/server.c b/source3/wrepld/server.c
index 349f2a21ab..31f260e94c 100644
--- a/source3/wrepld/server.c
+++ b/source3/wrepld/server.c
@@ -619,7 +619,7 @@ static void process(void)
 		lp_set_logfile(logfile);
 	}
 
-	set_remote_machine_name("wrepld");
+	set_remote_machine_name("wrepld", False);
 
 	setup_logging(argv[0],log_stdout);
 
-- 
cgit 


From c08c475cf2b287b57779b4bf515cf351ad1f686d Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 8 Mar 2003 10:24:48 +0000
Subject: Testparm needs the extra arg to set_local_machine_name() too. (This
 used to be commit 30ba31e6355b5dfb902e42d2b5edc71630db2923)

---
 source3/utils/testparm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index b68deaaa5d..60243b671b 100644
--- a/source3/utils/testparm.c
+++ b/source3/utils/testparm.c
@@ -227,7 +227,7 @@ int main(int argc, const char *argv[])
 	caddr = poptGetArg(pc);
 	
 	if (new_local_machine) {
-		set_local_machine_name(new_local_machine);
+		set_local_machine_name(new_local_machine, True);
 	}
 
 	dbf = x_stdout;
-- 
cgit 


From bebdbcd248ccb3021d0b94f360fc3cf8ba9e90a6 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Sat, 8 Mar 2003 17:29:40 +0000
Subject: more on idmap two layers structure with - local tdb cache - remote
 idmap repository

compiles
(This used to be commit 8fb4e210bc7564ed491d121c20d598ba0bfbddff)
---
 source3/include/idmap.h |  24 +++++----
 source3/sam/idmap.c     | 134 ++++++++++++++++++++++++++++++++++++------------
 source3/sam/idmap_tdb.c | 127 ++++++++++++++++++++++++++++++++-------------
 3 files changed, 207 insertions(+), 78 deletions(-)

(limited to 'source3')

diff --git a/source3/include/idmap.h b/source3/include/idmap.h
index 5a1f4fafc3..fd7646a324 100644
--- a/source3/include/idmap.h
+++ b/source3/include/idmap.h
@@ -22,24 +22,30 @@
    Boston, MA  02111-1307, USA.   
 */
 
-#define	ID_EMPTY	0
-#define ID_USERID	1
-#define ID_GROUPID	2
-#define ID_OTHER	3
+#define ID_EMPTY	0x00
+#define ID_USERID	0x01
+#define ID_GROUPID	0x02
+#define ID_OTHER	0x04
 
-typedef union id_t {
+#define ID_TYPEMASK	0x0f
+
+#define ID_NOMAP	0x10
+#define ID_CACHE	0x20
+
+typedef union unid_t {
 	uid_t uid;
 	gid_t gid;
-} id_t;
+} unid_t;
 
 /* Filled out by IDMAP backends */
 struct idmap_methods {
 
 	/* Called when backend is first loaded */
-	NTSTATUS (*init)(void);
+	NTSTATUS (*init)(const char *init_str);
 
-	NTSTATUS (*get_sid_from_id)(DOM_SID *sid, id_t id, int id_type);
-	NTSTATUS (*get_id_from_sid)(id_t *id, int *id_type, DOM_SID *sid);
+	NTSTATUS (*get_sid_from_id)(DOM_SID *sid, unid_t id, int id_type);
+	NTSTATUS (*get_id_from_sid)(unid_t *id, int *id_type, DOM_SID *sid);
+	NTSTATUS (*set_mapping)(DOM_SID *sid, unid_t id, int id_type);
 
 	/* Called when backend is unloaded */
 	NTSTATUS (*close)(void);
diff --git a/source3/sam/idmap.c b/source3/sam/idmap.c
index 96638b4723..b18423a13b 100644
--- a/source3/sam/idmap.c
+++ b/source3/sam/idmap.c
@@ -21,7 +21,6 @@
 */
 
 #include "includes.h"
-#include "idmap.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_IDMAP
@@ -32,48 +31,58 @@ static struct {
 	/* Function to create a member of the idmap_methods list */
 	NTSTATUS (*reg_meth)(struct idmap_methods **methods);
 	struct idmap_methods *methods;
-} builtin_idmap_functions[] = {
+
+} remote_idmap_functions[] = {
+
 	{ "tdb", idmap_reg_tdb, NULL },
 	/* { "ldap", idmap_reg_ldap, NULL },*/
 	{ NULL, NULL, NULL }
+
 };
 
-/* singleton pattern: uberlazy evaluation */
-static struct idmap_methods *impl;
+static struct idmap_methods *local_cache;
+static struct idmap_methods *remote_repo;
 
-static struct idmap_methods *get_impl(const char *name)
+static struct idmap_methods *get_methods(const char *name)
 {
 	int i = 0;
 	struct idmap_methods *ret = NULL;
 
-	while (builtin_idmap_functions[i].name && strcmp(builtin_idmap_functions[i].name, name)) {
+	while (remote_idmap_functions[i].name && strcmp(remote_idmap_functions[i].name, name)) {
 		i++;
 	}
 
-	if (builtin_idmap_functions[i].name) {
+	if (remote_idmap_functions[i].name) {
 
-		if (!builtin_idmap_functions[i].methods) {
-			builtin_idmap_functions[i].reg_meth(&builtin_idmap_functions[i].methods);
+		if (!remote_idmap_functions[i].methods) {
+			remote_idmap_functions[i].reg_meth(&remote_idmap_functions[i].methods);
 		}
 
-		ret = builtin_idmap_functions[i].methods;
+		ret = remote_idmap_functions[i].methods;
 	}
 
 	return ret;
 }
 
 /* Load idmap backend functions */
-BOOL set_impl(void)
+BOOL load_methods(void)
 {
-	if (!impl) {
-		DEBUG(3, ("idmap_init: using '%s' as backend\n", lp_idmap_backend()));
+	if (!local_cache) {
+		idmap_reg_tdb(&local_cache);
+	}
+	
+	if (!remote_repo && lp_idmap_backend()) {
+		DEBUG(3, ("load_methods: using '%s' as remote backend\n", lp_idmap_backend()));
 		
-		impl = get_impl(lp_idmap_backend());
-		if (!impl) {
-			DEBUG(0, ("set_impl: could not load backend '%s'\n", lp_idmap_backend()));
+		remote_repo = get_methods(lp_idmap_backend());
+		if (!remote_repo) {
+			DEBUG(0, ("load_methods: could not load remote backend '%s'\n", lp_idmap_backend()));
 			return False;
 		}
 	}
+
+	idmap_init();
+
 	return True;
 }
 
@@ -82,9 +91,7 @@ NTSTATUS idmap_init(void)
 {
 	NTSTATUS ret;
 
-	if (!set_impl()) return NT_STATUS_UNSUCCESSFUL;
-
-	ret = impl->init();
+	ret = remote_repo->init("idmap.tdb");
 	if (NT_STATUS_IS_ERR(ret)) {
 		DEBUG(3, ("idmap_init: init failed!\n"));
 	}
@@ -92,47 +99,105 @@ NTSTATUS idmap_init(void)
 	return ret;
 }
 
+static NTSTATUS idmap_set_mapping(DOM_SID *sid, unid_t id, int id_type)
+{
+	NTSTATUS ret;
+
+	if (!load_methods()) return NT_STATUS_UNSUCCESSFUL;
+
+	ret = local_cache->set_mapping(sid, id, id_type);
+	if (NT_STATUS_IS_ERR(ret)) {
+		DEBUG (0, ("idmap_set_mapping: Error, unable to modify local cache!\n"));
+		return ret;
+	}
+
+	/* Being able to update the remote cache is seldomly right.
+	   Generally this is a forbidden operation. */
+	if (!(id_type & ID_CACHE) && (remote_repo != NULL)) {
+		remote_repo->set_mapping(sid, id, id_type);
+		if (NT_STATUS_IS_ERR(ret)) {
+			DEBUG (0, ("idmap_set_mapping: Error, unable to modify remote cache!\n"));
+		}
+	}
+
+	return ret;
+}
+
 /* Get ID from SID */
-NTSTATUS idmap_get_id_from_sid(id_t *id, int *id_type, DOM_SID *sid)
+NTSTATUS idmap_get_id_from_sid(unid_t *id, int *id_type, DOM_SID *sid)
 {
 	NTSTATUS ret;
+	int loc_type;
 
-	if (!set_impl()) return NT_STATUS_UNSUCCESSFUL;
+	if (!load_methods()) return NT_STATUS_UNSUCCESSFUL;
 
-	ret = impl->get_id_from_sid(id, id_type, sid);
+	loc_type = *id_type;
+	if (remote_repo) { /* We have a central remote idmap */
+		loc_type |= ID_NOMAP;
+	}
+	ret = local_cache->get_id_from_sid(id, &loc_type, sid);
 	if (NT_STATUS_IS_ERR(ret)) {
-		DEBUG(3, ("idmap_get_id_from_sid: error fetching id!\n"));
+		if (remote_repo) {
+			ret = remote_repo->get_id_from_sid(id, id_type, sid);
+			if (NT_STATUS_IS_ERR(ret)) {
+				DEBUG(3, ("idmap_get_id_from_sid: error fetching id!\n"));
+			} else {
+				loc_type |= ID_CACHE;
+				idmap_set_mapping(sid, *id, loc_type);
+			}
+		}
+	} else {
+		*id_type = loc_type & ID_TYPEMASK;
 	}
 
 	return ret;
 }
 
 /* Get SID from ID */
-NTSTATUS idmap_get_sid_from_id(DOM_SID *sid, id_t id, int id_type)
+NTSTATUS idmap_get_sid_from_id(DOM_SID *sid, unid_t id, int id_type)
 {
 	NTSTATUS ret;
+	int loc_type;
 
-	if (!set_impl()) return NT_STATUS_UNSUCCESSFUL;
+	if (!load_methods()) return NT_STATUS_UNSUCCESSFUL;
 
-	ret = impl->get_sid_from_id(sid, id, id_type);
+	loc_type = id_type;
+	if (remote_repo) {
+		loc_type = id_type | ID_NOMAP;
+	}
+	ret = local_cache->get_sid_from_id(sid, id, loc_type);
 	if (NT_STATUS_IS_ERR(ret)) {
-		DEBUG(3, ("idmap_get_sid_from_id: error fetching sid!\n"));
+		if (remote_repo) {
+			ret = remote_repo->get_sid_from_id(sid, id, id_type);
+			if (NT_STATUS_IS_ERR(ret)) {
+				DEBUG(3, ("idmap_get_sid_from_id: unable to fetch sid!\n"));
+			} else {
+				loc_type |= ID_CACHE;
+				idmap_set_mapping(sid, id, loc_type);
+			}
+		}
 	}
 
 	return ret;
 }
 
-
 /* Close backend */
 NTSTATUS idmap_close(void)
 {
 	NTSTATUS ret;
 
-	if (!set_impl()) return NT_STATUS_UNSUCCESSFUL;
+	if (!load_methods()) return NT_STATUS_UNSUCCESSFUL;
 
-	ret = impl->close();
+	ret = local_cache->close();
 	if (NT_STATUS_IS_ERR(ret)) {
-		DEBUG(3, ("idmap_close: close failed!\n"));
+		DEBUG(3, ("idmap_close: failed to close local cache!\n"));
+	}
+
+	if (remote_repo) {
+		ret = remote_repo->close();
+		if (NT_STATUS_IS_ERR(ret)) {
+			DEBUG(3, ("idmap_close: failed to close remote idmap repository!\n"));
+		}
 	}
 
 	return ret;
@@ -141,8 +206,9 @@ NTSTATUS idmap_close(void)
 /* Dump backend status */
 void idmap_status(void)
 {
-	if (!set_impl()) return;
-
-	impl->status();
+	if (load_methods()) {
+		local_cache->status();
+		remote_repo->status();
+	}
 }
 
diff --git a/source3/sam/idmap_tdb.c b/source3/sam/idmap_tdb.c
index 3aaab3ac42..4af46ac8d3 100644
--- a/source3/sam/idmap_tdb.c
+++ b/source3/sam/idmap_tdb.c
@@ -23,7 +23,6 @@
 */
 
 #include "includes.h"
-#include "idmap.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_IDMAP
@@ -38,6 +37,15 @@
 /* Globals */
 static TDB_CONTEXT *idmap_tdb;
 
+struct idmap_state {
+
+	/* User and group id pool */
+
+	uid_t uid_low, uid_high;               /* Range of uids to allocate */
+	gid_t gid_low, gid_high;               /* Range of gids to allocate */
+} idmap_state;
+
+
 /* FIXME: let handle conversions when all things work ok.
 	  I think it is better to handle the conversion at
 	  upgrade time and leave the old db intact.
@@ -175,25 +183,25 @@ static BOOL tdb_idmap_convert(const char *idmap_name)
 #endif
 
 /* Allocate either a user or group id from the pool */
-static NTSTATUS tdb_allocate_id(id_t *id, int id_type)
+static NTSTATUS tdb_allocate_id(unid_t *id, int id_type)
 {
 	int hwm;
 
 	if (!id) return NT_STATUS_INVALID_PARAMETER;
 
 	/* Get current high water mark */
-	switch (id_type) {
+	switch (id_type & ID_TYPEMASK) {
 		case ID_USERID:
 			if ((hwm = tdb_fetch_int32(idmap_tdb, HWM_USER)) == -1) {
 				return NT_STATUS_INTERNAL_DB_ERROR;
 			}
 
-			if (hwm > server_state.uid_high) {
+			if (hwm > idmap_state.uid_high) {
 				DEBUG(0, ("idmap Fatal Error: UID range full!!\n"));
 				return NT_STATUS_UNSUCCESSFUL;
 			}
 
-			*id.uid = hwm++;
+			(*id).uid = hwm++;
 
 			/* Store new high water mark */
 			tdb_store_int32(idmap_tdb, HWM_USER, hwm);
@@ -203,12 +211,12 @@ static NTSTATUS tdb_allocate_id(id_t *id, int id_type)
 				return NT_STATUS_INTERNAL_DB_ERROR;
 			}
 
-			if (hwm > server_state.gid_high) {
+			if (hwm > idmap_state.gid_high) {
 				DEBUG(0, ("idmap Fatal Error: GID range full!!\n"));
 				return NT_STATUS_UNSUCCESSFUL;
 			}
 
-			*id.gid = hwm++;
+			(*id).gid = hwm++;
 			
 			/* Store new high water mark */
 			tdb_store_int32(idmap_tdb, HWM_GROUP, hwm);
@@ -221,7 +229,7 @@ static NTSTATUS tdb_allocate_id(id_t *id, int id_type)
 }
 
 /* Get a sid from an id */
-static NTSTATUS tdb_get_sid_from_id(DOM_SID *sid, id_t id, int id_type)
+static NTSTATUS tdb_get_sid_from_id(DOM_SID *sid, unid_t id, int id_type)
 {
 	TDB_DATA key, data;
 	fstring keystr;
@@ -229,7 +237,7 @@ static NTSTATUS tdb_get_sid_from_id(DOM_SID *sid, id_t id, int id_type)
 
 	if (!sid) return NT_STATUS_INVALID_PARAMETER;
 
-	switch (id_type) {
+	switch (id_type & ID_TYPEMASK) {
 		case ID_USERID:
 		slprintf(keystr, sizeof(keystr), "UID %d", id.uid);
 		break;
@@ -256,7 +264,7 @@ static NTSTATUS tdb_get_sid_from_id(DOM_SID *sid, id_t id, int id_type)
 }
 
 /* Get an id from a sid */
-static NTSTATUS tdb_get_id_from_sid(id_t *id, int *id_type, DOM_SID *sid)
+static NTSTATUS tdb_get_id_from_sid(unid_t *id, int *id_type, DOM_SID *sid)
 {
 	TDB_DATA data, key;
 	fstring keystr;
@@ -273,15 +281,16 @@ static NTSTATUS tdb_get_id_from_sid(id_t *id, int *id_type, DOM_SID *sid)
 	data = tdb_fetch(idmap_tdb, key);
 
 	if (data.dptr) {
+		int type = *id_type & ID_TYPEMASK;
 		fstring scanstr;
 
-		if (*id_type == ID_EMPTY || *id_type == ID_USERID) {
+		if (type == ID_EMPTY || type == ID_USERID) {
 			/* Parse and return existing uid */
 			fstrcpy(scanstr, "UID %d");
 
-			if (sscanf(data.dptr, scanstr, *id.uid) == 1) {
+			if (sscanf(data.dptr, scanstr, (*id).uid) == 1) {
 				/* uid ok? */
-				if (*id_type == ID_EMPTY) {
+				if (type == ID_EMPTY) {
 					*id_type = ID_USERID;
 				}
 				ret = NT_STATUS_OK;
@@ -289,13 +298,13 @@ static NTSTATUS tdb_get_id_from_sid(id_t *id, int *id_type, DOM_SID *sid)
 			}
 		}
 
-		if (*id_type == ID_EMPTY || *id_type == ID_GROUPID) {
+		if (type == ID_EMPTY || type == ID_GROUPID) {
 			/* Parse and return existing gid */
 			fstrcpy(scanstr, "GID %d");
 
-			if (sscanf(data.dptr, scanstr, *id.gid) == 1) {
+			if (sscanf(data.dptr, scanstr, (*id).gid) == 1) {
 				/* gid ok? */
-				if (*id_type == ID_EMPTY) {
+				if (type == ID_EMPTY) {
 					*id_type = ID_GROUPID;
 				}
 				ret = NT_STATUS_OK;
@@ -304,24 +313,33 @@ static NTSTATUS tdb_get_id_from_sid(id_t *id, int *id_type, DOM_SID *sid)
 idok:
 		SAFE_FREE(data.dptr);
 
-	} else if (*id_type == ID_USERID || *id_type == ID_GROUPID) {
+	} else if (!(*id_type & ID_NOMAP) &&
+		   (((*id_type & ID_TYPEMASK) == ID_USERID)
+		    || (*id_type & ID_TYPEMASK) == ID_GROUPID)) {
 
 		/* Allocate a new id for this sid */
-		ret = tdb_allocate_id(id, id_type);
+		ret = tdb_allocate_id(id, *id_type);
 		if (NT_STATUS_IS_OK(ret)) {
 			fstring keystr2;
 
 			/* Store new id */
-			slprintf(keystr2, sizeof(keystr2), "%s %d",
-				 *id_type ? "GID" : "UID", *id);
+			if (*id_type & ID_USERID) {
+				slprintf(keystr2, sizeof(keystr2), "UID %d", (*id).uid);
+			} else {
+				slprintf(keystr2, sizeof(keystr2), "GID %d", (*id).gid);
+			}
 
 			data.dptr = keystr2;
 			data.dsize = strlen(keystr2) + 1;
 
-			if (tdb_store(idmap_tdb, key, data, TDB_INSERT) == -1)
+			if (tdb_store(idmap_tdb, key, data, TDB_INSERT) == -1) {
+				/* TODO: print tdb error !! */
 				return NT_STATUS_UNSUCCESSFUL;
-			if (tdb_store(idmap_tdb, data, key, TDB_INSERT) == -1)
+			}
+			if (tdb_store(idmap_tdb, data, key, TDB_INSERT) == -1) {
+				/* TODO: print tdb error !! */
 				return NT_STATUS_UNSUCCESSFUL;
+			}
 
 			ret = NT_STATUS_OK;
 		}
@@ -330,13 +348,49 @@ idok:
 	return ret;
 }
 
+static NTSTATUS tdb_set_mapping(DOM_SID *sid, unid_t id, int id_type)
+{
+	TDB_DATA ksid, kid;
+	fstring ksidstr;
+	fstring kidstr;
+
+	if (!sid) return NT_STATUS_INVALID_PARAMETER;
+
+	sid_to_string(ksidstr, sid);
+
+	ksid.dptr = ksidstr;
+	ksid.dsize = strlen(ksidstr) + 1;
+
+	id_type &= ID_TYPEMASK;
+	if (id_type & ID_USERID) {
+		slprintf(kidstr, sizeof(kidstr), "UID %d", id.uid);
+	} else if (id_type & ID_GROUPID) {
+		slprintf(kidstr, sizeof(kidstr), "GID %d", id.gid);
+	} else {
+		return NT_STATUS_INVALID_PARAMETER;
+	}
+
+	kid.dptr = kidstr;
+	kid.dsize = strlen(kidstr) + 1;
+
+	if (tdb_store(idmap_tdb, ksid, kid, TDB_INSERT) == -1) {
+		/* TODO: print tdb error !! */
+		return NT_STATUS_UNSUCCESSFUL;
+	}
+	if (tdb_store(idmap_tdb, kid, ksid, TDB_INSERT) == -1) {
+		/* TODO: print tdb error !! */
+		return NT_STATUS_UNSUCCESSFUL;
+	}
+	return NT_STATUS_OK;
+}
+
 /*****************************************************************************
  Initialise idmap database. 
 *****************************************************************************/
-static NTSTATUS tdb_idmap_init(void)
+static NTSTATUS tdb_idmap_init(const char *db_name)
 {
 	/* Open tdb cache */
-	if (!(idmap_tdb = tdb_open_log(lock_path("idmap.tdb"), 0,
+	if (!(idmap_tdb = tdb_open_log(lock_path(db_name), 0,
 				       TDB_DEFAULT, O_RDWR | O_CREAT,
 				       0600))) {
 		DEBUG(0, ("idmap_init: Unable to open idmap database\n"));
@@ -354,14 +408,14 @@ static NTSTATUS tdb_idmap_init(void)
 
 	/* Create high water marks for group and user id */
 	if (tdb_fetch_int32(idmap_tdb, HWM_USER) == -1) {
-		if (tdb_store_int32(idmap_tdb, HWM_USER, server_state.uid_low) == -1) {
+		if (tdb_store_int32(idmap_tdb, HWM_USER, idmap_state.uid_low) == -1) {
 			DEBUG(0, ("idmap_init: Unable to initialise user hwm in idmap database\n"));
 			return NT_STATUS_INTERNAL_DB_ERROR;
 		}
 	}
 
 	if (tdb_fetch_int32(idmap_tdb, HWM_GROUP) == -1) {
-		if (tdb_store_int32(idmap_tdb, HWM_GROUP, server_state.gid_low) == -1) {
+		if (tdb_store_int32(idmap_tdb, HWM_GROUP, idmap_state.gid_low) == -1) {
 			DEBUG(0, ("idmap_init: Unable to initialise group hwm in idmap database\n"));
 			return NT_STATUS_INTERNAL_DB_ERROR;
 		}
@@ -373,11 +427,13 @@ static NTSTATUS tdb_idmap_init(void)
 /* Close the tdb */
 static NTSTATUS tdb_idmap_close(void)
 {
-	if (idmap_tdb)
-		if (tdb_close(idmap_tdb) == 0)
+	if (idmap_tdb) {
+		if (tdb_close(idmap_tdb) == 0) {
 			return NT_STATUS_OK;
-		else
-			retrun NT_STATUS_UNSUCCESSFUL;
+		} else {
+			return NT_STATUS_UNSUCCESSFUL;
+		}
+	}
 	return NT_STATUS_OK;
 }
 
@@ -426,9 +482,9 @@ static void tdb_idmap_status(void)
 	/* Display percentage of id range already allocated. */
 
 	if (user_hwm != -1) {
-		int num_users = user_hwm - server_state.uid_low;
+		int num_users = user_hwm - idmap_state.uid_low;
 		int total_users =
-		    server_state.uid_high - server_state.uid_low;
+		    idmap_state.uid_high - idmap_state.uid_low;
 
 		DEBUG(DUMP_INFO,
 		      ("\tUser id range is %d%% full (%d of %d)\n",
@@ -437,9 +493,9 @@ static void tdb_idmap_status(void)
 	}
 
 	if (group_hwm != -1) {
-		int num_groups = group_hwm - server_state.gid_low;
+		int num_groups = group_hwm - idmap_state.gid_low;
 		int total_groups =
-		    server_state.gid_high - server_state.gid_low;
+		    idmap_state.gid_high - idmap_state.gid_low;
 
 		DEBUG(DUMP_INFO,
 		      ("\tGroup id range is %d%% full (%d of %d)\n",
@@ -455,6 +511,7 @@ struct idmap_methods tdb_idmap_methods = {
 	tdb_idmap_init,
 	tdb_get_sid_from_id,
 	tdb_get_id_from_sid,
+	tdb_set_mapping,
 	tdb_idmap_close,
 	tdb_idmap_status
 
@@ -464,6 +521,6 @@ NTSTATUS idmap_reg_tdb(struct idmap_methods **meth)
 {
 	*meth = &tdb_idmap_methods;
 
-	return NTSTATUS_OK;
+	return NT_STATUS_OK;
 }
 
-- 
cgit 


From 8ccff3e99527b7303e75f860e50d74bb83fdfb15 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 8 Mar 2003 23:39:44 +0000
Subject: This is C, not C++ (This used to be commit
 25d210b90b6c0377046d89a1dce7a32f94fd7859)

---
 source3/lib/substitute.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'source3')

diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c
index 1e3f51e2d8..ef68bce985 100644
--- a/source3/lib/substitute.c
+++ b/source3/lib/substitute.c
@@ -38,13 +38,13 @@ static fstring smb_user_name;
 void set_local_machine_name(const char* local_name, BOOL perm)
 {
 	static BOOL already_perm = False;
+	fstring tmp_local_machine;
+
 	if (already_perm)
 		return;
 
 	already_perm = perm;
 
-	fstring tmp_local_machine;
-
 	fstrcpy(tmp_local_machine,local_name);
 	trim_string(tmp_local_machine," "," ");
 	strlower(tmp_local_machine);
@@ -60,13 +60,13 @@ void set_local_machine_name(const char* local_name, BOOL perm)
 void set_remote_machine_name(const char* remote_name, BOOL perm)
 {
 	static BOOL already_perm = False;
+	fstring tmp_remote_machine;
+
 	if (already_perm)
 		return;
 
 	already_perm = perm;
 
-	fstring tmp_remote_machine;
-
 	fstrcpy(tmp_remote_machine,remote_name);
 	trim_string(tmp_remote_machine," "," ");
 	strlower(tmp_remote_machine);
-- 
cgit 


From 6ed674023620cc77e3276561f913b7a62ed26245 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sun, 9 Mar 2003 01:13:41 +0000
Subject: Don't fault on error returns (ptr == 0) for this LSA query.

(for example, query to non-dc)

Andrew Bartlett
(This used to be commit d1dde5f684652f86e63ac6cfa34ff42a680693de)
---
 source3/rpc_parse/parse_lsa.c | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'source3')

diff --git a/source3/rpc_parse/parse_lsa.c b/source3/rpc_parse/parse_lsa.c
index 53a0fc958d..2753ae524a 100644
--- a/source3/rpc_parse/parse_lsa.c
+++ b/source3/rpc_parse/parse_lsa.c
@@ -2219,18 +2219,21 @@ BOOL lsa_io_r_query_info2(const char *desc, LSA_R_QUERY_INFO2 *r_c,
 
 	if(!prs_uint32("ptr", ps, depth, &r_c->ptr))
 		return False;
-	if(!prs_uint16("info_class", ps, depth, &r_c->info_class))
-		return False;
-	switch(r_c->info_class) {
-	case 0x000c:
-		if (!lsa_io_dns_dom_info("info12", &r_c->info.dns_dom_info,
-					 ps, depth))
+
+	if (r_c->ptr != 0) {
+		if(!prs_uint16("info_class", ps, depth, &r_c->info_class))
 			return False;
+		switch(r_c->info_class) {
+		case 0x000c:
+			if (!lsa_io_dns_dom_info("info12", &r_c->info.dns_dom_info,
+						 ps, depth))
+				return False;
 		break;
-	default:
-		DEBUG(0,("lsa_io_r_query_info2: unknown info class %d\n",
-			 r_c->info_class));
-		return False;
+		default:
+			DEBUG(0,("lsa_io_r_query_info2: unknown info class %d\n",
+				 r_c->info_class));
+			return False;
+		}
 	}
 
 	if(!prs_align(ps))
-- 
cgit 


From 2ed7730f2d498a446dc7281e652d02a9dd2d94cf Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sun, 9 Mar 2003 09:23:09 +0000
Subject: Change the way we sign SMB packets, to a function pointer interface.

The intention is to allow for NTLMSSP and kerberos signing of packets, but
for now it's just what I call 'simple' signing. (aka SMB signing per the SNIA
spec)

Andrew Bartlett
(This used to be commit b9cf95c3dc04a45de71fb16e85c1bfbae50e6d8f)
---
 source3/Makefile.in          |   2 +-
 source3/include/client.h     |  13 +-
 source3/libsmb/cliconnect.c  |  47 +------
 source3/libsmb/clientgen.c   |   8 +-
 source3/libsmb/smb_signing.c | 329 +++++++++++++++++++++++++++++++++++++++++++
 source3/libsmb/smbencrypt.c  | 100 +------------
 6 files changed, 346 insertions(+), 153 deletions(-)
 create mode 100644 source3/libsmb/smb_signing.c

(limited to 'source3')

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 7de4b0ae8f..23c88d3ab1 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -201,7 +201,7 @@ LIBSMB_OBJ = libsmb/clientgen.o libsmb/cliconnect.o libsmb/clifile.o \
 	     libsmb/clirap.o libsmb/clierror.o libsmb/climessage.o \
 	     libsmb/clireadwrite.o libsmb/clilist.o libsmb/cliprint.o \
 	     libsmb/clitrans.o libsmb/clisecdesc.o libsmb/clidgram.o \
-	     libsmb/clistr.o \
+	     libsmb/clistr.o libsmb/smb_signing.o \
              libsmb/smberr.o libsmb/credentials.o libsmb/pwd_cache.o \
 	     libsmb/clioplock.o libsmb/errormap.o libsmb/clirap2.o \
 	     libsmb/passchange.o libsmb/doserr.o \
diff --git a/source3/include/client.h b/source3/include/client.h
index 73e29a1fff..2e6b9337e4 100644
--- a/source3/include/client.h
+++ b/source3/include/client.h
@@ -58,14 +58,15 @@ struct print_job_info
 };
 
 typedef struct smb_sign_info {
-	BOOL use_smb_signing;
+	void (*sign_outgoing_message)(struct cli_state *cli);
+	BOOL (*check_incoming_message)(struct cli_state *cli);
+	void (*free_signing_context)(struct cli_state *cli);
+	void *signing_context;
+
 	BOOL negotiated_smb_signing;
-	BOOL temp_smb_signing;
-	size_t mac_key_len;
-	uint8 mac_key[64];
-	uint32 send_seq_num;
-	uint32 reply_seq_num;
 	BOOL allow_smb_signing;
+	BOOL doing_signing;
+	BOOL mandetory_signing;
 } smb_sign_info;
 
 struct cli_state {
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 49b0004ac2..589c7b36bb 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -228,39 +228,11 @@ static BOOL cli_session_setup_plaintext(struct cli_state *cli, const char *user,
 	return True;
 }
 
-static void set_signing_on_cli (struct cli_state *cli, uint8 user_session_key[16], DATA_BLOB response) 
-{
-	uint8 zero_sig[8];
-	ZERO_STRUCT(zero_sig);
-
-	DEBUG(5, ("Server returned security sig:\n"));
-	dump_data(5, &cli->inbuf[smb_ss_field], 8);
-
-	if (cli->sign_info.use_smb_signing) {
-		DEBUG(5, ("smb signing already active on connection\n"));
-	} else if (memcmp(&cli->inbuf[smb_ss_field], zero_sig, 8) != 0) {
-
-		DEBUG(3, ("smb signing enabled!\n"));
-		cli->sign_info.use_smb_signing = True;
-		cli_calculate_mac_key(cli, user_session_key, response);
-	} else {
-		DEBUG(5, ("smb signing NOT enabled!\n"));
-	}
-}
-
 static void set_cli_session_key (struct cli_state *cli, DATA_BLOB session_key) 
 {
 	memcpy(cli->user_session_key, session_key.data, MIN(session_key.length, sizeof(cli->user_session_key)));
 }
 
-
-static void set_temp_signing_on_cli(struct cli_state *cli) 
-{
-	if (cli->sign_info.negotiated_smb_signing)
-		cli->sign_info.temp_smb_signing = True;
-}
-
-
 /****************************************************************************
    do a NT1 NTLM/LM encrypted session setup
    @param cli client state to create do session setup on
@@ -310,8 +282,7 @@ static BOOL cli_session_setup_nt1(struct cli_state *cli, const char *user,
 			session_key = data_blob(NULL, 16);
 			SMBsesskeygen_ntv1(nt_hash, NULL, session_key.data);
 		}
-
-		set_temp_signing_on_cli(cli);
+		cli_simple_set_signing(cli, session_key.data, nt_response); 
 	} else {
 		/* pre-encrypted password supplied.  Only used for 
 		   security=server, can't do
@@ -374,14 +345,14 @@ static BOOL cli_session_setup_nt1(struct cli_state *cli, const char *user,
 	if (session_key.data) {
 		/* Have plaintext orginal */
 		set_cli_session_key(cli, session_key);
-		set_signing_on_cli(cli, session_key.data, nt_response);
 	}
 
+	ret = True;
 end:	
 	data_blob_free(&lm_response);
 	data_blob_free(&nt_response);
 	data_blob_free(&session_key);
-	return True;
+	return ret;
 }
 
 /****************************************************************************
@@ -403,8 +374,6 @@ static DATA_BLOB cli_session_setup_blob(struct cli_state *cli, DATA_BLOB blob)
 	set_message(cli->outbuf,12,0,True);
 	SCVAL(cli->outbuf,smb_com,SMBsesssetupX);
 
-	set_temp_signing_on_cli(cli);
-
 	cli_setup_packet(cli);
 			
 	SCVAL(cli->outbuf,smb_vwv0,0xFF);
@@ -883,11 +852,6 @@ BOOL cli_negprot(struct cli_state *cli)
 	int numprots;
 	int plength;
 
-	if (cli->sign_info.use_smb_signing) {
-		DEBUG(0, ("Cannot send negprot again, particularly after setting up SMB Signing\n"));
-		return False;
-	}
-
 	if (cli->protocol < PROTOCOL_NT1)
 		cli->use_spnego = False;
 
@@ -1013,11 +977,6 @@ BOOL cli_session_request(struct cli_state *cli,
 	if (cli->port == 445)
 		return True;
 
-	if (cli->sign_info.use_smb_signing) {
-		DEBUG(0, ("Cannot send session resquest again, particularly after setting up SMB Signing\n"));
-		return False;
-	}
-
 	/* send a session request (RFC 1002) */
 	/* setup the packet length
          * Remove four bytes from the length count, since the length
diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
index 6ef7a7bd9c..3cae643c38 100644
--- a/source3/libsmb/clientgen.c
+++ b/source3/libsmb/clientgen.c
@@ -177,9 +177,6 @@ void cli_setup_packet(struct cli_state *cli)
 			flags2 |= FLAGS2_32_BIT_ERROR_CODES;
 		if (cli->use_spnego)
 			flags2 |= FLAGS2_EXTENDED_SECURITY;
-		if (cli->sign_info.use_smb_signing 
-		    || cli->sign_info.temp_smb_signing)
-			flags2 |= FLAGS2_SMB_SECURITY_SIGNATURES;
 		SSVAL(cli->outbuf,smb_flg2, flags2);
 	}
 }
@@ -262,6 +259,9 @@ struct cli_state *cli_initialise(struct cli_state *cli)
 	if (getenv("CLI_FORCE_DOSERR"))
 		cli->force_dos_errors = True;
 
+	/* initialise signing */
+	cli_null_set_signing(cli);
+
 	if (lp_client_signing()) 
 		cli->sign_info.allow_smb_signing = True;
                                    
@@ -303,6 +303,7 @@ void cli_close_connection(struct cli_state *cli)
 	SAFE_FREE(cli->outbuf);
 	SAFE_FREE(cli->inbuf);
 
+	cli_free_signing_context(cli);
 	data_blob_free(&cli->secblob);
 
 	if (cli->mem_ctx) {
@@ -314,6 +315,7 @@ void cli_close_connection(struct cli_state *cli)
 		close(cli->fd);
 	cli->fd = -1;
 	cli->smb_rw_error = 0;
+
 }
 
 /****************************************************************************
diff --git a/source3/libsmb/smb_signing.c b/source3/libsmb/smb_signing.c
new file mode 100644
index 0000000000..b3a6351893
--- /dev/null
+++ b/source3/libsmb/smb_signing.c
@@ -0,0 +1,329 @@
+/* 
+   Unix SMB/CIFS implementation.
+   SMB Signing Code
+   Copyright (C) Jeremy Allison 2002.
+   Copyright (C) Andrew Bartlett <abartlet@samba.org> 2002-2003
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "includes.h"
+
+struct smb_basic_signing_context {
+	DATA_BLOB mac_key;
+	uint32 send_seq_num;
+	uint32 reply_seq_num;
+};
+
+/***********************************************************
+ SMB signing - Common code before we set a new signing implementation
+************************************************************/
+
+static BOOL set_smb_signing_common(struct cli_state *cli) 
+{
+	if (cli->sign_info.doing_signing) {
+		return False;
+	}
+	
+	if (cli->sign_info.free_signing_context)
+		cli->sign_info.free_signing_context(cli);
+
+	/* These calls are INCONPATIBLE with SMB signing */
+	cli->readbraw_supported = False;
+	cli->writebraw_supported = False;
+	
+	return True;
+}
+
+/***********************************************************
+ SMB signing - Common code for 'real' implementations
+************************************************************/
+
+static BOOL set_smb_signing_real_common(struct cli_state *cli) 
+{
+	if (cli->sign_info.mandetory_signing) {
+		DEBUG(5, ("Mandetory SMB signing enabled!\n"));
+		cli->sign_info.doing_signing = True;
+	}
+
+	DEBUG(5, ("SMB signing enabled!\n"));
+
+	return True;
+}
+
+static void mark_packet_signed(struct cli_state *cli) 
+{
+	uint16 flags2;
+	flags2 = SVAL(cli->outbuf,smb_flg2);
+	flags2 |= FLAGS2_SMB_SECURITY_SIGNATURES;
+	SSVAL(cli->outbuf,smb_flg2, flags2);
+}
+
+/***********************************************************
+ SMB signing - Simple implementation - calculate a MAC to send.
+************************************************************/
+
+static void cli_simple_sign_outgoing_message(struct cli_state *cli)
+{
+	unsigned char calc_md5_mac[16];
+	struct MD5Context md5_ctx;
+	struct smb_basic_signing_context *data = cli->sign_info.signing_context;
+
+	/*
+	 * Firstly put the sequence number into the first 4 bytes.
+	 * and zero out the next 4 bytes.
+	 */
+	SIVAL(cli->outbuf, smb_ss_field, 
+	      data->send_seq_num);
+	SIVAL(cli->outbuf, smb_ss_field + 4, 0);
+
+	/* mark the packet as signed - BEFORE we sign it...*/
+	mark_packet_signed(cli);
+
+	/* Calculate the 16 byte MAC and place first 8 bytes into the field. */
+	MD5Init(&md5_ctx);
+	MD5Update(&md5_ctx, data->mac_key.data, 
+		  data->mac_key.length); 
+	MD5Update(&md5_ctx, cli->outbuf + 4, smb_len(cli->outbuf));
+	MD5Final(calc_md5_mac, &md5_ctx);
+
+	DEBUG(10, ("sent SMB signiture of\n"));
+	dump_data(10, calc_md5_mac, 8);
+
+	memcpy(&cli->outbuf[smb_ss_field], calc_md5_mac, 8);
+
+/*	cli->outbuf[smb_ss_field+2]=0; 
+	Uncomment this to test if the remote server actually verifies signitures...*/
+	data->send_seq_num++;
+	data->reply_seq_num = data->send_seq_num;
+	data->send_seq_num++;
+}
+
+/***********************************************************
+ SMB signing - Simple implementation - check a MAC sent by server.
+************************************************************/
+
+static BOOL cli_simple_check_incoming_message(struct cli_state *cli)
+{
+	BOOL good;
+	unsigned char calc_md5_mac[16];
+	unsigned char server_sent_mac[8];
+	struct MD5Context md5_ctx;
+	struct smb_basic_signing_context *data = cli->sign_info.signing_context;
+
+	/*
+	 * Firstly put the sequence number into the first 4 bytes.
+	 * and zero out the next 4 bytes.
+	 */
+
+	memcpy(server_sent_mac, &cli->inbuf[smb_ss_field], sizeof(server_sent_mac));
+
+	DEBUG(10, ("got SMB signiture of\n"));
+	dump_data(10, server_sent_mac, 8);
+
+	SIVAL(cli->inbuf, smb_ss_field, data->reply_seq_num);
+	SIVAL(cli->inbuf, smb_ss_field + 4, 0);
+
+	/* Calculate the 16 byte MAC and place first 8 bytes into the field. */
+	MD5Init(&md5_ctx);
+	MD5Update(&md5_ctx, data->mac_key.data, 
+		  data->mac_key.length); 
+	MD5Update(&md5_ctx, cli->inbuf + 4, smb_len(cli->inbuf));
+	MD5Final(calc_md5_mac, &md5_ctx);
+
+	good = (memcmp(server_sent_mac, calc_md5_mac, 8) == 0);
+	
+	if (good && !cli->sign_info.doing_signing) {
+		cli->sign_info.doing_signing = True;
+	}
+
+	if (!good) {
+		DEBUG(1, ("SMB signiture check failed!\n"));
+	}
+
+	return good;
+}
+
+/***********************************************************
+ SMB signing - Simple implementation - free signing context
+************************************************************/
+
+static void cli_simple_free_signing_context(struct cli_state *cli)
+{
+	struct smb_basic_signing_context *data = cli->sign_info.signing_context;
+
+	data_blob_free(&data->mac_key);
+	SAFE_FREE(cli->sign_info.signing_context);
+
+	return;
+}
+
+/***********************************************************
+ SMB signing - Simple implementation - setup the MAC key.
+************************************************************/
+
+void cli_simple_set_signing(struct cli_state *cli, const uchar user_session_key[16], const DATA_BLOB response)
+{
+	struct smb_basic_signing_context *data;
+
+	if (!set_smb_signing_common(cli)) {
+		return;
+	}
+
+	if (!set_smb_signing_real_common(cli)) {
+		return;
+	}
+
+	data = smb_xmalloc(sizeof(*data));
+	cli->sign_info.signing_context = data;
+	
+	data->mac_key = data_blob(NULL, MIN(response.length + 16, 40));
+
+	memcpy(&data->mac_key.data[0], user_session_key, 16);
+	memcpy(&data->mac_key.data[16],response.data, MIN(response.length, 40 - 16));
+
+	/* Initialise the sequence number */
+	data->send_seq_num = 0;
+
+	cli->sign_info.sign_outgoing_message = cli_simple_sign_outgoing_message;
+	cli->sign_info.check_incoming_message = cli_simple_check_incoming_message;
+	cli->sign_info.free_signing_context = cli_simple_free_signing_context;
+}
+
+/***********************************************************
+ SMB signing - NULL implementation - calculate a MAC to send.
+************************************************************/
+
+static void cli_null_sign_outgoing_message(struct cli_state *cli)
+{
+	static uchar zeros[8];
+	memcpy(&cli->outbuf[smb_ss_field], zeros, sizeof(zeros));
+}
+
+/***********************************************************
+ SMB signing - NULL implementation - check a MAC sent by server.
+************************************************************/
+
+static BOOL cli_null_check_incoming_message(struct cli_state *cli)
+{
+	return True;
+}
+
+/***********************************************************
+ SMB signing - NULL implementation - free signing context
+************************************************************/
+
+static void cli_null_free_signing_context(struct cli_state *cli)
+{
+	return;
+}
+
+/***********************************************************
+ SMB signing - NULL implementation - setup the MAC key.
+************************************************************/
+
+void cli_null_set_signing(struct cli_state *cli)
+{
+	struct smb_basic_sign_data *data;
+
+	if (!set_smb_signing_common(cli)) {
+		return;
+	}
+
+	cli->sign_info.signing_context = NULL;
+	
+	cli->sign_info.sign_outgoing_message = cli_null_sign_outgoing_message;
+	cli->sign_info.check_incoming_message = cli_null_check_incoming_message;
+	cli->sign_info.free_signing_context = cli_null_free_signing_context;
+}
+
+/***********************************************************
+ SMB signing - TEMP implementation - calculate a MAC to send.
+************************************************************/
+
+static void cli_temp_sign_outgoing_message(struct cli_state *cli)
+{
+	memcpy(&cli->outbuf[smb_ss_field], "SignRequest", 8);
+	return;
+}
+
+/***********************************************************
+ SMB signing - TEMP implementation - check a MAC sent by server.
+************************************************************/
+
+static BOOL cli_temp_check_incoming_message(struct cli_state *cli)
+{
+	return True;
+}
+
+/***********************************************************
+ SMB signing - TEMP implementation - free signing context
+************************************************************/
+
+static void cli_temp_free_signing_context(struct cli_state *cli)
+{
+	return;
+}
+
+/***********************************************************
+ SMB signing - NULL implementation - setup the MAC key.
+************************************************************/
+
+void cli_temp_set_signing(struct cli_state *cli)
+{
+	if (!set_smb_signing_common(cli)) {
+		return;
+	}
+
+	cli->sign_info.signing_context = NULL;
+	
+	cli->sign_info.sign_outgoing_message = cli_temp_sign_outgoing_message;
+	cli->sign_info.check_incoming_message = cli_temp_check_incoming_message;
+	cli->sign_info.free_signing_context = cli_temp_free_signing_context;
+}
+
+/**
+ *  Free the singing context
+ */
+ 
+void cli_free_signing_context(struct cli_state *cli) 
+{
+	if (cli->sign_info.free_signing_context) 
+		cli->sign_info.free_signing_context(cli);
+
+	cli_null_set_signing(cli);
+}
+
+void cli_caclulate_sign_mac(struct cli_state *cli)
+{
+	cli->sign_info.sign_outgoing_message(cli);
+}
+
+BOOL cli_check_sign_mac(struct cli_state *cli) 
+{
+	BOOL good;
+	good = cli->sign_info.check_incoming_message(cli);
+	
+	if (!good) {
+		if (cli->sign_info.doing_signing) {
+			return False;
+		} else {
+			cli_free_signing_context(cli);	
+		}
+	}
+
+	return True;
+}
+
diff --git a/source3/libsmb/smbencrypt.c b/source3/libsmb/smbencrypt.c
index aa9391325f..28160d9609 100644
--- a/source3/libsmb/smbencrypt.c
+++ b/source3/libsmb/smbencrypt.c
@@ -295,7 +295,7 @@ void SMBsesskeygen_ntv1(const uchar kr[16],
 #endif
 }
 
-DATA_BLOB NTLMv2_generate_response(uchar ntlm_v2_hash[16],
+static DATA_BLOB NTLMv2_generate_response(uchar ntlm_v2_hash[16],
 				   DATA_BLOB server_chal, size_t client_chal_length)
 {
 	uchar ntlmv2_response[16];
@@ -416,101 +416,3 @@ BOOL decode_pw_buffer(char in_buffer[516], char *new_pwrd,
 	
 	return True;
 }
-
-/***********************************************************
- SMB signing - setup the MAC key.
-************************************************************/
-
-void cli_calculate_mac_key(struct cli_state *cli, const uchar user_session_key[16], const DATA_BLOB response)
-{
-	
-	memcpy(&cli->sign_info.mac_key[0], user_session_key, 16);
-	memcpy(&cli->sign_info.mac_key[16],response.data, MIN(response.length, 40 - 16));
-	cli->sign_info.mac_key_len = MIN(response.length + 16, 40);
-	cli->sign_info.use_smb_signing = True;
-
-	/* These calls are INCONPATIBLE with SMB signing */
-	cli->readbraw_supported = False;
-	cli->writebraw_supported = False;
-
-	/* Reset the sequence number in case we had a previous (aborted) attempt */
-	cli->sign_info.send_seq_num = 2;
-}
-
-/***********************************************************
- SMB signing - calculate a MAC to send.
-************************************************************/
-
-void cli_caclulate_sign_mac(struct cli_state *cli)
-{
-	unsigned char calc_md5_mac[16];
-	struct MD5Context md5_ctx;
-
-	if (cli->sign_info.temp_smb_signing) {
-		memcpy(&cli->outbuf[smb_ss_field], "SignRequest", 8);
-		cli->sign_info.temp_smb_signing = False;
-		return;
-	}
-
-	if (!cli->sign_info.use_smb_signing) {
-		return;
-	}
-
-	/*
-	 * Firstly put the sequence number into the first 4 bytes.
-	 * and zero out the next 4 bytes.
-	 */
-	SIVAL(cli->outbuf, smb_ss_field, cli->sign_info.send_seq_num);
-	SIVAL(cli->outbuf, smb_ss_field + 4, 0);
-
-	/* Calculate the 16 byte MAC and place first 8 bytes into the field. */
-	MD5Init(&md5_ctx);
-	MD5Update(&md5_ctx, cli->sign_info.mac_key, cli->sign_info.mac_key_len);
-	MD5Update(&md5_ctx, cli->outbuf + 4, smb_len(cli->outbuf));
-	MD5Final(calc_md5_mac, &md5_ctx);
-
-	memcpy(&cli->outbuf[smb_ss_field], calc_md5_mac, 8);
-
-/*	cli->outbuf[smb_ss_field+2]=0; 
-	Uncomment this to test if the remote server actually verifies signitures...*/
-	cli->sign_info.send_seq_num++;
-	cli->sign_info.reply_seq_num = cli->sign_info.send_seq_num;
-	cli->sign_info.send_seq_num++;
-}
-
-/***********************************************************
- SMB signing - check a MAC sent by server.
-************************************************************/
-
-BOOL cli_check_sign_mac(struct cli_state *cli)
-{
-	unsigned char calc_md5_mac[16];
-	unsigned char server_sent_mac[8];
-	struct MD5Context md5_ctx;
-
-	if (cli->sign_info.temp_smb_signing) {
-		return True;
-	}
-
-	if (!cli->sign_info.use_smb_signing) {
-		return True;
-	}
-
-	/*
-	 * Firstly put the sequence number into the first 4 bytes.
-	 * and zero out the next 4 bytes.
-	 */
-
-	memcpy(server_sent_mac, &cli->inbuf[smb_ss_field], sizeof(server_sent_mac));
-
-	SIVAL(cli->inbuf, smb_ss_field, cli->sign_info.reply_seq_num);
-	SIVAL(cli->inbuf, smb_ss_field + 4, 0);
-
-	/* Calculate the 16 byte MAC and place first 8 bytes into the field. */
-	MD5Init(&md5_ctx);
-	MD5Update(&md5_ctx, cli->sign_info.mac_key, cli->sign_info.mac_key_len);
-	MD5Update(&md5_ctx, cli->inbuf + 4, smb_len(cli->inbuf));
-	MD5Final(calc_md5_mac, &md5_ctx);
-
-	return (memcmp(server_sent_mac, calc_md5_mac, 8) == 0);
-}
-- 
cgit 


From 2b6a6df0f65caccb31c78008539d24f8c4a2f72a Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sun, 9 Mar 2003 21:09:28 +0000
Subject: Try not to clobber the session request. (This used to be commit
 05cffbee56f0556f550b4d14f3111bd7db972621)

---
 source3/libsmb/smb_signing.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'source3')

diff --git a/source3/libsmb/smb_signing.c b/source3/libsmb/smb_signing.c
index b3a6351893..581d18fef7 100644
--- a/source3/libsmb/smb_signing.c
+++ b/source3/libsmb/smb_signing.c
@@ -208,8 +208,10 @@ void cli_simple_set_signing(struct cli_state *cli, const uchar user_session_key[
 
 static void cli_null_sign_outgoing_message(struct cli_state *cli)
 {
-	static uchar zeros[8];
-	memcpy(&cli->outbuf[smb_ss_field], zeros, sizeof(zeros));
+	/* we can't zero out the sig, as we might be trying to send a
+	   session request - which is NBT-level, not SMB level and doesn't
+	   have the feild */
+	return;
 }
 
 /***********************************************************
@@ -295,7 +297,7 @@ void cli_temp_set_signing(struct cli_state *cli)
 }
 
 /**
- *  Free the singing context
+ * Free the singing context
  */
  
 void cli_free_signing_context(struct cli_state *cli) 
@@ -306,11 +308,21 @@ void cli_free_signing_context(struct cli_state *cli)
 	cli_null_set_signing(cli);
 }
 
+/**
+ * Sign a packet with the current mechinism
+ */
+ 
 void cli_caclulate_sign_mac(struct cli_state *cli)
 {
 	cli->sign_info.sign_outgoing_message(cli);
 }
 
+/**
+ * Check a packet with the current mechinism
+ * @return False if we had an established signing connection
+ *         which had a back checksum, True otherwise
+ */
+ 
 BOOL cli_check_sign_mac(struct cli_state *cli) 
 {
 	BOOL good;
-- 
cgit 


From cb1de38cfd09bae002b8adf104d92569a9b695bb Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Mon, 10 Mar 2003 00:37:25 +0000
Subject: Check for valgrind.h (This used to be commit
 0ece70d631bf095bf9c8819180b6c59990159cd0)

---
 source3/configure.in | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source3')

diff --git a/source3/configure.in b/source3/configure.in
index cc38e37f3f..b2cd15b3b3 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -556,6 +556,7 @@ AC_CHECK_HEADERS(sys/mount.h sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h t
 AC_CHECK_HEADERS(sys/termio.h sys/statfs.h sys/dustat.h sys/statvfs.h stdarg.h sys/sockio.h)
 AC_CHECK_HEADERS(security/pam_modules.h security/_pam_macros.h ldap.h lber.h dlfcn.h)
 AC_CHECK_HEADERS(sys/syslog.h syslog.h)
+AC_CHECK_HEADERS(valgrind.h)
 
 #
 # HPUX has a bug in that including shadow.h causes a re-definition of MAXINT.
-- 
cgit 


From becf7a099710ba50f4611d0e16151337236b8a93 Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Mon, 10 Mar 2003 00:45:28 +0000
Subject: Include valgrind.h if present on the system. (This used to be commit
 65ba78c6bd4c5ab7ec9bf4d15e4410482e82588d)

---
 source3/include/includes.h | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'source3')

diff --git a/source3/include/includes.h b/source3/include/includes.h
index b9ba4b84d5..297f38ae97 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -433,6 +433,11 @@
 #include <com_err.h>
 #endif
 
+#if HAVE_VALGRIND_H
+/* Special macros that are no-ops except when run under Valgrind on x86.  */
+#include <valgrind.h>
+#endif
+
 /* we support ADS if we want it and have krb5 and ldap libs */
 #if defined(WITH_ADS) && defined(HAVE_KRB5) && defined(HAVE_LDAP)
 #define HAVE_ADS
-- 
cgit 


From de6b39d898d5fb3106d7ed80249be7f74f83caf6 Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Mon, 10 Mar 2003 01:10:45 +0000
Subject: Clobber strings with 0xf1f1f1f1 before writing to them to check
 buffer lengths are correct.  Attempts to pstrcpy into an fstring or allocated
 string should fail in developer builds.

This builds on abartlet's earlier overflow probe for safe_strcpy, but
by clobbering the whole string with a nonzero value is more likely to
find overflows on the stack.

This is only used in -DDEVELOPER mode.

Reviewed by abartlet, tpot.
(This used to be commit 8d915e266cd8ccc8b27e9c7ea8e9d003d05f8182)
---
 source3/lib/util_str.c | 41 +++++++++++++++++++++++++++++++++--------
 1 file changed, 33 insertions(+), 8 deletions(-)

(limited to 'source3')

diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c
index 070c59c1b2..924cf9d921 100644
--- a/source3/lib/util_str.c
+++ b/source3/lib/util_str.c
@@ -430,6 +430,27 @@ BOOL str_is_all(const char *s,char c)
 	return True;
 }
 
+
+/**
+ * In developer builds, clobber a region of memory.
+ *
+ * If we think a string buffer is longer than it really is, this ought
+ * to make the failure obvious, by segfaulting (if in the heap) or by
+ * killing the return address (on the stack), or by trapping under a
+ * memory debugger.
+ *
+ * This is meant to catch possible string overflows, even if the
+ * actual string copied is not big enough to cause an overflow.
+ **/
+void clobber_region(char *dest, size_t len)
+{
+#ifdef DEVELOPER
+	/* F1 is odd and 0xf1f1f1f1 shouldn't be a valid pointer */
+	memset(dest, 0xF1, len);
+#endif
+}
+
+
 /**
  Safe string copy into a known length string. maxlength does not
  include the terminating zero.
@@ -444,13 +465,7 @@ char *safe_strcpy(char *dest,const char *src, size_t maxlength)
 		return NULL;
 	}
 
-#ifdef DEVELOPER
-	/* We intentionally write out at the extremity of the destination
-	 * string.  If the destination is too short (e.g. pstrcpy into mallocd
-	 * or fstring) then this should cause an error under a memory
-	 * checker. */
-	dest[maxlength] = '\0';
-#endif
+	clobber_region(dest, maxlength+1);
 
 	if (!src) {
 		*dest = 0;
@@ -490,6 +505,8 @@ char *safe_strcat(char *dest, const char *src, size_t maxlength)
 	src_len = strlen(src);
 	dest_len = strlen(dest);
 
+	clobber_region(dest + dest_len, maxlength + 1 - dest_len);
+	
 	if (src_len + dest_len > maxlength) {
 		DEBUG(0,("ERROR: string overflow by %d in safe_strcat [%.50s]\n",
 			 (int)(src_len + dest_len - maxlength), src));
@@ -499,7 +516,7 @@ char *safe_strcat(char *dest, const char *src, size_t maxlength)
 		dest[maxlength] = 0;
 		return NULL;
 	}
-	
+
 	memcpy(&dest[dest_len], src, src_len);
 	dest[dest_len + src_len] = 0;
 	return dest;
@@ -516,6 +533,8 @@ char *alpha_strcpy(char *dest, const char *src, const char *other_safe_chars, si
 {
 	size_t len, i;
 
+	clobber_region(dest, maxlength);
+
 	if (!dest) {
 		DEBUG(0,("ERROR: NULL dest in alpha_strcpy\n"));
 		return NULL;
@@ -554,8 +573,12 @@ char *alpha_strcpy(char *dest, const char *src, const char *other_safe_chars, si
 char *StrnCpy(char *dest,const char *src,size_t n)
 {
 	char *d = dest;
+
+	clobber_region(dest, n+1);
+	
 	if (!dest)
 		return(NULL);
+	
 	if (!src) {
 		*dest = 0;
 		return(dest);
@@ -576,6 +599,8 @@ char *strncpyn(char *dest, const char *src, size_t n, char c)
 	char *p;
 	size_t str_len;
 
+	clobber_region(dest, n+1);
+
 	p = strchr_m(src, c);
 	if (p == NULL) {
 		DEBUG(5, ("strncpyn: separator character (%c) not found\n", c));
-- 
cgit 


From e9a94cd2c9cab4518603620259dae44b40d9049e Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 10 Mar 2003 02:14:35 +0000
Subject: Further work on NTLMSSP-based SMB signing.  Current status is that I
 cannnot get Win2k to send a valid signiture in it's session setup reply -
 which it will give to win2k clients.

So, I need to look at becoming 'more like MS', but for now I'll get this code
into the tree.  It's actually based on the TNG cli_pipe_ntlmssp.c, as it was
slightly easier to understand than our own (but only the utility functions
remain in any way intact...).

This includes the mysical 'NTLM2' code - I have no idea if it actually works.

(I couldn't get TNG to use it for its pipes either).

Andrew Bartlett
(This used to be commit a034a5e381ba5612be21e2ba640d11f82cd945da)
---
 source3/include/ntlmssp.h     |  23 +++++
 source3/libsmb/cliconnect.c   |  47 ++++++++--
 source3/libsmb/ntlmssp.c      |  37 +++++---
 source3/libsmb/ntlmssp_sign.c | 208 ++++++++++++++++++++++++++++++++++++++++++
 source3/libsmb/smb_signing.c  | 180 ++++++++++++++++++++++++++++++------
 5 files changed, 447 insertions(+), 48 deletions(-)
 create mode 100644 source3/libsmb/ntlmssp_sign.c

(limited to 'source3')

diff --git a/source3/include/ntlmssp.h b/source3/include/ntlmssp.h
index 4fa4259a6a..f0278ffece 100644
--- a/source3/include/ntlmssp.h
+++ b/source3/include/ntlmssp.h
@@ -92,6 +92,8 @@ typedef struct ntlmssp_state
 typedef struct ntlmssp_client_state 
 {
 	TALLOC_CTX *mem_ctx;
+	unsigned int ref_count;
+
 	BOOL unicode;
 	BOOL use_ntlmv2;
 	char *user;
@@ -102,9 +104,30 @@ typedef struct ntlmssp_client_state
 	const char *(*get_global_myname)(void);
 	const char *(*get_domain)(void);
 
+	DATA_BLOB chal;
+ 	DATA_BLOB lm_resp;
+	DATA_BLOB nt_resp;
 	DATA_BLOB session_key;
 	
 	uint32 neg_flags;
+	
+	/* SMB Signing */
+	
+	uint32 ntlmssp_seq_num;
+
+	/* ntlmv2 */
+	char cli_sign_const[16];
+	char cli_seal_const[16];
+	char srv_sign_const[16];
+	char srv_seal_const[16];
+
+	unsigned char cli_sign_hash[258];
+	unsigned char cli_seal_hash[258];
+	unsigned char srv_sign_hash[258];
+	unsigned char srv_seal_hash[258];
+
+	/* ntlmv1 */
+	unsigned char ntlmssp_hash[258];
 
 } NTLMSSP_CLIENT_STATE;
 
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 589c7b36bb..36b6f609f5 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -356,15 +356,13 @@ end:
 }
 
 /****************************************************************************
- Send a extended security session setup blob, returning a reply blob.
+ Send a extended security session setup blob
 ****************************************************************************/
 
-static DATA_BLOB cli_session_setup_blob(struct cli_state *cli, DATA_BLOB blob)
+static BOOL cli_session_setup_blob_send(struct cli_state *cli, DATA_BLOB blob)
 {
 	uint32 capabilities = cli_session_setup_capabilities(cli);
 	char *p;
-	DATA_BLOB blob2 = data_blob(NULL, 0);
-	uint32 len;
 
 	capabilities |= CAP_EXTENDED_SECURITY;
 
@@ -389,7 +387,18 @@ static DATA_BLOB cli_session_setup_blob(struct cli_state *cli, DATA_BLOB blob)
 	p += clistr_push(cli, p, "Unix", -1, STR_TERMINATE);
 	p += clistr_push(cli, p, "Samba", -1, STR_TERMINATE);
 	cli_setup_bcc(cli, p);
-	cli_send_smb(cli);
+	return cli_send_smb(cli);
+}
+
+/****************************************************************************
+ Send a extended security session setup blob, returning a reply blob.
+****************************************************************************/
+
+static DATA_BLOB cli_session_setup_blob_receive(struct cli_state *cli)
+{
+	DATA_BLOB blob2 = data_blob(NULL, 0);
+	char *p;
+	size_t len;
 
 	if (!cli_receive_smb(cli))
 		return blob2;
@@ -418,6 +427,20 @@ static DATA_BLOB cli_session_setup_blob(struct cli_state *cli, DATA_BLOB blob)
 	return blob2;
 }
 
+/****************************************************************************
+ Send a extended security session setup blob, returning a reply blob.
+****************************************************************************/
+
+static DATA_BLOB cli_session_setup_blob(struct cli_state *cli, DATA_BLOB blob)
+{
+	DATA_BLOB blob2 = data_blob(NULL, 0);
+	if (!cli_session_setup_blob_send(cli, blob)) {
+		return blob2;
+	}
+		
+	return cli_session_setup_blob_receive(cli);
+}
+
 #ifdef HAVE_KRB5
 /****************************************************************************
  Use in-memory credentials cache
@@ -471,6 +494,8 @@ static BOOL cli_session_setup_ntlmssp(struct cli_state *cli, const char *user,
 	DATA_BLOB blob_in = data_blob(NULL, 0);
 	DATA_BLOB blob_out;
 
+	cli_temp_set_signing(cli);
+
 	if (!NT_STATUS_IS_OK(nt_status = ntlmssp_client_start(&ntlmssp_state))) {
 		return False;
 	}
@@ -501,8 +526,15 @@ static BOOL cli_session_setup_ntlmssp(struct cli_state *cli, const char *user,
 			}
 		
 			/* now send that blob on its way */
-			blob = cli_session_setup_blob(cli, msg1);
+			if (!cli_session_setup_blob_send(cli, msg1)) {
+				return False;
+			}
 			data_blob_free(&msg1);
+			
+			cli_ntlmssp_set_signing(cli, ntlmssp_state);
+			
+			blob = cli_session_setup_blob_receive(cli);
+
 			nt_status = cli_nt_error(cli);
 		}
 		
@@ -539,6 +571,9 @@ static BOOL cli_session_setup_ntlmssp(struct cli_state *cli, const char *user,
 		set_cli_session_key(cli, ntlmssp_state->session_key);
 	}
 
+	/* we have a reference conter on ntlmssp_state, if we are signing
+	   then the state will be kept by the signing engine */
+
 	if (!NT_STATUS_IS_OK(ntlmssp_client_end(&ntlmssp_state))) {
 		return False;
 	}
diff --git a/source3/libsmb/ntlmssp.c b/source3/libsmb/ntlmssp.c
index e1509f6b63..5722b8efcd 100644
--- a/source3/libsmb/ntlmssp.c
+++ b/source3/libsmb/ntlmssp.c
@@ -81,7 +81,7 @@ static const uint8 *get_challenge(struct ntlmssp_state *ntlmssp_state)
 
 /**
  * Determine correct target name flags for reply, given server role 
- * and negoitated falgs
+ * and negotiated flags
  * 
  * @param ntlmssp_state NTLMSSP State
  * @param neg_flags The flags from the packet
@@ -291,7 +291,7 @@ static NTSTATUS ntlmssp_server_auth(struct ntlmssp_state *ntlmssp_state,
 /**
  * Create an NTLMSSP state machine
  * 
- * @param ntlmssp_state NTLMSSP State, allocated by this funciton
+ * @param ntlmssp_state NTLMSSP State, allocated by this function
  */
 
 NTSTATUS ntlmssp_server_start(NTLMSSP_STATE **ntlmssp_state)
@@ -322,7 +322,7 @@ NTSTATUS ntlmssp_server_start(NTLMSSP_STATE **ntlmssp_state)
 /**
  * End an NTLMSSP state machine
  * 
- * @param ntlmssp_state NTLMSSP State, free()ed by this funciton
+ * @param ntlmssp_state NTLMSSP State, free()ed by this function
  */
 
 NTSTATUS ntlmssp_server_end(NTLMSSP_STATE **ntlmssp_state)
@@ -431,7 +431,7 @@ static NTSTATUS ntlmssp_client_challenge(struct ntlmssp_client_state *ntlmssp_st
 	DATA_BLOB session_key = data_blob(NULL, 0);
 	uint8 datagram_sess_key[16];
 
-	ZERO_STRUCT(datagram_sess_key);
+	generate_random_buffer(datagram_sess_key, sizeof(datagram_sess_key), False);	
 
 	if (!msrpc_parse(&reply, "CdBd",
 			 "NTLMSSP",
@@ -508,8 +508,6 @@ static NTSTATUS ntlmssp_client_challenge(struct ntlmssp_client_state *ntlmssp_st
 		session_key = data_blob(NULL, 16);
 		SMBsesskeygen_ntv1(nt_hash, NULL, session_key.data);
 	}
-	
-	data_blob_free(&challenge_blob);
 
 	/* this generates the actual auth packet */
 	if (!msrpc_gen(next_request, auth_gen_string, 
@@ -520,7 +518,7 @@ static NTSTATUS ntlmssp_client_challenge(struct ntlmssp_client_state *ntlmssp_st
 		       ntlmssp_state->domain, 
 		       ntlmssp_state->user, 
 		       ntlmssp_state->get_global_myname(), 
-		       datagram_sess_key, 0,
+		       datagram_sess_key, 16,
 		       ntlmssp_state->neg_flags)) {
 		
 		data_blob_free(&lm_response);
@@ -529,9 +527,14 @@ static NTSTATUS ntlmssp_client_challenge(struct ntlmssp_client_state *ntlmssp_st
 		return NT_STATUS_NO_MEMORY;
 	}
 
-	data_blob_free(&lm_response);
-	data_blob_free(&nt_response);
+	data_blob_free(&ntlmssp_state->chal);
+	data_blob_free(&ntlmssp_state->lm_resp);
+	data_blob_free(&ntlmssp_state->nt_resp);
+	data_blob_free(&ntlmssp_state->session_key);
 
+	ntlmssp_state->chal = challenge_blob;
+	ntlmssp_state->lm_resp = lm_response;
+	ntlmssp_state->nt_resp = nt_response;
 	ntlmssp_state->session_key = session_key;
 
 	return NT_STATUS_MORE_PROCESSING_REQUIRED;
@@ -558,10 +561,12 @@ NTSTATUS ntlmssp_client_start(NTLMSSP_CLIENT_STATE **ntlmssp_state)
 	(*ntlmssp_state)->unicode = True;
 
 	(*ntlmssp_state)->neg_flags = 
-	       	NTLMSSP_NEGOTIATE_128 | 
+		NTLMSSP_NEGOTIATE_128 |
 		NTLMSSP_NEGOTIATE_NTLM |
 		NTLMSSP_REQUEST_TARGET;
 
+	(*ntlmssp_state)->ref_count = 1;
+
 	return NT_STATUS_OK;
 }
 
@@ -569,8 +574,16 @@ NTSTATUS ntlmssp_client_end(NTLMSSP_CLIENT_STATE **ntlmssp_state)
 {
 	TALLOC_CTX *mem_ctx = (*ntlmssp_state)->mem_ctx;
 
-	data_blob_free(&(*ntlmssp_state)->session_key);
-	talloc_destroy(mem_ctx);
+	(*ntlmssp_state)->ref_count--;
+
+	if ((*ntlmssp_state)->ref_count == 0) {
+		data_blob_free(&(*ntlmssp_state)->chal);
+		data_blob_free(&(*ntlmssp_state)->lm_resp);
+		data_blob_free(&(*ntlmssp_state)->nt_resp);
+		data_blob_free(&(*ntlmssp_state)->session_key);
+		talloc_destroy(mem_ctx);
+	}
+
 	*ntlmssp_state = NULL;
 	return NT_STATUS_OK;
 }
diff --git a/source3/libsmb/ntlmssp_sign.c b/source3/libsmb/ntlmssp_sign.c
new file mode 100644
index 0000000000..f51d532319
--- /dev/null
+++ b/source3/libsmb/ntlmssp_sign.c
@@ -0,0 +1,208 @@
+/* 
+ *  Unix SMB/CIFS implementation.
+ *  Version 3.0
+ *  NTLMSSP Signing routines
+ *  Copyright (C) Luke Kenneth Casson Leighton 1996-2001
+ *  Copyright (C) Andrew Bartlett 2003
+ *  
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *  
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *  
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software Foundation,
+ *  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include "includes.h"
+
+#define CLI_SIGN "session key to client-to-server signing key magic constant"
+#define CLI_SEAL "session key to client-to-server sealing key magic constant"
+#define SRV_SIGN "session key to server-to-client signing key magic constant"
+#define SRV_SEAL "session key to server-to-client sealing key magic constant"
+
+static void NTLMSSPcalc_ap( unsigned char *hash, unsigned char *data, int len)
+{
+    unsigned char index_i = hash[256];
+    unsigned char index_j = hash[257];
+    int ind;
+
+    for (ind = 0; ind < len; ind++)
+    {
+        unsigned char tc;
+        unsigned char t;
+
+        index_i++;
+        index_j += hash[index_i];
+
+        tc = hash[index_i];
+        hash[index_i] = hash[index_j];
+        hash[index_j] = tc;
+
+        t = hash[index_i] + hash[index_j];
+        data[ind] = data[ind] ^ hash[t];
+    }
+
+    hash[256] = index_i;
+    hash[257] = index_j;
+}
+
+static void calc_hash(unsigned char *hash, const char *k2, int k2l)
+{
+	unsigned char j = 0;
+	int ind;
+
+	for (ind = 0; ind < 256; ind++)
+	{
+		hash[ind] = (unsigned char)ind;
+	}
+
+	for (ind = 0; ind < 256; ind++)
+	{
+		unsigned char tc;
+
+		j += (hash[ind] + k2[ind%k2l]);
+
+		tc = hash[ind];
+		hash[ind] = hash[j];
+		hash[j] = tc;
+	}
+
+	hash[256] = 0;
+	hash[257] = 0;
+}
+
+static void calc_ntlmv2_hash(unsigned char hash[16], char digest[16],
+			     const char encrypted_response[16], 
+			     const char *constant)
+{
+	struct MD5Context ctx3;
+
+	MD5Init(&ctx3);
+	MD5Update(&ctx3, encrypted_response, 5);
+	MD5Update(&ctx3, constant, strlen(constant));
+	MD5Final(digest, &ctx3);
+
+	calc_hash(hash, digest, 16);
+}
+
+static NTSTATUS ntlmssp_make_packet_signiture(NTLMSSP_CLIENT_STATE *ntlmssp_state,
+					      const uchar *data, size_t length, 
+					      DATA_BLOB *sig) 
+{
+	if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_NTLM2) {
+		HMACMD5Context ctx;
+		char seq_num[4];
+		uchar digest[16];
+		SIVAL(seq_num, 0, &ntlmssp_state->ntlmssp_seq_num);
+
+		hmac_md5_init_limK_to_64(ntlmssp_state->cli_sign_const, 16, &ctx);
+		hmac_md5_update(seq_num, 4, &ctx);
+		hmac_md5_update(data, length, &ctx);
+		hmac_md5_final(digest, &ctx);
+
+		if (!msrpc_gen(sig, "Bd", digest, sizeof(digest), ntlmssp_state->ntlmssp_seq_num)) {
+			return NT_STATUS_NO_MEMORY;
+		}
+	       
+		NTLMSSPcalc_ap(ntlmssp_state->cli_seal_hash,  sig->data, sig->length);
+	} else {
+		uint32 crc;
+		crc = crc32_calc_buffer(data, length);
+		if (!msrpc_gen(sig, "ddd", 0, crc, ntlmssp_state->ntlmssp_seq_num)) {
+			return NT_STATUS_NO_MEMORY;
+		}
+		
+		NTLMSSPcalc_ap(ntlmssp_state->ntlmssp_hash, sig->data, sig->length);
+	}
+	return NT_STATUS_OK;
+}
+
+NTSTATUS ntlmssp_client_sign_packet(NTLMSSP_CLIENT_STATE *ntlmssp_state,
+					   const uchar *data, size_t length, 
+					   DATA_BLOB *sig) 
+{
+	ntlmssp_state->ntlmssp_seq_num++;
+	return ntlmssp_make_packet_signiture(ntlmssp_state, data, length, sig);
+}
+
+/**
+ * Check the signature of an incoming packet 
+ * @note caller *must* check that the signature is the size it expects 
+ *
+ */
+
+NTSTATUS ntlmssp_client_check_packet(NTLMSSP_CLIENT_STATE *ntlmssp_state,
+					   const uchar *data, size_t length, 
+					   const DATA_BLOB *sig) 
+{
+	DATA_BLOB local_sig;
+	NTSTATUS nt_status;
+
+	if (sig->length < 8) {
+		DEBUG(0, ("NTLMSSP packet check failed due to short signiture (%u bytes)!\n", 
+			  sig->length));
+	}
+
+	nt_status = ntlmssp_make_packet_signiture(ntlmssp_state, data, 
+						  length, &local_sig);
+	
+	if (!NT_STATUS_IS_OK(nt_status)) {
+		DEBUG(0, ("NTLMSSP packet check failed with %s\n", nt_errstr(nt_status)));
+		return nt_status;
+	}
+	
+	if (memcmp(sig->data, local_sig.data, MIN(sig->length, local_sig.length)) == 0) {
+		return NT_STATUS_OK;
+	} else {
+		DEBUG(0, ("NTLMSSP packet check failed due to invalid signiture!\n"));
+		return NT_STATUS_ACCESS_DENIED;
+	}
+}
+
+/**
+   Initialise the state for NTLMSSP signing.
+*/
+NTSTATUS ntlmssp_client_sign_init(NTLMSSP_CLIENT_STATE *ntlmssp_state)
+{
+	unsigned char p24[24];
+	unsigned char lm_hash[16];
+
+	if (!ntlmssp_state->lm_resp.data) {
+		/* can't sign or check signitures yet */ 
+		return NT_STATUS_UNSUCCESSFUL;
+	}
+			    
+	E_deshash(ntlmssp_state->password, lm_hash);
+		
+	NTLMSSPOWFencrypt(lm_hash, ntlmssp_state->lm_resp.data, p24);
+	
+	if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_NTLM2)
+	{
+		calc_ntlmv2_hash(ntlmssp_state->cli_sign_hash, ntlmssp_state->cli_sign_const, p24, CLI_SIGN);
+		calc_ntlmv2_hash(ntlmssp_state->cli_seal_hash, ntlmssp_state->cli_seal_const, p24, CLI_SEAL);
+		calc_ntlmv2_hash(ntlmssp_state->srv_sign_hash, ntlmssp_state->srv_sign_const, p24, SRV_SIGN);
+		calc_ntlmv2_hash(ntlmssp_state->srv_seal_hash, ntlmssp_state->srv_seal_const, p24, SRV_SEAL);
+	}
+	else
+	{
+		char k2[8];
+		memcpy(k2, p24, 5);
+		k2[5] = 0xe5;
+		k2[6] = 0x38;
+		k2[7] = 0xb0;
+		
+		calc_hash(ntlmssp_state->ntlmssp_hash, k2, 8);
+	}
+
+	ntlmssp_state->ntlmssp_seq_num = 0;
+
+	ZERO_STRUCT(lm_hash);
+	return NT_STATUS_OK;
+}
diff --git a/source3/libsmb/smb_signing.c b/source3/libsmb/smb_signing.c
index 581d18fef7..40359c5c8c 100644
--- a/source3/libsmb/smb_signing.c
+++ b/source3/libsmb/smb_signing.c
@@ -33,6 +33,11 @@ struct smb_basic_signing_context {
 
 static BOOL set_smb_signing_common(struct cli_state *cli) 
 {
+	if (!cli->sign_info.negotiated_smb_signing 
+	    && !cli->sign_info.mandetory_signing) {
+		return False;
+	}
+
 	if (cli->sign_info.doing_signing) {
 		return False;
 	}
@@ -40,7 +45,7 @@ static BOOL set_smb_signing_common(struct cli_state *cli)
 	if (cli->sign_info.free_signing_context)
 		cli->sign_info.free_signing_context(cli);
 
-	/* These calls are INCONPATIBLE with SMB signing */
+	/* These calls are INCOMPATIBLE with SMB signing */
 	cli->readbraw_supported = False;
 	cli->writebraw_supported = False;
 	
@@ -54,7 +59,7 @@ static BOOL set_smb_signing_common(struct cli_state *cli)
 static BOOL set_smb_signing_real_common(struct cli_state *cli) 
 {
 	if (cli->sign_info.mandetory_signing) {
-		DEBUG(5, ("Mandetory SMB signing enabled!\n"));
+		DEBUG(5, ("Mandatory SMB signing enabled!\n"));
 		cli->sign_info.doing_signing = True;
 	}
 
@@ -71,6 +76,28 @@ static void mark_packet_signed(struct cli_state *cli)
 	SSVAL(cli->outbuf,smb_flg2, flags2);
 }
 
+static BOOL signing_good(struct cli_state *cli, BOOL good) 
+{
+	DEBUG(10, ("got SMB signature of\n"));
+	dump_data(10,&cli->outbuf[smb_ss_field] , 8);
+
+	if (good && !cli->sign_info.doing_signing) {
+		cli->sign_info.doing_signing = True;
+	}
+
+	if (!good) {
+		if (cli->sign_info.doing_signing) {
+			DEBUG(1, ("SMB signature check failed!\n"));
+			return False;
+		} else {
+			DEBUG(3, ("Server did not sign reply correctly\n"));
+			cli_free_signing_context(cli);
+			return False;
+		}
+	}
+	return True;
+}	
+
 /***********************************************************
  SMB signing - Simple implementation - calculate a MAC to send.
 ************************************************************/
@@ -99,7 +126,7 @@ static void cli_simple_sign_outgoing_message(struct cli_state *cli)
 	MD5Update(&md5_ctx, cli->outbuf + 4, smb_len(cli->outbuf));
 	MD5Final(calc_md5_mac, &md5_ctx);
 
-	DEBUG(10, ("sent SMB signiture of\n"));
+	DEBUG(10, ("sent SMB signature of\n"));
 	dump_data(10, calc_md5_mac, 8);
 
 	memcpy(&cli->outbuf[smb_ss_field], calc_md5_mac, 8);
@@ -130,7 +157,7 @@ static BOOL cli_simple_check_incoming_message(struct cli_state *cli)
 
 	memcpy(server_sent_mac, &cli->inbuf[smb_ss_field], sizeof(server_sent_mac));
 
-	DEBUG(10, ("got SMB signiture of\n"));
+	DEBUG(10, ("got SMB signature of\n"));
 	dump_data(10, server_sent_mac, 8);
 
 	SIVAL(cli->inbuf, smb_ss_field, data->reply_seq_num);
@@ -145,15 +172,7 @@ static BOOL cli_simple_check_incoming_message(struct cli_state *cli)
 
 	good = (memcmp(server_sent_mac, calc_md5_mac, 8) == 0);
 	
-	if (good && !cli->sign_info.doing_signing) {
-		cli->sign_info.doing_signing = True;
-	}
-
-	if (!good) {
-		DEBUG(1, ("SMB signiture check failed!\n"));
-	}
-
-	return good;
+	return signing_good(cli, good);
 }
 
 /***********************************************************
@@ -174,16 +193,16 @@ static void cli_simple_free_signing_context(struct cli_state *cli)
  SMB signing - Simple implementation - setup the MAC key.
 ************************************************************/
 
-void cli_simple_set_signing(struct cli_state *cli, const uchar user_session_key[16], const DATA_BLOB response)
+BOOL cli_simple_set_signing(struct cli_state *cli, const uchar user_session_key[16], const DATA_BLOB response)
 {
 	struct smb_basic_signing_context *data;
 
 	if (!set_smb_signing_common(cli)) {
-		return;
+		return False;
 	}
 
 	if (!set_smb_signing_real_common(cli)) {
-		return;
+		return False;
 	}
 
 	data = smb_xmalloc(sizeof(*data));
@@ -194,12 +213,105 @@ void cli_simple_set_signing(struct cli_state *cli, const uchar user_session_key[
 	memcpy(&data->mac_key.data[0], user_session_key, 16);
 	memcpy(&data->mac_key.data[16],response.data, MIN(response.length, 40 - 16));
 
-	/* Initialise the sequence number */
+	/* Initialize the sequence number */
 	data->send_seq_num = 0;
 
 	cli->sign_info.sign_outgoing_message = cli_simple_sign_outgoing_message;
 	cli->sign_info.check_incoming_message = cli_simple_check_incoming_message;
 	cli->sign_info.free_signing_context = cli_simple_free_signing_context;
+
+	return True;
+}
+
+/***********************************************************
+ SMB signing - NTLMSSP implementation - calculate a MAC to send.
+************************************************************/
+
+static void cli_ntlmssp_sign_outgoing_message(struct cli_state *cli)
+{
+	NTSTATUS nt_status;
+	DATA_BLOB sig;
+	NTLMSSP_CLIENT_STATE *ntlmssp_state = cli->sign_info.signing_context;
+
+	/* mark the packet as signed - BEFORE we sign it...*/
+	mark_packet_signed(cli);
+	
+	nt_status = ntlmssp_client_sign_packet(ntlmssp_state, cli->outbuf + 4, 
+					       smb_len(cli->outbuf), &sig);
+	
+	if (!NT_STATUS_IS_OK(nt_status)) {
+		DEBUG(0, ("NTLMSSP signing failed with %s\n", nt_errstr(nt_status)));
+		return;
+	}
+
+	DEBUG(10, ("sent SMB signature of\n"));
+	dump_data(10, sig.data, MIN(sig.length, 8));
+	memcpy(&cli->outbuf[smb_ss_field], sig.data, MIN(sig.length, 8));
+	
+	data_blob_free(&sig);
+}
+
+/***********************************************************
+ SMB signing - NTLMSSP implementation - check a MAC sent by server.
+************************************************************/
+
+static BOOL cli_ntlmssp_check_incoming_message(struct cli_state *cli)
+{
+	BOOL good;
+	NTSTATUS nt_status;
+	DATA_BLOB sig = data_blob(&cli->outbuf[smb_ss_field], 8);
+
+	NTLMSSP_CLIENT_STATE *ntlmssp_state = cli->sign_info.signing_context;
+
+	nt_status = ntlmssp_client_check_packet(ntlmssp_state, cli->outbuf + 4, 
+						smb_len(cli->outbuf), &sig);
+	
+	data_blob_free(&sig);
+	
+	good = NT_STATUS_IS_OK(nt_status);
+	if (!NT_STATUS_IS_OK(nt_status)) {
+		DEBUG(5, ("NTLMSSP signing failed with %s\n", nt_errstr(nt_status)));
+	}
+
+	return signing_good(cli, good);
+}
+
+/***********************************************************
+ SMB signing - NTLMSSP implementation - free signing context
+************************************************************/
+
+static void cli_ntlmssp_free_signing_context(struct cli_state *cli)
+{
+	ntlmssp_client_end((NTLMSSP_CLIENT_STATE **)&cli->sign_info.signing_context);
+}
+
+/***********************************************************
+ SMB signing - NTLMSSP implementation - setup the MAC key.
+************************************************************/
+
+BOOL cli_ntlmssp_set_signing(struct cli_state *cli,
+			     NTLMSSP_CLIENT_STATE *ntlmssp_state)
+{
+	if (!set_smb_signing_common(cli)) {
+		return False;
+	}
+
+	if (!NT_STATUS_IS_OK(ntlmssp_client_sign_init(ntlmssp_state))) {
+		return False;
+	}
+
+	if (!set_smb_signing_real_common(cli)) {
+		return False;
+	}
+
+	cli->sign_info.signing_context = ntlmssp_state;
+	ntlmssp_state->ref_count++;
+
+	cli->sign_info.sign_outgoing_message = cli_ntlmssp_sign_outgoing_message;
+	cli->sign_info.check_incoming_message = cli_ntlmssp_check_incoming_message;
+	cli->sign_info.free_signing_context = cli_ntlmssp_free_signing_context;
+
+	return True;
 }
 
 /***********************************************************
@@ -210,7 +322,7 @@ static void cli_null_sign_outgoing_message(struct cli_state *cli)
 {
 	/* we can't zero out the sig, as we might be trying to send a
 	   session request - which is NBT-level, not SMB level and doesn't
-	   have the feild */
+	   have the field */
 	return;
 }
 
@@ -232,23 +344,24 @@ static void cli_null_free_signing_context(struct cli_state *cli)
 	return;
 }
 
-/***********************************************************
+/**
  SMB signing - NULL implementation - setup the MAC key.
-************************************************************/
 
-void cli_null_set_signing(struct cli_state *cli)
+ @note Used as an initialisation only - it will not correctly
+       shut down a real signing mechinism
+*/
+
+BOOL cli_null_set_signing(struct cli_state *cli)
 {
 	struct smb_basic_sign_data *data;
 
-	if (!set_smb_signing_common(cli)) {
-		return;
-	}
-
 	cli->sign_info.signing_context = NULL;
 	
 	cli->sign_info.sign_outgoing_message = cli_null_sign_outgoing_message;
 	cli->sign_info.check_incoming_message = cli_null_check_incoming_message;
 	cli->sign_info.free_signing_context = cli_null_free_signing_context;
+
+	return True;
 }
 
 /***********************************************************
@@ -257,7 +370,12 @@ void cli_null_set_signing(struct cli_state *cli)
 
 static void cli_temp_sign_outgoing_message(struct cli_state *cli)
 {
-	memcpy(&cli->outbuf[smb_ss_field], "SignRequest", 8);
+	/* mark the packet as signed - BEFORE we sign it...*/
+	mark_packet_signed(cli);
+
+	/* I wonder what BSRSPYL stands for - but this is what MS 
+	   actually sends! */
+	memcpy(&cli->outbuf[smb_ss_field], "BSRSPYL ", 8);
 	return;
 }
 
@@ -283,10 +401,10 @@ static void cli_temp_free_signing_context(struct cli_state *cli)
  SMB signing - NULL implementation - setup the MAC key.
 ************************************************************/
 
-void cli_temp_set_signing(struct cli_state *cli)
+BOOL cli_temp_set_signing(struct cli_state *cli)
 {
 	if (!set_smb_signing_common(cli)) {
-		return;
+		return False;
 	}
 
 	cli->sign_info.signing_context = NULL;
@@ -294,6 +412,8 @@ void cli_temp_set_signing(struct cli_state *cli)
 	cli->sign_info.sign_outgoing_message = cli_temp_sign_outgoing_message;
 	cli->sign_info.check_incoming_message = cli_temp_check_incoming_message;
 	cli->sign_info.free_signing_context = cli_temp_free_signing_context;
+
+	return True;
 }
 
 /**
@@ -309,7 +429,7 @@ void cli_free_signing_context(struct cli_state *cli)
 }
 
 /**
- * Sign a packet with the current mechinism
+ * Sign a packet with the current mechanism
  */
  
 void cli_caclulate_sign_mac(struct cli_state *cli)
@@ -318,7 +438,7 @@ void cli_caclulate_sign_mac(struct cli_state *cli)
 }
 
 /**
- * Check a packet with the current mechinism
+ * Check a packet with the current mechanism
  * @return False if we had an established signing connection
  *         which had a back checksum, True otherwise
  */
-- 
cgit 


From 190708832c7aa10b03bab8c48077faca486c539d Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 10 Mar 2003 02:48:32 +0000
Subject: Makefile.in for NTLMSSP singing update (This used to be commit
 7717555438e4d74bb63d12abde3573933c15342a)

---
 source3/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 23c88d3ab1..3ae939c4f5 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -192,7 +192,7 @@ SECRETS_OBJ = passdb/secrets.o
 LIBNMB_OBJ = libsmb/unexpected.o libsmb/namecache.o libsmb/nmblib.o \
 	     libsmb/namequery.o 
 
-LIBNTLMSSP_OBJ = libsmb/ntlmssp.o libsmb/ntlmssp_parse.o
+LIBNTLMSSP_OBJ = libsmb/ntlmssp.o libsmb/ntlmssp_parse.o libsmb/ntlmssp_sign.o
 
 LIBSAMBA_OBJ = libsmb/nterr.o libsmb/smbdes.o libsmb/smbencrypt.o
 
-- 
cgit 


From 44bd743c286405cad0b10149ff5e116fc21e8322 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 10 Mar 2003 02:49:52 +0000
Subject: added -i option for ignoring dot errors in masktest (This used to be
 commit 0f4d1172a6add3f490fca22a45975d2588485146)

---
 source3/torture/masktest.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'source3')

diff --git a/source3/torture/masktest.c b/source3/torture/masktest.c
index 7d751fb789..06dead3f16 100644
--- a/source3/torture/masktest.c
+++ b/source3/torture/masktest.c
@@ -33,6 +33,7 @@ static const char *filechars = "abcdefghijklm.";
 static int verbose;
 static int die_on_error;
 static int NumLoops = 0;
+static int ignore_dot_errors = 0;
 
 /* a test fn for LANMAN mask support */
 int ms_fnmatch_lanman_core(const char *pattern, const char *string)
@@ -324,7 +325,9 @@ static void testpair(struct cli_state *cli, char *mask, char *file)
 
 	res2 = reg_test(cli, mask, long_name, short_name);
 
-	if (showall || strcmp(res1, res2)) {
+	if (showall || 
+	    ((strcmp(res1, res2) && !ignore_dot_errors) ||
+	     (strcmp(res1+2, res2+2) && ignore_dot_errors))) {
 		DEBUG(0,("%s %s %d mask=[%s] file=[%s] rfile=[%s/%s]\n",
 			 res1, res2, count, mask, file, long_name, short_name));
 		if (die_on_error) exit(1);
@@ -409,6 +412,7 @@ static void usage(void)
 	-v                             verbose mode\n\
 	-E                             die on error\n\
         -a                             show all tests\n\
+        -i                             ignore . and .. errors\n\
 \n\
   This program tests wildcard matching between two servers. It generates\n\
   random pairs of filenames/masks and tests that they match in the same\n\
@@ -461,7 +465,7 @@ static void usage(void)
 
 	seed = time(NULL);
 
-	while ((opt = getopt(argc, argv, "n:d:U:s:hm:f:aoW:M:vE")) != EOF) {
+	while ((opt = getopt(argc, argv, "n:d:U:s:hm:f:aoW:M:vEi")) != EOF) {
 		switch (opt) {
 		case 'n':
 			NumLoops = atoi(optarg);
@@ -472,6 +476,9 @@ static void usage(void)
 		case 'E':
 			die_on_error = 1;
 			break;
+		case 'i':
+			ignore_dot_errors = 1;
+			break;
 		case 'v':
 			verbose++;
 			break;
-- 
cgit 


From 8dd9e99f37c984f94e9ebc2005e3806c9bb43767 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 10 Mar 2003 02:51:30 +0000
Subject: fixed use_oplocks and the timeout in smbtorture startup (This used to
 be commit cec1ef09e5009cdac22e6c9ca101a49c5ef36b1a)

---
 source3/torture/torture.c | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

(limited to 'source3')

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index ca4dbed1d8..090f08c160 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -150,15 +150,25 @@ BOOL torture_open_connection(struct cli_state **c)
 {
 	BOOL retry;
 	int flags = 0;
+	NTSTATUS status;
+
 	if (use_kerberos)
 		flags |= CLI_FULL_CONNECTION_USE_KERBEROS;
 	
-	return (NT_STATUS_IS_OK(
-			cli_full_connection(c, myname,
-					    host, NULL, port_to_use, 
-					    share, "?????", 
-					    username, workgroup, 
-					    password, flags, &retry)));
+	status = cli_full_connection(c, myname,
+				     host, NULL, port_to_use, 
+				     share, "?????", 
+				     username, workgroup, 
+				     password, flags, &retry);
+	if (!NT_STATUS_IS_OK(status)) {
+		return False;
+	}
+
+	if (use_oplocks) (*c)->use_oplocks = True;
+	if (use_level_II_oplocks) (*c)->use_level_II_oplocks = True;
+	(*c)->timeout = 120000; /* set a really long timeout (2 minutes) */
+
+	return True;
 }
 
 
-- 
cgit 


From fba0a720353c113e7aedc6fb7e90f0aff938a8fb Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Mon, 10 Mar 2003 03:04:47 +0000
Subject: Use "$@" to preserve shell quoting in case somebody passes an escaped
 string as a configure parameter. (This used to be commit
 3285c80cb0e41d6736b4f74b01a65d55753a7920)

---
 source3/configure.developer | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/configure.developer b/source3/configure.developer
index 0409a75061..a7074acfd3 100755
--- a/source3/configure.developer
+++ b/source3/configure.developer
@@ -1,2 +1,2 @@
 #!/bin/sh
-`dirname $0`/configure --enable-developer $*
+`dirname $0`/configure --enable-developer "$@"
-- 
cgit 


From 8cad904f385dfe25e6dffe39a773641d02ed2776 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 10 Mar 2003 12:08:32 +0000
Subject: Don't segfault on make_server_info_guest() failure - instead return
 the error code.

make_server_info_guest() requires an entry in the SAM at the moment, but
this will change before release.

Andrew Bartlett
(This used to be commit 6a956390fa253e87e38b3f1909f13595fbf2767a)
---
 source3/smbd/sesssetup.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'source3')

diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index dfe246e398..2661fe3f93 100644
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -39,16 +39,14 @@ static NTSTATUS do_map_to_guest(NTSTATUS status, auth_serversupplied_info **serv
 		    (lp_map_to_guest() == MAP_TO_GUEST_ON_BAD_PASSWORD)) {
 			DEBUG(3,("No such user %s [%s] - using guest account\n",
 				 user, domain));
-			make_server_info_guest(server_info);
-			status = NT_STATUS_OK;
+			status = make_server_info_guest(server_info);
 		}
 	}
 
 	if (NT_STATUS_EQUAL(status, NT_STATUS_WRONG_PASSWORD)) {
 		if (lp_map_to_guest() == MAP_TO_GUEST_ON_BAD_PASSWORD) {
 			DEBUG(3,("Registered username %s for guest access\n",user));
-			make_server_info_guest(server_info);
-			status = NT_STATUS_OK;
+			status = make_server_info_guest(server_info);
 		}
 	}
 
-- 
cgit 


From 683c17ac0dfce64e7cfcafbc640b18ea4610f021 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Mon, 10 Mar 2003 15:05:06 +0000
Subject: check a pointer before dereferencing it; not sure why userdata ==
 NULL though (This used to be commit 6fca29ddcdb111af24ee051b555ab4eec8cadd1d)

---
 source3/nmbd/nmbd_browsesync.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/nmbd/nmbd_browsesync.c b/source3/nmbd/nmbd_browsesync.c
index 84c6f43f57..5914ea9637 100644
--- a/source3/nmbd/nmbd_browsesync.c
+++ b/source3/nmbd/nmbd_browsesync.c
@@ -258,7 +258,7 @@ static void domain_master_node_status_fail(struct subnet_record *subrec,
   {
     dbgtext( "domain_master_node_status_fail:\n" );
     dbgtext( "Doing a node status request to the domain master browser\n" );
-    dbgtext( "for workgroup %s ", userdata->data );
+    dbgtext( "for workgroup %s ", userdata ? userdata->data : "NULL" );
     dbgtext( "at IP %s failed.\n", inet_ntoa(rrec->packet->ip) );
     dbgtext( "Cannot sync browser lists.\n" );
   }
-- 
cgit 


From 06c4d9a8ff4373227ba6a418b8af627aaddbc4d0 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Mon, 10 Mar 2003 16:59:29 +0000
Subject: Some conversion to pstrcpy_base.

Volker
(This used to be commit 329911e43681b724cb0579aad77b4a658759d7ba)
---
 source3/libsmb/clirap.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'source3')

diff --git a/source3/libsmb/clirap.c b/source3/libsmb/clirap.c
index 24108d40f3..a1845b2e16 100644
--- a/source3/libsmb/clirap.c
+++ b/source3/libsmb/clirap.c
@@ -85,19 +85,19 @@ BOOL cli_NetWkstaUserLogon(struct cli_state *cli,char *user, char *workstation)
 	p = param;
 	SSVAL(p,0,132); /* api number */
 	p += 2;
-	pstrcpy(p,"OOWb54WrLh");
+	pstrcpy_base(p,"OOWb54WrLh",param);
 	p = skip_string(p,1);
-	pstrcpy(p,"WB21BWDWWDDDDDDDzzzD");
+	pstrcpy_base(p,"WB21BWDWWDDDDDDDzzzD",param);
 	p = skip_string(p,1);
 	SSVAL(p,0,1);
 	p += 2;
-	pstrcpy(p,user);
+	pstrcpy_base(p,user,param);
 	strupper(p);
 	p += 21;
 	p++;
 	p += 15;
 	p++; 
-	pstrcpy(p, workstation); 
+	pstrcpy_base(p, workstation, param);
 	strupper(p);
 	p += 16;
 	SSVAL(p, 0, CLI_BUFFER_SIZE);
@@ -145,9 +145,9 @@ int cli_RNetShareEnum(struct cli_state *cli, void (*fn)(const char *, uint32, co
 	p = param;
 	SSVAL(p,0,0); /* api number */
 	p += 2;
-	pstrcpy(p,"WrLeh");
+	pstrcpy_base(p,"WrLeh",param);
 	p = skip_string(p,1);
-	pstrcpy(p,"B13BWz");
+	pstrcpy_base(p,"B13BWz",param);
 	p = skip_string(p,1);
 	SSVAL(p,0,1);
 	/*
-- 
cgit 


From 2e3f9c35d5c16bfe8cf78374f699abe9ed56b4ca Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Tue, 11 Mar 2003 00:14:55 +0000
Subject: Patch from Ronan Waide:

> when doing "enumdomusers", rpcclient prints each one preceded by the
> word "group" instead of "user"
(This used to be commit 17567dd1d510d4cf1dffa67be78510ae51571ec6)
---
 source3/rpcclient/cmd_samr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/rpcclient/cmd_samr.c b/source3/rpcclient/cmd_samr.c
index cec6b1680b..95ea27562e 100644
--- a/source3/rpcclient/cmd_samr.c
+++ b/source3/rpcclient/cmd_samr.c
@@ -684,7 +684,7 @@ static NTSTATUS cmd_samr_enum_dom_users(struct cli_state *cli,
 		    NT_STATUS_V(result) == NT_STATUS_V(STATUS_MORE_ENTRIES)) {
 
 			for (i = 0; i < num_dom_users; i++)
-				printf("group:[%s] rid:[0x%x]\n", 
+                               printf("user:[%s] rid:[0x%x]\n", 
 				       dom_users[i], dom_rids[i]);
 		}
 
-- 
cgit 


From dcf7cad4bff3797fd2c606f6225a4ed68b0a3c51 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Tue, 11 Mar 2003 02:30:17 +0000
Subject: Remove obsolete file. (This used to be commit
 c5c1a7979385778c08d6dd7796cfe8be1815992f)

---
 source3/nsswitch/README | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 source3/nsswitch/README

(limited to 'source3')

diff --git a/source3/nsswitch/README b/source3/nsswitch/README
deleted file mode 100644
index 9f0c581df6..0000000000
--- a/source3/nsswitch/README
+++ /dev/null
@@ -1,13 +0,0 @@
-This extension provides a "wins" module for NSS on glibc2/Linux.  This
-allows you to use a WINS entry in /etc/nsswitch.conf for hostname
-resolution, allowing you to resolve netbios names via start unix
-gethostbyname() calls. The end result is that you can use netbios
-names as host names in unix apps.
-
-1) run configure
-2) run "make nsswitch"
-3) cp nsswitch/libnss_wins.so /lib/libnss_wins.so.2
-4) add a wins entry to the hosts line in /etc/nsswitch.conf
-5) use it
-
-tridge@linuxcare.com
-- 
cgit 


From ee28d38fbc5639140478e51cc33ec0a312d785da Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Tue, 11 Mar 2003 04:21:14 +0000
Subject: When opening an existing DB, don't require the hash_size specified to
 the open call to be the same as that of the existing tdb.  The specified
 hash_size is only used if the tdb needs to be (re)created.

With this patch in place, tdbtool can open the printing tdbs, which
are created with a hash_size of 5000.  Before it would fail with EIO.
(This used to be commit e412dd6d7e5a41de94c07c64b186390ccce104cc)
---
 source3/tdb/tdb.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'source3')

diff --git a/source3/tdb/tdb.c b/source3/tdb/tdb.c
index 097209ff7a..0ec770ed81 100644
--- a/source3/tdb/tdb.c
+++ b/source3/tdb/tdb.c
@@ -1728,8 +1728,7 @@ TDB_CONTEXT *tdb_open_ex(const char *name, int hash_size, int tdb_flags,
 
 	if (read(tdb->fd, &tdb->header, sizeof(tdb->header)) != sizeof(tdb->header)
 	    || strcmp(tdb->header.magic_food, TDB_MAGIC_FOOD) != 0
-	    || tdb->header.version != TDB_VERSION
-	    || (tdb->header.hash_size != hash_size
+	    || (tdb->header.version != TDB_VERSION
 		&& !(rev = (tdb->header.version==TDB_BYTEREV(TDB_VERSION))))) {
 		/* its not a valid database - possibly initialise it */
 		if (!(open_flags & O_CREAT) || tdb_new_database(tdb, hash_size) == -1) {
-- 
cgit 


From cca61adcd242b96a1cf3c3b6528fd23a4998c2c3 Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Tue, 11 Mar 2003 05:57:53 +0000
Subject: If using --enable-developer and valgrind.h is present, define
 VALGRIND. (This used to be commit 71c8e90117f00f168416f2f35a1c25755e2d0ed4)

---
 source3/include/includes.h | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'source3')

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 297f38ae97..7e5ad0e3cd 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -438,6 +438,14 @@
 #include <valgrind.h>
 #endif
 
+/* If we have --enable-developer and the valgrind header is present,
+ * then we're OK to use it.  Set a macro so this logic can be done only
+ * once. */
+#if defined(DEVELOPER) && HAVE_VALGRIND_H
+#define VALGRIND
+#endif
+
+
 /* we support ADS if we want it and have krb5 and ldap libs */
 #if defined(WITH_ADS) && defined(HAVE_KRB5) && defined(HAVE_LDAP)
 #define HAVE_ADS
-- 
cgit 


From c13990277f1ab2e6810ada193caa720f6e71f087 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 11 Mar 2003 06:31:23 +0000
Subject: make sure we have an empty directory when we start the utable test
 (This used to be commit af415842b80f024ca26b4e3bc52fd73fce0a28f3)

---
 source3/torture/utable.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/torture/utable.c b/source3/torture/utable.c
index d9c1fcbafd..d8a1557dbb 100644
--- a/source3/torture/utable.c
+++ b/source3/torture/utable.c
@@ -129,8 +129,12 @@ BOOL torture_casetable(int dummy)
 
 	memset(equiv, 0, sizeof(equiv));
 
-	cli_mkdir(cli, "\\utable");
 	cli_unlink(cli, "\\utable\\*");
+	cli_rmdir(cli, "\\utable");
+	if (!cli_mkdir(cli, "\\utable")) {
+		printf("Failed to create utable directory!\n");
+		return False;
+	}
 
 	for (c=1; c < 0x10000; c++) {
 		size_t size;
-- 
cgit 


From 191b44b91c628d2647a1e1355508c2eafa59535f Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 11 Mar 2003 06:53:10 +0000
Subject: fixed the MANGLE smbtorture test with the new paranoid string code
 (This used to be commit 7be44dbe009a8d831c0720a2649fc871b067beef)

---
 source3/torture/mangle_test.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/torture/mangle_test.c b/source3/torture/mangle_test.c
index 86030027ba..d1475eb64e 100644
--- a/source3/torture/mangle_test.c
+++ b/source3/torture/mangle_test.c
@@ -135,7 +135,7 @@ static void gen_name(char *name)
 
 	/* and a medium probability of a common lead string */
 	if (random() % 10 == 0) {
-		strncpy(p, "ABCDE", 5);
+		strncpy(p, "ABCDE", 6);
 	}
 
 	/* and a high probability of a good extension length */
-- 
cgit 


From 538c832ba147caa4c5f66439022ecb11ee2e5335 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 11 Mar 2003 06:53:44 +0000
Subject: having sticky create times is not a bug (This used to be commit
 f283f71104319fa9f1e7d22fc91b8d7224ae157a)

---
 source3/torture/torture.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'source3')

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 090f08c160..327212c6be 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -2130,7 +2130,6 @@ static BOOL run_trans2test(int dummy)
 			printf("create time=%s", ctime(&c_time));
 			printf("modify time=%s", ctime(&m_time));
 			printf("This system appears to have sticky create times\n");
-			correct = False;
 		}
 		if (a_time % (60*60) == 0) {
 			printf("access time=%s", ctime(&a_time));
-- 
cgit 


From 6f7ac2dcab02a0babf4c18e6fe1d1697943bddfc Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Tue, 11 Mar 2003 07:23:43 +0000
Subject: Note about using Valgrind with tdbs. (This used to be commit
 36c6f67d4af50d8fc4c8bd54486df315861d55c2)

---
 source3/tdb/tdb.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'source3')

diff --git a/source3/tdb/tdb.c b/source3/tdb/tdb.c
index 0ec770ed81..ab50f40ef6 100644
--- a/source3/tdb/tdb.c
+++ b/source3/tdb/tdb.c
@@ -20,6 +20,27 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
+
+
+/* NOTE: If you use tdbs under valgrind, and in particular if you run
+ * tdbtorture, you may get spurious "uninitialized value" warnings.  I
+ * think this is because valgrind doesn't understand that the mmap'd
+ * area may be written to by other processes.  Memory can, from the
+ * point of view of the grinded process, spontaneously become
+ * initialized.
+ *
+ * I can think of a few solutions.  [mbp 20030311]
+ *
+ * 1 - Write suppressions for Valgrind so that it doesn't complain
+ * about this.  Probably the most reasonable but people need to
+ * remember to use them.
+ *
+ * 2 - Use IO not mmap when running under valgrind.  Not so nice.
+ *
+ * 3 - Use the special valgrind macros to mark memory as valid at the
+ * right time.  Probably too hard -- the process just doesn't know.
+ */ 
+
 #ifdef STANDALONE
 #if HAVE_CONFIG_H
 #include <config.h>
-- 
cgit 


From 2e01ef5957bcdecb057d94122529b7cbd7f40ec2 Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Tue, 11 Mar 2003 07:25:48 +0000
Subject: Remove valgrind_strlen function, hopefully no longer needed with
 recent Valgrind relases and clashing with -DVALGRIND. (This used to be commit
 98479f1315cf8968152e1566966ac57e171008c3)

---
 source3/include/includes.h |  4 ----
 source3/lib/util_str.c     |  9 ---------
 source3/tdb/tdbbackup.c    | 10 ----------
 3 files changed, 23 deletions(-)

(limited to 'source3')

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 7e5ad0e3cd..b6abdd99ce 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -1220,10 +1220,6 @@ int smb_xvasprintf(char **ptr, const char *format, va_list ap) PRINTF_ATTRIBUTE(
 time_t timegm(struct tm *tm);
 #endif
 
-#if defined(VALGRIND)
-#define strlen(x) valgrind_strlen(x)
-#endif
-
 /*
  * Veritas File System.  Often in addition to native.
  * Quotas different.
diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c
index 924cf9d921..7dd5ee4242 100644
--- a/source3/lib/util_str.c
+++ b/source3/lib/util_str.c
@@ -1667,12 +1667,3 @@ char * base64_encode_data_blob(DATA_BLOB data)
     return result;
 }
 
-#ifdef VALGRIND
-size_t valgrind_strlen(const char *s)
-{
-	size_t count;
-	for(count = 0; *s++; count++)
-		;
-	return count;
-}
-#endif
diff --git a/source3/tdb/tdbbackup.c b/source3/tdb/tdbbackup.c
index 7b344de6c4..36ba7db918 100644
--- a/source3/tdb/tdbbackup.c
+++ b/source3/tdb/tdbbackup.c
@@ -303,13 +303,3 @@ static void usage(void)
 
 	return ret;
 }
-
-#ifdef VALGRIND
-size_t valgrind_strlen(const char *s)
-{
-	size_t count;
-	for(count = 0; *s++; count++)
-		;
-	return count;
-}
-#endif
-- 
cgit 


From d40890e6a05badaac4b41979890a17ef1e69b5f7 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Tue, 11 Mar 2003 09:16:37 +0000
Subject: This is how combination of domain logons and security parameter best
 combine. Comments wellcome.

Simo.
(This used to be commit e1431424e7603d946f63cfe7fe669b0b32ac8095)
---
 source3/param/loadparm.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source3')

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index f7f12bbe80..2a83905a9f 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -3804,14 +3804,14 @@ static void set_server_role(void)
 
 	switch (lp_security()) {
 		case SEC_SHARE:
+		case SEC_SERVER:
+		case SEC_ADS:
 			if (lp_domain_logons())
 				DEBUG(0, ("Server's Role (logon server) conflicts with share-level security\n"));
 			break;
-		case SEC_SERVER:
 		case SEC_DOMAIN:
-		case SEC_ADS:
 			if (lp_domain_logons()) {
-				server_role = ROLE_DOMAIN_PDC;
+				server_role = ROLE_DOMAIN_BDC;
 				break;
 			}
 			server_role = ROLE_DOMAIN_MEMBER;
-- 
cgit 


From da6266f4f18b3406676372c6632d3b8199aaa420 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 11 Mar 2003 10:06:34 +0000
Subject: After 'consultation' with idra, this is how I think the server roles
 should work...

Andrew Bartlett
(This used to be commit 5c1f1005907bf50b809dfae1f8251c7122103098)
---
 source3/param/loadparm.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'source3')

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 2a83905a9f..5bffa2c862 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -3804,18 +3804,23 @@ static void set_server_role(void)
 
 	switch (lp_security()) {
 		case SEC_SHARE:
-		case SEC_SERVER:
-		case SEC_ADS:
 			if (lp_domain_logons())
 				DEBUG(0, ("Server's Role (logon server) conflicts with share-level security\n"));
 			break;
-		case SEC_DOMAIN:
+		case SEC_SERVER:
+			if (lp_domain_logons())
+				DEBUG(0, ("Server's Role (logon server) conflicts with server-level security\n"));
+			break;
+		case SEC_ADS:
 			if (lp_domain_logons()) {
-				server_role = ROLE_DOMAIN_BDC;
+				server_role = ROLE_DOMAIN_PDC;
 				break;
 			}
 			server_role = ROLE_DOMAIN_MEMBER;
 			break;
+		case SEC_DOMAIN:
+			if (lp_domain_logons())
+				DEBUG(0, ("Server's Role (logon server) NOT ADVISED with domain-level security\n"));
 		case SEC_USER:
 			if (lp_domain_logons()) {
 
-- 
cgit 


From 60a8e3c20c24b6150946d7b6f348e8e5b050ed94 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 11 Mar 2003 10:13:57 +0000
Subject: Some further tought on the server role issue - try not to break it
 compeatly.

Andrew Bartlett
(This used to be commit 4c6a2d8d28d1752d7fee52d253ce2829bd0a0671)
---
 source3/param/loadparm.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'source3')

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 5bffa2c862..7d0208fb85 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -3810,6 +3810,12 @@ static void set_server_role(void)
 		case SEC_SERVER:
 			if (lp_domain_logons())
 				DEBUG(0, ("Server's Role (logon server) conflicts with server-level security\n"));
+			server_role = ROLE_DOMAIN_MEMBER;
+			break;
+		case SEC_DOMAIN:
+			if (lp_domain_logons())
+				DEBUG(0, ("Server's Role (logon server) NOT ADVISED with domain-level security\n"));
+			server_role = ROLE_DOMAIN_MEMBER;
 			break;
 		case SEC_ADS:
 			if (lp_domain_logons()) {
@@ -3818,9 +3824,6 @@ static void set_server_role(void)
 			}
 			server_role = ROLE_DOMAIN_MEMBER;
 			break;
-		case SEC_DOMAIN:
-			if (lp_domain_logons())
-				DEBUG(0, ("Server's Role (logon server) NOT ADVISED with domain-level security\n"));
 		case SEC_USER:
 			if (lp_domain_logons()) {
 
-- 
cgit 


From 17030fc403feb3ce5097d088ecf992e8b684d81a Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 11 Mar 2003 10:53:46 +0000
Subject: security=domain and domain logons = yes should be a BDC (of sorts).

Matches 2.2

Andrew Bartlett
(This used to be commit f6497fd639c5bb7d61eda0286c4c3c38609933b0)
---
 source3/param/loadparm.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'source3')

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 7d0208fb85..c21b88ff20 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -3813,8 +3813,11 @@ static void set_server_role(void)
 			server_role = ROLE_DOMAIN_MEMBER;
 			break;
 		case SEC_DOMAIN:
-			if (lp_domain_logons())
-				DEBUG(0, ("Server's Role (logon server) NOT ADVISED with domain-level security\n"));
+			if (lp_domain_logons()) {
+				DEBUG(1, ("Server's Role (logon server) NOT ADVISED with domain-level security\n"));
+				server_role = ROLE_DOMAIN_BDC;
+				break;
+			}
 			server_role = ROLE_DOMAIN_MEMBER;
 			break;
 		case SEC_ADS:
-- 
cgit 


From 3b580ff000d9f258c581efded52d5d7c55375173 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 11 Mar 2003 11:28:59 +0000
Subject: This patch attemptes to clean up winbindd's mutex locking.

The current locking scheme in winbind is a complete mess - indeed, the
next step should be to push the locking into cli_full_connection(), but
I'll leave it for now.

This patch works on the noted behaviour that 2 parts of the connection
process need protection - and independent protection.  Tim Potter did
some work on this a little while back, verifying the second case.

The two cases are:
 - between connect() and first session setup
 - during the auth2 phase of the netlogon pipe setup.

I've removed the counter on the lock, as I fail to see what it gains us.

This patch also adds 'anonymous fallback' to our winbindd -> DC connection.

If the authenticated connection fails (wbinfo -A specifed) - say that
account isn't trusted by a trusted DC - then we try an anonymous.

Both tpot and mbp like the patch.

Andrew Bartlett
(This used to be commit 0620320002082298a15cbba72bd79aecfc607947)
---
 source3/lib/server_mutex.c     |  6 ++--
 source3/nsswitch/winbindd_cm.c | 78 ++++++++++++++++++++----------------------
 source3/passdb/secrets.c       | 30 ++++------------
 3 files changed, 46 insertions(+), 68 deletions(-)

(limited to 'source3')

diff --git a/source3/lib/server_mutex.c b/source3/lib/server_mutex.c
index 878e5497d8..3e5512c734 100644
--- a/source3/lib/server_mutex.c
+++ b/source3/lib/server_mutex.c
@@ -30,8 +30,6 @@
    like the single-connection that NT makes. */
 
 static char *mutex_server_name;
-/* FIXME. ref_count should be allocated per name... JRA. */
-size_t ref_count;
 
 BOOL grab_server_mutex(const char *name)
 {
@@ -40,7 +38,7 @@ BOOL grab_server_mutex(const char *name)
 		DEBUG(0,("grab_server_mutex: malloc failed for %s\n", name));
 		return False;
 	}
-	if (!secrets_named_mutex(mutex_server_name, 10, &ref_count)) {
+	if (!secrets_named_mutex(mutex_server_name, 10)) {
 		DEBUG(10,("grab_server_mutex: failed for %s\n", name));
 		SAFE_FREE(mutex_server_name);
 		return False;
@@ -52,7 +50,7 @@ BOOL grab_server_mutex(const char *name)
 void release_server_mutex(void)
 {
 	if (mutex_server_name) {
-		secrets_named_mutex_release(mutex_server_name, &ref_count);
+		secrets_named_mutex_release(mutex_server_name);
 		SAFE_FREE(mutex_server_name);
 	}
 }
diff --git a/source3/nsswitch/winbindd_cm.c b/source3/nsswitch/winbindd_cm.c
index 54096c0c1d..1b49d8ce01 100644
--- a/source3/nsswitch/winbindd_cm.c
+++ b/source3/nsswitch/winbindd_cm.c
@@ -302,7 +302,7 @@ static void add_failed_connection_entry(struct winbindd_cm_conn *new_conn,
 /* Open a connction to the remote server, cache failures for 30 seconds */
 
 static NTSTATUS cm_open_connection(const char *domain, const int pipe_index,
-			       struct winbindd_cm_conn *new_conn, BOOL keep_mutex)
+			       struct winbindd_cm_conn *new_conn)
 {
 	struct failed_connection_cache *fcc;
 	NTSTATUS result;
@@ -310,7 +310,6 @@ static NTSTATUS cm_open_connection(const char *domain, const int pipe_index,
 	struct in_addr dc_ip;
 	int i;
 	BOOL retry = True;
-	BOOL got_mutex = False;
 
 	ZERO_STRUCT(dc_ip);
 
@@ -366,24 +365,21 @@ static NTSTATUS cm_open_connection(const char *domain, const int pipe_index,
 	      new_conn->controller, global_myname(), ipc_domain, ipc_username));
 
 	for (i = 0; retry && (i < 3); i++) {
-		
-		if (!secrets_named_mutex(new_conn->controller, WINBIND_SERVER_MUTEX_WAIT_TIME, &new_conn->mutex_ref_count)) {
+		BOOL got_mutex;
+		if (!(got_mutex = secrets_named_mutex(new_conn->controller, WINBIND_SERVER_MUTEX_WAIT_TIME))) {
 			DEBUG(0,("cm_open_connection: mutex grab failed for %s\n", new_conn->controller));
 			result = NT_STATUS_POSSIBLE_DEADLOCK;
 			continue;
 		}
-
-		got_mutex = True;
-
+		
 		result = cli_full_connection(&new_conn->cli, global_myname(), new_conn->controller, 
-			&dc_ip, 0, "IPC$", "IPC", ipc_username, ipc_domain, 
-			ipc_password, 0, &retry);
+					     &dc_ip, 0, "IPC$", "IPC", ipc_username, ipc_domain, 
+					     ipc_password, CLI_FULL_CONNECTION_ANNONYMOUS_FALLBACK, &retry);
+		
+		secrets_named_mutex_release(new_conn->controller);
 
 		if (NT_STATUS_IS_OK(result))
 			break;
-
-		secrets_named_mutex_release(new_conn->controller, &new_conn->mutex_ref_count);
-		got_mutex = False;
 	}
 
 	SAFE_FREE(ipc_username);
@@ -391,8 +387,6 @@ static NTSTATUS cm_open_connection(const char *domain, const int pipe_index,
 	SAFE_FREE(ipc_password);
 
 	if (!NT_STATUS_IS_OK(result)) {
-		if (got_mutex)
-			secrets_named_mutex_release(new_conn->controller, &new_conn->mutex_ref_count);
 		add_failed_connection_entry(new_conn, result);
 		return result;
 	}
@@ -407,16 +401,12 @@ static NTSTATUS cm_open_connection(const char *domain, const int pipe_index,
 		 * if the PDC is an NT4 box.   but since there is only one 2k 
 		 * specific UUID right now, i'm not going to bother.  --jerry
 		 */
-		if (got_mutex)
-			secrets_named_mutex_release(new_conn->controller, &new_conn->mutex_ref_count);
 		if ( !is_win2k_pipe(pipe_index) )
 			add_failed_connection_entry(new_conn, result);
 		cli_shutdown(new_conn->cli);
 		return result;
 	}
 
-	if ((got_mutex) && !keep_mutex)
-		secrets_named_mutex_release(new_conn->controller, &new_conn->mutex_ref_count);
 	return NT_STATUS_OK;
 }
 
@@ -455,7 +445,7 @@ static BOOL connection_ok(struct winbindd_cm_conn *conn)
 /* Get a connection to the remote DC and open the pipe.  If there is already a connection, use that */
 
 static NTSTATUS get_connection_from_cache(const char *domain, const char *pipe_name,
-		struct winbindd_cm_conn **conn_out, BOOL keep_mutex) 
+		struct winbindd_cm_conn **conn_out) 
 {
 	struct winbindd_cm_conn *conn, conn_temp;
 	NTSTATUS result;
@@ -472,12 +462,6 @@ static NTSTATUS get_connection_from_cache(const char *domain, const char *pipe_n
 				SAFE_FREE(conn);
 				conn = &conn_temp;  /* Just to keep the loop moving */
 			} else {
-				if (keep_mutex) {
-					if (!secrets_named_mutex(conn->controller,
-							WINBIND_SERVER_MUTEX_WAIT_TIME, &conn->mutex_ref_count))
-						DEBUG(0,("get_connection_from_cache: mutex grab failed for %s\n",
-							conn->controller));
-				}
 				break;
 			}
 		}
@@ -489,7 +473,7 @@ static NTSTATUS get_connection_from_cache(const char *domain, const char *pipe_n
 		
 		ZERO_STRUCTP(conn);
 		
-		if (!NT_STATUS_IS_OK(result = cm_open_connection(domain, get_pipe_index(pipe_name), conn, keep_mutex))) {
+		if (!NT_STATUS_IS_OK(result = cm_open_connection(domain, get_pipe_index(pipe_name), conn))) {
 			DEBUG(3, ("Could not open a connection to %s for %s (%s)\n", 
 				  domain, pipe_name, nt_errstr(result)));
 		        SAFE_FREE(conn);
@@ -517,7 +501,7 @@ BOOL cm_check_for_native_mode_win2k( const char *domain )
 	ZERO_STRUCT( ctr );
 	
 	
-	if ( !NT_STATUS_IS_OK(result = cm_open_connection(domain, PI_LSARPC_DS, &conn, False)) ) {
+	if ( !NT_STATUS_IS_OK(result = cm_open_connection(domain, PI_LSARPC_DS, &conn)) ) {
 		DEBUG(5, ("cm_check_for_native_mode_win2k: Could not open a connection to %s for PIPE_LSARPC (%s)\n", 
 			  domain, nt_errstr(result)));
 		return False;
@@ -555,7 +539,7 @@ CLI_POLICY_HND *cm_get_lsa_handle(const char *domain)
 
 	/* Look for existing connections */
 
-	if (!NT_STATUS_IS_OK(result = get_connection_from_cache(domain, PIPE_LSARPC, &conn, False)))
+	if (!NT_STATUS_IS_OK(result = get_connection_from_cache(domain, PIPE_LSARPC, &conn)))
 		return NULL;
 
 	/* This *shitty* code needs scrapping ! JRA */
@@ -571,7 +555,7 @@ CLI_POLICY_HND *cm_get_lsa_handle(const char *domain)
 	if (!NT_STATUS_IS_OK(result)) {
 		/* Hit the cache code again.  This cleans out the old connection and gets a new one */
 		if (conn->cli->fd == -1) { /* Try again, if the remote host disapeared */
-			if (!NT_STATUS_IS_OK(result = get_connection_from_cache(domain, PIPE_LSARPC, &conn, False)))
+			if (!NT_STATUS_IS_OK(result = get_connection_from_cache(domain, PIPE_LSARPC, &conn)))
 				return NULL;
 
 			result = cli_lsa_open_policy(conn->cli, conn->cli->mem_ctx, False, 
@@ -603,7 +587,7 @@ CLI_POLICY_HND *cm_get_sam_handle(char *domain)
 
 	/* Look for existing connections */
 
-	if (!NT_STATUS_IS_OK(result = get_connection_from_cache(domain, PIPE_SAMR, &conn, False)))
+	if (!NT_STATUS_IS_OK(result = get_connection_from_cache(domain, PIPE_SAMR, &conn)))
 		return NULL;
 	
 	/* This *shitty* code needs scrapping ! JRA */
@@ -618,7 +602,7 @@ CLI_POLICY_HND *cm_get_sam_handle(char *domain)
 	if (!NT_STATUS_IS_OK(result)) {
 		/* Hit the cache code again.  This cleans out the old connection and gets a new one */
 		if (conn->cli->fd == -1) { /* Try again, if the remote host disapeared */
-			if (!NT_STATUS_IS_OK(result = get_connection_from_cache(domain, PIPE_SAMR, &conn, False)))
+			if (!NT_STATUS_IS_OK(result = get_connection_from_cache(domain, PIPE_SAMR, &conn)))
 				return NULL;
 
 			result = cli_samr_connect(conn->cli, conn->cli->mem_ctx,
@@ -875,35 +859,47 @@ NTSTATUS cm_get_netlogon_cli(const char *domain, const unsigned char *trust_pass
 	NTSTATUS result = NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND;
 	struct winbindd_cm_conn *conn;
 	uint32 neg_flags = 0x000001ff;
+	fstring lock_name;
+	BOOL got_mutex;
 
 	if (!cli)
 		return NT_STATUS_INVALID_PARAMETER;
 
 	/* Open an initial conection - keep the mutex. */
 
-	if (!NT_STATUS_IS_OK(result = get_connection_from_cache(domain, PIPE_NETLOGON, &conn, True)))
+	if (!NT_STATUS_IS_OK(result = get_connection_from_cache(domain, PIPE_NETLOGON, &conn)))
 		return result;
 	
-	result = cli_nt_setup_creds(conn->cli, get_sec_chan(), trust_passwd, &neg_flags, 2);
-
-	if (conn->mutex_ref_count)
-		secrets_named_mutex_release(conn->controller, &conn->mutex_ref_count);
+	snprintf(lock_name, sizeof(lock_name), "NETLOGON\\%s", conn->controller);
 
+	if (!(got_mutex = secrets_named_mutex(lock_name, WINBIND_SERVER_MUTEX_WAIT_TIME))) {
+		DEBUG(0,("cm_get_netlogon_cli: mutex grab failed for %s\n", conn->controller));
+	}
+			
+	result = cli_nt_setup_creds(conn->cli, get_sec_chan(), trust_passwd, &neg_flags, 2);
+	
+	if (got_mutex)
+		secrets_named_mutex_release(lock_name);
+			
 	if (!NT_STATUS_IS_OK(result)) {
 		DEBUG(0, ("error connecting to domain password server: %s\n",
 			  nt_errstr(result)));
 		
 		/* Hit the cache code again.  This cleans out the old connection and gets a new one */
 		if (conn->cli->fd == -1) {
-
-			if (!NT_STATUS_IS_OK(result = get_connection_from_cache(domain, PIPE_NETLOGON, &conn, True)))
+			if (!NT_STATUS_IS_OK(result = get_connection_from_cache(domain, PIPE_NETLOGON, &conn)))
 				return result;
 			
+			snprintf(lock_name, sizeof(lock_name), "NETLOGON\\%s", conn->controller);
+			if (!(got_mutex = secrets_named_mutex(lock_name, WINBIND_SERVER_MUTEX_WAIT_TIME))) {
+				DEBUG(0,("cm_get_netlogon_cli: mutex grab failed for %s\n", conn->controller));
+			}
+			
 			/* Try again */
 			result = cli_nt_setup_creds( conn->cli, get_sec_chan(),trust_passwd, &neg_flags, 2);
-
-			if (conn->mutex_ref_count)
-				secrets_named_mutex_release(conn->controller, &conn->mutex_ref_count);
+			
+			if (got_mutex)
+				secrets_named_mutex_release(lock_name);
 		}
 		
 		if (!NT_STATUS_IS_OK(result)) {
diff --git a/source3/passdb/secrets.c b/source3/passdb/secrets.c
index a58ea492ea..2b944a9941 100644
--- a/source3/passdb/secrets.c
+++ b/source3/passdb/secrets.c
@@ -588,24 +588,17 @@ NTSTATUS secrets_get_trusted_domains(TALLOC_CTX* ctx, int* enum_ctx, unsigned in
  between smbd instances.
 *******************************************************************************/
 
-BOOL secrets_named_mutex(const char *name, unsigned int timeout, size_t *p_ref_count)
+BOOL secrets_named_mutex(const char *name, unsigned int timeout)
 {
-	size_t ref_count = *p_ref_count;
 	int ret = 0;
 
 	if (!message_init())
 		return False;
 
-	if (ref_count == 0) {
-		ret = tdb_lock_bystring(tdb, name, timeout);
-		if (ret == 0)
-			DEBUG(10,("secrets_named_mutex: got mutex for %s\n", name ));
-	}
+	ret = tdb_lock_bystring(tdb, name, timeout);
+	if (ret == 0)
+		DEBUG(10,("secrets_named_mutex: got mutex for %s\n", name ));
 
-	if (ret == 0) {
-		*p_ref_count = ++ref_count;
-		DEBUG(10,("secrets_named_mutex: ref_count for mutex %s = %u\n", name, (unsigned int)ref_count ));
-	}
 	return (ret == 0);
 }
 
@@ -613,19 +606,10 @@ BOOL secrets_named_mutex(const char *name, unsigned int timeout, size_t *p_ref_c
  Unlock a named mutex.
 *******************************************************************************/
 
-void secrets_named_mutex_release(const char *name, size_t *p_ref_count)
+void secrets_named_mutex_release(const char *name)
 {
-	size_t ref_count = *p_ref_count;
-
-	SMB_ASSERT(ref_count != 0);
-
-	if (ref_count == 1) {
-		tdb_unlock_bystring(tdb, name);
-		DEBUG(10,("secrets_named_mutex: released mutex for %s\n", name ));
-	}
-
-	*p_ref_count = --ref_count;
-	DEBUG(10,("secrets_named_mutex_release: ref_count for mutex %s = %u\n", name, (unsigned int)ref_count ));
+	tdb_unlock_bystring(tdb, name);
+	DEBUG(10,("secrets_named_mutex: released mutex for %s\n", name ));
 }
 
 /*********************************************************
-- 
cgit 


From 77916f652fba812287541ab0d6a5ed203852cd3d Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Tue, 11 Mar 2003 18:10:36 +0000
Subject: Fix up zero termination. Spotted by Sebastian Krahmer
 <krahmer@suse.de>. Jeremy. (This used to be commit
 69becdb563b2620513931811a6695481bebcceed)

---
 source3/smbd/quotas.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/smbd/quotas.c b/source3/smbd/quotas.c
index 9d3bfe2d64..c2f001423e 100644
--- a/source3/smbd/quotas.c
+++ b/source3/smbd/quotas.c
@@ -413,10 +413,11 @@ static BOOL nfs_quotas(char *nfspath, uid_t euser_id, SMB_BIG_UINT *bsize, SMB_B
 
 	len=strcspn(mnttype, ":");
 	pathname=strstr(mnttype, ":");
-	cutstr = (char *) malloc(sizeof(char) * len );
+	cutstr = (char *) malloc(len+1);
 	if (!cutstr)
 		return False;
 
+	memset(cutstr, '\0', len+1);
 	host = strncat(cutstr,mnttype, sizeof(char) * len );
 	DEBUG(5,("nfs_quotas: looking for mount on \"%s\"\n", cutstr));
 	DEBUG(5,("nfs_quotas: of path \"%s\"\n", mnttype));
-- 
cgit 


From 0a2d131a35e4e73409ebb6c146308cb3f9c17a93 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Tue, 11 Mar 2003 20:57:41 +0000
Subject: We use unsigned now, so use %u. Jeremy. (This used to be commit
 01727b0296ee407e49444b9d9c4e7993892cb537)

---
 source3/smbd/ipc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/smbd/ipc.c b/source3/smbd/ipc.c
index da30ec7440..c8bb0c2505 100644
--- a/source3/smbd/ipc.c
+++ b/source3/smbd/ipc.c
@@ -508,7 +508,7 @@ int reply_trans(connection_struct *conn, char *inbuf,char *outbuf, int size, int
 	}
 	
 	
-	DEBUG(3,("trans <%s> data=%d params=%d setup=%d\n",
+	DEBUG(3,("trans <%s> data=%u params=%u setup=%u\n",
 		 name,tdscnt,tpscnt,suwcnt));
 	
 	/*
-- 
cgit 


From a16b155fc92e7802d17d1ed27b8dc832fa7e531f Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Wed, 12 Mar 2003 02:57:48 +0000
Subject: Add example of string overflow which is now caught in developer mode.
 (This used to be commit dcf1705782f5d589120624c90b695b81a0332e6b)

---
 source3/torture/t_stringoverflow.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 source3/torture/t_stringoverflow.c

(limited to 'source3')

diff --git a/source3/torture/t_stringoverflow.c b/source3/torture/t_stringoverflow.c
new file mode 100644
index 0000000000..b0503adb8f
--- /dev/null
+++ b/source3/torture/t_stringoverflow.c
@@ -0,0 +1,16 @@
+#include "includes.h"
+
+ int main(void)
+{
+	fstring dest;
+
+	printf("running on valgrind? %d\n", RUNNING_ON_VALGRIND);
+
+	/* Try copying a string into an fstring buffer.  The string
+	 * will actually fit, but this is still wrong because you
+	 * can't pstrcpy into an fstring.  This should trap in a
+	 * developer build. */
+	pstrcpy(dest, "hello");
+
+	return 0;
+}
-- 
cgit 


From 9a63d8bc2af36386bd863dcda8d749cc9f29bb47 Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Wed, 12 Mar 2003 02:58:45 +0000
Subject: Update usage message. (This used to be commit
 17f01f6959fb79ba11a56d6869ec9789e3ee2f74)

---
 source3/torture/t_strcmp.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/torture/t_strcmp.c b/source3/torture/t_strcmp.c
index 622769001b..b510d64cf0 100644
--- a/source3/torture/t_strcmp.c
+++ b/source3/torture/t_strcmp.c
@@ -9,7 +9,8 @@
 int main(int argc, char *argv[])
 {
 	if (argc != 3) {
-		fprintf(stderr, "usage: %s STRING1 STRING2\nCompares two strings\n",
+		fprintf(stderr, "usage: %s STRING1 STRING2\n"
+			"Compares two strings, prints the results of StrCaseCmp\n",
 			argv[0]);
 		return 2;
 	}
-- 
cgit 


From ffd5eae60eaae186d93f37537cc3cb4d5d446c83 Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Wed, 12 Mar 2003 03:04:37 +0000
Subject: Start importing the Python testing framework that Tim and I have been
 working on into the main Samba tree. (This used to be commit
 f3b77aae13df2559a81db6453d04e0fe8004cd52)

---
 source3/stf/README.stf | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 source3/stf/README.stf

(limited to 'source3')

diff --git a/source3/stf/README.stf b/source3/stf/README.stf
new file mode 100644
index 0000000000..3fbd33cb6c
--- /dev/null
+++ b/source3/stf/README.stf
@@ -0,0 +1,3 @@
+This directory contains the Samba Testing Framework, a Python-based
+system for exercising Samba in various ways.  It is quite small at the
+moment.
-- 
cgit 


From 57b68013e170e290292cf23bb2259dfb09259d2d Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Wed, 12 Mar 2003 03:06:42 +0000
Subject: Import ComfyChair framework from trunk. (This used to be commit
 a7fb1fcc72ffe3cc2aa9c5abfcbd8197e7610167)

---
 source3/stf/comfychair.py | 266 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 266 insertions(+)
 create mode 100644 source3/stf/comfychair.py

(limited to 'source3')

diff --git a/source3/stf/comfychair.py b/source3/stf/comfychair.py
new file mode 100644
index 0000000000..00b2262b26
--- /dev/null
+++ b/source3/stf/comfychair.py
@@ -0,0 +1,266 @@
+#! /usr/bin/env python
+
+# Copyright (C) 2002, 2003 by Martin Pool <mbp@samba.org>
+# 
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
+
+"""comfychair: a Python-based instrument of software torture.
+
+Copyright (C) 2002, 2003 by Martin Pool <mbp@samba.org>
+
+This is a test framework designed for testing programs written in
+Python, or (through a fork/exec interface) any other language.  It is
+similar in design to the very nice 'svntest' system used by
+Subversion, but has no Subversion-specific features.
+
+It is somewhat similar to PyUnit, except:
+
+ - it allows capture of detailed log messages from a test, to be
+   optionally displayed if the test fails.
+
+ - it allows execution of a specified subset of tests
+
+ - it avoids Java idioms that are not so useful in Python
+
+WRITING TESTS:
+
+  Each test case is a callable object, typically a function.  Its
+  documentation string describes the test, and the first line of the
+  docstring should be a brief name.
+
+  The test should return 0 for pass, or non-zero for failure.
+  Alternatively they may raise an exception.
+
+  Tests may import this "comfychair" module to get some useful
+  utilities, but that is not strictly required.
+  
+"""
+
+# TODO: Put everything into a temporary directory?
+
+# TODO: Have a means for tests to customize the display of their
+# failure messages.  In particular, if a shell command failed, then
+# give its stderr.
+
+import sys, re
+
+class TestCase:
+    """A base class for tests.  This class defines required functions which
+    can optionally be overridden by subclasses.  It also provides some
+    utility functions for"""
+
+    def __init__(self):
+        self.test_log = ""
+        self.background_pids = []
+    
+    def setUp(self):
+        """Set up test fixture."""
+        pass
+
+    def tearDown(self):
+        """Tear down test fixture."""
+        pass
+
+    def runTest(self):
+        """Run the test."""
+        pass
+
+    def fail(self, reason = ""):
+        """Say the test failed."""
+        raise AssertionError(reason)
+
+    def assert_(self, expr, reason = ""):
+        if not expr:
+            raise AssertionError(reason)
+
+    def assert_re_match(self, pattern, s):
+        """Assert that a string matches a particular pattern
+
+        Inputs:
+          pattern      string: regular expression
+          s            string: to be matched
+
+        Raises:
+          AssertionError if not matched
+          """
+        if not re.match(pattern, s):
+            raise AssertionError("string %s does not match regexp %s" % (`s`, `pattern`))
+
+    def assert_regexp(self, pattern, s):
+        """Assert that a string *contains* a particular pattern
+
+        Inputs:
+          pattern      string: regular expression
+          s            string: to be searched
+
+        Raises:
+          AssertionError if not matched
+          """
+        if not re.search(pattern, s):
+            raise AssertionError("string %s does not contain regexp %s" % (`s`, `pattern`))
+
+
+    def assert_no_file(self, filename):
+        import os.path
+        assert not os.path.exists(filename), ("file exists but should not: %s" % filename)
+
+
+    def runCmdNoWait(self, cmd):
+        import os
+        name = cmd[0]
+        self.test_log = self.test_log + "Run in background:\n" + `cmd` + "\n"
+        pid = os.spawnvp(os.P_NOWAIT, name, cmd)
+        self.test_log = self.test_log + "pid: %d\n" % pid
+        return pid
+
+
+    def runCmd(self, cmd, expectedResult = 0):
+        """Run a command, fail if the command returns an unexpected exit
+        code.  Return the output produced."""
+        rc, output = self.runCmdUnchecked(cmd)
+        if rc != expectedResult:
+            raise AssertionError("command returned %d; expected %s: \"%s\"" %
+                                 (rc, expectedResult, cmd))
+
+        return output
+
+    def runCmdUnchecked(self, cmd, skip_on_noexec = 0):
+        """Invoke a command; return (exitcode, stdout)"""
+        import os, popen2
+        pobj = popen2.Popen4(cmd)
+        output = pobj.fromchild.read()
+        waitstatus = pobj.wait()
+        assert not os.WIFSIGNALED(waitstatus), \
+               ("%s terminated with signal %d", cmd, os.WTERMSIG(waitstatus))
+        rc = os.WEXITSTATUS(waitstatus)
+        self.test_log = self.test_log + ("""Run command: %s
+Wait status: %#x
+Output:
+%s""" % (cmd, waitstatus, output))
+        if skip_on_noexec and rc == 127:
+            # Either we could not execute the command or the command
+            # returned exit code 127.  According to system(3) we can't
+            # tell the difference.
+            raise NotRunError, "could not execute %s" % cmd
+        return rc, output
+
+    def explainFailure(self, exc_info = None):
+        import traceback
+        # Move along, nothing to see here
+        if not exc_info and self.test_log == "":
+            return
+        print "-----------------------------------------------------------------"
+        if exc_info:
+            traceback.print_exc(file=sys.stdout)
+        print self.test_log
+        print "-----------------------------------------------------------------"
+
+    def require(self, predicate, message):
+        """Check a predicate for running this test.
+
+If the predicate value is not true, the test is skipped with a message explaining
+why."""
+        if not predicate:
+            raise NotRunError, message
+
+    def require_root(self):
+        """Skip this test unless run by root."""
+        import os
+        self.require(os.getuid() == 0,
+                     "must be root to run this test")
+
+    def log(self, msg):
+        """Log a message to the test log.  This message is displayed if
+        the test fails, or when the runtests function is invoked with
+        the verbose option."""
+        self.test_log = self.test_log + msg + "\n"
+
+class NotRunError(Exception):
+    def __init__(self, value = None):
+        self.value = value
+
+def test_name(test):
+    """Return a human-readable name for a test.
+
+    Inputs:
+      test         some kind of callable test object
+
+    Returns:
+      name         string: a short printable name
+      """
+    try:
+        return test.__name__
+    except:
+        return `test`
+
+def runtests(test_list, verbose = 0):
+    """Run a series of tests.
+
+    Eventually, this routine will also examine sys.argv[] to handle
+    extra options.
+
+    Inputs:
+      test_list    sequence of callable test objects
+
+    Returns:
+      unix return code: 0 for success, 1 for failures, 2 for test failure
+    """
+    import traceback
+    ret = 0
+    for test in test_list:
+        print "%-60s" % test_name(test),
+        # flush now so that long running tests are easier to follow
+        sys.stdout.flush()
+
+        try:
+            try: # run test and show result
+                obj = test()
+                if hasattr(obj, "setUp"):
+                    obj.setUp()
+                obj.runTest()
+                print "OK"
+            except KeyboardInterrupt:
+                print "INTERRUPT"
+                obj.explainFailure(sys.exc_info())
+                ret = 2
+                break
+            except NotRunError, msg:
+                print "NOTRUN, %s" % msg.value
+            except:
+                print "FAIL"
+                obj.explainFailure(sys.exc_info())
+                ret = 1
+        finally:
+            try:
+                if hasattr(obj, "tearDown"):
+                    obj.tearDown()
+            except KeyboardInterrupt:
+                print "interrupted during tearDown"
+                obj.explainFailure(sys.exc_info())
+                ret = 2
+                break
+            except:
+                print "error during tearDown"
+                obj.explainFailure(sys.exc_info())
+                ret = 1
+        # Display log file if we're verbose
+        if ret == 0 and verbose:
+            obj.explainFailure()
+            
+    return ret
+
+if __name__ == '__main__':
+    print __doc__
-- 
cgit 


From 053435a8febdd12b240db752ca83b0833f8c1909 Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Wed, 12 Mar 2003 03:07:46 +0000
Subject: Import design notes by martin and tpot from ComfyChair and stf
 modules. (This used to be commit f923729ca37c18fd58943015a530607c05e96659)

---
 source3/stf/notes.txt | 175 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 175 insertions(+)
 create mode 100644 source3/stf/notes.txt

(limited to 'source3')

diff --git a/source3/stf/notes.txt b/source3/stf/notes.txt
new file mode 100644
index 0000000000..68aca63c23
--- /dev/null
+++ b/source3/stf/notes.txt
@@ -0,0 +1,175 @@
+		-*- indented-text -*-
+
+(set lotus no)
+
+
+
+Notes on using comfychair with Samba (samba testing framework units):
+
+The tests need to rely on some external resources, such as 
+
+If suitable resources are not available, need to skip particular
+tests.  Must include a message indicating what resources would be
+needed to run that test.  (e.g. must be root.)
+
+We want to be able to select and run particular subsets of tests, such
+as "all winbind tests".
+
+We want to keep the number of configurable parameters down as much as
+possible, to make it easy on people running the tests.
+
+Wherever possible, the tests should set up their preconditions, but a
+few basic resources need to be provided by the people running the
+tests.  So for example, rather than asking the user for the name of a
+non-root user, we should give the tests the administrator name and
+password, and it can create a new user to use.
+
+This makes it simpler to get the tests running, and possible also
+makes them more reproducible.
+
+In the future, rather than using NT machines provided by the test
+person, we might have a way to drive VMWare non-persistent sessions,
+to make tests even more tightly controlled.
+
+
+Another design question is how to communicate this information to the
+tests.  If there's a lot of settings, then it might need to be stored
+in a configuration file.  
+
+However, if we succeed in cutting down the number of parameters, then
+it might be straightforward to pass the information on the command
+line or in an environment variable.  
+
+Environment variables are probably better because they can't be seen
+by other users, and they are more easily passed down through an
+invocation of "make check".
+
+
+
+Notes on Samba Testing Framework for Unittests
+----------------------------------------------
+
+This is to be read after reading the notes.txt from comfychair.  I'm
+proposing a slightly more concrete description of what's described
+there.
+
+The model of having tests require named resources looks useful for
+incorporation into a framework that can be run by many people in
+widely different environments.
+
+Some possible environments for running the test framework in are:
+
+    - Casual downloader of Samba compiling from source and just wants
+      to run 'make check'.  May only have one Unix machine and a
+      handful of clients.
+
+    - Samba team member with access to a small number of other
+      machines or VMware sessions.
+
+    - PSA developer who may not have intimate knowledge of Samba
+      internals and is only interested in testing against the PSA.
+
+    - Non-team hacker wanting to run test suite after making small
+      hacks. 
+
+    - Build farm environment (loaner machine with no physical access
+      or root privilege).
+
+    - HP BAT.
+
+Developers in most of these environments are also potential test case
+authors.  It should be easy for people unfamiliar with the framework
+to write new tests and have them work.  We should provide examples and
+the existing tests should well written and understandable.
+
+Different types of tests:
+
+    - Tests that check Samba internals and link against
+      libbigballofmud.so.  For example:
+
+        - Upper/lowercase string functions
+        - user_in_list() for large lists
+
+    - Tests that use the Samba Python extensions.
+
+    - Tests that execute Samba command line programs, for example
+      smbpasswd. 
+
+    - Tests that require other resources on the network such as domain
+      controllers or PSAs.
+
+    - Tests that are performed on the documentation or the source code
+      such as:
+
+        - grep for common spelling mistakes made by abartlet (-:
+        - grep for company copyright (IBM, HP)
+                         
+    - Link to other existing testing frameworks (smbtorture,
+      abartlet's bash based build farm tests)
+
+I propose a TestResourceManager which would be instantiated by a test
+case.  The test case would require("resourcename") as part of its
+constructor and raise a comfychair.NotRun exception if the resource
+was not present.  A TestResource class could be defined which could
+read a configuration file or examine a environment variable and
+register a resource only if some condition was satisfied.
+
+It would be nice to be able to completely separate the PSA testing
+from the test framework.  This would entail being able to define test
+resources dynamically, possibly with a plugin type system.
+
+class TestResourceManager:
+    def __init__(self, name):
+        self.resources = {}
+
+    def register(self, resource):
+        name = resource.name()
+        if self.resources.has_key(name):
+            raise "Test manager already has resource %s" % name
+        self.resources[name] = resource
+
+    def require(self, resource_name):
+        if not self.resources.has_key(resource_name):
+            raise "Test manager does not have resources %s" % resource_name
+
+class TestResource:
+    def __init__(self, name):
+        self.name = name
+
+    def name(self):
+        return self.name
+
+import os
+
+trm = TestResourceManager()
+
+if os.getuid() == 0:
+    trm.register(TestResource("root"))
+
+A config-o-matic Python module can take a list of machines and
+administrator%password entries and classify them by operating system
+version and service pack.  These resources would be registered with
+the TestResourceManager.
+
+Some random thoughts about named resources for network servers:
+
+require("nt4.sp3")
+require("nt4.domaincontroller")
+require("psa")
+
+Some kind of format for location of passwords, libraries:
+
+require("exec(smbpasswd)")
+require("lib(bigballofmud)")
+
+maybe require("exec.smbpasswd") looks nicer...
+
+The require() function could return a dictionary of configuration
+information or some handle to fetch dynamic information on.  We may
+need to create and destroy extra users or print queues.  How to manage
+cleanup of dynamic resources?
+
+Requirements for running stf:
+
+    - Python, obviously
+    - Samba python extensions
-- 
cgit 


From eb4ea93ac3a1bc1bb395ee0d74d72b08b3fe8190 Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Wed, 12 Mar 2003 03:08:28 +0000
Subject: Import Samba Testing Framework code from private CVS module. (This
 used to be commit 0effe832a48f0c51d50675558cc2744e815d68c7)

---
 source3/stf/osver.py   |  55 ++++++++++
 source3/stf/spoolss.py | 288 +++++++++++++++++++++++++++++++++++++++++++++++++
 source3/stf/stf.py     | 101 +++++++++++++++++
 source3/stf/test.py    |  28 +++++
 4 files changed, 472 insertions(+)
 create mode 100755 source3/stf/osver.py
 create mode 100755 source3/stf/spoolss.py
 create mode 100755 source3/stf/stf.py
 create mode 100755 source3/stf/test.py

(limited to 'source3')

diff --git a/source3/stf/osver.py b/source3/stf/osver.py
new file mode 100755
index 0000000000..68601fa7bb
--- /dev/null
+++ b/source3/stf/osver.py
@@ -0,0 +1,55 @@
+#!/usr/bin/python
+#
+# Utilities for determining the Windows operating system version remotely.
+#
+
+from samba import srvsvc
+
+# Constants
+
+PLATFORM_UNKNOWN = 0
+PLATFORM_WIN9X = 1
+PLATFORM_NT4 = 2
+PLATFORM_NT5 = 3                        # Windows 2000
+
+def platform_name(platform_type):
+
+    platform_names = { PLATFORM_UNKNOWN: "Unknown",
+                       PLATFORM_WIN9X: "Windows 9x",
+                       PLATFORM_NT4: "Windows NT",
+                       PLATFORM_NT5: "Windows 2000" }
+
+    if platform_names.has_key(platform_type):
+        return platform_names[platform_type]
+
+    return "Unknown"
+
+def platform_type(info101):
+    """Determine the operating system type from a SRV_INFO_101."""
+
+    if info101['major_version'] == 4 and info101['minor_version'] == 0:
+        return PLATFORM_NT4
+
+    if info101['major_version'] == 5 and info101['minor_version'] == 0:
+        return PLATFORM_NT5
+
+    return PLATFORM_UNKNOWN
+
+def is_domain_controller(info101):
+    """Return true if the server_type field from a  SRV_INFO_101
+    indicates a domain controller."""
+    return info101['server_type'] & srvsvc.SV_TYPE_DOMAIN_CTRL
+
+def os_version(name):
+    info = srvsvc.netservergetinfo("\\\\%s" % name, 101)
+    return platform_type(info)
+
+if __name__ == "__main__":
+    import sys
+    if len(sys.argv) != 2:
+        print "Usage: osver.py server"
+        sys.exit(0)
+    info = srvsvc.netservergetinfo("\\\\%s" % sys.argv[1], 101)
+    print "platform type = %d" % platform_type(info)
+    if is_domain_controller(info):
+        print "%s is a domain controller" % sys.argv[1]
diff --git a/source3/stf/spoolss.py b/source3/stf/spoolss.py
new file mode 100755
index 0000000000..735291508b
--- /dev/null
+++ b/source3/stf/spoolss.py
@@ -0,0 +1,288 @@
+#!/usr/bin/python
+
+import re
+import comfychair, stf
+from samba import spoolss
+
+class PrintServerTest(comfychair.TestCase):
+    """An abstract class requiring a print server."""
+    def setUp(self):
+        # TODO: create a test printer
+        self.server = stf.get_server(platform = "nt")
+        self.require(self.server != None, "print server required")
+        # TODO: remove hardcoded printer name
+        self.printername = "p"
+        self.uncname = "\\\\%s\\%s" % \
+                           (self.server["hostname"], self.printername)
+
+class W2kPrintServerTest(comfychair.TestCase):
+    """An abstract class requiring a print server."""
+    def setUp(self):
+        # TODO: create a test printer
+        self.server = stf.get_server(platform = "nt5")
+        self.require(self.server != None, "print server required")
+        # TODO: remove hardcoded printer name
+        self.printername = "p"
+        self.uncname = "\\\\%s\\%s" % \
+                           (self.server["hostname"], self.printername)
+
+class CredentialTest(PrintServerTest):
+    """An class that calls a function with various sets of credentials."""
+    def runTest(self):
+
+        bad_user_creds = {"username": "spotty",
+                          "domain": "dog",
+                          "password": "bone"}
+                        
+        cases = ((self.server["administrator"], "Admin credentials", 1),
+                 (bad_user_creds,               "Bad credentials",   0))
+
+        # TODO: add unpriv user case
+
+        for creds, testname, result in cases:
+            try:
+                self.runTestArg(creds)
+            except:
+                if result:
+                    import traceback
+                    traceback.print_exc()
+                    self.fail("rpc with creds %s failed when it "
+                              "should have suceeded" % creds)
+                return
+
+            if not result:
+                self.fail("rpc with creds %s suceeded when it should "
+                          "have failed" % creds)
+        
+class ArgTestServer(PrintServerTest):
+    """Test a RPC that takes a UNC print server name."""
+    def runTest(self):
+
+        # List of test cases, %s substituted for server name
+
+        cases = (("",             "No server name",          0),
+                 ("\\\\%s",       "Valid server name",       1),
+                 ("\\%s",         "Invalid unc server name", 0),
+                 ("\\\\%s__",     "Invalid unc server name", 0))
+
+        for unc, testname, result in cases:
+            unc = re.sub("%s", self.server["hostname"], unc)
+            try:
+                self.runTestArg(unc)
+            except:
+                if result:
+                    self.fail("rpc(\"%s\") failed when it should have "
+                              "suceeded" % unc)
+                return
+
+            if not result:
+                # Suceeded when we should have failed
+                self.fail("rpc(\"%s\") suceeded when it should have "
+                          "failed" % unc)
+
+class ArgTestServerAndPrinter(ArgTestServer):
+    """Test a RPC that takes a UNC print server or UNC printer name."""
+    def runTest(self):
+
+        ArgTestServer.runTest(self)
+        
+        # List of test cases, %s substituted for server name, %p substituted
+        # for printer name.
+
+        cases = (("\\\\%s\\%p",   "Valid server and printer name",      1),
+                 ("\\\\%s\\%p__", "Valid server, invalid printer name", 0),
+                 ("\\\\%s__\\%p", "Invalid server, valid printer name", 0))
+
+        for unc, testname, result in cases:
+            unc = re.sub("%s", self.server["hostname"], unc)
+            unc = re.sub("%p", self.printername, unc)
+            try:
+                self.runTestArg(unc)
+            except:
+                if result:
+                    self.fail("openprinter(\"%s\") failed when it should have "
+                              "suceeded" % unc)
+                return
+
+            if not result:
+                # Suceeded when we should have failed
+                self.fail("openprinter(\"%s\") suceeded when it should have "
+                          "failed" % unc)
+
+class OpenPrinterArg(ArgTestServerAndPrinter):
+    """Test the OpenPrinter RPC with combinations of valid and invalid
+    server and printer names."""
+    def runTestArg(self, unc):
+        spoolss.openprinter(unc)
+
+class OpenPrinterCred(CredentialTest):
+    """Test opening printer with good and bad credentials."""
+    def runTestArg(self, creds):
+        spoolss.openprinter(self.uncname, creds = creds)
+
+class ClosePrinter(PrintServerTest):
+    """Test the ClosePrinter RPC on a printer handle."""
+    def runTest(self):
+        hnd = spoolss.openprinter(self.uncname)
+        spoolss.closeprinter(hnd)
+        
+class ClosePrinterServer(PrintServerTest):
+    """Test the ClosePrinter RPC on a print server handle."""
+    def runTest(self):
+        hnd = spoolss.openprinter("\\\\%s" % self.server["hostname"])
+        spoolss.closeprinter(hnd)
+        
+class GetPrinterInfo(PrintServerTest):
+    """Retrieve printer info at various levels."""
+
+    # Sample printer data
+
+    sample_info = {
+        0: {'printer_errors': 0, 'unknown18': 0, 'unknown13': 0, 'unknown26': 0, 'cjobs': 0, 'unknown11': 0, 'server_name': '\\\\win2kdc1', 'total_pages': 0, 'unknown15': 586, 'unknown16': 0, 'month': 2, 'unknown20': 0, 'second': 23, 'unknown22': 983040, 'unknown25': 0, 'total_bytes': 0, 'unknown27': 0, 'year': 2003, 'build_version': 2195, 'unknown28': 0, 'global_counter': 4, 'day': 13, 'minute': 53, 'total_jobs': 0, 'unknown29': 1114112, 'name': '\\\\win2kdc1\\p', 'hour': 2, 'level': 0, 'c_setprinter': 0, 'change_id': 522454169, 'major_version': 5, 'unknown23': 15, 'day_of_week': 4, 'unknown14': 1, 'session_counter': 2, 'status': 1, 'unknown7': 1, 'unknown8': 0, 'unknown9': 0, 'milliseconds': 421, 'unknown24': 0},
+        1: {'comment': "I'm a teapot!", 'level': 1, 'flags': 8388608, 'name': '\\\\win2kdc1\\p', 'description': '\\\\win2kdc1\\p,HP LaserJet 4,Canberra office'},
+        2: {'comment': "I'm a teapot!", 'status': 1, 'print_processor': 'WinPrint', 'until_time': 0, 'share_name': 'p', 'start_time': 0, 'device_mode': {'icm_method': 1, 'bits_per_pel': 0, 'log_pixels': 0, 'orientation': 1, 'panning_width': 0, 'color': 2, 'pels_width': 0, 'print_quality': 600, 'driver_version': 24, 'display_flags': 0, 'y_resolution': 600, 'media_type': 0, 'display_frequency': 0, 'icm_intent': 0, 'pels_height': 0, 'reserved1': 0, 'size': 220, 'scale': 100, 'dither_type': 0, 'panning_height': 0, 'default_source': 7, 'duplex': 1, 'fields': 16131, 'spec_version': 1025, 'copies': 1, 'device_name': '\\\\win2kdc1\\p', 'paper_size': 1, 'paper_length': 0, 'private': 'private', 'collate': 0, 'paper_width': 0, 'form_name': 'Letter', 'reserved2': 0, 'tt_option': 0}, 'port_name': 'LPT1:', 'sepfile': '', 'parameters': '', 'security_descriptor': {'group_sid': 'S-1-5-21-1606980848-1677128483-854245398-513', 'sacl': None, 'dacl': {'ace_list': [{'flags': 0, 'type': 0, 'mask': 983052, 'trustee': 'S-1-5-32-544'}, {'flags': 9, 'type': 0, 'mask': 983056, 'trustee': 'S-1-5-32-544'}, {'flags': 0, 'type': 0, 'mask': 131080, 'trustee': 'S-1-5-21-1606980848-1677128483-854245398-1121'}, {'flags': 10, 'type': 0, 'mask': 131072, 'trustee': 'S-1-3-0'}, {'flags': 9, 'type': 0, 'mask': 983056, 'trustee': 'S-1-3-0'}, {'flags': 0, 'type': 0, 'mask': 131080, 'trustee': 'S-1-5-21-1606980848-1677128483-854245398-1124'}, {'flags': 0, 'type': 0, 'mask': 131080, 'trustee': 'S-1-1-0'}, {'flags': 0, 'type': 0, 'mask': 983052, 'trustee': 'S-1-5-32-550'}, {'flags': 9, 'type': 0, 'mask': 983056, 'trustee': 'S-1-5-32-550'}, {'flags': 0, 'type': 0, 'mask': 983052, 'trustee': 'S-1-5-32-549'}, {'flags': 9, 'type': 0, 'mask': 983056, 'trustee': 'S-1-5-32-549'}, {'flags': 0, 'type': 0, 'mask': 983052, 'trustee': 'S-1-5-21-1606980848-1677128483-854245398-1106'}], 'revision': 2}, 'owner_sid': 'S-1-5-32-544', 'revision': 1}, 'name': '\\\\win2kdc1\\p', 'server_name': '\\\\win2kdc1', 'level': 2, 'datatype': 'RAW', 'cjobs': 0, 'average_ppm': 0, 'priority': 1, 'driver_name': 'HP LaserJet 4', 'location': 'Canberra office', 'attributes': 8776, 'default_priority': 0},
+        3: {'flags': 4, 'security_descriptor': {'group_sid': 'S-1-5-21-1606980848-1677128483-854245398-513', 'sacl': None, 'dacl': {'ace_list': [{'flags': 0, 'type': 0, 'mask': 983052, 'trustee': 'S-1-5-32-544'}, {'flags': 9, 'type': 0, 'mask': 983056, 'trustee': 'S-1-5-32-544'}, {'flags': 0, 'type': 0, 'mask': 131080, 'trustee': 'S-1-5-21-1606980848-1677128483-854245398-1121'}, {'flags': 10, 'type': 0, 'mask': 131072, 'trustee': 'S-1-3-0'}, {'flags': 9, 'type': 0, 'mask': 983056, 'trustee': 'S-1-3-0'}, {'flags': 0, 'type': 0, 'mask': 131080, 'trustee': 'S-1-5-21-1606980848-1677128483-854245398-1124'}, {'flags': 0, 'type': 0, 'mask': 131080, 'trustee': 'S-1-1-0'}, {'flags': 0, 'type': 0, 'mask': 983052, 'trustee': 'S-1-5-32-550'}, {'flags': 9, 'type': 0, 'mask': 983056, 'trustee': 'S-1-5-32-550'}, {'flags': 0, 'type': 0, 'mask': 983052, 'trustee': 'S-1-5-32-549'}, {'flags': 9, 'type': 0, 'mask': 983056, 'trustee': 'S-1-5-32-549'}, {'flags': 0, 'type': 0, 'mask': 983052, 'trustee': 'S-1-5-21-1606980848-1677128483-854245398-1106'}], 'revision': 2}, 'owner_sid': 'S-1-5-32-544', 'revision': 1}, 'level': 3}
+        }
+
+    def runTest(self):
+        self.hnd = spoolss.openprinter(self.uncname)
+
+        # Everyone should have getprinter levels 0-3
+
+        for i in (0, 1, 2, 3):
+            info = self.hnd.getprinter(level = i)
+            try:
+                stf.dict_check(self.sample_info[i], info)
+            except ValueError, msg:
+                raise "info%d: %s" % (i, msg)
+
+class EnumPrinters(PrintServerTest):
+    """Enumerate print info at various levels."""
+
+    sample_info = {
+
+        0: {'q': {'printer_errors': 0, 'unknown18': 0, 'unknown13': 0, 'unknown26': 0, 'cjobs': 0, 'unknown11': 0, 'server_name': '', 'total_pages': 0, 'unknown15': 586, 'unknown16': 0, 'month': 2, 'unknown20': 0, 'second': 23, 'unknown22': 983040, 'unknown25': 0, 'total_bytes': 0, 'unknown27': 0, 'year': 2003, 'build_version': 2195, 'unknown28': 0, 'global_counter': 4, 'day': 13, 'minute': 53, 'total_jobs': 0, 'unknown29': -1833435136, 'name': 'q', 'hour': 2, 'level': 0, 'c_setprinter': 0, 'change_id': 522454169, 'major_version': 5, 'unknown23': 15, 'day_of_week': 4, 'unknown14': 1, 'session_counter': 1, 'status': 0, 'unknown7': 1, 'unknown8': 0, 'unknown9': 0, 'milliseconds': 421, 'unknown24': 0}, 'p': {'printer_errors': 0, 'unknown18': 0, 'unknown13': 0, 'unknown26': 0, 'cjobs': 0, 'unknown11': 0, 'server_name': '', 'total_pages': 0, 'unknown15': 586, 'unknown16': 0, 'month': 2, 'unknown20': 0, 'second': 23, 'unknown22': 983040, 'unknown25': 0, 'total_bytes': 0, 'unknown27': 0, 'year': 2003, 'build_version': 2195, 'unknown28': 0, 'global_counter': 4, 'day': 13, 'minute': 53, 'total_jobs': 0, 'unknown29': -1831337984, 'name': 'p', 'hour': 2, 'level': 0, 'c_setprinter': 0, 'change_id': 522454169, 'major_version': 5, 'unknown23': 15, 'day_of_week': 4, 'unknown14': 1, 'session_counter': 1, 'status': 1, 'unknown7': 1, 'unknown8': 0, 'unknown9': 0, 'milliseconds': 421, 'unknown24': 0}, 'magpie': {'printer_errors': 0, 'unknown18': 0, 'unknown13': 0, 'unknown26': 0, 'cjobs': 0, 'unknown11': 0, 'server_name': '', 'total_pages': 0, 'unknown15': 586, 'unknown16': 0, 'month': 2, 'unknown20': 0, 'second': 23, 'unknown22': 983040, 'unknown25': 0, 'total_bytes': 0, 'unknown27': 0, 'year': 2003, 'build_version': 2195, 'unknown28': 0, 'global_counter': 4, 'day': 13, 'minute': 53, 'total_jobs': 0, 'unknown29': 1114112, 'name': 'magpie', 'hour': 2, 'level': 0, 'c_setprinter': 0, 'change_id': 522454169, 'major_version': 5, 'unknown23': 15, 'day_of_week': 4, 'unknown14': 1, 'session_counter': 1, 'status': 0, 'unknown7': 1, 'unknown8': 0, 'unknown9': 0, 'milliseconds': 421, 'unknown24': 0}},
+
+        1: {'q': {'comment': 'cheepy birds', 'level': 1, 'flags': 8388608, 'name': 'q', 'description': 'q,HP LaserJet 4,'}, 'p': {'comment': "I'm a teapot!", 'level': 1, 'flags': 8388608, 'name': 'p', 'description': 'p,HP LaserJet 4,Canberra office'}, 'magpie': {'comment': '', 'level': 1, 'flags': 8388608, 'name': 'magpie', 'description': 'magpie,Generic / Text Only,'}}
+        }
+
+    def runTest(self):
+        for i in (0, 1):
+            info = spoolss.enumprinters(
+                "\\\\%s" % self.server["hostname"], level = i)
+            try:
+                stf.dict_check(self.sample_info[i], info)
+            except ValueError, msg:
+                raise "info%d: %s" % (i, msg)
+
+class EnumPrintersArg(ArgTestServer):
+    def runTestArg(self, unc):
+        spoolss.enumprinters(unc)
+
+class EnumPrintersCred(CredentialTest):
+    """Test opening printer with good and bad credentials."""
+    def runTestArg(self, creds):
+        spoolss.enumprinters(
+            "\\\\%s" % self.server["hostname"], creds = creds)
+
+class EnumPrinterdrivers(PrintServerTest):
+
+    sample_info = {
+        1: {'Okipage 10ex (PCL5E) : STANDARD': {'name': 'Okipage 10ex (PCL5E) : STANDARD', 'level': 1}, 'Generic / Text Only': {'name': 'Generic / Text Only', 'level': 1}, 'Brother HL-1030 series': {'name': 'Brother HL-1030 series', 'level': 1}, 'Brother HL-1240 series': {'name': 'Brother HL-1240 series', 'level': 1}, 'HP DeskJet 1220C Printer': {'name': 'HP DeskJet 1220C Printer', 'level': 1}, 'HP LaserJet 4100 PCL 6': {'name': 'HP LaserJet 4100 PCL 6', 'level': 1}, 'HP LaserJet 4': {'name': 'HP LaserJet 4', 'level': 1}},
+        2: {'Okipage 10ex (PCL5E) : STANDARD': {'version': 2, 'config_file': '\\\\WIN2KDC1\\print$\\W32X86\\2\\RASDDUI.DLL', 'name': 'Okipage 10ex (PCL5E) : STANDARD', 'driver_path': '\\\\WIN2KDC1\\print$\\W32X86\\2\\RASDD.DLL', 'data_file': '\\\\WIN2KDC1\\print$\\W32X86\\2\\OKIPAGE.DLL', 'level': 2, 'architecture': 'Windows NT x86'}, 'Generic / Text Only': {'version': 3, 'config_file': '\\\\WIN2KDC1\\print$\\W32X86\\3\\UNIDRVUI.DLL', 'name': 'Generic / Text Only', 'driver_path': '\\\\WIN2KDC1\\print$\\W32X86\\3\\UNIDRV.DLL', 'data_file': '\\\\WIN2KDC1\\print$\\W32X86\\3\\TTY.GPD', 'level': 2, 'architecture': 'Windows NT x86'}, 'Brother HL-1030 series': {'version': 3, 'config_file': '\\\\WIN2KDC1\\print$\\W32X86\\3\\BRUHL99A.DLL', 'name': 'Brother HL-1030 series', 'driver_path': '\\\\WIN2KDC1\\print$\\W32X86\\3\\BROHL99A.DLL', 'data_file': '\\\\WIN2KDC1\\print$\\W32X86\\3\\BROHL103.PPD', 'level': 2, 'architecture': 'Windows NT x86'}, 'Brother HL-1240 series': {'version': 3, 'config_file': '\\\\WIN2KDC1\\print$\\W32X86\\3\\BRUHL99A.DLL', 'name': 'Brother HL-1240 series', 'driver_path': '\\\\WIN2KDC1\\print$\\W32X86\\3\\BROHL99A.DLL', 'data_file': '\\\\WIN2KDC1\\print$\\W32X86\\3\\BROHL124.PPD', 'level': 2, 'architecture': 'Windows NT x86'}, 'HP DeskJet 1220C Printer': {'version': 3, 'config_file': '\\\\WIN2KDC1\\print$\\W32X86\\3\\HPW8KMD.DLL', 'name': 'HP DeskJet 1220C Printer', 'driver_path': '\\\\WIN2KDC1\\print$\\W32X86\\3\\HPW8KMD.DLL', 'data_file': '\\\\WIN2KDC1\\print$\\W32X86\\3\\HPW8KMD.DLL', 'level': 2, 'architecture': 'Windows NT x86'}, 'HP LaserJet 4100 PCL 6': {'version': 3, 'config_file': '\\\\WIN2KDC1\\print$\\W32X86\\3\\HPBF042E.DLL', 'name': 'HP LaserJet 4100 PCL 6', 'driver_path': '\\\\WIN2KDC1\\print$\\W32X86\\3\\HPBF042G.DLL', 'data_file': '\\\\WIN2KDC1\\print$\\W32X86\\3\\HPBF042I.PMD', 'level': 2, 'architecture': 'Windows NT x86'}, 'HP LaserJet 4': {'version': 2, 'config_file': '\\\\WIN2KDC1\\print$\\W32X86\\2\\hpblff0.dll', 'name': 'HP LaserJet 4', 'driver_path': '\\\\WIN2KDC1\\print$\\W32X86\\2\\hpblff2.dll', 'data_file': '\\\\WIN2KDC1\\print$\\W32X86\\2\\hpblff39.pmd', 'level': 2, 'architecture': 'Windows NT x86'}}
+        }
+
+    def runTest(self):
+        for i in (1, 2):
+            info = spoolss.enumprinterdrivers(
+                "\\\\%s" % self.server["hostname"], level = i)
+            try:
+                if not self.sample_info.has_key(i):
+                    self.log("%s" % info)
+                    self.fail()
+                stf.dict_check(self.sample_info[i], info)
+            except ValueError, msg:
+                raise "info%d: %s" % (i, msg)
+
+class EnumPrinterdriversArg(ArgTestServer):
+    def runTestArg(self, unc):
+        spoolss.enumprinterdrivers(unc)
+
+class EnumPrinterdriversCred(CredentialTest):
+    """Test opening printer with good and bad credentials."""
+    def runTestArg(self, creds):
+        spoolss.enumprinterdrivers(
+            "\\\\%s" % self.server["hostname"], creds = creds)
+
+def usage():
+    print "Usage: spoolss.py [options] [test1[,test2...]]"
+    print "\t -v/--verbose     Display debugging information"
+    print "\t -l/--list-tests  List available tests"
+    print
+    print "A list of comma separated test names or regular expressions"
+    print "can be used to filter the tests performed."
+            
+def test_match(subtest_list, test_name):
+    """Return true if a test matches a comma separated list of regular
+    expression of test names."""
+    # re.match does an implicit ^ at the start of the pattern.
+    # Explicitly anchor to end to avoid matching substrings.
+    for s in string.split(subtest_list, ","):
+        if re.match(s + "$", test_name):
+            return 1
+    return 0
+           
+if __name__ == "__main__":
+    import os, sys, string
+    import getopt
+    
+    try:
+        opts, args = getopt.getopt(sys.argv[1:], "vl", \
+                                   ["verbose", "list-tests"])
+    except getopt.GetoptError:
+        usage()
+        sys.exit(0)
+
+    verbose = 0
+    list_tests = 0
+
+    for opt, arg in opts:
+        if opt in ("-v", "--verbose"):
+            verbose = 1
+        if opt in ("-l", "--list-tests"):
+            list_tests = 1
+
+    if len(args) > 1:
+        usage()
+        sys.exit(0)
+
+    test_list = [
+        OpenPrinterArg,
+        OpenPrinterCred,
+        ClosePrinter,
+        ClosePrinterServer,
+        GetPrinterInfo,
+        EnumPrinters,
+        EnumPrintersCred,
+        EnumPrintersArg,
+        EnumPrinterdrivers,
+        EnumPrinterdriversCred,
+        EnumPrinterdriversArg,
+        ]
+
+    if len(args):
+        t = []
+        for test in test_list:
+            if test_match(args[0], test.__name__):
+                t.append(test)
+        test_list = t
+
+    if os.environ.has_key("SAMBA_DEBUG"):
+        spoolss.setup_logging(interactive = 1)
+        spoolss.set_debuglevel(10)
+
+    if list_tests:
+        for test in test_list:
+            print test.__name__
+    else:
+        comfychair.runtests(test_list, verbose = verbose)
diff --git a/source3/stf/stf.py b/source3/stf/stf.py
new file mode 100755
index 0000000000..ee0ff73561
--- /dev/null
+++ b/source3/stf/stf.py
@@ -0,0 +1,101 @@
+#!/usr/bin/python
+#
+# Samba Testing Framework for Unit-testing
+#
+
+import os, string, re
+import osver
+
+def get_server_list_from_string(s):
+
+    server_list = []
+    
+    # Format is a list of server:domain\username%password separated
+    # by commas.
+
+    for entry in string.split(s, ","):
+
+        # Parse entry 
+
+        m = re.match("(.*):(.*)(\\\\|/)(.*)%(.*)", entry)
+        if not m:
+            raise "badly formed server list entry '%s'" % entry
+
+        server = m.group(1)
+        domain = m.group(2)
+        username = m.group(4)
+        password = m.group(5)
+
+        # Categorise servers
+
+        server_list.append({"platform": osver.os_version(server),
+                            "hostname": server,
+                            "administrator": {"username": username,
+                                              "domain": domain,
+                                              "password" : password}})
+
+    return server_list
+
+def get_server_list():
+    """Iterate through all sources of server info and append them all
+    in one big list."""
+    
+    server_list = []
+
+    # The $STF_SERVERS environment variable
+
+    if os.environ.has_key("STF_SERVERS"):
+        server_list = server_list + \
+                      get_server_list_from_string(os.environ["STF_SERVERS"])
+
+    return server_list
+
+def get_server(platform = None):
+    """Return configuration information for a server.  The platform
+    argument can be a string either 'nt4' or 'nt5' for Windows NT or
+    Windows 2000 servers, or just 'nt' for Windows NT and higher."""
+    
+    server_list = get_server_list()
+
+    for server in server_list:
+        if platform:
+            p = server["platform"]
+            if platform == "nt":
+                if (p == osver.PLATFORM_NT4 or p == osver.PLATFORM_NT5):
+                    return server
+            if platform == "nt4" and p == osver.PLATFORM_NT4:
+                return server
+            if platform == "nt5" and p == osver.PLATFORM_NT5:
+                return server
+        else:
+            # No filter defined, return first in list
+            return server
+        
+    return None
+
+def dict_check(sample_dict, real_dict):
+    """Check that real_dict contains all the keys present in sample_dict
+    and no extras.  Also check that common keys are of them same type."""
+    tmp = real_dict.copy()
+    for key in sample_dict.keys():
+        # Check existing key and type
+        if not real_dict.has_key(key):
+            raise ValueError, "dict does not contain key '%s'" % key
+        if type(sample_dict[key]) != type(real_dict[key]):
+            raise ValueError, "dict has differing types (%s vs %s) for key " \
+                  "'%s'" % (type(sample_dict[key]), type(real_dict[key]), key)
+        # Check dictionaries recursively
+        if type(sample_dict[key]) == dict:
+            dict_check(sample_dict[key], real_dict[key])
+        # Delete visited keys from copy
+        del(tmp[key])
+    # Any keys leftover are present in the real dict but not the sample
+    if len(tmp) == 0:
+        return
+    result = "dict has extra keys: "
+    for key in tmp.keys():
+        result = result + key + " "
+    raise ValueError, result
+
+if __name__ == "__main__":
+    print get_server(platform = "nt")
diff --git a/source3/stf/test.py b/source3/stf/test.py
new file mode 100755
index 0000000000..2e9abd976f
--- /dev/null
+++ b/source3/stf/test.py
@@ -0,0 +1,28 @@
+#!/usr/bin/python
+
+# meta-test-case / example for comfychair.  Should demonstrate
+# different kinds of failure.
+
+import comfychair, stf
+
+class NormalTest(comfychair.TestCase):
+    def runTest(self):
+        pass
+
+class RootTest(comfychair.TestCase):
+    def setUp(self):
+        self.require_root()
+            
+    def runTest(self):
+        pass
+
+class GoodExecTest(comfychair.TestCase):
+    def runTest(self):
+        exit, stdout = self.runCmdUnchecked("ls -l")
+
+class BadExecTest(comfychair.TestCase):
+    def setUp(self):
+        exit, stdout = self.runCmdUnchecked("spottyfoot --slobber",
+                                            skip_on_noexec = 1)
+
+comfychair.runtests([NormalTest, RootTest, GoodExecTest, BadExecTest])
-- 
cgit 


From 62ead1b8bede20e73e18fdca5bcaf0aee9d1f56b Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Wed, 12 Mar 2003 07:14:03 +0000
Subject: New import of ComfyChair, many changes (This used to be commit
 e84046e769a518fa1970827f4dcb8284ba9b9952)

---
 source3/stf/comfychair.py | 214 ++++++++++++++++++++++++++++++----------------
 1 file changed, 139 insertions(+), 75 deletions(-)

(limited to 'source3')

diff --git a/source3/stf/comfychair.py b/source3/stf/comfychair.py
index 00b2262b26..b552baccd2 100644
--- a/source3/stf/comfychair.py
+++ b/source3/stf/comfychair.py
@@ -22,31 +22,11 @@
 Copyright (C) 2002, 2003 by Martin Pool <mbp@samba.org>
 
 This is a test framework designed for testing programs written in
-Python, or (through a fork/exec interface) any other language.  It is
-similar in design to the very nice 'svntest' system used by
-Subversion, but has no Subversion-specific features.
+Python, or (through a fork/exec interface) any other language.
 
-It is somewhat similar to PyUnit, except:
+For more information, see the file README.comfychair.
 
- - it allows capture of detailed log messages from a test, to be
-   optionally displayed if the test fails.
-
- - it allows execution of a specified subset of tests
-
- - it avoids Java idioms that are not so useful in Python
-
-WRITING TESTS:
-
-  Each test case is a callable object, typically a function.  Its
-  documentation string describes the test, and the first line of the
-  docstring should be a brief name.
-
-  The test should return 0 for pass, or non-zero for failure.
-  Alternatively they may raise an exception.
-
-  Tests may import this "comfychair" module to get some useful
-  utilities, but that is not strictly required.
-  
+To run a test suite based on ComfyChair, just run it as a program.
 """
 
 # TODO: Put everything into a temporary directory?
@@ -66,15 +46,15 @@ class TestCase:
         self.test_log = ""
         self.background_pids = []
     
-    def setUp(self):
+    def setup(self):
         """Set up test fixture."""
         pass
 
-    def tearDown(self):
+    def teardown(self):
         """Tear down test fixture."""
         pass
 
-    def runTest(self):
+    def runtest(self):
         """Run the test."""
         pass
 
@@ -82,10 +62,39 @@ class TestCase:
         """Say the test failed."""
         raise AssertionError(reason)
 
+
+    #############################################################
+    # Requisition methods
+
+    def require(self, predicate, message):
+        """Check a predicate for running this test.
+
+If the predicate value is not true, the test is skipped with a message explaining
+why."""
+        if not predicate:
+            raise NotRunError, message
+
+    def require_root(self):
+        """Skip this test unless run by root."""
+        import os
+        self.require(os.getuid() == 0,
+                     "must be root to run this test")
+
+    #############################################################
+    # Assertion methods
+
     def assert_(self, expr, reason = ""):
         if not expr:
             raise AssertionError(reason)
 
+    def assert_equal(self, a, b):
+        if not a == b:
+            raise AssertionError("assertEquals failed: %s" % `(a, b)`)
+            
+    def assert_notequal(self, a, b):
+        if a == b:
+            raise AssertionError("assertNotEqual failed: %s" % `(a, b)`)
+
     def assert_re_match(self, pattern, s):
         """Assert that a string matches a particular pattern
 
@@ -97,9 +106,11 @@ class TestCase:
           AssertionError if not matched
           """
         if not re.match(pattern, s):
-            raise AssertionError("string %s does not match regexp %s" % (`s`, `pattern`))
+            raise AssertionError("string does not match regexp\n"
+                                 "    string: %s\n"
+                                 "    re: %s" % (`s`, `pattern`))
 
-    def assert_regexp(self, pattern, s):
+    def assert_re_search(self, pattern, s):
         """Assert that a string *contains* a particular pattern
 
         Inputs:
@@ -110,7 +121,9 @@ class TestCase:
           AssertionError if not matched
           """
         if not re.search(pattern, s):
-            raise AssertionError("string %s does not contain regexp %s" % (`s`, `pattern`))
+            raise AssertionError("string does not contain regexp\n"
+                                 "    string: %s\n"
+                                 "    re: %s" % (`s`, `pattern`))
 
 
     def assert_no_file(self, filename):
@@ -118,7 +131,10 @@ class TestCase:
         assert not os.path.exists(filename), ("file exists but should not: %s" % filename)
 
 
-    def runCmdNoWait(self, cmd):
+    #############################################################
+    # Methods for running programs
+
+    def runcmd_background(self, cmd):
         import os
         name = cmd[0]
         self.test_log = self.test_log + "Run in background:\n" + `cmd` + "\n"
@@ -127,17 +143,17 @@ class TestCase:
         return pid
 
 
-    def runCmd(self, cmd, expectedResult = 0):
+    def runcmd(self, cmd, expectedResult = 0):
         """Run a command, fail if the command returns an unexpected exit
         code.  Return the output produced."""
-        rc, output = self.runCmdUnchecked(cmd)
+        rc, output = self.runcmd_unchecked(cmd)
         if rc != expectedResult:
             raise AssertionError("command returned %d; expected %s: \"%s\"" %
                                  (rc, expectedResult, cmd))
 
         return output
 
-    def runCmdUnchecked(self, cmd, skip_on_noexec = 0):
+    def runcmd_unchecked(self, cmd, skip_on_noexec = 0):
         """Invoke a command; return (exitcode, stdout)"""
         import os, popen2
         pobj = popen2.Popen4(cmd)
@@ -157,7 +173,7 @@ Output:
             raise NotRunError, "could not execute %s" % cmd
         return rc, output
 
-    def explainFailure(self, exc_info = None):
+    def explain_failure(self, exc_info = None):
         import traceback
         # Move along, nothing to see here
         if not exc_info and self.test_log == "":
@@ -168,19 +184,6 @@ Output:
         print self.test_log
         print "-----------------------------------------------------------------"
 
-    def require(self, predicate, message):
-        """Check a predicate for running this test.
-
-If the predicate value is not true, the test is skipped with a message explaining
-why."""
-        if not predicate:
-            raise NotRunError, message
-
-    def require_root(self):
-        """Skip this test unless run by root."""
-        import os
-        self.require(os.getuid() == 0,
-                     "must be root to run this test")
 
     def log(self, msg):
         """Log a message to the test log.  This message is displayed if
@@ -188,23 +191,12 @@ why."""
         the verbose option."""
         self.test_log = self.test_log + msg + "\n"
 
+
 class NotRunError(Exception):
+    """Raised if a test must be skipped because of missing resources"""
     def __init__(self, value = None):
         self.value = value
 
-def test_name(test):
-    """Return a human-readable name for a test.
-
-    Inputs:
-      test         some kind of callable test object
-
-    Returns:
-      name         string: a short printable name
-      """
-    try:
-        return test.__name__
-    except:
-        return `test`
 
 def runtests(test_list, verbose = 0):
     """Run a series of tests.
@@ -220,47 +212,119 @@ def runtests(test_list, verbose = 0):
     """
     import traceback
     ret = 0
-    for test in test_list:
-        print "%-60s" % test_name(test),
+    for test_class in test_list:
+        print "%-60s" % _test_name(test_class),
         # flush now so that long running tests are easier to follow
         sys.stdout.flush()
 
         try:
             try: # run test and show result
-                obj = test()
-                if hasattr(obj, "setUp"):
-                    obj.setUp()
-                obj.runTest()
+                obj = test_class()
+                if hasattr(obj, "setup"):
+                    obj.setup()
+                obj.runtest()
                 print "OK"
             except KeyboardInterrupt:
                 print "INTERRUPT"
-                obj.explainFailure(sys.exc_info())
+                obj.explain_failure(sys.exc_info())
                 ret = 2
                 break
             except NotRunError, msg:
                 print "NOTRUN, %s" % msg.value
             except:
                 print "FAIL"
-                obj.explainFailure(sys.exc_info())
+                obj.explain_failure(sys.exc_info())
                 ret = 1
         finally:
             try:
-                if hasattr(obj, "tearDown"):
-                    obj.tearDown()
+                if hasattr(obj, "teardown"):
+                    obj.teardown()
             except KeyboardInterrupt:
-                print "interrupted during tearDown"
-                obj.explainFailure(sys.exc_info())
+                print "interrupted during teardown"
+                obj.explain_failure(sys.exc_info())
                 ret = 2
                 break
             except:
-                print "error during tearDown"
-                obj.explainFailure(sys.exc_info())
+                print "error during teardown"
+                obj.explain_failure(sys.exc_info())
                 ret = 1
         # Display log file if we're verbose
         if ret == 0 and verbose:
-            obj.explainFailure()
+            obj.explain_failure()
             
     return ret
 
+
+def _test_name(test_class):
+    """Return a human-readable name for a test class.
+    """
+    try:
+        return test_class.__name__
+    except:
+        return `test_class`
+
+
+def print_help():
+    """Help for people running tests"""
+    import sys
+    print """%s: software test suite based on ComfyChair
+
+usage:
+    To run all tests, just run this program.  To run particular tests,
+    list them on the command line.
+
+options:
+    --help           show usage message
+    --list           list available tests
+    --verbose        show more information while running tests
+""" % sys.argv[0]
+
+
+def print_list(test_list):
+    """Show list of available tests"""
+    for test_class in test_list:
+        print "    %s" % _test_name(test_class)
+
+
+def main(tests):
+    """Main entry point for test suites based on ComfyChair.
+
+Test suites should contain this boilerplate:
+
+    if __name__ == '__main__':
+        comfychair.main(tests)
+
+This function handles standard options such as --help and --list, and
+by default runs all tests in the suggested order.
+
+Calls sys.exit() on completion.
+"""
+    from sys import argv
+    import getopt, sys
+
+    verbose = 0
+
+    opts, args = getopt.getopt(argv[1:], '', ['help', 'list', 'verbose'])
+    if ('--help', '') in opts:
+        print_help()
+        return
+    elif ('--list', '') in opts:
+        print_list(tests)
+        return 
+
+    if ('--verbose', '') in opts:
+        verbose = 1
+
+    if args:
+        by_name = {}
+        for t in tests:
+            by_name[_test_name(t)] = t
+        which_tests = [by_name[name] for name in args]
+    else:
+        which_tests = tests
+
+    sys.exit(runtests(which_tests, verbose))
+
+
 if __name__ == '__main__':
     print __doc__
-- 
cgit 


From 52fbbf051b926cea44b9458289ea155d36a8bb7c Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Wed, 12 Mar 2003 07:17:39 +0000
Subject: Update for new version of ComfyChair: some methods are renamed to be
 more consistent, and it now looks at command-line arguments to work out what
 to do.

Run this program to get a quick demonstration of what ComfyChair does.
(This used to be commit 9b0c59a10707b2bbe3837d718e5030a6cdf19bfa)
---
 source3/stf/test.py | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

(limited to 'source3')

diff --git a/source3/stf/test.py b/source3/stf/test.py
index 2e9abd976f..fb57926cc3 100755
--- a/source3/stf/test.py
+++ b/source3/stf/test.py
@@ -3,26 +3,31 @@
 # meta-test-case / example for comfychair.  Should demonstrate
 # different kinds of failure.
 
-import comfychair, stf
+import comfychair
 
 class NormalTest(comfychair.TestCase):
-    def runTest(self):
+    def runtest(self):
         pass
 
 class RootTest(comfychair.TestCase):
-    def setUp(self):
+    def setup(self):
         self.require_root()
             
     def runTest(self):
         pass
 
 class GoodExecTest(comfychair.TestCase):
-    def runTest(self):
-        exit, stdout = self.runCmdUnchecked("ls -l")
+    def runtest(self):
+        stdout = self.runcmd("ls -l")
 
 class BadExecTest(comfychair.TestCase):
-    def setUp(self):
-        exit, stdout = self.runCmdUnchecked("spottyfoot --slobber",
-                                            skip_on_noexec = 1)
+    def setup(self):
+        exit, stdout = self.runcmd_unchecked("spottyfoot --slobber",
+                                             skip_on_noexec = 1)
+
+
+tests = [NormalTest, RootTest, GoodExecTest, BadExecTest]
 
-comfychair.runtests([NormalTest, RootTest, GoodExecTest, BadExecTest])
+if __name__ == '__main__':
+    comfychair.main(tests)
+    
-- 
cgit 


From a6c6800746a77fd041151b42c4aad9d170efb931 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 12 Mar 2003 10:36:14 +0000
Subject: Patch from Ken Cross <kcross@nssolutions.com> to take a username in
 the form of user@realm for kerberos logins.

Andrew Bartlett
(This used to be commit ce013dc13e9e77b5cb9b2d5a4b76d54f91614e6c)
---
 source3/utils/net_ads.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'source3')

diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 8cd3bac802..ea31a92575 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -124,6 +124,7 @@ static ADS_STRUCT *ads_startup(void)
 	ADS_STATUS status;
 	BOOL need_password = False;
 	BOOL second_time = False;
+	char *realm;
 	
 	ads = ads_init(NULL, NULL, opt_host);
 
@@ -150,6 +151,16 @@ retry:
 
 	ads->auth.user_name = strdup(opt_user_name);
 
+	/*
+	 * If the username is of the form "name@realm", 
+	 * extract the realm and convert to upper case.
+	 */
+	if (realm = strchr(ads->auth.user_name, '@')) {
+		*realm++ = '\0';
+		ads->auth.realm = strdup(realm);
+		strupper(ads->auth.realm);
+	}
+
 	status = ads_connect(ads);
 	if (!ADS_ERR_OK(status)) {
 		if (!need_password && !second_time) {
-- 
cgit 


From 02abe94f81136f85dc72b7015213871831ce2e1a Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 12 Mar 2003 10:56:55 +0000
Subject:  - Fix a double-free (I can't say I understand the code, but it
 matches the other cases and keeps valgrind quiet).

 - Add static

Andrew Bartlett
(This used to be commit e9da9c500b96a828d744e7a1c64427fc01153310)
---
 source3/libads/krb5_setpw.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'source3')

diff --git a/source3/libads/krb5_setpw.c b/source3/libads/krb5_setpw.c
index ac7377cd2f..29bf1a427c 100644
--- a/source3/libads/krb5_setpw.c
+++ b/source3/libads/krb5_setpw.c
@@ -546,7 +546,6 @@ ADS_STATUS krb5_set_password(const char *kdc_host, const char *princ, const char
 
 	krb5_free_creds(context, credsp);
 	krb5_free_principal(context, creds.client);
-	krb5_free_principal(context, creds.server);
 	krb5_free_principal(context, principal);
 	krb5_free_context(context);
 
@@ -579,11 +578,11 @@ kerb_prompter(krb5_context ctx, void *data,
 	return 0;
 }
 
-ADS_STATUS krb5_chg_password(const char *kdc_host,
-				const char *principal,
-				const char *oldpw, 
-				const char *newpw, 
-				int time_offset)
+static ADS_STATUS krb5_chg_password(const char *kdc_host,
+				    const char *principal,
+				    const char *oldpw, 
+				    const char *newpw, 
+				    int time_offset)
 {
     ADS_STATUS aret;
     krb5_error_code ret;
-- 
cgit 


From f4a8417d6fa058ec33753a4df1222131a73add3e Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 12 Mar 2003 11:00:02 +0000
Subject: Add const (This used to be commit
 147a0c8b13d20e06c557fb817a36fddf9a920d65)

---
 source3/lib/crc32.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3')

diff --git a/source3/lib/crc32.c b/source3/lib/crc32.c
index bd4f1633e5..da3aeaa901 100644
--- a/source3/lib/crc32.c
+++ b/source3/lib/crc32.c
@@ -8,7 +8,7 @@
 
 #include "includes.h"
 
-static unsigned long CRCTable[256] = 
+static const unsigned long CRCTable[256] = 
 {
         0x00000000,0x77073096,0xEE0E612C,0x990951BA,0x076DC419,0x706AF48F,
         0xE963A535,0x9E6495A3,0x0EDB8832,0x79DCB8A4,0xE0D5E91E,0x97D2D988,
@@ -55,7 +55,7 @@ static unsigned long CRCTable[256] =
         0xB40BBE37,0xC30C8EA1,0x5A05DF1B,0x2D02EF8D
 };
 
-uint32 crc32_calc_buffer( char *buffer, uint32 count)
+uint32 crc32_calc_buffer( const char *buffer, uint32 count)
 {
 	uint32 crc=0xffffffff, i;
         for(i=0;i<count;i++)
-- 
cgit 


From c992f66d733d230bc71f61ab4d13c08354ec0685 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Wed, 12 Mar 2003 15:40:43 +0000
Subject: adding some initiaial code to sert %a to Win2K3 (using Native LanMan
 string from .NET RC2) (This used to be commit
 4c823e61d14a33344deb887043b60b2e3c83416f)

---
 source3/include/smb.h    | 2 +-
 source3/lib/util.c       | 3 +++
 source3/smbd/sesssetup.c | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/include/smb.h b/source3/include/smb.h
index bd4f113039..bf2d5631a7 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1408,7 +1408,7 @@ enum ldap_ssl_types {LDAP_SSL_ON, LDAP_SSL_OFF, LDAP_SSL_START_TLS};
 enum ldap_passwd_sync_types {LDAP_PASSWD_SYNC_ON, LDAP_PASSWD_SYNC_OFF, LDAP_PASSWD_SYNC_ONLY};
 
 /* Remote architectures we know about. */
-enum remote_arch_types {RA_UNKNOWN, RA_WFWG, RA_OS2, RA_WIN95, RA_WINNT, RA_WIN2K, RA_WINXP, RA_SAMBA};
+enum remote_arch_types {RA_UNKNOWN, RA_WFWG, RA_OS2, RA_WIN95, RA_WINNT, RA_WIN2K, RA_WINXP, RA_WIN2K3, RA_SAMBA};
 
 /* case handling */
 enum case_handling {CASE_LOWER,CASE_UPPER};
diff --git a/source3/lib/util.c b/source3/lib/util.c
index 15b75356a8..8d62db5ebb 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -1767,6 +1767,9 @@ void set_remote_arch(enum remote_arch_types type)
 	case RA_WINXP:
 		fstrcpy(remote_arch, "WinXP");
 		return;
+	case RA_WIN2K3:
+		fstrcpy(remote_arch, "Win2K3");
+		return;
 	case RA_SAMBA:
 		fstrcpy(remote_arch,"Samba");
 		return;
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index 2661fe3f93..70158a9015 100644
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -617,6 +617,8 @@ int reply_sesssetup_and_X(connection_struct *conn, char *inbuf,char *outbuf,
 		if ( ra_type == RA_WIN2K ) {
 			if ( 0 == strcmp( native_lanman, "Windows 2002 5.1" ) )
 				set_remote_arch( RA_WINXP );
+			else if ( 0 == strcmp( native_lanman, "Windows .NET 5.2" ) )
+				set_remote_arch( RA_WIN2K3 );
 		}
 		
 
-- 
cgit 


From 15ae0c4dedbfb279c9ee77cd37e9c4a55b8434e5 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Wed, 12 Mar 2003 19:08:01 +0000
Subject: Ensure we count the length correctly in mangle_map. Jeremy. (This
 used to be commit 596705198c555568da208f59008ab87c5164bfb4)

---
 source3/smbd/mangle_map.c | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

(limited to 'source3')

diff --git a/source3/smbd/mangle_map.c b/source3/smbd/mangle_map.c
index 553e3d949d..5ae3ebd174 100644
--- a/source3/smbd/mangle_map.c
+++ b/source3/smbd/mangle_map.c
@@ -150,36 +150,45 @@ static void mangled_map(char *s, const char *MangledMap)
 		}
 		DEBUG( 5, ("End of first in pair '%s'\n", end) );
 		if( (match_string = map_filename( s, start, end-start )) ) {
+			int size_left = sizeof(new_string) - 1;
 			DEBUG( 5, ("Found a match\n") );
 			/* Found a match. */
 			start = end + 1; /* Point to start of what it is to become. */
 			DEBUG( 5, ("Start of second in pair '%s'\n", start) );
 			end = start;
 			np = new_string;
-			while( (*end)             /* Not the end of string. */
+			while( (*end && size_left > 0)    /* Not the end of string. */
 			       && (*end != ')')      /* Not the end of the pattern. */
-			       && (*end != '*') )    /* Not a wildcard. */
+			       && (*end != '*') ) {   /* Not a wildcard. */
 				*np++ = *end++;
+				size_left--;
+			}
 
 			if( !*end ) {
 				start = end;
 				continue;               /* Always check for the end. */
 			}
 			if( *end == '*' ) {
-				pstrcpy( np, match_string );
+				if (size_left > 0 )
+					safe_strcpy( np, match_string, size_left );
 				np += strlen( match_string );
+				size_left -= strlen( match_string );
 				end++;                  /* Skip the '*' */
-				while ((*end)           /* Not the end of string. */
+				while ((*end && size_left >  0)   /* Not the end of string. */
 				       && (*end != ')') /* Not the end of the pattern. */
-				       && (*end != '*'))/* Not a wildcard. */
+				       && (*end != '*')) { /* Not a wildcard. */
 					*np++ = *end++;
+					size_left--;
+				}
 			}
 			if (!*end) {
 				start = end;
 				continue;               /* Always check for the end. */
 			}
-			*np++ = '\0';             /* NULL terminate it. */
+			if (size_left > 0)
+				*np++ = '\0';             /* NULL terminate it. */
 			DEBUG(5,("End of second in pair '%s'\n", end));
+			new_string[sizeof(new_string)-1] = '\0';
 			pstrcpy( s, new_string );  /* Substitute with the new name. */
 			DEBUG( 5, ("s is now '%s'\n", s) );
 		}
-- 
cgit 


From 00d89c3f7c647b56381ba333658c0ed8e02dccdc Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 12 Mar 2003 21:01:25 +0000
Subject: fixed a strcat noticed by metze (This used to be commit
 db3ad0dbe0bca729f98ca5d5a698388fe086daf2)

---
 source3/param/loadparm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index c21b88ff20..3878dabb60 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -3095,7 +3095,7 @@ BOOL lp_do_parameter(int snum, const char *pszParmName, const char *pszParmValue
 			ZERO_STRUCT(vfskey);
 			pstr_sprintf(vfskey, "%s:", pszParmName);
 			slen = strlen(vfskey);
-			safe_strcat(vfskey, sep+1, sizeof(pstring));
+			pstrcat(vfskey, sep+1);
 			trim_string(vfskey+slen, " ", " ");
 			not_added = True;
 			data = (snum < 0) ? Globals.param_opt : 
-- 
cgit 


From ddfed383a0791986c6d08fde67840e99424ebb1a Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Wed, 12 Mar 2003 22:24:12 +0000
Subject: Change size parameters from signed to unsigned to fix up warnings.
 Jeremy. (This used to be commit 2e9880ef7c259b67eb75edc8098b734c3b7b22c1)

---
 source3/include/client.h  |   2 +-
 source3/libsmb/clifile.c  |  12 +--
 source3/libsmb/clilist.c  |   2 +-
 source3/libsmb/clirap.c   |  38 ++++----
 source3/libsmb/clitrans.c | 233 ++++++++++++++++++++++++++++++++--------------
 5 files changed, 191 insertions(+), 96 deletions(-)

(limited to 'source3')

diff --git a/source3/include/client.h b/source3/include/client.h
index 2e6b9337e4..a3efda4918 100644
--- a/source3/include/client.h
+++ b/source3/include/client.h
@@ -114,7 +114,7 @@ struct cli_state {
 	int max_mux;
 	char *outbuf;
 	char *inbuf;
-	int bufsize;
+	unsigned int bufsize;
 	int initialised;
 	int win95;
 	uint32 capabilities;
diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c
index 31d7ea5911..f61787abde 100644
--- a/source3/libsmb/clifile.c
+++ b/source3/libsmb/clifile.c
@@ -29,8 +29,8 @@
 
 static BOOL cli_link_internal(struct cli_state *cli, const char *fname_src, const char *fname_dst, BOOL hard_link)
 {
-	int data_len = 0;
-	int param_len = 0;
+	unsigned int data_len = 0;
+	unsigned int param_len = 0;
 	uint16 setup = TRANSACT2_SETPATHINFO;
 	char param[sizeof(pstring)+6];
 	pstring data;
@@ -123,8 +123,8 @@ BOOL cli_unix_hardlink(struct cli_state *cli, const char *fname_src, const char
 
 static BOOL cli_unix_chmod_chown_internal(struct cli_state *cli, const char *fname, uint32 mode, uint32 uid, uint32 gid)
 {
-	int data_len = 0;
-	int param_len = 0;
+	unsigned int data_len = 0;
+	unsigned int param_len = 0;
 	uint16 setup = TRANSACT2_SETPATHINFO;
 	char param[sizeof(pstring)+6];
 	char data[100];
@@ -335,8 +335,8 @@ BOOL cli_rmdir(struct cli_state *cli, const char *dname)
 
 int cli_nt_delete_on_close(struct cli_state *cli, int fnum, BOOL flag)
 {
-	int data_len = 1;
-	int param_len = 6;
+	unsigned int data_len = 1;
+	unsigned int param_len = 6;
 	uint16 setup = TRANSACT2_SETFILEINFO;
 	pstring param;
 	unsigned char data;
diff --git a/source3/libsmb/clilist.c b/source3/libsmb/clilist.c
index 89ab5d6414..3884e4da82 100644
--- a/source3/libsmb/clilist.c
+++ b/source3/libsmb/clilist.c
@@ -154,7 +154,7 @@ int cli_list_new(struct cli_state *cli,const char *Mask,uint16 attribute,
 	int ff_dir_handle=0;
 	int loop_count = 0;
 	char *rparam=NULL, *rdata=NULL;
-	int param_len, data_len;	
+	unsigned int param_len, data_len;	
 	uint16 setup;
 	pstring param;
 
diff --git a/source3/libsmb/clirap.c b/source3/libsmb/clirap.c
index a1845b2e16..b38e7d5c23 100644
--- a/source3/libsmb/clirap.c
+++ b/source3/libsmb/clirap.c
@@ -41,8 +41,8 @@ BOOL cli_api_pipe(struct cli_state *cli, const char *pipe_name,
                  data, data_count, max_data_count);
 
   return (cli_receive_trans(cli, SMBtrans, 
-                            rparam, (int *)rparam_count,
-                            rdata, (int *)rdata_count));
+                            rparam, (unsigned int *)rparam_count,
+                            rdata, (unsigned int *)rdata_count));
 }
 
 /****************************************************************************
@@ -51,8 +51,8 @@ call a remote api
 BOOL cli_api(struct cli_state *cli,
 	     char *param, int prcnt, int mprcnt,
 	     char *data, int drcnt, int mdrcnt,
-	     char **rparam, int *rprcnt,
-	     char **rdata, int *rdrcnt)
+	     char **rparam, unsigned int *rprcnt,
+	     char **rdata, unsigned int *rdrcnt)
 {
   cli_send_trans(cli,SMBtrans,
                  PIPE_LANMAN,             /* Name */
@@ -286,8 +286,8 @@ BOOL cli_oem_change_password(struct cli_state *cli, const char *user, const char
   char *p = param;
   unsigned char old_pw_hash[16];
   unsigned char new_pw_hash[16];
-  int data_len;
-  int param_len = 0;
+  unsigned int data_len;
+  unsigned int param_len = 0;
   char *rparam = NULL;
   char *rdata = NULL;
   int rprcnt, rdrcnt;
@@ -368,9 +368,9 @@ BOOL cli_qpathinfo(struct cli_state *cli, const char *fname,
 		   time_t *c_time, time_t *a_time, time_t *m_time, 
 		   size_t *size, uint16 *mode)
 {
-	int data_len = 0;
-	int param_len = 0;
-	int rparam_len, rdata_len;
+	unsigned int data_len = 0;
+	unsigned int param_len = 0;
+	unsigned int rparam_len, rdata_len;
 	uint16 setup = TRANSACT2_QPATHINFO;
 	pstring param;
 	char *rparam=NULL, *rdata=NULL;
@@ -449,8 +449,8 @@ BOOL cli_qpathinfo2(struct cli_state *cli, const char *fname,
 		    time_t *w_time, size_t *size, uint16 *mode,
 		    SMB_INO_T *ino)
 {
-	int data_len = 0;
-	int param_len = 0;
+	unsigned int data_len = 0;
+	unsigned int param_len = 0;
 	uint16 setup = TRANSACT2_QPATHINFO;
 	pstring param;
 	char *rparam=NULL, *rdata=NULL;
@@ -518,8 +518,8 @@ send a qfileinfo QUERY_FILE_NAME_INFO call
 BOOL cli_qfilename(struct cli_state *cli, int fnum, 
 		   pstring name)
 {
-	int data_len = 0;
-	int param_len = 0;
+	unsigned int data_len = 0;
+	unsigned int param_len = 0;
 	uint16 setup = TRANSACT2_QFILEINFO;
 	pstring param;
 	char *rparam=NULL, *rdata=NULL;
@@ -563,8 +563,8 @@ BOOL cli_qfileinfo(struct cli_state *cli, int fnum,
 		   time_t *c_time, time_t *a_time, time_t *m_time, 
 		   time_t *w_time, SMB_INO_T *ino)
 {
-	int data_len = 0;
-	int param_len = 0;
+	unsigned int data_len = 0;
+	unsigned int param_len = 0;
 	uint16 setup = TRANSACT2_QFILEINFO;
 	pstring param;
 	char *rparam=NULL, *rdata=NULL;
@@ -631,8 +631,8 @@ send a qfileinfo call
 ****************************************************************************/
 BOOL cli_qfileinfo_test(struct cli_state *cli, int fnum, int level, char *outdata)
 {
-	int data_len = 0;
-	int param_len = 0;
+	unsigned int data_len = 0;
+	unsigned int param_len = 0;
 	uint16 setup = TRANSACT2_QFILEINFO;
 	pstring param;
 	char *rparam=NULL, *rdata=NULL;
@@ -677,8 +677,8 @@ send a qpathinfo SMB_QUERY_FILE_ALT_NAME_INFO call
 ****************************************************************************/
 NTSTATUS cli_qpathinfo_alt_name(struct cli_state *cli, const char *fname, fstring alt_name)
 {
-	int data_len = 0;
-	int param_len = 0;
+	unsigned int data_len = 0;
+	unsigned int param_len = 0;
 	uint16 setup = TRANSACT2_QPATHINFO;
 	pstring param;
 	char *rparam=NULL, *rdata=NULL;
diff --git a/source3/libsmb/clitrans.c b/source3/libsmb/clitrans.c
index 3d862a1796..7e3357a8cc 100644
--- a/source3/libsmb/clitrans.c
+++ b/source3/libsmb/clitrans.c
@@ -24,18 +24,19 @@
 
 
 /****************************************************************************
-  send a SMB trans or trans2 request
-  ****************************************************************************/
+ Send a SMB trans or trans2 request.
+****************************************************************************/
+
 BOOL cli_send_trans(struct cli_state *cli, int trans, 
 		    const char *pipe_name, 
 		    int fid, int flags,
-		    uint16 *setup, int lsetup, int msetup,
-		    char *param, int lparam, int mparam,
-		    char *data, int ldata, int mdata)
+		    uint16 *setup, unsigned int lsetup, unsigned int msetup,
+		    char *param, unsigned int lparam, unsigned int mparam,
+		    char *data, unsigned int ldata, unsigned int mdata)
 {
 	int i;
-	int this_ldata,this_lparam;
-	int tot_data=0,tot_param=0;
+	unsigned int this_ldata,this_lparam;
+	unsigned int tot_data=0,tot_param=0;
 	char *outdata,*outparam;
 	char *p;
 	int pipe_name_len=0;
@@ -83,14 +84,13 @@ BOOL cli_send_trans(struct cli_state *cli, int trans,
 	cli_setup_bcc(cli, outdata+this_ldata);
 
 	show_msg(cli->outbuf);
-	cli_send_smb(cli);
+	if (!cli_send_smb(cli))
+		return False;
 
 	if (this_ldata < ldata || this_lparam < lparam) {
 		/* receive interim response */
-		if (!cli_receive_smb(cli) || 
-		    cli_is_error(cli)) {
+		if (!cli_receive_smb(cli) || cli_is_error(cli))
 			return(False);
-		}      
 
 		tot_data = this_ldata;
 		tot_param = this_lparam;
@@ -123,7 +123,8 @@ BOOL cli_send_trans(struct cli_state *cli, int trans,
 			cli_setup_bcc(cli, outdata+this_ldata);
 			
 			show_msg(cli->outbuf);
-			cli_send_smb(cli);
+			if (!cli_send_smb(cli))
+				return False;
 			
 			tot_data += this_ldata;
 			tot_param += this_lparam;
@@ -133,17 +134,17 @@ BOOL cli_send_trans(struct cli_state *cli, int trans,
 	return(True);
 }
 
-
 /****************************************************************************
-  receive a SMB trans or trans2 response allocating the necessary memory
-  ****************************************************************************/
+ Receive a SMB trans or trans2 response allocating the necessary memory.
+****************************************************************************/
+
 BOOL cli_receive_trans(struct cli_state *cli,int trans,
-                              char **param, int *param_len,
-                              char **data, int *data_len)
+                              char **param, unsigned int *param_len,
+                              char **data, unsigned int *data_len)
 {
-	int total_data=0;
-	int total_param=0;
-	int this_data,this_param;
+	unsigned int total_data=0;
+	unsigned int total_param=0;
+	unsigned int this_data,this_param;
 	NTSTATUS status;
 	char *tdata;
 	char *tparam;
@@ -170,9 +171,8 @@ BOOL cli_receive_trans(struct cli_state *cli,int trans,
 	 */
 	status = cli_nt_error(cli);
 	
-	if (NT_STATUS_IS_ERR(status)) {
+	if (NT_STATUS_IS_ERR(status))
 		return False;
-	}
 
 	/* parse out the lengths */
 	total_data = SVAL(cli->inbuf,smb_tdrcnt);
@@ -199,7 +199,7 @@ BOOL cli_receive_trans(struct cli_state *cli,int trans,
 			*param = tparam;
 	}
 
-	while (1)  {
+	for (;;)  {
 		this_data = SVAL(cli->inbuf,smb_drcnt);
 		this_param = SVAL(cli->inbuf,smb_prcnt);
 
@@ -209,21 +209,59 @@ BOOL cli_receive_trans(struct cli_state *cli,int trans,
 			return False;
 		}
 
-		if (this_data)
-			memcpy(*data + SVAL(cli->inbuf,smb_drdisp),
-			       smb_base(cli->inbuf) + SVAL(cli->inbuf,smb_droff),
-			       this_data);
-		if (this_param)
-			memcpy(*param + SVAL(cli->inbuf,smb_prdisp),
-			       smb_base(cli->inbuf) + SVAL(cli->inbuf,smb_proff),
-			       this_param);
+		if (this_data + *data_len < this_data ||
+				this_data + *data_len < *data_len ||
+				this_param + *param_len < this_param ||
+				this_param + *param_len < *param_len) {
+			DEBUG(1,("Data overflow in cli_receive_trans\n"));
+			return False;
+		}
+
+		if (this_data) {
+			unsigned int data_offset_out = SVAL(cli->inbuf,smb_drdisp);
+			unsigned int data_offset_in = SVAL(cli->inbuf,smb_droff);
+
+			if (data_offset_out > total_data ||
+					data_offset_out + this_data > total_data ||
+					data_offset_out + this_data < data_offset_out ||
+					data_offset_out + this_data < this_data) {
+				DEBUG(1,("Data overflow in cli_receive_trans\n"));
+				return False;
+			}
+			if (data_offset_in > cli->bufsize ||
+					data_offset_in + this_data >  cli->bufsize ||
+					data_offset_in + this_data < data_offset_in ||
+					data_offset_in + this_data < this_data) {
+				DEBUG(1,("Data overflow in cli_receive_trans\n"));
+				return False;
+			}
+
+			memcpy(*data + data_offset_out, smb_base(cli->inbuf) + data_offset_in, this_data);
+		}
+		if (this_param) {
+			unsigned int param_offset_out = SVAL(cli->inbuf,smb_prdisp);
+			unsigned int param_offset_in = SVAL(cli->inbuf,smb_proff);
+
+			if (param_offset_out > total_param ||
+					param_offset_out + this_param > total_param ||
+					param_offset_out + this_param < param_offset_out ||
+					param_offset_out + this_param < this_param) {
+				DEBUG(1,("Param overflow in cli_receive_trans\n"));
+				return False;
+			}
+			if (param_offset_in > cli->bufsize ||
+					param_offset_in + this_param >  cli->bufsize ||
+					param_offset_in + this_param < param_offset_in ||
+					param_offset_in + this_param < this_param) {
+				DEBUG(1,("Param overflow in cli_receive_trans\n"));
+				return False;
+			}
+
+			memcpy(*param + param_offset_out, smb_base(cli->inbuf) + param_offset_in, this_param);
+		}
 		*data_len += this_data;
 		*param_len += this_param;
 
-		/* parse out the total lengths again - they can shrink! */
-		total_data = SVAL(cli->inbuf,smb_tdrcnt);
-		total_param = SVAL(cli->inbuf,smb_tprcnt);
-		
 		if (total_data <= *data_len && total_param <= *param_len)
 			break;
 		
@@ -242,27 +280,35 @@ BOOL cli_receive_trans(struct cli_state *cli,int trans,
 		if (NT_STATUS_IS_ERR(cli_nt_error(cli))) {
 			return(False);
 		}
+
+		/* parse out the total lengths again - they can shrink! */
+		if (SVAL(cli->inbuf,smb_tdrcnt) < total_data)
+			total_data = SVAL(cli->inbuf,smb_tdrcnt);
+		if (SVAL(cli->inbuf,smb_tprcnt) < total_param)
+			total_param = SVAL(cli->inbuf,smb_tprcnt);
+		
+		if (total_data <= *data_len && total_param <= *param_len)
+			break;
+		
 	}
 	
 	return(True);
 }
 
-
-
-
 /****************************************************************************
-  send a SMB nttrans request
-  ****************************************************************************/
+ Send a SMB nttrans request.
+****************************************************************************/
+
 BOOL cli_send_nt_trans(struct cli_state *cli, 
 		       int function, 
 		       int flags,
-		       uint16 *setup, int lsetup, int msetup,
-		       char *param, int lparam, int mparam,
-		       char *data, int ldata, int mdata)
+		       uint16 *setup, unsigned int lsetup, unsigned int msetup,
+		       char *param, unsigned int lparam, unsigned int mparam,
+		       char *data, unsigned int ldata, unsigned int mdata)
 {
-	int i;
-	int this_ldata,this_lparam;
-	int tot_data=0,tot_param=0;
+	unsigned int i;
+	unsigned int this_ldata,this_lparam;
+	unsigned int tot_data=0,tot_param=0;
 	char *outdata,*outparam;
 
 	this_lparam = MIN(lparam,cli->max_xmit - (500+lsetup*2)); /* hack */
@@ -301,14 +347,13 @@ BOOL cli_send_nt_trans(struct cli_state *cli,
 	cli_setup_bcc(cli, outdata+this_ldata);
 
 	show_msg(cli->outbuf);
-	cli_send_smb(cli);
+	if (!cli_send_smb(cli))
+		return False;
 
 	if (this_ldata < ldata || this_lparam < lparam) {
 		/* receive interim response */
-		if (!cli_receive_smb(cli) || 
-		    cli_is_error(cli)) {
+		if (!cli_receive_smb(cli) || cli_is_error(cli))
 			return(False);
-		}      
 
 		tot_data = this_ldata;
 		tot_param = this_lparam;
@@ -340,7 +385,8 @@ BOOL cli_send_nt_trans(struct cli_state *cli,
 			cli_setup_bcc(cli, outdata+this_ldata);
 			
 			show_msg(cli->outbuf);
-			cli_send_smb(cli);
+			if (!cli_send_smb(cli))
+				return False;
 			
 			tot_data += this_ldata;
 			tot_param += this_lparam;
@@ -355,13 +401,14 @@ BOOL cli_send_nt_trans(struct cli_state *cli,
 /****************************************************************************
   receive a SMB nttrans response allocating the necessary memory
   ****************************************************************************/
+
 BOOL cli_receive_nt_trans(struct cli_state *cli,
-			  char **param, int *param_len,
-			  char **data, int *data_len)
+			  char **param, unsigned int *param_len,
+			  char **data, unsigned int *data_len)
 {
-	int total_data=0;
-	int total_param=0;
-	int this_data,this_param;
+	unsigned int total_data=0;
+	unsigned int total_param=0;
+	unsigned int this_data,this_param;
 	uint8 eclass;
 	uint32 ecode;
 	char *tdata;
@@ -423,25 +470,65 @@ BOOL cli_receive_nt_trans(struct cli_state *cli,
 
 		if (this_data + *data_len > total_data ||
 		    this_param + *param_len > total_param) {
-			DEBUG(1,("Data overflow in cli_receive_trans\n"));
+			DEBUG(1,("Data overflow in cli_receive_nt_trans\n"));
+			return False;
+		}
+
+		if (this_data + *data_len < this_data ||
+				this_data + *data_len < *data_len ||
+				this_param + *param_len < this_param ||
+				this_param + *param_len < *param_len) {
+			DEBUG(1,("Data overflow in cli_receive_nt_trans\n"));
 			return False;
 		}
 
-		if (this_data)
-			memcpy(*data + SVAL(cli->inbuf,smb_ntr_DataDisplacement),
-			       smb_base(cli->inbuf) + SVAL(cli->inbuf,smb_ntr_DataOffset),
-			       this_data);
-		if (this_param)
-			memcpy(*param + SVAL(cli->inbuf,smb_ntr_ParameterDisplacement),
-			       smb_base(cli->inbuf) + SVAL(cli->inbuf,smb_ntr_ParameterOffset),
-			       this_param);
+		if (this_data) {
+			unsigned int data_offset_out = SVAL(cli->inbuf,smb_ntr_DataDisplacement);
+			unsigned int data_offset_in = SVAL(cli->inbuf,smb_ntr_DataOffset);
+
+			if (data_offset_out > total_data ||
+					data_offset_out + this_data > total_data ||
+					data_offset_out + this_data < data_offset_out ||
+					data_offset_out + this_data < this_data) {
+				DEBUG(1,("Data overflow in cli_receive_nt_trans\n"));
+				return False;
+			}
+			if (data_offset_in > cli->bufsize ||
+					data_offset_in + this_data >  cli->bufsize ||
+					data_offset_in + this_data < data_offset_in ||
+					data_offset_in + this_data < this_data) {
+				DEBUG(1,("Data overflow in cli_receive_nt_trans\n"));
+				return False;
+			}
+
+			memcpy(*data + data_offset_out, smb_base(cli->inbuf) + data_offset_in, this_data);
+		}
+
+		if (this_param) {
+			unsigned int param_offset_out = SVAL(cli->inbuf,smb_ntr_ParameterDisplacement);
+			unsigned int param_offset_in = SVAL(cli->inbuf,smb_ntr_ParameterOffset);
+
+			if (param_offset_out > total_param ||
+					param_offset_out + this_param > total_param ||
+					param_offset_out + this_param < param_offset_out ||
+					param_offset_out + this_param < this_param) {
+				DEBUG(1,("Param overflow in cli_receive_nt_trans\n"));
+				return False;
+			}
+			if (param_offset_in > cli->bufsize ||
+					param_offset_in + this_param >  cli->bufsize ||
+					param_offset_in + this_param < param_offset_in ||
+					param_offset_in + this_param < this_param) {
+				DEBUG(1,("Param overflow in cli_receive_nt_trans\n"));
+				return False;
+			}
+
+			memcpy(*param + param_offset_out, smb_base(cli->inbuf) + param_offset_in, this_param);
+		}
+
 		*data_len += this_data;
 		*param_len += this_param;
 
-		/* parse out the total lengths again - they can shrink! */
-		total_data = SVAL(cli->inbuf,smb_ntr_TotalDataCount);
-		total_param = SVAL(cli->inbuf,smb_ntr_TotalParameterCount);
-		
 		if (total_data <= *data_len && total_param <= *param_len)
 			break;
 		
@@ -462,6 +549,14 @@ BOOL cli_receive_nt_trans(struct cli_state *cli,
                            !(eclass == ERRDOS && ecode == ERRmoredata))
 				return(False);
 		}
+		/* parse out the total lengths again - they can shrink! */
+		if (SVAL(cli->inbuf,smb_ntr_TotalDataCount) < total_data)
+			total_data = SVAL(cli->inbuf,smb_ntr_TotalDataCount);
+		if (SVAL(cli->inbuf,smb_ntr_TotalParameterCount) < total_param)
+			total_param = SVAL(cli->inbuf,smb_ntr_TotalParameterCount);
+		
+		if (total_data <= *data_len && total_param <= *param_len)
+			break;
 	}
 	
 	return(True);
-- 
cgit 


From 3b104f6e2dc56c5edcf0278e7e43d4993e7db368 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 13 Mar 2003 04:34:31 +0000
Subject: win2000 can take much longer than the specified time to respond to a
 lock - so to make the torture tests valid I give it a grace time of 10
 seconds instead of 2 (This used to be commit
 c9c9e9eb26ec3042395637d14a6661d04a629ccc)

---
 source3/libsmb/clifile.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c
index f61787abde..8e84963c09 100644
--- a/source3/libsmb/clifile.c
+++ b/source3/libsmb/clifile.c
@@ -633,7 +633,7 @@ BOOL cli_lock(struct cli_state *cli, int fnum,
 	cli_send_smb(cli);
 
 	if (timeout != 0) {
-		cli->timeout = (timeout == -1) ? 0x7FFFFFFF : (timeout + 2*1000);
+		cli->timeout = (timeout == -1) ? 0x7FFFFFFF : (timeout + 10*1000);
 	}
 
 	if (!cli_receive_smb(cli)) {
-- 
cgit 


From 537e4d55651a51227fc7af4de0853165503c7b12 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 13 Mar 2003 04:35:15 +0000
Subject: fixed the unmarshalling of the queryaliasmem SAMR call (This used to
 be commit 80c45434092a881fe2c9ae7f90856deea4722cb0)

---
 source3/rpc_parse/parse_samr.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'source3')

diff --git a/source3/rpc_parse/parse_samr.c b/source3/rpc_parse/parse_samr.c
index d031d13955..222af57e5b 100644
--- a/source3/rpc_parse/parse_samr.c
+++ b/source3/rpc_parse/parse_samr.c
@@ -4623,13 +4623,17 @@ BOOL samr_io_r_query_aliasmem(const char *desc, SAMR_R_QUERY_ALIASMEM * r_u,
 
 			for (i = 0; i < r_u->num_sids1; i++) {
 				ptr_sid[i] = 1;
-				if(!prs_uint32("", ps, depth, &ptr_sid[i]))
+				if(!prs_uint32("ptr_sid", ps, depth, &ptr_sid[i]))
 				  return False;
 			}
 
+			if (UNMARSHALLING(ps)) {
+				r_u->sid = talloc(ps->mem_ctx, r_u->num_sids1 * sizeof(DOM_SID));
+			}
+
 			for (i = 0; i < r_u->num_sids1; i++) {
 				if (ptr_sid[i] != 0) {
-					if(!smb_io_dom_sid2("", &r_u->sid[i], ps, depth))
+					if(!smb_io_dom_sid2("sid", &r_u->sid[i], ps, depth))
 						return False;
 				}
 			}
-- 
cgit 


From d2a85e518536796c69c689ded50cb6551d460f97 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 13 Mar 2003 04:36:32 +0000
Subject: show which files we fail to create in the casetable test (This used
 to be commit d40e3747cfa2994349aa84568f7b79457341a058)

---
 source3/torture/utable.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'source3')

diff --git a/source3/torture/utable.c b/source3/torture/utable.c
index d8a1557dbb..74d5f164c0 100644
--- a/source3/torture/utable.c
+++ b/source3/torture/utable.c
@@ -141,7 +141,7 @@ BOOL torture_casetable(int dummy)
 
 		if (c == '.' || c == '\\') continue;
 
-		printf("%04x\n", c);
+		printf("%04x (%c)\n", c, isprint(c)?c:'.');
 
 		fname = form_name(c);
 		fnum = cli_nt_create_full(cli, fname, 
@@ -150,7 +150,10 @@ BOOL torture_casetable(int dummy)
 					  FILE_SHARE_NONE,
 					  FILE_OPEN_IF, 0);
 
-		if (fnum == -1) continue;
+		if (fnum == -1) {
+			printf("Failed to create file with char %04x\n", c);
+			continue;
+		}
 
 		size = 0;
 
-- 
cgit 


From 5e7f809f8f2806f0315f81b109688b3e2ff8b950 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Thu, 13 Mar 2003 05:52:49 +0000
Subject: Fixed crash bug when calling tdb_unlockkeys() with no locked keys.

woot!
(This used to be commit eb432700c0010e536be3a0703f152c533357b851)
---
 source3/tdb/tdb.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source3')

diff --git a/source3/tdb/tdb.c b/source3/tdb/tdb.c
index ab50f40ef6..c414ae0d31 100644
--- a/source3/tdb/tdb.c
+++ b/source3/tdb/tdb.c
@@ -1954,6 +1954,8 @@ int tdb_lockkeys(TDB_CONTEXT *tdb, u32 number, TDB_DATA keys[])
 void tdb_unlockkeys(TDB_CONTEXT *tdb)
 {
 	u32 i;
+	if (!tdb->lockedkeys)
+		return;
 	for (i = 0; i < tdb->lockedkeys[0]; i++)
 		tdb_unlock(tdb, tdb->lockedkeys[i+1], F_WRLCK);
 	SAFE_FREE(tdb->lockedkeys);
-- 
cgit 


From 6d0a1eaaaad05b2860561619856698f8d1e193c1 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Thu, 13 Mar 2003 06:09:18 +0000
Subject: Added chainlock, chainunlock, lock_bystring and unlock_bystring
 methods. (This used to be commit cd5c47f47379a8c4021771ec28a9da0085f80d98)

---
 source3/python/py_tdb.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 81 insertions(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/python/py_tdb.c b/source3/python/py_tdb.c
index 4969c1047e..e525422a30 100644
--- a/source3/python/py_tdb.c
+++ b/source3/python/py_tdb.c
@@ -1,7 +1,7 @@
 /* 
    Python wrappers for TDB module
 
-   Copyright (C) Tim Potter, 2002
+   Copyright (C) Tim Potter, 2002-2003
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -481,6 +481,82 @@ PyObject *py_tdb_hnd_traverse(PyObject *self, PyObject *args, PyObject *kw)
 	return PyInt_FromLong(result);
 }
 
+PyObject *py_tdb_hnd_chainlock(PyObject *self, PyObject *args)
+{
+	tdb_hnd_object *obj = (tdb_hnd_object *)self;
+	TDB_DATA key;
+	int result;
+
+        if (!obj->tdb) {
+		PyErr_SetString(py_tdb_error, "tdb object has been closed"); 
+		return NULL;
+        }	
+
+	if (!PyArg_ParseTuple(args, "s#", &key.dptr, &key.dsize))
+		return NULL;
+
+	result = tdb_chainlock(obj->tdb, key);
+
+	return PyInt_FromLong(result != -1);
+}
+
+PyObject *py_tdb_hnd_chainunlock(PyObject *self, PyObject *args)
+{
+	tdb_hnd_object *obj = (tdb_hnd_object *)self;
+	TDB_DATA key;
+	int result;
+
+        if (!obj->tdb) {
+		PyErr_SetString(py_tdb_error, "tdb object has been closed"); 
+		return NULL;
+        }	
+
+	if (!PyArg_ParseTuple(args, "s#", &key.dptr, &key.dsize))
+		return NULL;
+
+	result = tdb_chainunlock(obj->tdb, key);
+
+	return PyInt_FromLong(result != -1);
+}
+
+PyObject *py_tdb_hnd_lock_bystring(PyObject *self, PyObject *args)
+{
+	tdb_hnd_object *obj = (tdb_hnd_object *)self;
+	int result, timeout = 30;
+	char *s;
+
+        if (!obj->tdb) {
+		PyErr_SetString(py_tdb_error, "tdb object has been closed"); 
+		return NULL;
+        }	
+
+	if (!PyArg_ParseTuple(args, "s|i", &s, &timeout))
+		return NULL;
+
+	result = tdb_lock_bystring(obj->tdb, s, timeout);
+
+	return PyInt_FromLong(result != -1);
+}
+
+PyObject *py_tdb_hnd_unlock_bystring(PyObject *self, PyObject *args)
+{
+	tdb_hnd_object *obj = (tdb_hnd_object *)self;
+	char *s;
+
+        if (!obj->tdb) {
+		PyErr_SetString(py_tdb_error, "tdb object has been closed"); 
+		return NULL;
+        }	
+
+	if (!PyArg_ParseTuple(args, "s", &s))
+		return NULL;
+
+	tdb_unlock_bystring(obj->tdb, s);
+
+	Py_INCREF(Py_None);
+	return Py_None;
+}
+
 /* 
  * Method dispatch table for this module
  */
@@ -505,6 +581,10 @@ static PyMethodDef tdb_hnd_methods[] = {
 	{ "lock", (PyCFunction)py_tdb_hnd_lock, METH_VARARGS },
 	{ "unlock", (PyCFunction)py_tdb_hnd_unlock, METH_VARARGS },
 	{ "traverse", (PyCFunction)py_tdb_hnd_traverse, METH_VARARGS | METH_KEYWORDS },
+	{ "chainlock", (PyCFunction)py_tdb_hnd_chainlock, METH_VARARGS | METH_KEYWORDS },
+	{ "chainunlock", (PyCFunction)py_tdb_hnd_chainunlock, METH_VARARGS | METH_KEYWORDS },
+	{ "lock_bystring", (PyCFunction)py_tdb_hnd_lock_bystring, METH_VARARGS | METH_KEYWORDS },
+	{ "unlock_bystring", (PyCFunction)py_tdb_hnd_unlock_bystring, METH_VARARGS | METH_KEYWORDS },
 	{ NULL }
 };
 
-- 
cgit 


From 9951cca72fcbba4d4f93ac0e30bab2e4f54487f5 Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Thu, 13 Mar 2003 06:16:51 +0000
Subject: In Valgrind 1.9.4, the headers have moved to <valgrind/valgrind.h>,
 etc.  So check for that as well as the old names. (This used to be commit
 1ffa4d75b75979b8abb409634212ce43a0826467)

---
 source3/configure.in | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/configure.in b/source3/configure.in
index b2cd15b3b3..aa95cf19fe 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -556,7 +556,10 @@ AC_CHECK_HEADERS(sys/mount.h sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h t
 AC_CHECK_HEADERS(sys/termio.h sys/statfs.h sys/dustat.h sys/statvfs.h stdarg.h sys/sockio.h)
 AC_CHECK_HEADERS(security/pam_modules.h security/_pam_macros.h ldap.h lber.h dlfcn.h)
 AC_CHECK_HEADERS(sys/syslog.h syslog.h)
-AC_CHECK_HEADERS(valgrind.h)
+
+# In valgrind 1.0.x, it's just valgrind.h.  In 1.9.x+ there's a
+# subdirectory of headers.
+AC_CHECK_HEADERS(valgrind.h valgrind/valgrind.h valgrind/memcheck.h)
 
 #
 # HPUX has a bug in that including shadow.h causes a re-definition of MAXINT.
-- 
cgit 


From 197f98aededbb456951be2d0d7f8ac587006a60d Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Thu, 13 Mar 2003 06:18:18 +0000
Subject: In Valgrind 1.9.4, the headers have moved to <valgrind/valgrind.h>,
 etc.  So check for that as well as the old names when including macros and
 conditionally defining -DVALGRIND. (This used to be commit
 c9151c7b1113e2f01bd33d4dd301a2e7e2040b35)

---
 source3/include/includes.h | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'source3')

diff --git a/source3/include/includes.h b/source3/include/includes.h
index b6abdd99ce..25245e9c0c 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -433,15 +433,19 @@
 #include <com_err.h>
 #endif
 
-#if HAVE_VALGRIND_H
-/* Special macros that are no-ops except when run under Valgrind on x86.  */
+/* Special macros that are no-ops except when run under Valgrind on
+ * x86.  They've moved a little bit from valgrind 1.0.4 to 1.9.4 */
+#if HAVE_VALGRIND_MEMCHECK_H
+        /* memcheck.h includes valgrind.h */
+#include <valgrind/memcheck.h>
+#elif HAVE_VALGRIND_H
 #include <valgrind.h>
 #endif
 
 /* If we have --enable-developer and the valgrind header is present,
  * then we're OK to use it.  Set a macro so this logic can be done only
  * once. */
-#if defined(DEVELOPER) && HAVE_VALGRIND_H
+#if defined(DEVELOPER) && (HAVE_VALGRIND_H || HAVE_VALGRIND_VALGRIND_H)
 #define VALGRIND
 #endif
 
-- 
cgit 


From 593ed8d1d995d4b31b8798367f5a4e963ce2e312 Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Thu, 13 Mar 2003 07:05:10 +0000
Subject: Add bin/libbigballofmud.a non-shared library.  A bit easier to link
 to for testing than the .so.  (http://www.laputan.org/mud/mud.html) (This
 used to be commit 386087d77f836b8133afc977c9c3e8e7845125dc)

---
 source3/Makefile.in | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'source3')

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 3ae939c4f5..78cd5746a7 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -893,6 +893,10 @@ bin/libbigballofmud.@SHLIBEXT@: $(LIBBIGBALLOFMUD_PICOBJS)
 	$(SHLD) $(LDSHFLAGS) -o $@ $(LIBBIGBALLOFMUD_PICOBJS) $(LIBS) \
 		@SONAMEFLAG@`basename $@`.$(LIBBIGBALLOFMUD_MAJOR)
 
+bin/libbigballofmud.a: $(LIBBIGBALLOFMUD_OBJS)
+	@echo Linking bigballofmud non-shared library $@
+	-$(AR) -rc $@ $(LIBBIGBALLOFMUD_OBJS)
+
 libsmbclient: bin/libsmbclient.a @LIBSMBCLIENT_SHARED@
 
 bin/librpc_lsarpc.@SHLIBEXT@: $(RPC_LSA_OBJ)
-- 
cgit 


From f764518bd100310a35b5d8cd9b747b12ae4a4755 Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Fri, 14 Mar 2003 04:50:17 +0000
Subject: Merge from Subversion

* Better report formatting
(This used to be commit e7eafa10da828b4dc46a05a99164eb8ac37563df)
---
 source3/stf/comfychair.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3')

diff --git a/source3/stf/comfychair.py b/source3/stf/comfychair.py
index b552baccd2..d7e23efc10 100644
--- a/source3/stf/comfychair.py
+++ b/source3/stf/comfychair.py
@@ -170,7 +170,7 @@ Output:
             # Either we could not execute the command or the command
             # returned exit code 127.  According to system(3) we can't
             # tell the difference.
-            raise NotRunError, "could not execute %s" % cmd
+            raise NotRunError, "could not execute %s" % `cmd`
         return rc, output
 
     def explain_failure(self, exc_info = None):
@@ -213,7 +213,7 @@ def runtests(test_list, verbose = 0):
     import traceback
     ret = 0
     for test_class in test_list:
-        print "%-60s" % _test_name(test_class),
+        print "%-30s" % _test_name(test_class),
         # flush now so that long running tests are easier to follow
         sys.stdout.flush()
 
-- 
cgit 


From bc7f13cdb36212d0e2f9a8d86be9892a3c9dd373 Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Fri, 14 Mar 2003 04:54:10 +0000
Subject: Add examples of ComfyChair (This used to be commit
 dfee0a6ad5d203df04df8a54da87ff5e493a33ca)

---
 source3/stf/example.py | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100755 source3/stf/example.py

(limited to 'source3')

diff --git a/source3/stf/example.py b/source3/stf/example.py
new file mode 100755
index 0000000000..1f121fd9af
--- /dev/null
+++ b/source3/stf/example.py
@@ -0,0 +1,33 @@
+#! /usr/bin/env python
+
+# Copyright (C) 2003 by Martin Pool <mbp@samba.org>
+# 
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
+
+
+"""example of using ComfyChair"""
+
+import comfychair
+
+class OnePlusOne(comfychair.TestCase):
+    def runtest(self):
+        self.assert_(1 + 1 == 2)
+
+tests = [OnePlusOne]
+
+if __name__ == '__main__':
+    comfychair.main(tests)
+
-- 
cgit 


From e37372f4d6e10204adf272f978524751420e890f Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 14 Mar 2003 10:02:12 +0000
Subject: Found by metze with the clobber-region check - if it's a pstring, use
 pstrcpy().

Andrew Bartlett
(This used to be commit f9c3c93f55cac774e576fd5975c0582e0b334d6a)
---
 source3/libsmb/clifile.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c
index 8e84963c09..d86f36405d 100644
--- a/source3/libsmb/clifile.c
+++ b/source3/libsmb/clifile.c
@@ -948,7 +948,7 @@ BOOL cli_chkpath(struct cli_state *cli, const char *path)
 	pstring path2;
 	char *p;
 	
-	safe_strcpy(path2,path,sizeof(pstring));
+	pstrcpy(path2,path);
 	trim_string(path2,NULL,"\\");
 	if (!*path2) *path2 = '\\';
 	
-- 
cgit 


From 33c8a6779d490bd1aa722231a59a3b68343dbc17 Mon Sep 17 00:00:00 2001
From: Rafal Szczesniak <mimir@samba.org>
Date: Fri, 14 Mar 2003 17:05:13 +0000
Subject: /tmp/newfun.msg (This used to be commit
 3f4cb7b2c4d9b54b41bcc184ccfd00032e2b021b)

---
 source3/Makefile.in           |   4 +-
 source3/libsmb/trust_passwd.c | 116 ----------------------------
 source3/libsmb/trusts_util.c  | 174 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 176 insertions(+), 118 deletions(-)
 delete mode 100644 source3/libsmb/trust_passwd.c
 create mode 100644 source3/libsmb/trusts_util.c

(limited to 'source3')

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 78cd5746a7..e42dd1f395 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -214,8 +214,8 @@ LIBMSRPC_OBJ = rpc_client/cli_lsarpc.o rpc_client/cli_samr.o \
 	       rpc_client/cli_reg.o rpc_client/cli_pipe.o \
 	       rpc_client/cli_spoolss.o rpc_client/cli_spoolss_notify.o  \
 	       rpc_client/cli_ds.o libsmb/namequery_dc.o
-
-LIBMSRPC_SERVER_OBJ = libsmb/trust_passwd.o
+	       
+LIBMSRPC_SERVER_OBJ = libsmb/trusts_util.o
 
 REGOBJS_OBJ = registry/reg_objects.o
 REGISTRY_OBJ = registry/reg_frontend.o registry/reg_cachehook.o registry/reg_printing.o \
diff --git a/source3/libsmb/trust_passwd.c b/source3/libsmb/trust_passwd.c
deleted file mode 100644
index cf9fd58b13..0000000000
--- a/source3/libsmb/trust_passwd.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/* 
- *  Unix SMB/CIFS implementation.
- *  Routines to change trust account passwords.
- *  Copyright (C) Andrew Bartlett                   2001.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *  
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *  
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "includes.h"
-
-/*********************************************************
- Change the domain password on the PDC.
-
- Just changes the password betwen the two values specified.
-
- Caller must have the cli connected to the netlogon pipe
- already.
-**********************************************************/
-static NTSTATUS just_change_the_password(struct cli_state *cli, TALLOC_CTX *mem_ctx, 
-					 unsigned char orig_trust_passwd_hash[16],
-					 unsigned char new_trust_passwd_hash[16])
-{
-	NTSTATUS result;
-	uint32 neg_flags = 0x000001ff;
-
-	result = cli_nt_setup_creds(cli, get_sec_chan(), orig_trust_passwd_hash, &neg_flags, 2);
-	
-	if (!NT_STATUS_IS_OK(result)) {
-		DEBUG(1,("just_change_the_password: unable to setup creds (%s)!\n",
-			 nt_errstr(result)));
-		return result;
-	}
-
-	result = cli_net_srv_pwset(cli, mem_ctx, global_myname(), new_trust_passwd_hash);
-
-	if (!NT_STATUS_IS_OK(result)) {
-		DEBUG(0,("just_change_the_password: unable to change password (%s)!\n",
-			 nt_errstr(result)));
-	}
-	return result;
-}
-
-/*********************************************************
- Change the domain password on the PDC.
- Store the password ourselves, but use the supplied password
- Caller must have already setup the connection to the NETLOGON pipe
-**********************************************************/
-
-NTSTATUS trust_pw_change_and_store_it(struct cli_state *cli, TALLOC_CTX *mem_ctx, 
-				      unsigned char orig_trust_passwd_hash[16])
-{
-	unsigned char new_trust_passwd_hash[16];
-	char *new_trust_passwd;
-	char *str;
-	NTSTATUS nt_status;
-		
-	/* Create a random machine account password */
-	str = generate_random_str(DEFAULT_TRUST_ACCOUNT_PASSWORD_LENGTH);
-	new_trust_passwd = talloc_strdup(mem_ctx, str);
-	
-	E_md4hash(new_trust_passwd, new_trust_passwd_hash);
-
-	nt_status = just_change_the_password(cli, mem_ctx, orig_trust_passwd_hash,
-					     new_trust_passwd_hash);
-	
-	if (NT_STATUS_IS_OK(nt_status)) {
-		DEBUG(3,("%s : trust_pw_change_and_store_it: Changed password.\n", 
-			 timestring(False)));
-		/*
-		 * Return the result of trying to write the new password
-		 * back into the trust account file.
-		 */
-		if (!secrets_store_machine_password(new_trust_passwd)) {
-			nt_status = NT_STATUS_UNSUCCESSFUL;
-		}
-	}
-
-	return nt_status;
-}
-
-/*********************************************************
- Change the domain password on the PDC.
- Do most of the legwork ourselfs.  Caller must have
- already setup the connection to the NETLOGON pipe
-**********************************************************/
-
-NTSTATUS trust_pw_find_change_and_store_it(struct cli_state *cli, TALLOC_CTX *mem_ctx, 
-					   const char *domain) 
-{
-	unsigned char old_trust_passwd_hash[16];
-	char *up_domain;
-	
-	up_domain = talloc_strdup(mem_ctx, domain);
-
-	if (!secrets_fetch_trust_account_password(domain,
-						  old_trust_passwd_hash, 
-						  NULL)) {
-		DEBUG(0, ("could not fetch domain secrets for domain %s!\n", domain));
-		return NT_STATUS_UNSUCCESSFUL;
-	}
-	
-	return trust_pw_change_and_store_it(cli, mem_ctx, old_trust_passwd_hash);
-	
-}					 
diff --git a/source3/libsmb/trusts_util.c b/source3/libsmb/trusts_util.c
new file mode 100644
index 0000000000..055851f6b7
--- /dev/null
+++ b/source3/libsmb/trusts_util.c
@@ -0,0 +1,174 @@
+/* 
+ *  Unix SMB/CIFS implementation.
+ *  Routines to operate on various trust relationships
+ *  Copyright (C) Andrew Bartlett                   2001
+ *  Copyright (C) Rafal Szczesniak                  2003
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *  
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *  
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "includes.h"
+
+/*********************************************************
+ Change the domain password on the PDC.
+
+ Just changes the password betwen the two values specified.
+
+ Caller must have the cli connected to the netlogon pipe
+ already.
+**********************************************************/
+static NTSTATUS just_change_the_password(struct cli_state *cli, TALLOC_CTX *mem_ctx, 
+					 unsigned char orig_trust_passwd_hash[16],
+					 unsigned char new_trust_passwd_hash[16])
+{
+	NTSTATUS result;
+	uint32 neg_flags = 0x000001ff;
+
+	result = cli_nt_setup_creds(cli, get_sec_chan(), orig_trust_passwd_hash, &neg_flags, 2);
+	
+	if (!NT_STATUS_IS_OK(result)) {
+		DEBUG(1,("just_change_the_password: unable to setup creds (%s)!\n",
+			 nt_errstr(result)));
+		return result;
+	}
+
+	result = cli_net_srv_pwset(cli, mem_ctx, global_myname(), new_trust_passwd_hash);
+
+	if (!NT_STATUS_IS_OK(result)) {
+		DEBUG(0,("just_change_the_password: unable to change password (%s)!\n",
+			 nt_errstr(result)));
+	}
+	return result;
+}
+
+/*********************************************************
+ Change the domain password on the PDC.
+ Store the password ourselves, but use the supplied password
+ Caller must have already setup the connection to the NETLOGON pipe
+**********************************************************/
+
+NTSTATUS trust_pw_change_and_store_it(struct cli_state *cli, TALLOC_CTX *mem_ctx, 
+				      unsigned char orig_trust_passwd_hash[16])
+{
+	unsigned char new_trust_passwd_hash[16];
+	char *new_trust_passwd;
+	char *str;
+	NTSTATUS nt_status;
+		
+	/* Create a random machine account password */
+	str = generate_random_str(DEFAULT_TRUST_ACCOUNT_PASSWORD_LENGTH);
+	new_trust_passwd = talloc_strdup(mem_ctx, str);
+	
+	E_md4hash(new_trust_passwd, new_trust_passwd_hash);
+
+	nt_status = just_change_the_password(cli, mem_ctx, orig_trust_passwd_hash,
+					     new_trust_passwd_hash);
+	
+	if (NT_STATUS_IS_OK(nt_status)) {
+		DEBUG(3,("%s : trust_pw_change_and_store_it: Changed password.\n", 
+			 timestring(False)));
+		/*
+		 * Return the result of trying to write the new password
+		 * back into the trust account file.
+		 */
+		if (!secrets_store_machine_password(new_trust_passwd)) {
+			nt_status = NT_STATUS_UNSUCCESSFUL;
+		}
+	}
+
+	return nt_status;
+}
+
+/*********************************************************
+ Change the domain password on the PDC.
+ Do most of the legwork ourselfs.  Caller must have
+ already setup the connection to the NETLOGON pipe
+**********************************************************/
+
+NTSTATUS trust_pw_find_change_and_store_it(struct cli_state *cli, TALLOC_CTX *mem_ctx, 
+					   const char *domain) 
+{
+	unsigned char old_trust_passwd_hash[16];
+	char *up_domain;
+	
+	up_domain = talloc_strdup(mem_ctx, domain);
+
+	if (!secrets_fetch_trust_account_password(domain,
+						  old_trust_passwd_hash, 
+						  NULL)) {
+		DEBUG(0, ("could not fetch domain secrets for domain %s!\n", domain));
+		return NT_STATUS_UNSUCCESSFUL;
+	}
+	
+	return trust_pw_change_and_store_it(cli, mem_ctx, old_trust_passwd_hash);
+	
+}
+
+
+/**
+ * Verify whether or not given domain is trusted.
+ *
+ * @param domain_name name of the domain to be verified
+ * @return true if domain is one of the trusted once or
+ *         false if otherwise
+ **/
+ 
+BOOL is_trusted_domain(const char* dom_name)
+{
+	int enum_ctx = 0;
+	const int trustdom_size = 10;
+	int num_domains, i;
+	TRUSTDOM **domains;
+	NTSTATUS result;
+	fstring trustdom_name;
+	DOM_SID trustdom_sid;
+	TALLOC_CTX *mem_ctx;
+	
+	/*
+	 * Query the secrets db as an ultimate source of information
+	 * about trusted domain names. This is PDC or BDC case.
+	 */
+	mem_ctx = talloc_init("is_trusted_domain");
+	
+	do {
+		result = secrets_get_trusted_domains(mem_ctx, &enum_ctx, trustdom_size,
+		                                     &num_domains, &domains);
+		/* compare each returned entry against incoming connection's domain */
+		for (i = 0; i < num_domains; i++) {
+			pull_ucs2_fstring(trustdom_name, domains[i]->name);
+			if (strequal(trustdom_name, dom_name)) {
+				talloc_destroy(mem_ctx);
+				return True;
+			}
+		}						
+	} while (NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES));
+		
+	/*
+	 * Query the trustdom_cache updated periodically. The only
+	 * way for domain member server.
+	 */
+	if (trustdom_cache_enable() &&
+		trustdom_cache_fetch(dom_name, &trustdom_sid)) {
+		trustdom_cache_shutdown();
+		return True;
+	}
+
+	/*
+	 * if nothing's been found, then give up here, although
+	 * the last resort might be to query the PDC.
+	 */
+	return False;
+}
+
-- 
cgit 


From e583dd6278fedf9ad45b551dccf94fbe6c785119 Mon Sep 17 00:00:00 2001
From: Rafal Szczesniak <mimir@samba.org>
Date: Fri, 14 Mar 2003 17:12:40 +0000
Subject: Fresh meat in trusted domains code:  - packing/unpacking utility
 functions for trusted domain    password struct; can be used to prepare
 buffer to store    in secrets.tdb or (soon) passdb backend  - similiar
 functions for DOM_SID  - respectively modified secrets_(fetch|store) routines
  - new auth mapping code utilising introduced is_trusted_domain    function 
 - added tdb (un)packing of single bytes

Rafal
(This used to be commit 5281ee7e84421b9be746aed2f1718ceaf2a2fe3d)
---
 source3/auth/auth_util.c  |  26 ++------
 source3/include/secrets.h |   4 +-
 source3/passdb/secrets.c  |  77 ++++++++++++++---------
 source3/tdb/tdbutil.c     | 153 +++++++++++++++++++++++++++++++++++++++++++---
 4 files changed, 201 insertions(+), 59 deletions(-)

(limited to 'source3')

diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index 7d85153bd0..a6ad2b883b 100644
--- a/source3/auth/auth_util.c
+++ b/source3/auth/auth_util.c
@@ -227,27 +227,13 @@ NTSTATUS make_user_info_map(auth_usersupplied_info **user_info,
 
 		domain = client_domain;
 
-		if ((smb_name) && (*smb_name)) { /* Don't do this for guests */
-			char *user = NULL;
-			if (asprintf(&user, "%s%s%s", 
-				 client_domain, lp_winbind_separator(), 
-				 smb_name) < 0) {
-				DEBUG(0, ("make_user_info_map: asprintf() failed!\n"));
-				return NT_STATUS_NO_MEMORY;
-			}
-
-			DEBUG(5, ("make_user_info_map: testing for user %s\n", user));
-			
-			if (Get_Pwnam(user) == NULL) {
-				DEBUG(5, ("make_user_info_map: test for user %s failed\n", user));
-				domain = lp_workgroup();
-				DEBUG(5, ("make_user_info_map: trusted domain %s doesn't appear to exist, using %s\n", 
-					  client_domain, domain));
-			} else {
-				DEBUG(5, ("make_user_info_map: using trusted domain %s\n", domain));
-			}
-			SAFE_FREE(user);
+		if (is_trusted_domain(domain)) {
+			return make_user_info(user_info, smb_name, internal_username,
+			                      client_domain, domain, wksta_name,
+			                      lm_pwd, nt_pwd, plaintext, ntlmssp_flags,
+			                      encrypted);
 		}
+
 	} else {
 		domain = lp_workgroup();
 	}
diff --git a/source3/include/secrets.h b/source3/include/secrets.h
index 183b29d7a8..07faf28d43 100644
--- a/source3/include/secrets.h
+++ b/source3/include/secrets.h
@@ -57,14 +57,14 @@ struct machine_acct_pass {
 /*
  * storage structure for trusted domain
  */
-struct trusted_dom_pass {
+typedef struct trusted_dom_pass {
 	size_t uni_name_len;
 	smb_ucs2_t uni_name[32]; /* unicode domain name */
 	size_t pass_len;
 	fstring pass;		/* trust relationship's password */
 	time_t mod_time;
 	DOM_SID domain_sid;	/* remote domain's sid */
-};
+} TRUSTED_DOM_PASS;
 
 /*
  * trusted domain entry/entries returned by secrets_get_trusted_domains
diff --git a/source3/passdb/secrets.c b/source3/passdb/secrets.c
index 2b944a9941..4b0913a624 100644
--- a/source3/passdb/secrets.c
+++ b/source3/passdb/secrets.c
@@ -265,38 +265,44 @@ BOOL secrets_fetch_trust_account_password(const char *domain, uint8 ret_pwd[16],
 ************************************************************************/
 
 BOOL secrets_fetch_trusted_domain_password(const char *domain, char** pwd,
-					   DOM_SID *sid, time_t *pass_last_set_time)
+                                           DOM_SID *sid, time_t *pass_last_set_time)
 {
-	struct trusted_dom_pass *pass;
+	struct trusted_dom_pass pass;
 	size_t size;
+	
+	/* unpacking structures */
+	char* pass_buf;
+	int pass_len = 0;
+
+	ZERO_STRUCT(pass);
 
 	/* fetching trusted domain password structure */
-	if (!(pass = secrets_fetch(trustdom_keystr(domain), &size))) {
+	if (!(pass_buf = secrets_fetch(trustdom_keystr(domain), &size))) {
 		DEBUG(5, ("secrets_fetch failed!\n"));
 		return False;
 	}
 
-	if (size != sizeof(*pass)) {
-		DEBUG(0, ("secrets were of incorrect size!\n"));
+	/* unpack trusted domain password */
+	pass_len = tdb_trusted_dom_pass_unpack(pass_buf, size, &pass);
+	if (pass_len != size) {
+		DEBUG(5, ("Invalid secrets size. Unpacked data doesn't match trusted_dom_pass structure.\n"));
 		return False;
 	}
-
+			
 	/* the trust's password */	
 	if (pwd) {
-		*pwd = strdup(pass->pass);
+		*pwd = strdup(pass.pass);
 		if (!*pwd) {
 			return False;
 		}
 	}
 
 	/* last change time */
-	if (pass_last_set_time) *pass_last_set_time = pass->mod_time;
+	if (pass_last_set_time) *pass_last_set_time = pass.mod_time;
 
 	/* domain sid */
-	memcpy(&sid, &(pass->domain_sid), sizeof(sid));
-	
-	SAFE_FREE(pass);
-	
+	sid_copy(sid, &pass.domain_sid);
+		
 	return True;
 }
 
@@ -315,7 +321,7 @@ BOOL secrets_store_trust_account_password(const char *domain, uint8 new_pwd[16])
 }
 
 /**
- * Routine to set the password for trusted domain
+ * Routine to store the password for trusted domain
  *
  * @param domain remote domain name
  * @param pwd plain text password of trust relationship
@@ -325,12 +331,17 @@ BOOL secrets_store_trust_account_password(const char *domain, uint8 new_pwd[16])
  **/
 
 BOOL secrets_store_trusted_domain_password(const char* domain, smb_ucs2_t *uni_dom_name,
-					   size_t uni_name_len, const char* pwd,
-					   DOM_SID sid)
-{
+                                           size_t uni_name_len, const char* pwd,
+                                           DOM_SID sid)
+{	
+	/* packing structures */
+	pstring pass_buf;
+	int pass_len = 0;
+	int pass_buf_len = sizeof(pass_buf);
+	
 	struct trusted_dom_pass pass;
 	ZERO_STRUCT(pass);
-
+	
 	/* unicode domain name and its length */
 	if (!uni_dom_name)
 		return False;
@@ -346,9 +357,11 @@ BOOL secrets_store_trusted_domain_password(const char* domain, smb_ucs2_t *uni_d
 	fstrcpy(pass.pass, pwd);
 
 	/* domain sid */
-	memcpy(&(pass.domain_sid), &sid, sizeof(sid));
+	sid_copy(&pass.domain_sid, &sid);
+	
+	pass_len = tdb_trusted_dom_pass_pack(pass_buf, pass_buf_len, &pass);
 
-	return secrets_store(trustdom_keystr(domain), (void *)&pass, sizeof(pass));
+	return secrets_store(trustdom_keystr(domain), (void *)&pass_buf, pass_len);
 }
 
 /************************************************************************
@@ -475,9 +488,10 @@ NTSTATUS secrets_get_trusted_domains(TALLOC_CTX* ctx, int* enum_ctx, unsigned in
 	char *pattern;
 	unsigned int start_idx;
 	uint32 idx = 0;
-	size_t size;
+	size_t size, packed_size = 0;
 	fstring dom_name;
-	struct trusted_dom_pass *pass;
+	char *packed_pass;
+	struct trusted_dom_pass *pass = talloc_zero(ctx, sizeof(struct trusted_dom_pass));
 	NTSTATUS status;
 
 	if (!secrets_init()) return NT_STATUS_ACCESS_DENIED;
@@ -505,7 +519,7 @@ NTSTATUS secrets_get_trusted_domains(TALLOC_CTX* ctx, int* enum_ctx, unsigned in
 	 */
 	status = NT_STATUS_NO_MORE_ENTRIES;
 
-	/* searching for keys in sectrets db -- way to go ... */
+	/* searching for keys in secrets db -- way to go ... */
 	for (k = keys; k; k = k->next) {
 		char *secrets_key;
 		
@@ -516,14 +530,20 @@ NTSTATUS secrets_get_trusted_domains(TALLOC_CTX* ctx, int* enum_ctx, unsigned in
 			return NT_STATUS_NO_MEMORY;
 		}
 				
-		pass = secrets_fetch(secrets_key, &size);
-		
-		if (size != sizeof(*pass)) {
+		packed_pass = secrets_fetch(secrets_key, &size);
+		packed_size = tdb_trusted_dom_pass_unpack(packed_pass, size, pass);
+
+		if (size != packed_size) {
 			DEBUG(2, ("Secrets record %s is invalid!\n", secrets_key));
 			SAFE_FREE(pass);
-			continue;
+			if (size) SAFE_FREE(packed_pass);
+
+			return NT_STATUS_UNSUCCESSFUL;
 		}
 		
+		/* packed representation isn't needed anymore */
+		SAFE_FREE(packed_pass);
+		
 		pull_ucs2_fstring(dom_name, pass->uni_name);
 		DEBUG(18, ("Fetched secret record num %d.\nDomain name: %s, SID: %s\n",
 			   idx, dom_name, sid_string_static(&pass->domain_sid)));
@@ -569,10 +589,7 @@ NTSTATUS secrets_get_trusted_domains(TALLOC_CTX* ctx, int* enum_ctx, unsigned in
 				   start_idx, max_num_domains));
 		}
 		
-		idx++;
-		
-		/* free returned tdb record */
-		SAFE_FREE(pass);
+		idx++;		
 	}
 	
 	DEBUG(5, ("secrets_get_trusted_domains: got %d domains\n", *num_domains));
diff --git a/source3/tdb/tdbutil.c b/source3/tdb/tdbutil.c
index 0d8f6128cc..b153d442bd 100644
--- a/source3/tdb/tdbutil.c
+++ b/source3/tdb/tdbutil.c
@@ -42,7 +42,7 @@ static void gotalarm_sig(void)
 static TDB_DATA make_tdb_data(const char *dptr, size_t dsize)
 {
 	TDB_DATA ret;
-	ret.dptr = dptr;
+	ret.dptr = smb_xstrdup(dptr);
 	ret.dsize = dsize;
 	return ret;
 }
@@ -387,6 +387,7 @@ BOOL tdb_change_uint32_atomic(TDB_CONTEXT *tdb, const char *keystr, uint32 *oldv
 size_t tdb_pack(char *buf, int bufsize, const char *fmt, ...)
 {
 	va_list ap;
+	uint8 bt;
 	uint16 w;
 	uint32 d;
 	int i;
@@ -402,40 +403,46 @@ size_t tdb_pack(char *buf, int bufsize, const char *fmt, ...)
 
 	while (*fmt) {
 		switch ((c = *fmt++)) {
-		case 'w':
+		case 'b': /* unsigned 8-bit integer */
+			len = 1;
+			bt = (uint8)va_arg(ap, int);
+			if (bufsize >= len)
+				SSVAL(buf, 0, bt);
+			break;
+		case 'w': /* unsigned 16-bit integer */
 			len = 2;
 			w = (uint16)va_arg(ap, int);
 			if (bufsize >= len)
 				SSVAL(buf, 0, w);
 			break;
-		case 'd':
+		case 'd': /* signed 32-bit integer (standard int in most systems) */
 			len = 4;
 			d = va_arg(ap, uint32);
 			if (bufsize >= len)
 				SIVAL(buf, 0, d);
 			break;
-		case 'p':
+		case 'p': /* pointer */
 			len = 4;
 			p = va_arg(ap, void *);
 			d = p?1:0;
 			if (bufsize >= len)
 				SIVAL(buf, 0, d);
 			break;
-		case 'P':
+		case 'P': /* null-terminated string */
 			s = va_arg(ap,char *);
 			w = strlen(s);
 			len = w + 1;
 			if (bufsize >= len)
 				memcpy(buf, s, len);
 			break;
-		case 'f':
+		case 'f': /* null-terminated string */
 			s = va_arg(ap,char *);
 			w = strlen(s);
 			len = w + 1;
 			if (bufsize >= len)
 				memcpy(buf, s, len);
 			break;
-		case 'B':
+		case 'B': /* fixed-length string */
 			i = va_arg(ap, int);
 			s = va_arg(ap, char *);
 			len = 4+i;
@@ -471,6 +478,7 @@ size_t tdb_pack(char *buf, int bufsize, const char *fmt, ...)
 int tdb_unpack(char *buf, int bufsize, const char *fmt, ...)
 {
 	va_list ap;
+	uint8 *bt;
 	uint16 *w;
 	uint32 *d;
 	int len;
@@ -486,6 +494,13 @@ int tdb_unpack(char *buf, int bufsize, const char *fmt, ...)
 	
 	while (*fmt) {
 		switch ((c=*fmt++)) {
+		case 'b':
+			len = 1;
+			bt = va_arg(ap, uint8 *);
+			if (bufsize < len)
+				goto no_space;
+			*bt = SVAL(buf, 0);
+			break;
 		case 'w':
 			len = 2;
 			w = va_arg(ap, uint16 *);
@@ -563,6 +578,130 @@ int tdb_unpack(char *buf, int bufsize, const char *fmt, ...)
 	return -1;
 }
 
+
+/**
+ * Pack SID passed by pointer
+ *
+ * @param pack_buf pointer to buffer which is to be filled with packed data
+ * @param bufsize size of packing buffer
+ * @param sid pointer to sid to be packed
+ *
+ * @return length of the packed representation of the whole structure
+ **/
+size_t tdb_sid_pack(char* pack_buf, int bufsize, DOM_SID* sid)
+{
+	int idx;
+	size_t len = 0;
+	
+	if (!sid || !pack_buf) return -1;
+	
+	len += tdb_pack(pack_buf + len, bufsize - len, "bb", sid->sid_rev_num,
+	                sid->num_auths);
+	
+	for (idx = 0; idx < 6; idx++) {
+		len += tdb_pack(pack_buf + len, bufsize - len, "b", sid->id_auth[idx]);
+	}
+	
+	for (idx = 0; idx < MAXSUBAUTHS; idx++) {
+		len += tdb_pack(pack_buf + len, bufsize - len, "d", sid->sub_auths[idx]);
+	}
+	
+	return len;
+}
+
+
+/**
+ * Unpack SID into a pointer
+ *
+ * @param pack_buf pointer to buffer with packed representation
+ * @param bufsize size of the buffer
+ * @param sid pointer to sid structure to be filled with unpacked data
+ *
+ * @return size of structure unpacked from buffer
+ **/
+size_t tdb_sid_unpack(char* pack_buf, int bufsize, DOM_SID* sid)
+{
+	int idx, len = 0;
+	
+	if (!sid || !pack_buf) return -1;
+
+	len += tdb_unpack(pack_buf + len, bufsize - len, "bb",
+	                  &sid->sid_rev_num, &sid->num_auths);
+			  
+	for (idx = 0; idx < 6; idx++) {
+		len += tdb_unpack(pack_buf + len, bufsize - len, "b", &sid->id_auth[idx]);
+	}
+	
+	for (idx = 0; idx < MAXSUBAUTHS; idx++) {
+		len += tdb_unpack(pack_buf + len, bufsize - len, "d", &sid->sub_auths[idx]);
+	}
+	
+	return len;
+}
+
+
+/**
+ * Pack TRUSTED_DOM_PASS passed by pointer
+ *
+ * @param pack_buf pointer to buffer which is to be filled with packed data
+ * @param bufsize size of the buffer
+ * @param pass pointer to trusted domain password to be packed
+ *
+ * @return length of the packed representation of the whole structure
+ **/
+size_t tdb_trusted_dom_pass_pack(char* pack_buf, int bufsize, TRUSTED_DOM_PASS* pass)
+{
+	int idx, len = 0;
+	
+	if (!pack_buf || !pass) return -1;
+	
+	/* packing unicode domain name and password */
+	len += tdb_pack(pack_buf + len, bufsize - len, "d", pass->uni_name_len);
+	
+	for (idx = 0; idx < 32; idx++)
+		len +=  tdb_pack(pack_buf + len, bufsize - len, "w", pass->uni_name[idx]);
+	
+	len += tdb_pack(pack_buf + len, bufsize - len, "dPd", pass->pass_len,
+	                     pass->pass, pass->mod_time);
+
+	/* packing SID structure */
+	len += tdb_sid_pack(pack_buf + len, bufsize - len, &pass->domain_sid);
+
+	return len;
+}
+
+
+/**
+ * Unpack TRUSTED_DOM_PASS passed by pointer
+ *
+ * @param pack_buf pointer to buffer with packed representation
+ * @param bufsize size of the buffer
+ * @param pass pointer to trusted domain password to be filled with unpacked data
+ *
+ * @return size of structure unpacked from buffer
+ **/
+size_t tdb_trusted_dom_pass_unpack(char* pack_buf, int bufsize, TRUSTED_DOM_PASS* pass)
+{
+	int idx, len = 0;
+	
+	if (!pack_buf || !pass) return -1;
+
+	/* unpack unicode domain name and plaintext password */
+	len += tdb_unpack(pack_buf, bufsize - len, "d", &pass->uni_name_len);
+	
+	for (idx = 0; idx < 32; idx++)
+		len +=  tdb_unpack(pack_buf + len, bufsize - len, "w", &pass->uni_name[idx]);
+
+	len += tdb_unpack(pack_buf + len, bufsize - len, "dPd", &pass->pass_len, &pass->pass,
+	                  &pass->mod_time);
+	
+	/* unpack domain sid */
+	len += tdb_sid_unpack(pack_buf + len, bufsize - len, &pass->domain_sid);
+	
+	return len;	
+}
+
+
 /****************************************************************************
  Log tdb messages via DEBUG().
 ****************************************************************************/
-- 
cgit 


From 5f86db85dfe26ad235dae8bb479cac8ef9af2d15 Mon Sep 17 00:00:00 2001
From: Rafal Szczesniak <mimir@samba.org>
Date: Fri, 14 Mar 2003 17:16:33 +0000
Subject: Extending code to work both in case of domain membership and domain
 controller respecting interdomain trust relationships. In the latter case we
 need to find DC of remote domain instead of ours. In the former 'domain' is
 our domain name.

Rafal
(This used to be commit 0cd45d5d3b3e3ec5a589c3ee9f0e369901eefe8f)
---
 source3/auth/auth_domain.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/auth/auth_domain.c b/source3/auth/auth_domain.c
index 0d90a184a4..079bb49a21 100644
--- a/source3/auth/auth_domain.c
+++ b/source3/auth/auth_domain.c
@@ -272,7 +272,7 @@ static NTSTATUS find_connect_dc(struct cli_state **cli,
 	struct in_addr dc_ip;
 	fstring srv_name;
 
-	if ( !rpc_find_dc(lp_workgroup(), srv_name, &dc_ip) ) {
+	if (!rpc_find_dc(domain, srv_name, &dc_ip)) {
 		DEBUG(0,("find_connect_dc: Failed to find an DCs for %s\n", lp_workgroup()));
 		return NT_STATUS_NO_LOGON_SERVERS;
 	}
-- 
cgit 


From 9db9982cd34d36d8b23e94a4063761c8b6aa9e17 Mon Sep 17 00:00:00 2001
From: Rafal Szczesniak <mimir@samba.org>
Date: Fri, 14 Mar 2003 17:20:13 +0000
Subject: We haven't implemented The Singing Contexts so far. Who knows what
 .NET server brings, though ...?  ;-)

Rafal
(This used to be commit d81b0d26903004be6a99ac029dd531fd18947268)
---
 source3/libsmb/smb_signing.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/libsmb/smb_signing.c b/source3/libsmb/smb_signing.c
index 40359c5c8c..c3538ee9fd 100644
--- a/source3/libsmb/smb_signing.c
+++ b/source3/libsmb/smb_signing.c
@@ -417,7 +417,7 @@ BOOL cli_temp_set_signing(struct cli_state *cli)
 }
 
 /**
- * Free the singing context
+ * Free the signing context
  */
  
 void cli_free_signing_context(struct cli_state *cli) 
-- 
cgit 


From 7ae555c43c55ab95f75fb4afdd3d2bcb403ad3b3 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Fri, 14 Mar 2003 23:11:19 +0000
Subject: fix WinXP & Win2K3 remote_arch and check pointer in ntlmssp code
 before dereferencing (This used to be commit
 2487480228b99183cab9e34ab497997e0c144ed6)

---
 source3/Makefile.in      |  5 +++--
 source3/lib/util.c       | 16 ++++++++++++++++
 source3/smbd/sesssetup.c | 35 ++++++++++++++++++-----------------
 3 files changed, 37 insertions(+), 19 deletions(-)

(limited to 'source3')

diff --git a/source3/Makefile.in b/source3/Makefile.in
index e42dd1f395..2334e278f2 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -85,6 +85,7 @@ PIDDIR = @piddir@
 # man pages language(s)
 man_langs = "@manlangs@"
 
+LIBSMBCLIENT=bin/libsmbclient.a @LIBSMBCLIENT_SHARED@
 LIBSMBCLIENT_MAJOR=0
 LIBSMBCLIENT_MINOR=1
 
@@ -897,7 +898,7 @@ bin/libbigballofmud.a: $(LIBBIGBALLOFMUD_OBJS)
 	@echo Linking bigballofmud non-shared library $@
 	-$(AR) -rc $@ $(LIBBIGBALLOFMUD_OBJS)
 
-libsmbclient: bin/libsmbclient.a @LIBSMBCLIENT_SHARED@
+libsmbclient: $(LIBSMBCLIENT)
 
 bin/librpc_lsarpc.@SHLIBEXT@: $(RPC_LSA_OBJ)
 	@echo "Linking $@"
@@ -1135,7 +1136,7 @@ TOPFILES=dynconfig.o dynconfig.po
 
 clean: delheaders python_clean
 	-rm -f core */*~ *~ */*.o */*.po */*.po32 */*.@SHLIBEXT@ \
-		$(TOPFILES) $(BIN_PROGS) $(SBIN_PROGS) $(MODULES) $(TORTURE_PROGS) .headers.stamp
+		$(TOPFILES) $(BIN_PROGS) $(SBIN_PROGS) $(MODULES) $(TORTURE_PROGS) $(LIBSMBCLIENT) .headers.stamp
 
 # Making this target will just make sure that the prototype files
 # exist, not necessarily that they are up to date.  Since they're
diff --git a/source3/lib/util.c b/source3/lib/util.c
index 8d62db5ebb..77ffa70a47 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -1740,6 +1740,22 @@ BOOL is_myworkgroup(const char *s)
 	return(ret);
 }
 
+/*******************************************************************
+ we distinguish between 2K and XP by the "Native Lan Manager" string
+   WinXP => "Windows 2002 5.1"
+   Win2k => "Windows 2000 5.0"
+   NT4   => "Windows NT 4.0" 
+   Win9x => "Windows 4.0"
+********************************************************************/
+
+void ra_lanman_string( const char *native_lanman )
+{		 
+	if ( 0 == strcmp( native_lanman, "Windows 2002 5.1" ) )
+		set_remote_arch( RA_WINXP );
+	else if ( 0 == strcmp( native_lanman, "Windows .NET 5.2" ) )
+		set_remote_arch( RA_WIN2K3 );
+}
+
 /*******************************************************************
  Set the horrid remote_arch string based on an enum.
 ********************************************************************/
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index 70158a9015..674f6145d3 100644
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -396,8 +396,10 @@ static int reply_spnego_auth(connection_struct *conn, char *inbuf, char *outbuf,
 		return ERROR_NT(NT_STATUS_LOGON_FAILURE);
 	}
 
+	if ( global_ntlmssp_state ) {
 	nt_status = auth_ntlmssp_update(global_ntlmssp_state, 
 					  auth, &auth_reply);
+	}
 
 	data_blob_free(&auth);
 
@@ -422,6 +424,10 @@ static int reply_sesssetup_and_X_spnego(connection_struct *conn, char *inbuf,
 	DATA_BLOB blob1;
 	int ret;
 	size_t bufrem;
+	fstring native_os, native_lanman;
+	char *p2;
+	uint16 data_blob_len = SVAL(inbuf, smb_vwv7);
+	enum remote_arch_types ra_type = get_remote_arch();
 
 	DEBUG(3,("Doing spnego session setup\n"));
 
@@ -431,19 +437,27 @@ static int reply_sesssetup_and_X_spnego(connection_struct *conn, char *inbuf,
 		
 	p = (uint8 *)smb_buf(inbuf);
 
-	if (SVAL(inbuf, smb_vwv7) == 0) {
+	if (data_blob_len == 0) {
 		/* an invalid request */
 		return ERROR_NT(NT_STATUS_LOGON_FAILURE);
 	}
 
 	bufrem = smb_bufrem(inbuf, p);
 	/* pull the spnego blob */
-	blob1 = data_blob(p, MIN(bufrem, SVAL(inbuf, smb_vwv7)));
+	blob1 = data_blob(p, MIN(bufrem, data_blob_len));
 
 #if 0
 	file_save("negotiate.dat", blob1.data, blob1.length);
 #endif
 
+	p2 = inbuf + smb_vwv13 + data_blob_len;
+	p2 += srvstr_pull_buf(inbuf, native_os, p2, sizeof(native_os), STR_TERMINATE);
+	p2 += srvstr_pull_buf(inbuf, native_lanman, p2, sizeof(native_lanman), STR_TERMINATE);
+	DEBUG(3,("NativeOS=[%s] NativeLanMan=[%s]\n", native_os, native_lanman));
+
+	if ( ra_type == RA_WIN2K )
+		ra_lanman_string( native_lanman );
+
 	if (blob1.data[0] == ASN1_APPLICATION(0)) {
 		/* its a negTokenTarg packet */
 		ret = reply_spnego_negotiate(conn, inbuf, outbuf, length, bufsize, blob1);
@@ -606,21 +620,8 @@ int reply_sesssetup_and_X(connection_struct *conn, char *inbuf,char *outbuf,
 		DEBUG(3,("Domain=[%s]  NativeOS=[%s] NativeLanMan=[%s]\n",
 			 domain,native_os,native_lanman));
 
-		/* 
-		 * we distinguish between 2K and XP by the "Native Lan Manager" string
-		 *   WinXP => "Windows 2002 5.1"
-		 *   Win2k => "Windows 2000 5.0"
-		 *   NT4   => "Windows NT 4.0" 
-		 *   Win9x => "Windows 4.0"
-		 */
-		 
-		if ( ra_type == RA_WIN2K ) {
-			if ( 0 == strcmp( native_lanman, "Windows 2002 5.1" ) )
-				set_remote_arch( RA_WINXP );
-			else if ( 0 == strcmp( native_lanman, "Windows .NET 5.2" ) )
-				set_remote_arch( RA_WIN2K3 );
-		}
-		
+		if ( ra_type == RA_WIN2K )
+			ra_lanman_string( native_lanman );
 
 	}
 	
-- 
cgit 


From dadae3bdd261e7768162448049952244abd7c8af Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 15 Mar 2003 06:10:48 +0000
Subject: Now that mimir has done the grunt work, I'll fix up the comment (This
 used to be commit 7154fe10969a34b97ddc8321bfb5271b8e6d4795)

---
 source3/auth/auth_util.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'source3')

diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index a6ad2b883b..f4c43d2d4b 100644
--- a/source3/auth/auth_util.c
+++ b/source3/auth/auth_util.c
@@ -219,10 +219,7 @@ NTSTATUS make_user_info_map(auth_usersupplied_info **user_info,
 		   where it doens't supply a domain for logon script
 		   'net use' commands.
 
-		   The way I do it here is by checking if the fully
-		   qualified username exists. This is rather reliant
-		   on winbind, but until we have a better method this
-		   will have to do 
+		   Finally, we do this by looking up a cache of trusted domains!
 		*/
 
 		domain = client_domain;
-- 
cgit 


From ef07127b3014742550b15cb163b595bafeebafb5 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 15 Mar 2003 06:31:23 +0000
Subject: strictly, you can't #if on somthing that may or may not be defined.

Andrew Bartlett
(This used to be commit 49bae0227323e811cb71ada24928d24f7dc56d1f)
---
 source3/tdb/spinlock.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/tdb/spinlock.h b/source3/tdb/spinlock.h
index d6a2ac6eb8..8b0e833ff5 100644
--- a/source3/tdb/spinlock.h
+++ b/source3/tdb/spinlock.h
@@ -1,7 +1,7 @@
 #ifndef __SPINLOCK_H__
 #define __SPINLOCK_H__
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 
-- 
cgit 


From c3221b8377e267133b7c04d78d98d806c54da599 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 15 Mar 2003 06:34:32 +0000
Subject: Found by my new checking code (yet to be commited):

Allow a service longer than 4 characters in CORE tcon.

Andrew Bartlett
(This used to be commit b56613c1cc13ebd5c9ba11a35d2f96c4c3eb0628)
---
 source3/smbd/reply.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index fb730bc625..80f648981a 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -161,7 +161,7 @@ int reply_tcon(connection_struct *conn,
 	*service_buf = *password = *dev = 0;
 
 	p = smb_buf(inbuf)+1;
-	p += srvstr_pull_buf(inbuf, service_buf, p, sizeof(service), STR_TERMINATE) + 1;
+	p += srvstr_pull_buf(inbuf, service_buf, p, sizeof(service_buf), STR_TERMINATE) + 1;
 	pwlen = srvstr_pull_buf(inbuf, password, p, sizeof(password), STR_TERMINATE) + 1;
 	p += pwlen;
 	p += srvstr_pull_buf(inbuf, dev, p, sizeof(dev), STR_TERMINATE) + 1;
-- 
cgit 


From 44f9f1042c9c436ccda7fefafd4a68749ffb5fe8 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 15 Mar 2003 06:41:31 +0000
Subject: Clean up the VFS module loading logic by making the parameter an
 P_LIST, rather than a runtime-parsed string.

Andrew Bartlett
(This used to be commit 3465cd6cd92c39c018979b5a82acbddca0927623)
---
 source3/param/loadparm.c | 21 ++------------
 source3/smbd/vfs.c       | 74 ++++++++++++++++++++++--------------------------
 2 files changed, 36 insertions(+), 59 deletions(-)

(limited to 'source3')

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 3878dabb60..d558b09d24 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -548,7 +548,6 @@ static int default_server_announce;
 /* prototypes for the special type handlers */
 static BOOL handle_include(const char *pszParmValue, char **ptr);
 static BOOL handle_copy(const char *pszParmValue, char **ptr);
-static BOOL handle_vfs_object(const char *pszParmValue, char **ptr);
 static BOOL handle_source_env(const char *pszParmValue, char **ptr);
 static BOOL handle_netbios_name(const char *pszParmValue, char **ptr);
 static BOOL handle_winbind_uid(const char *pszParmValue, char **ptr);
@@ -1104,7 +1103,7 @@ static struct parm_struct parm_table[] = {
 
 	{"VFS module options", P_SEP, P_SEPARATOR},
 	
-	{"vfs object", P_STRING, P_LOCAL, &sDefault.szVfsObjectFile, handle_vfs_object, NULL, FLAG_SHARE},
+	{"vfs object", P_LIST, P_LOCAL, &sDefault.szVfsObjectFile, NULL, NULL, FLAG_SHARE},
 	{"vfs options", P_STRING, P_LOCAL, &sDefault.szVfsOptions, NULL, NULL, FLAG_SHARE},
 	{"vfs path", P_STRING, P_LOCAL, &sDefault.szVfsPath, NULL, NULL, FLAG_SHARE},
 
@@ -1774,7 +1773,7 @@ FN_LOCAL_LIST(lp_readlist, readlist)
 FN_LOCAL_LIST(lp_writelist, writelist)
 FN_LOCAL_LIST(lp_printer_admin, printer_admin)
 FN_LOCAL_STRING(lp_fstype, fstype)
-FN_LOCAL_STRING(lp_vfsobj, szVfsObjectFile)
+FN_LOCAL_LIST(lp_vfsobj, szVfsObjectFile)
 FN_LOCAL_STRING(lp_vfs_options, szVfsOptions)
 FN_LOCAL_STRING(lp_vfs_path, szVfsPath)
 FN_LOCAL_STRING(lp_msdfs_proxy, szMSDfsProxy)
@@ -2738,22 +2737,6 @@ static BOOL handle_source_env(const char *pszParmValue, char **ptr)
 	return (result);
 }
 
-/***************************************************************************
- Handle the interpretation of the vfs object parameter.
-*************************************************************************/
-
-static BOOL handle_vfs_object(const char *pszParmValue, char **ptr)
-{
-	/* Set string value */
-
-	string_set(ptr, pszParmValue);
-
-	/* Do any other initialisation required for vfs.  Note that
-	   anything done here may have linking repercussions in nmbd. */
-
-	return True;
-}
-
 /***************************************************************************
  Handle the include operation.
 ***************************************************************************/
diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index 533c64b229..3bbe8a737a 100644
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -215,54 +215,48 @@ Proceeding in compatibility mode, new operations (since version #%d) will fallba
 
 BOOL smbd_vfs_init(connection_struct *conn)
 {
-	char **vfs_objects, *vfsobj, *vfs_module, *vfs_path;
-	int nobj, i;
+	const char **vfs_objects;
+	char *vfs_module, *vfs_path;
+	unsigned int i;
+	unsigned int j = 0;
 	struct smb_vfs_handle_struct *handle;
 	
 	/* Normal share - initialise with disk access functions */
 	vfs_init_default(conn);
+	vfs_objects = lp_vfsobj(SNUM(conn));
 
 	/* Override VFS functions if 'vfs object' was specified*/
-	if (*lp_vfsobj(SNUM(conn))) {
-		vfsobj = NULL;
-		for(i=0; i<SMB_VFS_OP_LAST; i++) {
-		  vfs_opaque_ops[i].op = ((void**)&default_vfs_ops)[i];
-		  vfs_opaque_ops[i].type = i;
-		  vfs_opaque_ops[i].layer = SMB_VFS_LAYER_OPAQUE;
+	if (!vfs_objects)
+		return True;
+
+	for(i=0; i<SMB_VFS_OP_LAST; i++) {
+		vfs_opaque_ops[i].op = ((void**)&default_vfs_ops)[i];
+		vfs_opaque_ops[i].type = i;
+		vfs_opaque_ops[i].layer = SMB_VFS_LAYER_OPAQUE;
+	}
+
+	vfs_path = lp_vfs_path(SNUM(conn));
+	
+	for (j=0; vfs_objects[j]; j++) {
+		conn->vfs_private = NULL;
+		handle = (struct smb_vfs_handle_struct *) smb_xmalloc(sizeof(smb_vfs_handle_struct));
+		/* Loadable object file */
+		handle->handle = NULL;
+		DLIST_ADD(conn->vfs_private, handle);
+		vfs_module = NULL;
+		if (vfs_path) {
+			asprintf(&vfs_module, "%s/%s", vfs_path, vfs_objects[j]);
+		} else {
+			asprintf(&vfs_module, "%s", vfs_objects[j]);
 		}
-		if (string_set(&vfsobj, lp_vfsobj(SNUM(conn)))) {
-			/* Parse passed modules specification to array of modules */
-			set_first_token(vfsobj);
-			/* We are using default separators: ' \t\r\n' */
-			vfs_objects = toktocliplist(&nobj, NULL);
-			if (vfs_objects) {
-				vfs_path = lp_vfs_path(SNUM(conn));
-				conn->vfs_private = NULL;
-				for(i=nobj-1; i>=0; i--) {
-					handle = (struct smb_vfs_handle_struct *) smb_xmalloc(sizeof(smb_vfs_handle_struct));
-					/* Loadable object file */
-					handle->handle = NULL;
-					DLIST_ADD(conn->vfs_private, handle)
-					vfs_module = NULL;
-					if (vfs_path) {
-						asprintf(&vfs_module, "%s/%s", vfs_path, vfs_objects[i]);
-					} else {
-						asprintf(&vfs_module, "%s", vfs_objects[i]);
-					}
-					if (!vfs_init_custom(conn, vfs_module)) {
-						DEBUG(0, ("smbd_vfs_init: vfs_init_custom failed for %s\n", vfs_module));
-						string_free(&vfsobj);
-						SAFE_FREE(vfs_module);
-						DLIST_REMOVE(conn->vfs_private, handle);
-						SAFE_FREE(handle);
-						return False;
-					}
-					SAFE_FREE(vfs_module);
-				}
-			}
-			string_free(&vfsobj);
-			return True;
+		if (!vfs_init_custom(conn, vfs_module)) {
+			DEBUG(0, ("smbd_vfs_init: vfs_init_custom failed for %s\n", vfs_module));
+			SAFE_FREE(vfs_module);
+			DLIST_REMOVE(conn->vfs_private, handle);
+			SAFE_FREE(handle);
+			return False;
 		}
+		SAFE_FREE(vfs_module);
 	}
 	return True;
 }
-- 
cgit 


From d21f97a25d01d1d576f71cf45f5c2003bcfc8fe8 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 15 Mar 2003 06:42:44 +0000
Subject: If it's an fstring, use fstrcpy().

Andrew Bartlett
(This used to be commit bf5e0698eed72d7fc005be08feb36ef82ada716c)
---
 source3/nsswitch/winbindd_wins.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'source3')

diff --git a/source3/nsswitch/winbindd_wins.c b/source3/nsswitch/winbindd_wins.c
index 8ddd5dc10d..a1d38ed69a 100644
--- a/source3/nsswitch/winbindd_wins.c
+++ b/source3/nsswitch/winbindd_wins.c
@@ -137,8 +137,8 @@ enum winbindd_result winbindd_wins_byip(struct winbindd_cli_state *state)
 		SAFE_FREE(status);
 		return WINBINDD_ERROR;
 	    }
-	    safe_strcat(response,state->request.data.winsreq,maxlen);
-	    safe_strcat(response,"\t",maxlen);
+	    fstrcat(response,state->request.data.winsreq);
+	    fstrcat(response,"\t");
 	    for (i = 0; i < count; i++) {
 		/* ignore group names */
 		if (status[i].flags & 0x80) continue;
@@ -148,8 +148,8 @@ enum winbindd_result winbindd_wins_byip(struct winbindd_cli_state *state)
 			    SAFE_FREE(status);
 			    return WINBINDD_ERROR;
 			}
-			safe_strcat(response, status[i].name, maxlen);
-			safe_strcat(response, " ", maxlen);
+			fstrcat(response, status[i].name);
+			fstrcat(response, " ");
 		}
 	    }
 	    /* make last character a newline */
@@ -190,16 +190,16 @@ enum winbindd_result winbindd_wins_byname(struct winbindd_cli_state *state)
 			/* Clear out the newline character */
 			response[strlen(response)-1] = ' '; 
 		    }
-		    safe_strcat(response,addr,maxlen);
-		    safe_strcat(response,"\t",maxlen);
+		    fstrcat(response,addr);
+		    fstrcat(response,"\t");
 		}
 		size = strlen(state->request.data.winsreq) + strlen(response);
 		if (size > maxlen) {
 		    SAFE_FREE(ip_list);
 		    return WINBINDD_ERROR;
 		}   
-		safe_strcat(response,state->request.data.winsreq,maxlen);
-		safe_strcat(response,"\n",maxlen);
+		fstrcat(response,state->request.data.winsreq);
+		fstrcat(response,"\n");
 		SAFE_FREE(ip_list);
 	} else
 		return WINBINDD_ERROR;
-- 
cgit 


From 6fe590983b5d4dca8cea82eaa8dfb7b3a13bc3d1 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 15 Mar 2003 06:43:37 +0000
Subject: Add const, and a signed/unsigned fix. (This used to be commit
 f07a93eaeba20f5704f43c7f02141adc564db136)

---
 source3/libsmb/clitrans.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source3')

diff --git a/source3/libsmb/clitrans.c b/source3/libsmb/clitrans.c
index 7e3357a8cc..3d3cd427d7 100644
--- a/source3/libsmb/clitrans.c
+++ b/source3/libsmb/clitrans.c
@@ -31,10 +31,10 @@ BOOL cli_send_trans(struct cli_state *cli, int trans,
 		    const char *pipe_name, 
 		    int fid, int flags,
 		    uint16 *setup, unsigned int lsetup, unsigned int msetup,
-		    char *param, unsigned int lparam, unsigned int mparam,
-		    char *data, unsigned int ldata, unsigned int mdata)
+		    const char *param, unsigned int lparam, unsigned int mparam,
+		    const char *data, unsigned int ldata, unsigned int mdata)
 {
-	int i;
+	unsigned int i;
 	unsigned int this_ldata,this_lparam;
 	unsigned int tot_data=0,tot_param=0;
 	char *outdata,*outparam;
-- 
cgit 


From 16ec110b0f1fe45b598a04e171397d97c3cb5aef Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 15 Mar 2003 06:45:19 +0000
Subject: client-side smbpasswd fixes - use pstrcpy_base to avoid
 clobber_region bugs

Andrew Bartlett
(This used to be commit 7ab6559369b4e6ee3c5269d8cff04e5a39f6b493)
---
 source3/libsmb/clirap.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'source3')

diff --git a/source3/libsmb/clirap.c b/source3/libsmb/clirap.c
index b38e7d5c23..224c37046c 100644
--- a/source3/libsmb/clirap.c
+++ b/source3/libsmb/clirap.c
@@ -281,7 +281,7 @@ Send a SamOEMChangePassword command
 BOOL cli_oem_change_password(struct cli_state *cli, const char *user, const char *new_password,
                              const char *old_password)
 {
-  char param[16+sizeof(fstring)];
+  pstring param;
   char data[532];
   char *p = param;
   unsigned char old_pw_hash[16];
@@ -300,11 +300,11 @@ BOOL cli_oem_change_password(struct cli_state *cli, const char *user, const char
 
   SSVAL(p,0,214); /* SamOEMChangePassword command. */
   p += 2;
-  pstrcpy(p, "zsT");
+  pstrcpy_base(p, "zsT", param);
   p = skip_string(p,1);
-  pstrcpy(p, "B516B16");
+  pstrcpy_base(p, "B516B16", param);
   p = skip_string(p,1);
-  pstrcpy(p,user);
+  pstrcpy_base(p,user, param);
   p = skip_string(p,1);
   SSVAL(p,0,532);
   p += 2;
@@ -317,7 +317,7 @@ BOOL cli_oem_change_password(struct cli_state *cli, const char *user, const char
    */
   E_deshash(old_password, old_pw_hash);
 
-  clistr_push(cli, dos_new_password, new_password, -1, STR_TERMINATE|STR_ASCII);
+  clistr_push(cli, dos_new_password, new_password, sizeof(dos_new_password), STR_TERMINATE|STR_ASCII);
 
   if (!make_oem_passwd_hash( data, dos_new_password, old_pw_hash, False))
     return False;
@@ -685,7 +685,7 @@ NTSTATUS cli_qpathinfo_alt_name(struct cli_state *cli, const char *fname, fstrin
 	int count=8;
 	char *p;
 	BOOL ret;
-	int len;
+	unsigned int len;
 
 	p = param;
 	memset(p, 0, 6);
-- 
cgit 


From dc7c505dec59329c5dde35763febab3547f6d642 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 15 Mar 2003 06:46:05 +0000
Subject: Be parinoid, malloc an extra SAFETY_MARGIN on the client's inbuf and
 outbuf.

Andrew Bartlett
(This used to be commit 2effcae13f9dfbff40b34d32c7fd82118c3fd096)
---
 source3/libsmb/clientgen.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3')

diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
index 3cae643c38..d969193089 100644
--- a/source3/libsmb/clientgen.c
+++ b/source3/libsmb/clientgen.c
@@ -245,8 +245,8 @@ struct cli_state *cli_initialise(struct cli_state *cli)
 	cli->timeout = 20000; /* Timeout is in milliseconds. */
 	cli->bufsize = CLI_BUFFER_SIZE+4;
 	cli->max_xmit = cli->bufsize;
-	cli->outbuf = (char *)malloc(cli->bufsize);
-	cli->inbuf = (char *)malloc(cli->bufsize);
+	cli->outbuf = (char *)malloc(cli->bufsize+SAFETY_MARGIN);
+	cli->inbuf = (char *)malloc(cli->bufsize+SAFETY_MARGIN);
 	cli->oplock_handler = cli_oplock_ack;
 
 	cli->use_spnego = lp_client_use_spnego();
-- 
cgit 


From a4ba0496846924df4688cf3678940ec3b14e6376 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 15 Mar 2003 06:46:43 +0000
Subject: Specify buffer sizes (This used to be commit
 aa12379b3fd9646199a8ff3f217ec7dfef1942a5)

---
 source3/libsmb/cliconnect.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3')

diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 36b6f609f5..763878f9b3 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -66,7 +66,7 @@ static BOOL cli_session_setup_lanman2(struct cli_state *cli, const char *user,
 		memcpy(pword, pass, passlen);
 	} else if (passlen > 0) {
 		/* Plaintext mode needed, assume plaintext supplied. */
-		passlen = clistr_push(cli, pword, pass, -1, STR_TERMINATE);
+		passlen = clistr_push(cli, pword, pass, sizeof(pword), STR_TERMINATE);
 	}
 
 	/* send a session setup command */
@@ -778,7 +778,7 @@ BOOL cli_send_tconX(struct cli_state *cli,
 			/*
 			 * Non-encrypted passwords - convert to DOS codepage before using.
 			 */
-			passlen = clistr_push(cli, pword, pass, -1, STR_TERMINATE);
+			passlen = clistr_push(cli, pword, pass, sizeof(pword), STR_TERMINATE);
 		} else {
 			memcpy(pword, pass, passlen);
 		}
-- 
cgit 


From 58abc7b5b623e19d81586db4ae834c8e18e83082 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 15 Mar 2003 06:50:45 +0000
Subject: If the server went away, don't segfault by attempting to FD_SET -1.

Andrew Bartlett
(This used to be commit 4b1337ee94a19e39a2f4012c4dbc32a2e58cacf5)
---
 source3/client/client.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'source3')

diff --git a/source3/client/client.c b/source3/client/client.c
index 065cd2fcc9..99fc779a9e 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -2269,6 +2269,9 @@ static void readline_callback(void)
 
 	last_t = t;
 
+	if (cli->fd == -1)
+		return;
+
  again:
 	FD_ZERO(&fds);
 	FD_SET(cli->fd,&fds);
-- 
cgit 


From eca1293fadf8774f016e18ca56ac200546ca70ba Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 15 Mar 2003 06:51:57 +0000
Subject: specify the size of these buffers (This used to be commit
 f6ea572cd57d4e655d387fe225a5d7122d587a9b)

---
 source3/libsmb/clilist.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3')

diff --git a/source3/libsmb/clilist.c b/source3/libsmb/clilist.c
index 3884e4da82..5bd1283ab7 100644
--- a/source3/libsmb/clilist.c
+++ b/source3/libsmb/clilist.c
@@ -178,7 +178,7 @@ int cli_list_new(struct cli_state *cli,const char *Mask,uint16 attribute,
 			SSVAL(param,6,info_level); 
 			SIVAL(param,8,0);
 			p = param+12;
-			p += clistr_push(cli, param+12, mask, -1, 
+			p += clistr_push(cli, param+12, mask, sizeof(param)-12, 
 					 STR_TERMINATE);
 		} else {
 			setup = TRANSACT2_FINDNEXT;
@@ -188,7 +188,7 @@ int cli_list_new(struct cli_state *cli,const char *Mask,uint16 attribute,
 			SIVAL(param,6,0); /* ff_resume_key */
 			SSVAL(param,10,8+4+2);	/* continue + resume required + close on end */
 			p = param+12;
-			p += clistr_push(cli, param+12, mask, -1, 
+			p += clistr_push(cli, param+12, mask, sizeof(param)-12, 
 					 STR_TERMINATE);
 		}
 
-- 
cgit 


From 32ae87014ce4bc7ddc25f15d44428b8ef2cf5593 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 15 Mar 2003 06:53:37 +0000
Subject: Truncate the machinename manually, so as not to generate level 0
 debugs for an expected situation.

Andrew Bartlett
(This used to be commit a07fccb7ae169c0b5089e3f7d2c5d6465b2e4686)
---
 source3/utils/pdbedit.c | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'source3')

diff --git a/source3/utils/pdbedit.c b/source3/utils/pdbedit.c
index cec3e70687..affcc75d67 100644
--- a/source3/utils/pdbedit.c
+++ b/source3/utils/pdbedit.c
@@ -363,20 +363,21 @@ static int new_machine (struct pdb_context *in, const char *machine_in)
 {
 	SAM_ACCOUNT *sam_pwent=NULL;
 	fstring machinename;
+	fstring machineaccount;
 	struct passwd  *pwd = NULL;
-	char name[16];
 	
 	fstrcpy(machinename, machine_in); 
+	machinename[15]= '\0';
 
 	if (machinename[strlen (machinename) -1] == '$')
 		machinename[strlen (machinename) -1] = '\0';
 	
 	strlower_m(machinename);
 	
-	safe_strcpy (name, machinename, 16);
-	safe_strcat (name, "$", 16);
+	fstrcpy(machineaccount, machinename);
+	fstrcat(machineaccount, "$");
 
-	if ((pwd = getpwnam_alloc(name))) {
+	if ((pwd = getpwnam_alloc(machineaccount))) {
 		if (!NT_STATUS_IS_OK(pdb_init_sam_pw( &sam_pwent, pwd))) {
 			fprintf(stderr, "Could not init sam from pw\n");
 			passwd_free(&pwd);
@@ -392,14 +393,14 @@ static int new_machine (struct pdb_context *in, const char *machine_in)
 
 	pdb_set_plaintext_passwd (sam_pwent, machinename);
 
-	pdb_set_username (sam_pwent, name, PDB_CHANGED);
+	pdb_set_username (sam_pwent, machineaccount, PDB_CHANGED);
 	
 	pdb_set_acct_ctrl (sam_pwent, ACB_WSTRUST, PDB_CHANGED);
 	
 	pdb_set_group_sid_from_rid(sam_pwent, DOMAIN_GROUP_RID_COMPUTERS, PDB_CHANGED);
 	
 	if (NT_STATUS_IS_OK(in->pdb_add_sam_account (in, sam_pwent))) {
-		print_user_info (in, name, True, False);
+		print_user_info (in, machineaccount, True, False);
 	} else {
 		fprintf (stderr, "Unable to add machine! (does it already exist?)\n");
 		pdb_free_sam (&sam_pwent);
@@ -435,12 +436,13 @@ static int delete_user_entry (struct pdb_context *in, const char *username)
 
 static int delete_machine_entry (struct pdb_context *in, const char *machinename)
 {
-	char name[16];
+	fstring name;
 	SAM_ACCOUNT *samaccount = NULL;
 	
-	safe_strcpy (name, machinename, 16);
-	if (name[strlen(name)] != '$')
-		safe_strcat (name, "$", 16);
+	fstrcpy(name, machinename);
+	name[15] = '\0';
+	if (name[strlen(name)-1] != '$')
+		fstrcat (name, "$");
 
 	if (!NT_STATUS_IS_OK(pdb_init_sam (&samaccount))) {
 		return -1;
-- 
cgit 


From 9a00acc472b3a9530ca71705faef3166aa9c4d47 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 15 Mar 2003 06:54:09 +0000
Subject: Fix off-by-one bug in safe_strcpy size paramater. (This used to be
 commit 9af30c9aae3623c4db1edca39a91973f0279acb4)

---
 source3/utils/smbcacls.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index a5cee0dae1..bce64df960 100644
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -916,7 +916,7 @@ You can string acls together with spaces, commas or newlines\n\
 	if (filename[0] != '\\') {
 		pstring s;
 		s[0] = '\\';
-		safe_strcpy(&s[1], filename, sizeof(pstring)-1);
+		safe_strcpy(&s[1], filename, sizeof(pstring)-2);
 		pstrcpy(filename, s);
 	}
 
-- 
cgit 


From 3b5bc93e9db4df6ded2eef7b32bda74328b04811 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 15 Mar 2003 07:14:55 +0000
Subject: String handling parinoia fixes.

This patch enables the compile-time checking of strings assable by means of
sizeof().  (Original code had the configure check reversed).

This is extended to all safe_strcpy() users, push_string and pull_string,
as well as the cli and srv derivitives.  There is an attempt to cap strings
at the end of the cli buffer, and clobber_region() of the speified length
(when not -1 :-).

Becouse of the way they are declared, the 'overmalloc a string' users of
safe_strcpy() have been changed to use overmalloc_safe_strcpy() (which skips
some of the checks).

This whole ball of mud worked fine, until I pulled out my 'fix' for our
statcache.  When jeremy fixes that, we should be able to get back to testing
this stuff.

This patch also includes a 'marker' of the last caller to clobber_region (ie,
the function that called pstrcpy() that called clobber_region) to assist in
debugging problems that may have smashed the stack.  This is printed at
smb_panic() time.  (Original idea and patch by metze).

It also removes some unsused functions, and #if 0's some others that are
unused but probably should be used in the near future.

For now, this patch gives us some confidence on one class of trivial parsing
error in our code.

Andrew Bartlett
(This used to be commit 31f4827acc2a2f00399a5528fc83a0dae5cebaf4)
---
 source3/Makefile.in            |   2 +-
 source3/configure.in           |   2 +-
 source3/include/includes.h     |   1 +
 source3/include/safe_string.h  | 161 +++++++++++++++++++++++++++++++++++------
 source3/include/srvstr.h       |  36 +++++++++
 source3/lib/charcnv.c          |  83 ++++-----------------
 source3/lib/util.c             |  16 +++-
 source3/lib/util_str.c         |  72 ++++++++----------
 source3/libsmb/clistr.c        |  28 +++++--
 source3/nmbd/nmbd_become_lmb.c |   2 +-
 source3/nmbd/nmbd_browsesync.c |   2 +-
 source3/smbd/srvstr.c          |  41 -----------
 source3/smbd/statcache.c       |  12 +--
 13 files changed, 264 insertions(+), 194 deletions(-)
 create mode 100644 source3/include/srvstr.h
 delete mode 100644 source3/smbd/srvstr.c

(limited to 'source3')

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 2334e278f2..1a4d97e083 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -336,7 +336,7 @@ SMBD_OBJ_SRV = smbd/files.o smbd/chgpasswd.o smbd/connection.o \
 	       smbd/vfs.o smbd/vfs-wrap.o smbd/statcache.o \
                smbd/posix_acls.o lib/sysacls.o lib/server_mutex.o \
 	       smbd/process.o smbd/service.o smbd/error.o \
-	       printing/printfsp.o lib/util_seaccess.o smbd/srvstr.o \
+	       printing/printfsp.o lib/util_seaccess.o \
                smbd/build_options.o \
 	       smbd/change_trust_pw.o \
 	       $(MANGLE_OBJ)
diff --git a/source3/configure.in b/source3/configure.in
index aa95cf19fe..e038654f7e 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -662,7 +662,7 @@ AC_CACHE_CHECK([if the compiler will optimize out function calls],samba_cv_optim
     AC_TRY_LINK([
 #include <stdio.h>],
 [
-		if (1) {
+		if (0) {
 		   this_function_does_not_exist();
 		} else {
 		  return 1;
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 25245e9c0c..2bba9d5084 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -855,6 +855,7 @@ struct printjob;
 
 /* String routines */
 
+#include "srvstr.h"
 #include "safe_string.h"
 
 #ifdef __COMPAR_FN_T
diff --git a/source3/include/safe_string.h b/source3/include/safe_string.h
index 6c2bd82bb9..c7386d3ac4 100644
--- a/source3/include/safe_string.h
+++ b/source3/include/safe_string.h
@@ -48,29 +48,45 @@
 
 #endif /* !_SPLINT_ */
 
+
 char * __unsafe_string_function_usage_here__(void);
 
-#ifdef HAVE_COMPILER_WILL_OPTIMIZE_OUT_FNS
+size_t __unsafe_string_function_usage_here2__(void);
 
-#define pstrcpy(d,s) ((sizeof(d) != sizeof(pstring) && sizeof(d) != sizeof(char *)) ? __unsafe_string_function_usage_here__() : safe_strcpy((d), (s),sizeof(pstring)-1))
-#define pstrcat(d,s) ((sizeof(d) != sizeof(pstring) && sizeof(d) != sizeof(char *)) ? __unsafe_string_function_usage_here__() : safe_strcat((d), (s),sizeof(pstring)-1))
-#define fstrcpy(d,s) ((sizeof(d) != sizeof(fstring) && sizeof(d) != sizeof(char *)) ? __unsafe_string_function_usage_here__() : safe_strcpy((d),(s),sizeof(fstring)-1))
-#define fstrcat(d,s) ((sizeof(d) != sizeof(fstring) && sizeof(d) != sizeof(char *)) ? __unsafe_string_function_usage_here__() : safe_strcat((d),(s),sizeof(fstring)-1))
+#ifdef HAVE_COMPILER_WILL_OPTIMIZE_OUT_FNS
 
-#define fstrterminate(d) ((sizeof(d) != sizeof(fstring) && sizeof(d) != sizeof(char *)) ? __unsafe_string_function_usage_here__() : (((d)[sizeof(fstring)-1]) = '\0'))
-#define pstrterminate(d) ((sizeof(d) != sizeof(pstring) && sizeof(d) != sizeof(char *)) ? __unsafe_string_function_usage_here__() : (((d)[sizeof(pstring)-1]) = '\0'))
+/* if the compiler will optimize out function calls, then use this to tell if we are 
+   have the correct types (this works only where sizeof() returns the size of the buffer, not
+   the size of the pointer). */
+
+#define CHECK_STRING_SIZE(d, len) (sizeof(d) != (len) && sizeof(d) != sizeof(char *))
+
+#define fstrterminate(d) (CHECK_STRING_SIZE(d, sizeof(fstring)) \
+    ? __unsafe_string_function_usage_here__() \
+    : (((d)[sizeof(fstring)-1]) = '\0'))
+#define pstrterminate(d) (CHECK_STRING_SIZE(d, sizeof(pstring)) \
+    ? __unsafe_string_function_usage_here__() \
+    : (((d)[sizeof(pstring)-1]) = '\0'))
+
+#define wpstrcpy(d,s) ((sizeof(d) != sizeof(wpstring) && sizeof(d) != sizeof(smb_ucs2_t *)) \
+    ? __unsafe_string_function_usage_here__() \
+    : safe_strcpy_w((d),(s),sizeof(wpstring)))
+#define wpstrcat(d,s) ((sizeof(d) != sizeof(wpstring) && sizeof(d) != sizeof(smb_ucs2_t *)) \
+    ? __unsafe_string_function_usage_here__() \
+    : safe_strcat_w((d),(s),sizeof(wpstring)))
+#define wfstrcpy(d,s) ((sizeof(d) != sizeof(wfstring) && sizeof(d) != sizeof(smb_ucs2_t *)) \
+    ? __unsafe_string_function_usage_here__() \
+    : safe_strcpy_w((d),(s),sizeof(wfstring)))
+#define wfstrcat(d,s) ((sizeof(d) != sizeof(wfstring) && sizeof(d) != sizeof(smb_ucs2_t *)) \
+    ? __unsafe_string_function_usage_here__() \
+    : safe_strcat_w((d),(s),sizeof(wfstring)))
 
-#define wpstrcpy(d,s) ((sizeof(d) != sizeof(wpstring) && sizeof(d) != sizeof(smb_ucs2_t *)) ? __unsafe_string_function_usage_here__() : safe_strcpy_w((d),(s),sizeof(wpstring)))
-#define wpstrcat(d,s) ((sizeof(d) != sizeof(wpstring) && sizeof(d) != sizeof(smb_ucs2_t *)) ? __unsafe_string_function_usage_here__() : safe_strcat_w((d),(s),sizeof(wpstring)))
-#define wfstrcpy(d,s) ((sizeof(d) != sizeof(wfstring) && sizeof(d) != sizeof(smb_ucs2_t *)) ? __unsafe_string_function_usage_here__() : safe_strcpy_w((d),(s),sizeof(wfstring)))
-#define wfstrcat(d,s) ((sizeof(d) != sizeof(wfstring) && sizeof(d) != sizeof(smb_ucs2_t *)) ? __unsafe_string_function_usage_here__() : safe_strcat_w((d),(s),sizeof(wfstring)))
+#define push_pstring_base(dest, src, pstring_base) \
+    (CHECK_STRING_SIZE(pstring_base, sizeof(pstring)) \
+    ? __unsafe_string_function_usage_here2__() \
+    : push_ascii(dest, src, sizeof(pstring)-PTR_DIFF(dest,pstring_base)-1, STR_TERMINATE))
 
-#else
-
-#define pstrcpy(d,s) safe_strcpy((d), (s),sizeof(pstring)-1)
-#define pstrcat(d,s) safe_strcat((d), (s),sizeof(pstring)-1)
-#define fstrcpy(d,s) safe_strcpy((d),(s),sizeof(fstring)-1)
-#define fstrcat(d,s) safe_strcat((d),(s),sizeof(fstring)-1)
+#else /* HAVE_COMPILER_WILL_OPTIMIZE_OUT_FNS */
 
 #define fstrterminate(d) (((d)[sizeof(fstring)-1]) = '\0')
 #define pstrterminate(d) (((d)[sizeof(pstring)-1]) = '\0')
@@ -80,12 +96,10 @@ char * __unsafe_string_function_usage_here__(void);
 #define wfstrcpy(d,s) safe_strcpy_w((d),(s),sizeof(wfstring))
 #define wfstrcat(d,s) safe_strcat_w((d),(s),sizeof(wfstring))
 
-#endif
+#define push_pstring_base(dest, src, pstring_base) \
+    push_ascii(dest, src, sizeof(pstring)-PTR_DIFF(dest,pstring_base)-1, STR_TERMINATE)
 
-/* replace some string functions with multi-byte
-   versions */
-#define strlower(s) strlower_m(s)
-#define strupper(s) strupper_m(s)
+#endif /* HAVE_COMPILER_WILL_OPTIMIZE_OUT_FNS */
 
 /* the addition of the DEVELOPER checks in safe_strcpy means we must
  * update a lot of code. To make this a little easier here are some
@@ -93,7 +107,106 @@ char * __unsafe_string_function_usage_here__(void);
 #define pstrcpy_base(dest, src, pstring_base) \
     safe_strcpy(dest, src, sizeof(pstring)-PTR_DIFF(dest,pstring_base)-1)
 
-#define push_pstring_base(dest, src, pstring_base) \
-    push_ascii(dest, src, sizeof(pstring)-PTR_DIFF(dest,pstring_base)-1, STR_TERMINATE)
+
+/* String copy functions - macro hell below adds 'type checking' (limited, but the best we can
+   do in C) and may tag with function name/number to record the last 'clobber region' on
+   that string */
+
+#define pstrcpy(d,s) safe_strcpy((d), (s),sizeof(pstring)-1)
+#define pstrcat(d,s) safe_strcat((d), (s),sizeof(pstring)-1)
+#define fstrcpy(d,s) safe_strcpy((d),(s),sizeof(fstring)-1)
+#define fstrcat(d,s) safe_strcat((d),(s),sizeof(fstring)-1)
+
+/* the addition of the DEVELOPER checks in safe_strcpy means we must
+ * update a lot of code. To make this a little easier here are some
+ * functions that provide the lengths with less pain */
+#define pstrcpy_base(dest, src, pstring_base) \
+    safe_strcpy(dest, src, sizeof(pstring)-PTR_DIFF(dest,pstring_base)-1)
+
+
+/* inside the _fn varients of these is a call to 'clobber_region' - which might
+   destory the stack on a buggy function.  Help the debugging process by putting
+   the function and line it was last called from into a static buffer
+
+   But only for developers */
+
+#ifdef DEVELOPER
+#define overmalloc_safe_strcpy(dest,src,maxlength)	safe_strcpy_fn(__FUNCTION__,__LINE__,dest,src,maxlength)
+#define safe_strcpy(dest,src,maxlength)	safe_strcpy_fn2(__FUNCTION__,__LINE__,dest,src,maxlength)
+#define safe_strcat(dest,src,maxlength)	safe_strcat_fn2(__FUNCTION__,__LINE__,dest,src,maxlength)
+#define push_string(base_ptr, dest, src, dest_len, flags) push_string_fn2(__FUNCTION__, __LINE__, base_ptr, dest, src, dest_len, flags)
+#define pull_string(base_ptr, dest, src, dest_len, src_len, flags) pull_string_fn2(__FUNCTION__, __LINE__, base_ptr, dest, src, dest_len, src_len, flags)
+#define clistr_push(cli, dest, src, dest_len, flags) clistr_push_fn2(__FUNCTION__, __LINE__, cli, dest, src, dest_len, flags)
+#define clistr_pull(cli, dest, src, dest_len, src_len, flags) clistr_pull_fn2(__FUNCTION__, __LINE__, cli, dest, src, dest_len, src_len, flags)
+
+#define alpha_strcpy(dest,src,other_safe_chars,maxlength) alpha_strcpy_fn(__FUNCTION__,__LINE__,dest,src,other_safe_chars,maxlength)
+#define StrnCpy(dest,src,n)		StrnCpy_fn(__FUNCTION__,__LINE__,dest,src,n)
+
+#else
+
+#define overmalloc_safe_strcpy(dest,src,maxlength)	safe_strcpy_fn(NULL,0,dest,src,maxlength)
+#define safe_strcpy(dest,src,maxlength)	safe_strcpy_fn2(NULL,0,dest,src,maxlength)
+#define safe_strcat(dest,src,maxlength)	safe_strcat_fn2(NULL,0,dest,src,maxlength)
+#define push_string(base_ptr, dest, src, dest_len, flags) push_string_fn2(NULL, 0, base_ptr, dest, src, dest_len, flags)
+#define pull_string(base_ptr, dest, src, dest_len, src_len, flags) pull_string_fn2(NULL, 0, base_ptr, dest, src, dest_len, src_len, flags)
+#define clistr_push(cli, dest, src, dest_len, flags) clistr_push_fn2(NULL, 0, cli, dest, src, dest_len, flags)
+#define clistr_pull(cli, dest, src, dest_len, src_len, flags) clistr_push_fn2(NULL, 0, cli, dest, src, dest_len, src_len, flags)
+
+#define alpha_strcpy(dest,src,other_safe_chars,maxlength) alpha_strcpy_fn(NULL,0,dest,src,other_safe_chars,maxlength)
+#define StrnCpy(dest,src,n)		StrnCpy_fn(NULL,0,dest,src,n)
+#endif /* DEVELOPER */
+
+
+#ifdef HAVE_COMPILER_WILL_OPTIMIZE_OUT_FNS
+
+/* if the compiler will optimize out function calls, then use this to tell if we are 
+   have the correct types (this works only where sizeof() returns the size of the buffer, not
+   the size of the pointer). */
+
+#define safe_strcpy_fn2(fn_name, fn_line, d, s, max_len) \
+    (CHECK_STRING_SIZE(d, max_len+1) \
+    ? __unsafe_string_function_usage_here__() \
+    : safe_strcpy_fn(fn_name, fn_line, (d), (s), (max_len)))
+
+#define safe_strcat_fn2(fn_name, fn_line, d, s, max_len) \
+    (CHECK_STRING_SIZE(d, max_len+1) \
+    ? __unsafe_string_function_usage_here__() \
+    : safe_strcat_fn(fn_name, fn_line, (d), (s), (max_len)))
+
+#define push_string_fn2(fn_name, fn_line, base_ptr, dest, src, dest_len, flags) \
+    (CHECK_STRING_SIZE(dest, dest_len) \
+    ? __unsafe_string_function_usage_here2__() \
+    : push_string_fn(fn_name, fn_line, base_ptr, dest, src, dest_len, flags))
+
+#define pull_string_fn2(fn_name, fn_line, base_ptr, dest, src, dest_len, src_len, flags) \
+    (CHECK_STRING_SIZE(dest, dest_len) \
+    ? __unsafe_string_function_usage_here2__() \
+    : pull_string_fn(fn_name, fn_line, base_ptr, dest, src, dest_len, src_len, flags))
+
+#define clistr_push_fn2(fn_name, fn_line, cli, dest, src, dest_len, flags) \
+    (CHECK_STRING_SIZE(dest, dest_len) \
+    ? __unsafe_string_function_usage_here2__() \
+    : clistr_push_fn(fn_name, fn_line, cli, dest, src, dest_len, flags))
+
+#define clistr_pull_fn2(fn_name, fn_line, cli, dest, src, dest_len, srclen, flags) \
+    (CHECK_STRING_SIZE(dest, dest_len) \
+    ? __unsafe_string_function_usage_here2__() \
+    : clistr_pull_fn(fn_name, fn_line, cli, dest, src, dest_len, srclen, flags))
+
+#else
+
+#define safe_strcpy_fn2 safe_strcpy_fn
+#define safe_strcat_fn2 safe_strcat_fn
+#define push_string_fn2 push_string_fn
+#define pull_string_fn2 pull_string_fn
+#define clistr_push_fn2 clistr_push_fn2
+#define clistr_pull_fn2 clistr_pull_fn2
+
+#endif
+
+/* replace some string functions with multi-byte
+   versions */
+#define strlower(s) strlower_m(s)
+#define strupper(s) strupper_m(s)
 
 #endif
diff --git a/source3/include/srvstr.h b/source3/include/srvstr.h
new file mode 100644
index 0000000000..a433e0e3f9
--- /dev/null
+++ b/source3/include/srvstr.h
@@ -0,0 +1,36 @@
+/* 
+   Unix SMB/CIFS implementation.
+   server specific string routines
+   Copyright (C) Andrew Tridgell 2001
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "includes.h"
+
+#define srvstr_push(base_ptr, dest, src, dest_len, flags) \
+    push_string(base_ptr, dest, src, dest_len, flags)
+
+#define srvstr_pull(base_ptr, dest, src, dest_len, src_len, flags) \
+    pull_string(base_ptr, dest, src, dest_len, src_len, flags)
+
+/* pull a string from the smb_buf part of a packet. In this case the
+   string can either be null terminated or it can be terminated by the
+   end of the smbbuf area 
+*/
+
+#define srvstr_pull_buf(inbuf, dest, src, dest_len, flags) \
+    pull_string(inbuf, dest, src, dest_len, smb_bufrem(inbuf, src), flags)
+
diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c
index a8df003f8b..76d77ddd67 100644
--- a/source3/lib/charcnv.c
+++ b/source3/lib/charcnv.c
@@ -186,7 +186,7 @@ size_t convert_string(charset_t from, charset_t to,
  * @returns Size in bytes of the converted string; or -1 in case of error.
  **/
 
-size_t convert_string_allocate(charset_t from, charset_t to,
+static size_t convert_string_allocate(charset_t from, charset_t to,
 		      		void const *src, size_t srclen, void **dest)
 {
 	size_t i_len, o_len, destlen;
@@ -265,7 +265,7 @@ convert:
  *
  * @returns Size in bytes of the converted string; or -1 in case of error.
  **/
-size_t convert_string_talloc(TALLOC_CTX *ctx, charset_t from, charset_t to,
+static size_t convert_string_talloc(TALLOC_CTX *ctx, charset_t from, charset_t to,
 		      		void const *src, size_t srclen, void **dest)
 {
 	void *alloced_string;
@@ -303,7 +303,7 @@ size_t unix_strlower(const char *src, size_t srclen, char *dest, size_t destlen)
 }
 
 
-size_t ucs2_align(const void *base_ptr, const void *p, int flags)
+static size_t ucs2_align(const void *base_ptr, const void *p, int flags)
 {
 	if (flags & (STR_NOALIGN|STR_ASCII))
 		return 0;
@@ -356,11 +356,6 @@ size_t push_ascii_pstring(void *dest, const char *src)
 	return push_ascii(dest, src, sizeof(pstring), STR_TERMINATE);
 }
 
-size_t push_pstring(void *dest, const char *src)
-{
-	return push_ascii(dest, src, sizeof(pstring), STR_TERMINATE);
-}
-
 /**
  * Copy a string from a dos codepage source to a unix char* destination.
  *
@@ -507,7 +502,7 @@ size_t push_ucs2_allocate(smb_ucs2_t **dest, const char *src)
  is -1 then no maxiumum is used.
 **/
 
-size_t push_utf8(void *dest, const char *src, size_t dest_len, int flags)
+static size_t push_utf8(void *dest, const char *src, size_t dest_len, int flags)
 {
 	size_t src_len = strlen(src);
 	pstring tmpbuf;
@@ -533,11 +528,6 @@ size_t push_utf8_fstring(void *dest, const char *src)
 	return push_utf8(dest, src, sizeof(fstring), STR_TERMINATE);
 }
 
-size_t push_utf8_pstring(void *dest, const char *src)
-{
-	return push_utf8(dest, src, sizeof(pstring), STR_TERMINATE);
-}
-
 /**
  * Copy a string from a unix char* src to a UTF-8 destination, allocating a buffer using talloc
  *
@@ -666,7 +656,7 @@ size_t pull_ucs2_allocate(void **dest, const smb_ucs2_t *src)
  The resulting string in "dest" is always null terminated.
 **/
 
-size_t pull_utf8(char *dest, const void *src, size_t dest_len, size_t src_len, int flags)
+static size_t pull_utf8(char *dest, const void *src, size_t dest_len, size_t src_len, int flags)
 {
 	size_t ret;
 
@@ -690,16 +680,7 @@ size_t pull_utf8(char *dest, const void *src, size_t dest_len, size_t src_len, i
 
 	return src_len;
 }
-
-size_t pull_utf8_pstring(char *dest, const void *src)
-{
-	return pull_utf8(dest, src, sizeof(pstring), -1, STR_TERMINATE);
-}
-
-size_t pull_utf8_fstring(char *dest, const void *src)
-{
-	return pull_utf8(dest, src, sizeof(fstring), -1, STR_TERMINATE);
-}
+#endif
 
 /**
  * Copy a string from a UTF-8 src to a unix char * destination, allocating a buffer using talloc
@@ -745,8 +726,11 @@ size_t pull_utf8_allocate(void **dest, const char *src)
  is -1 then no maxiumum is used.
 **/
 
-size_t push_string(const void *base_ptr, void *dest, const char *src, size_t dest_len, int flags)
+size_t push_string_fn(const char *function, unsigned int line, const void *base_ptr, void *dest, const char *src, size_t dest_len, int flags)
 {
+	if (dest_len != (size_t)-1)
+		clobber_region(function, line, dest, dest_len);
+
 	if (!(flags & STR_ASCII) && \
 	    ((flags & STR_UNICODE || \
 	      (SVAL(base_ptr, smb_flg2) & FLAGS2_UNICODE_STRINGS)))) {
@@ -770,8 +754,11 @@ size_t push_string(const void *base_ptr, void *dest, const char *src, size_t des
  The resulting string in "dest" is always null terminated.
 **/
 
-size_t pull_string(const void *base_ptr, char *dest, const void *src, size_t dest_len, size_t src_len, int flags)
+size_t pull_string_fn(const char *function, unsigned int line, const void *base_ptr, char *dest, const void *src, size_t dest_len, size_t src_len, int flags)
 {
+	if (dest_len != (size_t)-1)
+		clobber_region(function, line, dest, dest_len);
+
 	if (!(flags & STR_ASCII) && \
 	    ((flags & STR_UNICODE || \
 	      (SVAL(base_ptr, smb_flg2) & FLAGS2_UNICODE_STRINGS)))) {
@@ -790,27 +777,6 @@ size_t align_string(const void *base_ptr, const char *p, int flags)
 	return 0;
 }
 
-/**
- Convert from ucs2 to unix charset and return the
- allocated and converted string or NULL if an error occurred.
- You must provide a zero terminated string.
- The returning string will be zero terminated.
-**/
-
-char *acnv_u2ux(const smb_ucs2_t *src)
-{
-	size_t slen;
-	size_t dlen;
-	void *dest;
-	
-	slen = (strlen_w(src) + 1) * sizeof(smb_ucs2_t);
-	dlen = convert_string_allocate(CH_UCS2, CH_UNIX, src, slen, &dest);
-	if (dlen == (size_t)-1)
-		return NULL;
-	else
-		return dest;
-}
-
 /**
  Convert from unix to ucs2 charset and return the
  allocated and converted string or NULL if an error occurred.
@@ -832,27 +798,6 @@ smb_ucs2_t *acnv_uxu2(const char *src)
 		return dest;
 }
 
-/**
- Convert from ucs2 to dos charset and return the
- allocated and converted string or NULL if an error occurred.
- You must provide a zero terminated string.
- The returning string will be zero terminated.
-**/
-
-char *acnv_u2dos(const smb_ucs2_t *src)
-{
-	size_t slen;
-	size_t dlen;
-	void *dest;
-	
-	slen = (strlen_w(src) + 1) * sizeof(smb_ucs2_t);
-	dlen = convert_string_allocate(CH_UCS2, CH_DOS, src, slen, &dest);
-	if (dlen == (size_t)-1)
-		return NULL;
-	else
-		return dest;
-}
-
 /**
  Convert from dos to ucs2 charset and return the
  allocated and converted string or NULL if an error occurred.
diff --git a/source3/lib/util.c b/source3/lib/util.c
index 77ffa70a47..1f300a2815 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -1398,9 +1398,23 @@ gid_t nametogid(const char *name)
 
 void smb_panic(const char *why)
 {
-	char *cmd = lp_panic_action();
+	char *cmd;
 	int result;
 
+#ifdef DEVELOPER
+	{
+		extern char *global_clobber_region_function;
+		extern unsigned int global_clobber_region_line;
+		
+		if (global_clobber_region_function) {
+			DEBUG(0,("smb_panic: clobber_region() last called from [%s(%u)]\n",
+				 global_clobber_region_function,
+				 global_clobber_region_line));
+		} 
+	}
+#endif
+	
+	cmd = lp_panic_action();
 	if (cmd && *cmd) {
 		DEBUG(0, ("smb_panic(): calling panic action [%s]\n", cmd));
 		result = system(cmd);
diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c
index 7dd5ee4242..7643c2807e 100644
--- a/source3/lib/util_str.c
+++ b/source3/lib/util_str.c
@@ -21,6 +21,11 @@
 
 #include "includes.h"
 
+#ifdef DEVELOPER
+const char *global_clobber_region_function;
+unsigned int global_clobber_region_line;
+#endif
+
 /**
  * Get the next token from a string, return False if none found.
  * Handles double-quotes.
@@ -73,7 +78,7 @@ parameter so you can pass NULL. This is useful for user interface code
 but beware the fact that it is not re-entrant!
 **/
 
-static char *last_ptr=NULL;
+static const char *last_ptr=NULL;
 
 BOOL next_token_nr(const char **ptr,char *buff, const char *sep, size_t bufsize)
 {
@@ -409,28 +414,6 @@ size_t count_chars(const char *s,char c)
 	return(count);
 }
 
-/**
-Return True if a string consists only of one particular character.
-**/
-
-BOOL str_is_all(const char *s,char c)
-{
-	smb_ucs2_t *ptr;
-
-	if(s == NULL)
-		return False;
-	if(!*s)
-		return False;
-  
-	push_ucs2(NULL, tmpbuf,s, sizeof(tmpbuf), STR_TERMINATE);
-	for(ptr=tmpbuf;*ptr;ptr++)
-		if(*ptr!=UCS2_CHAR(c))
-			return False;
-
-	return True;
-}
-
-
 /**
  * In developer builds, clobber a region of memory.
  *
@@ -442,11 +425,13 @@ BOOL str_is_all(const char *s,char c)
  * This is meant to catch possible string overflows, even if the
  * actual string copied is not big enough to cause an overflow.
  **/
-void clobber_region(char *dest, size_t len)
+void clobber_region(const char *fn, unsigned int line, char *dest, size_t len)
 {
 #ifdef DEVELOPER
 	/* F1 is odd and 0xf1f1f1f1 shouldn't be a valid pointer */
 	memset(dest, 0xF1, len);
+	global_clobber_region_function = fn;
+	global_clobber_region_line = line;
 #endif
 }
 
@@ -456,7 +441,7 @@ void clobber_region(char *dest, size_t len)
  include the terminating zero.
 **/
 
-char *safe_strcpy(char *dest,const char *src, size_t maxlength)
+char *safe_strcpy_fn(const char *fn, int line, char *dest,const char *src, size_t maxlength)
 {
 	size_t len;
 
@@ -465,7 +450,7 @@ char *safe_strcpy(char *dest,const char *src, size_t maxlength)
 		return NULL;
 	}
 
-	clobber_region(dest, maxlength+1);
+	clobber_region(fn,line,dest, maxlength+1);
 
 	if (!src) {
 		*dest = 0;
@@ -489,8 +474,7 @@ char *safe_strcpy(char *dest,const char *src, size_t maxlength)
  Safe string cat into a string. maxlength does not
  include the terminating zero.
 **/
-
-char *safe_strcat(char *dest, const char *src, size_t maxlength)
+char *safe_strcat_fn(const char *fn, int line, char *dest, const char *src, size_t maxlength)
 {
 	size_t src_len, dest_len;
 
@@ -505,8 +489,8 @@ char *safe_strcat(char *dest, const char *src, size_t maxlength)
 	src_len = strlen(src);
 	dest_len = strlen(dest);
 
-	clobber_region(dest + dest_len, maxlength + 1 - dest_len);
-	
+	clobber_region(fn, line, dest + dest_len, maxlength + 1 - dest_len);
+
 	if (src_len + dest_len > maxlength) {
 		DEBUG(0,("ERROR: string overflow by %d in safe_strcat [%.50s]\n",
 			 (int)(src_len + dest_len - maxlength), src));
@@ -528,12 +512,11 @@ char *safe_strcat(char *dest, const char *src, size_t maxlength)
  and replaces with '_'. Deliberately does *NOT* check for multibyte
  characters. Don't change it !
 **/
-
-char *alpha_strcpy(char *dest, const char *src, const char *other_safe_chars, size_t maxlength)
+char *alpha_strcpy_fn(const char *fn, int line, char *dest, const char *src, const char *other_safe_chars, size_t maxlength)
 {
 	size_t len, i;
 
-	clobber_region(dest, maxlength);
+	clobber_region(fn, line, dest, maxlength);
 
 	if (!dest) {
 		DEBUG(0,("ERROR: NULL dest in alpha_strcpy\n"));
@@ -569,13 +552,12 @@ char *alpha_strcpy(char *dest, const char *src, const char *other_safe_chars, si
  Like strncpy but always null terminates. Make sure there is room!
  The variable n should always be one less than the available size.
 **/
-
-char *StrnCpy(char *dest,const char *src,size_t n)
+char *StrnCpy_fn(const char *fn, int line,char *dest,const char *src,size_t n)
 {
 	char *d = dest;
 
-	clobber_region(dest, n+1);
-	
+	clobber_region(fn, line, dest, n+1);
+
 	if (!dest)
 		return(NULL);
 	
@@ -589,12 +571,13 @@ char *StrnCpy(char *dest,const char *src,size_t n)
 	return(dest);
 }
 
+#if 0
 /**
  Like strncpy but copies up to the character marker.  always null terminates.
  returns a pointer to the character marker in the source string (src).
 **/
 
-char *strncpyn(char *dest, const char *src, size_t n, char c)
+static char *strncpyn(char *dest, const char *src, size_t n, char c)
 {
 	char *p;
 	size_t str_len;
@@ -613,6 +596,7 @@ char *strncpyn(char *dest, const char *src, size_t n, char c)
 
 	return p;
 }
+#endif
 
 /**
  Routine to get hex characters and turn them into a 16 byte array.
@@ -923,7 +907,7 @@ void all_string_sub(char *s,const char *pattern,const char *insert, size_t len)
  Use with caution!
 **/
 
-smb_ucs2_t *all_string_sub_w(const smb_ucs2_t *s, const smb_ucs2_t *pattern,
+static smb_ucs2_t *all_string_sub_w(const smb_ucs2_t *s, const smb_ucs2_t *pattern,
 				const smb_ucs2_t *insert)
 {
 	smb_ucs2_t *r, *rp;
@@ -981,11 +965,12 @@ smb_ucs2_t *all_string_sub_wa(smb_ucs2_t *s, const char *pattern,
 	return all_string_sub_w(s, p, i);
 }
 
+#if 0
 /**
  Splits out the front and back at a separator.
 **/
 
-void split_at_last_component(char *path, char *front, char sep, char *back)
+static void split_at_last_component(char *path, char *front, char sep, char *back)
 {
 	char *p = strrchr_m(path, sep);
 
@@ -1004,6 +989,7 @@ void split_at_last_component(char *path, char *front, char sep, char *back)
 			back[0] = 0;
 	}
 }
+#endif
 
 /**
  Write an octal as a string.
@@ -1023,7 +1009,7 @@ const char *octal_string(int i)
  Truncate a string at a specified length.
 **/
 
-char *string_truncate(char *s, int length)
+char *string_truncate(char *s, unsigned int length)
 {
 	if (s && strlen(s) > length)
 		s[length] = 0;
@@ -1182,11 +1168,12 @@ char *binary_string(char *buf, int len)
 	return ret;
 }
 
+#if 0
 /**
  Just a typesafety wrapper for snprintf into a fstring.
 **/
 
- int fstr_sprintf(fstring s, const char *fmt, ...)
+static int fstr_sprintf(fstring s, const char *fmt, ...)
 {
 	va_list ap;
 	int ret;
@@ -1196,6 +1183,7 @@ char *binary_string(char *buf, int len)
 	va_end(ap);
 	return ret;
 }
+#endif
 
 #ifndef HAVE_STRNDUP
 /**
diff --git a/source3/libsmb/clistr.c b/source3/libsmb/clistr.c
index 3c9964368e..97a3fa6cc9 100644
--- a/source3/libsmb/clistr.c
+++ b/source3/libsmb/clistr.c
@@ -20,24 +20,38 @@
 
 #include "includes.h"
 
-int clistr_push(struct cli_state *cli, void *dest, const char *src, int dest_len, int flags)
+size_t clistr_push_fn(const char *function, unsigned int line, 
+		   struct cli_state *cli, void *dest, 
+		   const char *src, int dest_len, int flags)
 {
-	return push_string(cli->outbuf, dest, src, dest_len, flags);
+	size_t buf_used = PTR_DIFF(dest, cli->outbuf);
+	if (dest_len == -1) {
+		if (((ptrdiff_t)dest < (ptrdiff_t)cli->outbuf) || (buf_used > cli->bufsize)) {
+			DEBUG(0, ("Pushing string of 'unlimited' length into non-SMB buffer!\n"));
+			return push_string_fn(function, line, cli->outbuf, dest, src, -1, flags);
+		}
+		return push_string_fn(function, line, cli->outbuf, dest, src, cli->bufsize - buf_used, flags);
+	}
+	
+	/* 'normal' push into size-specified buffer */
+	return push_string_fn(function, line, cli->outbuf, dest, src, dest_len, flags);
 }
 
-int clistr_pull(struct cli_state *cli, char *dest, const void *src, int dest_len, int src_len, 
-		int flags)
+size_t clistr_pull_fn(const char *function, unsigned int line, 
+		   struct cli_state *cli, char *dest, const void *src, 
+		   int dest_len, int src_len, 
+		   int flags)
 {
-	return pull_string(cli->inbuf, dest, src, dest_len, src_len, flags);
+	return pull_string_fn(function, line, cli->inbuf, dest, src, dest_len, src_len, flags);
 }
 
 
-int clistr_align_out(struct cli_state *cli, const void *p, int flags)
+size_t clistr_align_out(struct cli_state *cli, const void *p, int flags)
 {
 	return align_string(cli->outbuf, p, flags);
 }
 
-int clistr_align_in(struct cli_state *cli, const void *p, int flags)
+size_t clistr_align_in(struct cli_state *cli, const void *p, int flags)
 {
 	return align_string(cli->inbuf, p, flags);
 }
diff --git a/source3/nmbd/nmbd_become_lmb.c b/source3/nmbd/nmbd_become_lmb.c
index 829496c195..6f8e7efb1a 100644
--- a/source3/nmbd/nmbd_become_lmb.c
+++ b/source3/nmbd/nmbd_become_lmb.c
@@ -563,7 +563,7 @@ in workgroup %s on subnet %s\n",
   userdata->copy_fn = NULL;
   userdata->free_fn = NULL;
   userdata->userdata_len = strlen(work->work_group)+1;
-  safe_strcpy(userdata->data, work->work_group, size - sizeof(*userdata) - 1);
+  overmalloc_safe_strcpy(userdata->data, work->work_group, size - sizeof(*userdata) - 1);
 
   /* Register the special browser group name. */
   register_name(subrec, MSBROWSE, 0x01, samba_nb_type|NB_GROUP,
diff --git a/source3/nmbd/nmbd_browsesync.c b/source3/nmbd/nmbd_browsesync.c
index 5914ea9637..b9082ee1c3 100644
--- a/source3/nmbd/nmbd_browsesync.c
+++ b/source3/nmbd/nmbd_browsesync.c
@@ -333,7 +333,7 @@ static void find_domain_master_name_query_success(struct subnet_record *subrec,
   userdata->copy_fn = NULL;
   userdata->free_fn = NULL;
   userdata->userdata_len = strlen(work->work_group)+1;
-  safe_strcpy(userdata->data, work->work_group, size - sizeof(*userdata) - 1);
+  overmalloc_safe_strcpy(userdata->data, work->work_group, size - sizeof(*userdata) - 1);
 
   node_status( subrec, &nmbname, answer_ip, 
                domain_master_node_status_success,
diff --git a/source3/smbd/srvstr.c b/source3/smbd/srvstr.c
deleted file mode 100644
index 36fecf5bd2..0000000000
--- a/source3/smbd/srvstr.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-   server specific string routines
-   Copyright (C) Andrew Tridgell 2001
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include "includes.h"
-
-int srvstr_push(void *base_ptr, void *dest, const char *src, int dest_len, int flags)
-{
-	return push_string(base_ptr, dest, src, dest_len, flags);
-}
-
-int srvstr_pull(void *base_ptr, char *dest, const void *src, int dest_len, int src_len, 
-		int flags)
-{
-	return pull_string(base_ptr, dest, src, dest_len, src_len, flags);
-}
-
-/* pull a string from the smb_buf part of a packet. In this case the
-   string can either be null terminated or it can be terminated by the
-   end of the smbbuf area 
-*/
-int srvstr_pull_buf(void *inbuf, char *dest, const void *src, int dest_len, int flags)
-{
-	return pull_string(inbuf, dest, src, dest_len, smb_bufrem(inbuf, src), flags);
-}
diff --git a/source3/smbd/statcache.c b/source3/smbd/statcache.c
index b6e84ec9a5..ac4ffcf575 100644
--- a/source3/smbd/statcache.c
+++ b/source3/smbd/statcache.c
@@ -62,7 +62,7 @@ void stat_cache_add( char *full_orig_name, char *orig_translated_path)
     return;
 
   /*
-   * If we are in case insentive mode, we need to
+   * If we are in case insentive mode, we don't need to
    * store names that need no translation - else, it
    * would be a waste.
    */
@@ -106,8 +106,8 @@ void stat_cache_add( char *full_orig_name, char *orig_translated_path)
         DEBUG(0,("stat_cache_add: Out of memory !\n"));
         return;
       }
-      safe_strcpy(scp->names, orig_name, namelen);
-      safe_strcpy((scp->names+namelen+1), translated_path, namelen);
+      overmalloc_safe_strcpy(scp->names, orig_name, namelen);
+      overmalloc_safe_strcpy((scp->names+namelen+1), translated_path, namelen);
       scp->name_len = namelen;
       hash_insert(&stat_cache, (char *)scp, orig_name);
     }
@@ -122,8 +122,8 @@ void stat_cache_add( char *full_orig_name, char *orig_translated_path)
       DEBUG(0,("stat_cache_add: Out of memory !\n"));
       return;
     }
-    safe_strcpy(scp->names, orig_name, namelen);
-    safe_strcpy(scp->names+namelen+1, translated_path, namelen);
+    overmalloc_safe_strcpy(scp->names, orig_name, namelen);
+    overmalloc_safe_strcpy(scp->names+namelen+1, translated_path, namelen);
     scp->name_len = namelen;
     hash_insert(&stat_cache, (char *)scp, orig_name);
   }
@@ -136,7 +136,7 @@ void stat_cache_add( char *full_orig_name, char *orig_translated_path)
  Return True if we translated (and did a scuccessful stat on) the entire name.
 *****************************************************************************/
 
-BOOL stat_cache_lookup(connection_struct *conn, char *name, char *dirpath, 
+BOOL stat_cache_lookup(connection_struct *conn, pstring name, pstring dirpath, 
 		       char **start, SMB_STRUCT_STAT *pst)
 {
   stat_cache_entry *scp;
-- 
cgit 


From d8549b0360b86f151a8cd221838d005e083bfba8 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 15 Mar 2003 07:16:32 +0000
Subject: signed/unsigned fix (This used to be commit
 f6bcfa59447700e0ccfc069d0228019a9bdca9d2)

---
 source3/include/client.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3')

diff --git a/source3/include/client.h b/source3/include/client.h
index a3efda4918..0ea793de68 100644
--- a/source3/include/client.h
+++ b/source3/include/client.h
@@ -110,8 +110,8 @@ struct cli_state {
 	int readbraw_supported;
 	int writebraw_supported;
 	int timeout; /* in milliseconds. */
-	int max_xmit;
-	int max_mux;
+	size_t max_xmit;
+	size_t max_mux;
 	char *outbuf;
 	char *inbuf;
 	unsigned int bufsize;
-- 
cgit 


From a27d434c4b4363762e7a0d5eeddd35e2b8dbb374 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 15 Mar 2003 07:45:51 +0000
Subject: Fix signed/unsigned issues - mostly 'i' counters.

Fix an inconpatible poitner type that caused the IA64 not to build

Andrew Bartlett
(This used to be commit 37436b0aae108fceace3049d3868510e1ba592ac)
---
 source3/rpc_parse/parse_lsa.c  | 14 +++++++-------
 source3/rpc_parse/parse_misc.c | 10 +++++-----
 source3/rpc_parse/parse_net.c  | 22 +++++++++++-----------
 source3/rpc_parse/parse_prs.c  |  4 ++--
 source3/rpc_parse/parse_sec.c  | 16 ++++++++--------
 source3/rpc_parse/parse_srv.c  | 20 ++++++++++----------
 source3/utils/net_ads_cldap.c  |  8 ++++----
 7 files changed, 47 insertions(+), 47 deletions(-)

(limited to 'source3')

diff --git a/source3/rpc_parse/parse_lsa.c b/source3/rpc_parse/parse_lsa.c
index 2753ae524a..fc9999dc4d 100644
--- a/source3/rpc_parse/parse_lsa.c
+++ b/source3/rpc_parse/parse_lsa.c
@@ -80,7 +80,7 @@ static BOOL lsa_io_trans_name(const char *desc, LSA_TRANS_NAME *trn, prs_struct
 static BOOL lsa_io_dom_r_ref(const char *desc, DOM_R_REF *r_r, prs_struct *ps, 
 			     int depth)
 {
-	int i;
+	unsigned int i;
 
 	prs_debug(ps, depth, desc, "lsa_io_dom_r_ref");
 	depth++;
@@ -531,7 +531,7 @@ BOOL lsa_io_q_enum_trust_dom(const char *desc, LSA_Q_ENUM_TRUST_DOM *q_e,
 void init_r_enum_trust_dom(TALLOC_CTX *ctx, LSA_R_ENUM_TRUST_DOM *r_e, uint32 enum_context,
 			   uint32 req_num_domains, uint32 num_domains, TRUSTDOM **td)
 {
-	int i;
+	unsigned int i;
 
         DEBUG(5, ("init_r_enum_trust_dom\n"));
 	
@@ -851,7 +851,7 @@ static void init_lsa_sid_enum(TALLOC_CTX *mem_ctx, LSA_SID_ENUM *sen,
 static BOOL lsa_io_sid_enum(const char *desc, LSA_SID_ENUM *sen, prs_struct *ps, 
 			    int depth)
 {
-	int i;
+	unsigned int i;
 
 	prs_debug(ps, depth, desc, "lsa_io_sid_enum");
 	depth++;
@@ -967,7 +967,7 @@ BOOL lsa_io_q_lookup_sids(const char *desc, LSA_Q_LOOKUP_SIDS *q_s, prs_struct *
 static BOOL lsa_io_trans_names(const char *desc, LSA_TRANS_NAME_ENUM *trn,
                 prs_struct *ps, int depth)
 {
-	int i;
+	unsigned int i;
 
 	prs_debug(ps, depth, desc, "lsa_io_trans_names");
 	depth++;
@@ -1063,7 +1063,7 @@ makes a structure.
 void init_q_lookup_names(TALLOC_CTX *mem_ctx, LSA_Q_LOOKUP_NAMES *q_l, 
 			 POLICY_HND *hnd, int num_names, const char **names)
 {
-	int i;
+	unsigned int i;
 
 	DEBUG(5, ("init_q_lookup_names\n"));
 
@@ -1102,7 +1102,7 @@ reads or writes a structure.
 BOOL lsa_io_q_lookup_names(const char *desc, LSA_Q_LOOKUP_NAMES *q_r, 
 			   prs_struct *ps, int depth)
 {
-	int i;
+	unsigned int i;
 
 	prs_debug(ps, depth, desc, "lsa_io_q_lookup_names");
 	depth++;
@@ -1166,7 +1166,7 @@ reads or writes a structure.
 BOOL lsa_io_r_lookup_names(const char *desc, LSA_R_LOOKUP_NAMES *r_r, 
 			   prs_struct *ps, int depth)
 {
-	int i;
+	unsigned int i;
 
 	prs_debug(ps, depth, desc, "lsa_io_r_lookup_names");
 	depth++;
diff --git a/source3/rpc_parse/parse_misc.c b/source3/rpc_parse/parse_misc.c
index df80c76ee5..b7b0e9346b 100644
--- a/source3/rpc_parse/parse_misc.c
+++ b/source3/rpc_parse/parse_misc.c
@@ -697,7 +697,7 @@ BOOL smb_io_buffer5(const char *desc, BUFFER5 *buf5, prs_struct *ps, int depth)
  Inits a BUFFER2 structure.
 ********************************************************************/
 
-void init_buffer2(BUFFER2 *str, const uint8 *buf, int len)
+void init_buffer2(BUFFER2 *str, const uint8 *buf, size_t len)
 {
 	ZERO_STRUCTP(str);
 
@@ -1050,7 +1050,7 @@ BOOL smb_io_unistr2(const char *desc, UNISTR2 *uni2, uint32 buffer, prs_struct *
 BOOL init_unistr2_array(UNISTR2_ARRAY *array, 
 		       uint32 count, const char **strings)
 {
-	int i;
+	unsigned int i;
 
 	array->count = count;
 	array->ref_id = count?1:0;
@@ -1078,7 +1078,7 @@ BOOL init_unistr2_array(UNISTR2_ARRAY *array,
 ********************************************************************/
 BOOL smb_io_unistr2_array(const char *desc, UNISTR2_ARRAY *array, prs_struct *ps, int depth)
 {
-	int i;
+	unsigned int i;
 
 	prs_debug(ps, depth, desc, "smb_io_unistr2_array");
 	depth++;
@@ -1128,7 +1128,7 @@ BOOL smb_io_unistr2_array(const char *desc, UNISTR2_ARRAY *array, prs_struct *ps
 BOOL init_sid_array(SID_ARRAY *array,
 		    uint32 count, DOM_SID *sids)
 {
-	int i;
+	unsigned int i;
 
 	array->count = count;
 	array->ref_id = count?1:0;
@@ -1155,7 +1155,7 @@ BOOL init_sid_array(SID_ARRAY *array,
 ********************************************************************/
 BOOL smb_io_sid_array(const char *desc, SID_ARRAY *array, prs_struct *ps, int depth)
 {
-	int i;
+	unsigned int i;
 
 	prs_debug(ps, depth, desc, "smb_io_sid_array");
 	depth++;
diff --git a/source3/rpc_parse/parse_net.c b/source3/rpc_parse/parse_net.c
index 53f660fcc3..a660084250 100644
--- a/source3/rpc_parse/parse_net.c
+++ b/source3/rpc_parse/parse_net.c
@@ -432,7 +432,7 @@ BOOL net_io_r_logon_ctrl(const char *desc, NET_R_LOGON_CTRL *r_l, prs_struct *ps
 void init_r_trust_dom(NET_R_TRUST_DOM_LIST *r_t,
 			uint32 num_doms, const char *dom_name)
 {
-	int i = 0;
+	unsigned int i = 0;
 
 	DEBUG(5,("init_r_trust_dom\n"));
 
@@ -1038,12 +1038,12 @@ void init_id_info2(NET_ID_INFO_2 * id, const char *domain_name,
 		   uint32 log_id_low, uint32 log_id_high,
 		   const char *user_name, const char *wksta_name,
 		   const uchar lm_challenge[8],
-		   const uchar * lm_chal_resp, int lm_chal_resp_len,
-		   const uchar * nt_chal_resp, int nt_chal_resp_len)
+		   const uchar * lm_chal_resp, size_t lm_chal_resp_len,
+		   const uchar * nt_chal_resp, size_t nt_chal_resp_len)
 {
-	int len_domain_name = strlen(domain_name);
-	int len_user_name   = strlen(user_name  );
-	int len_wksta_name  = strlen(wksta_name );
+	size_t len_domain_name = strlen(domain_name);
+	size_t len_user_name   = strlen(user_name  );
+	size_t len_wksta_name  = strlen(wksta_name );
 	unsigned char lm_owf[24];
 	unsigned char nt_owf[128];
 
@@ -1281,7 +1281,7 @@ void init_net_user_info3(TALLOC_CTX *ctx, NET_USER_INFO_3 *usr,
 {
 	/* only cope with one "other" sid, right now. */
 	/* need to count the number of space-delimited sids */
-	int i;
+	unsigned int i;
 	int num_other_sids = 0;
 	
 	NTTIME 		logon_time, logoff_time, kickoff_time,
@@ -1390,7 +1390,7 @@ void init_net_user_info3(TALLOC_CTX *ctx, NET_USER_INFO_3 *usr,
 BOOL net_io_user_info3(const char *desc, NET_USER_INFO_3 *usr, prs_struct *ps, 
 		       int depth, uint16 validation_level)
 {
-	int i;
+	unsigned int i;
 
 	if (usr == NULL)
 		return False;
@@ -2363,7 +2363,7 @@ reads or writes a structure.
 static BOOL net_io_sam_policy_info(const char *desc, SAM_DELTA_POLICY *info,
 				      prs_struct *ps, int depth)
 {
-	int i;
+	unsigned int i;
 	prs_debug(ps, depth, desc, "net_io_sam_policy_info");
 	depth++;
 
@@ -2584,7 +2584,7 @@ reads or writes a structure.
 static BOOL net_io_sam_privs_info(const char *desc, SAM_DELTA_PRIVS *info,
 				      prs_struct *ps, int depth)
 {
-	int i;
+	unsigned int i;
 
 	prs_debug(ps, depth, desc, "net_io_sam_privs_info");
 	depth++;
@@ -2895,7 +2895,7 @@ reads or writes a structure.
 BOOL net_io_r_sam_deltas(const char *desc, uint8 sess_key[16],
                          NET_R_SAM_DELTAS *r_s, prs_struct *ps, int depth)
 {
-        int i;
+        unsigned int i;
 
 	prs_debug(ps, depth, desc, "net_io_r_sam_deltas");
 	depth++;
diff --git a/source3/rpc_parse/parse_prs.c b/source3/rpc_parse/parse_prs.c
index 702375be35..aeaa42ac92 100644
--- a/source3/rpc_parse/parse_prs.c
+++ b/source3/rpc_parse/parse_prs.c
@@ -938,7 +938,7 @@ BOOL prs_buffer2(BOOL charmode, const char *name, prs_struct *ps, int depth, BUF
 
 BOOL prs_string2(BOOL charmode, const char *name, prs_struct *ps, int depth, STRING2 *str)
 {
-	int i;
+	unsigned int i;
 	char *q = prs_mem_get(ps, str->str_max_len);
 	if (q == NULL)
 		return False;
@@ -1035,7 +1035,7 @@ BOOL prs_unistr3(BOOL charmode, const char *name, UNISTR3 *str, prs_struct *ps,
 
 BOOL prs_unistr(const char *name, prs_struct *ps, int depth, UNISTR *str)
 {
-	int len = 0;
+	unsigned int len = 0;
 	unsigned char *p = (unsigned char *)str->buffer;
 	uint8 *start;
 	char *q;
diff --git a/source3/rpc_parse/parse_sec.c b/source3/rpc_parse/parse_sec.c
index 10b0ff86ae..081173cf8d 100644
--- a/source3/rpc_parse/parse_sec.c
+++ b/source3/rpc_parse/parse_sec.c
@@ -159,7 +159,7 @@ BOOL sec_io_ace(const char *desc, SEC_ACE *psa, prs_struct *ps, int depth)
 
 NTSTATUS sec_ace_add_sid(TALLOC_CTX *ctx, SEC_ACE **new, SEC_ACE *old, unsigned *num, DOM_SID *sid, uint32 mask)
 {
-	int i = 0;
+	unsigned int i = 0;
 	
 	if (!ctx || !new || !old || !sid || !num)  return NT_STATUS_INVALID_PARAMETER;
 
@@ -185,7 +185,7 @@ NTSTATUS sec_ace_add_sid(TALLOC_CTX *ctx, SEC_ACE **new, SEC_ACE *old, unsigned
 
 NTSTATUS sec_ace_mod_sid(SEC_ACE *ace, size_t num, DOM_SID *sid, uint32 mask)
 {
-	int i = 0;
+	unsigned int i = 0;
 
 	if (!ace || !sid)  return NT_STATUS_INVALID_PARAMETER;
 
@@ -202,14 +202,14 @@ NTSTATUS sec_ace_mod_sid(SEC_ACE *ace, size_t num, DOM_SID *sid, uint32 mask)
  delete SID from ACL
 ********************************************************************/
 
-NTSTATUS sec_ace_del_sid(TALLOC_CTX *ctx, SEC_ACE **new, SEC_ACE *old, size_t *num, DOM_SID *sid)
+static NTSTATUS sec_ace_del_sid(TALLOC_CTX *ctx, SEC_ACE **new, SEC_ACE *old, uint32 *num, DOM_SID *sid)
 {
-	int i     = 0;
-	int n_del = 0;
+	unsigned int i     = 0;
+	unsigned int n_del = 0;
 
 	if (!ctx || !new || !old || !sid || !num)  return NT_STATUS_INVALID_PARAMETER;
 
-	if((new[0] = (SEC_ACE *) talloc_zero(ctx, *num * sizeof(SEC_ACE))) == 0)
+	if((new[0] = (SEC_ACE *) talloc_zero(ctx, (*num) * sizeof(SEC_ACE))) == 0)
 		return NT_STATUS_NO_MEMORY;
 
 	for (i = 0; i < *num; i ++) {
@@ -283,7 +283,7 @@ SEC_ACL *dup_sec_acl(TALLOC_CTX *ctx, SEC_ACL *src)
 
 BOOL sec_io_acl(const char *desc, SEC_ACL **ppsa, prs_struct *ps, int depth)
 {
-	int i;
+	unsigned int i;
 	uint32 old_offset;
 	uint32 offset_acl_size;
 	SEC_ACL *psa;
@@ -407,7 +407,7 @@ BOOL sec_ace_equal(SEC_ACE *s1, SEC_ACE *s2)
 
 BOOL sec_acl_equal(SEC_ACL *s1, SEC_ACL *s2)
 {
-	int i, j;
+	unsigned int i, j;
 
 	/* Trivial cases */
 
diff --git a/source3/rpc_parse/parse_srv.c b/source3/rpc_parse/parse_srv.c
index bfa1a13be9..27763aa224 100644
--- a/source3/rpc_parse/parse_srv.c
+++ b/source3/rpc_parse/parse_srv.c
@@ -1665,8 +1665,8 @@ static BOOL srv_io_srv_sess_info_0(const char *desc, SRV_SESS_INFO_0 *ss0, prs_s
 		return False;
 
 	if (ss0->ptr_sess_info != 0) {
-		int i;
-		int num_entries = ss0->num_entries_read;
+		uint32 i;
+		uint32 num_entries = ss0->num_entries_read;
 
 		if (num_entries > MAX_SESS_ENTRIES) {
 			num_entries = MAX_SESS_ENTRIES; /* report this! */
@@ -1802,8 +1802,8 @@ static BOOL srv_io_srv_sess_info_1(const char *desc, SRV_SESS_INFO_1 *ss1, prs_s
 		return False;
 
 	if (ss1->ptr_sess_info != 0) {
-		int i;
-		int num_entries = ss1->num_entries_read;
+		uint32 i;
+		uint32 num_entries = ss1->num_entries_read;
 
 		if (num_entries > MAX_SESS_ENTRIES) {
 			num_entries = MAX_SESS_ENTRIES; /* report this! */
@@ -1944,7 +1944,7 @@ BOOL srv_io_q_net_sess_enum(const char *desc, SRV_Q_NET_SESS_ENUM *q_n, prs_stru
 	if(!prs_uint32("sess_level", ps, depth, &q_n->sess_level))
 		return False;
 	
-	if (q_n->sess_level != -1) {
+	if (q_n->sess_level != (uint32)-1) {
 		if(!srv_io_srv_sess_ctr("sess_ctr", &q_n->ctr, ps, depth))
 			return False;
 	}
@@ -1976,7 +1976,7 @@ BOOL srv_io_r_net_sess_enum(const char *desc, SRV_R_NET_SESS_ENUM *r_n, prs_stru
 	if(!prs_uint32("sess_level", ps, depth, &r_n->sess_level))
 		return False;
 
-	if (r_n->sess_level != -1) {
+	if (r_n->sess_level != (uint32)-1) {
 		if(!srv_io_srv_sess_ctr("sess_ctr", &r_n->ctr, ps, depth))
 			return False;
 	}
@@ -2309,7 +2309,7 @@ BOOL srv_io_q_net_conn_enum(const char *desc, SRV_Q_NET_CONN_ENUM *q_n, prs_stru
 	if(!prs_uint32("conn_level", ps, depth, &q_n->conn_level))
 		return False;
 	
-	if (q_n->conn_level != -1) {
+	if (q_n->conn_level != (uint32)-1) {
 		if(!srv_io_srv_conn_ctr("conn_ctr", &q_n->ctr, ps, depth))
 			return False;
 	}
@@ -2341,7 +2341,7 @@ BOOL srv_io_r_net_conn_enum(const char *desc,  SRV_R_NET_CONN_ENUM *r_n, prs_str
 	if(!prs_uint32("conn_level", ps, depth, &r_n->conn_level))
 		return False;
 
-	if (r_n->conn_level != -1) {
+	if (r_n->conn_level != (uint32)-1) {
 		if(!srv_io_srv_conn_ctr("conn_ctr", &r_n->ctr, ps, depth))
 			return False;
 	}
@@ -2573,7 +2573,7 @@ BOOL srv_io_q_net_file_enum(const char *desc, SRV_Q_NET_FILE_ENUM *q_n, prs_stru
 	if(!prs_uint32("file_level", ps, depth, &q_n->file_level))
 		return False;
 
-	if (q_n->file_level != -1) {
+	if (q_n->file_level != (uint32)-1) {
 		if(!srv_io_srv_file_ctr("file_ctr", &q_n->ctr, ps, depth))
 			return False;
 	}
@@ -3271,7 +3271,7 @@ BOOL srv_io_q_net_disk_enum(const char *desc, SRV_Q_NET_DISK_ENUM *q_n, prs_stru
 BOOL srv_io_r_net_disk_enum(const char *desc, SRV_R_NET_DISK_ENUM *r_n, prs_struct *ps, int depth)
 {
 
-	int i;
+	unsigned int i;
 	uint32 entries_read, entries_read2, entries_read3;
 
 	if (r_n == NULL)
diff --git a/source3/utils/net_ads_cldap.c b/source3/utils/net_ads_cldap.c
index ad66af0439..86d5abea4b 100644
--- a/source3/utils/net_ads_cldap.c
+++ b/source3/utils/net_ads_cldap.c
@@ -59,7 +59,7 @@ struct cldap_netlogon_reply {
 */
 static unsigned pull_netlogon_string(struct netlogon_string *ret,const char *d)
 {
-	char *p = (char *)d;
+	const char *p = (const char *)d;
 
 	ZERO_STRUCTP(ret);
 
@@ -140,7 +140,7 @@ static int send_cldap_netlogon(int sock, const char *domain,
 		return -1;
 	}
 
-	if (write(sock, data.data, data.length) != data.length) {
+	if (write(sock, data.data, data.length) != (ssize_t)data.length) {
 		d_printf("failed to send cldap query (%s)\n", strerror(errno));
 	}
 
@@ -233,7 +233,7 @@ static int recv_cldap_netlogon(int sock, struct cldap_netlogon_reply *reply)
 */
 static void netlogon_string_free(struct netlogon_string *str)
 {
-	int i;
+	unsigned int i;
 
 	for (i = 0; i < str->comp_len; ++i) {
 		SAFE_FREE(str->component[i]);
@@ -259,7 +259,7 @@ static void cldap_reply_free(struct cldap_netlogon_reply *reply)
 static void d_print_netlogon_string(const char *label, 
 				    struct netlogon_string *str)
 {
-	int i;
+	unsigned int i;
 
 	if (str->comp_len) {
 		d_printf("%s", label);
-- 
cgit 


From f1d333ea35a4fed92e2d51aafa4e758f577e5cf1 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 15 Mar 2003 08:03:11 +0000
Subject: Remove an unused function and fix the build.

Andrew Bartlett
(This used to be commit 67a0319d268dfc0e2154d3ab0f8bf866e3cbb6db)
---
 source3/lib/charcnv.c | 36 ------------------------------------
 1 file changed, 36 deletions(-)

(limited to 'source3')

diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c
index 76d77ddd67..fa646573d8 100644
--- a/source3/lib/charcnv.c
+++ b/source3/lib/charcnv.c
@@ -646,42 +646,6 @@ size_t pull_ucs2_allocate(void **dest, const smb_ucs2_t *src)
 	return convert_string_allocate(CH_UCS2, CH_UNIX, src, src_len, dest);	
 }
 
-/**
- Copy a string from a utf-8 source to a unix char* destination.
- Flags can have:
-  STR_TERMINATE means the string in src is null terminated.
- if STR_TERMINATE is set then src_len is ignored.
- src_len is the length of the source area in bytes
- Return the number of bytes occupied by the string in src.
- The resulting string in "dest" is always null terminated.
-**/
-
-static size_t pull_utf8(char *dest, const void *src, size_t dest_len, size_t src_len, int flags)
-{
-	size_t ret;
-
-	if (dest_len == (size_t)-1)
-		dest_len = sizeof(pstring);
-
-	if (flags & STR_TERMINATE) {
-		if (src_len == (size_t)-1) {
-			src_len = strlen(src) + 1;
-		} else {
-			size_t len = strnlen(src, src_len);
-			if (len < src_len)
-				len++;
-			src_len = len;
-		}
-	}
-
-	ret = convert_string(CH_UTF8, CH_UNIX, src, src_len, dest, dest_len);
-	if (dest_len)
-		dest[MIN(ret, dest_len-1)] = 0;
-
-	return src_len;
-}
-#endif
-
 /**
  * Copy a string from a UTF-8 src to a unix char * destination, allocating a buffer using talloc
  *
-- 
cgit 


From 02704f973347f05af5ebcb0d4a494a6102199536 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 15 Mar 2003 08:18:29 +0000
Subject: Minor fixes.  - signed/unsigned  - quieten warning about assignment
 as truth value  - whitespace

Andrew Bartlett
(This used to be commit a13ce0df4b4a776fa635a1fb804dd00d195f58d0)
---
 source3/include/rpc_lsa.h    | 2 +-
 source3/libsmb/trusts_util.c | 4 ++--
 source3/smbd/ipc.c           | 8 ++++----
 source3/utils/net_ads.c      | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'source3')

diff --git a/source3/include/rpc_lsa.h b/source3/include/rpc_lsa.h
index c091e73321..8e1368810f 100644
--- a/source3/include/rpc_lsa.h
+++ b/source3/include/rpc_lsa.h
@@ -237,7 +237,7 @@ typedef struct r_lsa_query_sec_obj_info
 typedef struct lsa_query_info
 {
 	POLICY_HND pol; /* policy handle */
-    uint16 info_class; /* info class */
+	uint16 info_class; /* info class */
 
 } LSA_Q_QUERY_INFO;
 
diff --git a/source3/libsmb/trusts_util.c b/source3/libsmb/trusts_util.c
index 055851f6b7..f7b2c2e3a6 100644
--- a/source3/libsmb/trusts_util.c
+++ b/source3/libsmb/trusts_util.c
@@ -152,9 +152,9 @@ BOOL is_trusted_domain(const char* dom_name)
 				talloc_destroy(mem_ctx);
 				return True;
 			}
-		}						
+		}
 	} while (NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES));
-		
+
 	/*
 	 * Query the trustdom_cache updated periodically. The only
 	 * way for domain member server.
diff --git a/source3/smbd/ipc.c b/source3/smbd/ipc.c
index c8bb0c2505..85e28f5d17 100644
--- a/source3/smbd/ipc.c
+++ b/source3/smbd/ipc.c
@@ -138,9 +138,9 @@ void send_trans_reply(char *outbuf,
 		set_message(outbuf,10,1+this_ldata+this_lparam+align,False);
 
 		copy_trans_params_and_data(outbuf, align,
-									rparam, tot_param_sent, this_lparam,
-									rdata, tot_data_sent, this_ldata);
-
+					   rparam, tot_param_sent, this_lparam,
+					   rdata, tot_data_sent, this_ldata);
+		
 		SSVAL(outbuf,smb_vwv3,this_lparam);
 		SSVAL(outbuf,smb_vwv4,smb_offset(smb_buf(outbuf)+1,outbuf));
 		SSVAL(outbuf,smb_vwv5,tot_param_sent);
@@ -410,7 +410,7 @@ int reply_trans(connection_struct *conn, char *inbuf,char *outbuf, int size, int
 	}
 
 	if (suwcnt) {
-		int i;
+		unsigned int i;
 		if((setup = (uint16 *)malloc(suwcnt*sizeof(uint16))) == NULL) {
 			DEBUG(0,("reply_trans: setup malloc fail for %u bytes !\n", (unsigned int)(suwcnt * sizeof(uint16))));
 			SAFE_FREE(data);
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index ea31a92575..22b9d50ea1 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -155,7 +155,7 @@ retry:
 	 * If the username is of the form "name@realm", 
 	 * extract the realm and convert to upper case.
 	 */
-	if (realm = strchr(ads->auth.user_name, '@')) {
+	if ((realm = strchr(ads->auth.user_name, '@'))) {
 		*realm++ = '\0';
 		ads->auth.realm = strdup(realm);
 		strupper(ads->auth.realm);
-- 
cgit 


From 662b5498183a7ed981bc0fa9d29acb634f326d7c Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 15 Mar 2003 10:59:14 +0000
Subject: Fix the non-DEVELOPER case of my macro madness...

Andrew Bartlett
(This used to be commit 618bda3a28f65417e3c31a70229f6da70cf223fc)
---
 source3/include/safe_string.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/include/safe_string.h b/source3/include/safe_string.h
index c7386d3ac4..8b3665d97b 100644
--- a/source3/include/safe_string.h
+++ b/source3/include/safe_string.h
@@ -150,7 +150,7 @@ size_t __unsafe_string_function_usage_here2__(void);
 #define push_string(base_ptr, dest, src, dest_len, flags) push_string_fn2(NULL, 0, base_ptr, dest, src, dest_len, flags)
 #define pull_string(base_ptr, dest, src, dest_len, src_len, flags) pull_string_fn2(NULL, 0, base_ptr, dest, src, dest_len, src_len, flags)
 #define clistr_push(cli, dest, src, dest_len, flags) clistr_push_fn2(NULL, 0, cli, dest, src, dest_len, flags)
-#define clistr_pull(cli, dest, src, dest_len, src_len, flags) clistr_push_fn2(NULL, 0, cli, dest, src, dest_len, src_len, flags)
+#define clistr_pull(cli, dest, src, dest_len, src_len, flags) clistr_pull_fn2(NULL, 0, cli, dest, src, dest_len, src_len, flags)
 
 #define alpha_strcpy(dest,src,other_safe_chars,maxlength) alpha_strcpy_fn(NULL,0,dest,src,other_safe_chars,maxlength)
 #define StrnCpy(dest,src,n)		StrnCpy_fn(NULL,0,dest,src,n)
-- 
cgit 


From a4261c229571bea5ce3fc00f024133b3b50cd4bf Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 15 Mar 2003 11:28:45 +0000
Subject: Fix the 'non-optomizing compiler' case...

Andrew Bartlett
(This used to be commit 94424c5d72246b2e58f3a21aa0de6949d7eb2da1)
---
 source3/include/safe_string.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3')

diff --git a/source3/include/safe_string.h b/source3/include/safe_string.h
index 8b3665d97b..3e19659961 100644
--- a/source3/include/safe_string.h
+++ b/source3/include/safe_string.h
@@ -199,8 +199,8 @@ size_t __unsafe_string_function_usage_here2__(void);
 #define safe_strcat_fn2 safe_strcat_fn
 #define push_string_fn2 push_string_fn
 #define pull_string_fn2 pull_string_fn
-#define clistr_push_fn2 clistr_push_fn2
-#define clistr_pull_fn2 clistr_pull_fn2
+#define clistr_push_fn2 clistr_push_fn
+#define clistr_pull_fn2 clistr_pull_fn
 
 #endif
 
-- 
cgit 


From 2055e724ada91865ba00b2d79bc0737504ea761d Mon Sep 17 00:00:00 2001
From: Steve French <sfrench@samba.org>
Date: Sat, 15 Mar 2003 22:35:47 +0000
Subject: Checkin cifs vfs for Linux mount helper (This used to be commit
 a55acfd7a296c5ae9b043dc03393a29d87e43a40)

---
 source3/client/mount.cifs.c | 254 ++++++++++++++++++++++++++++++++++++--------
 1 file changed, 211 insertions(+), 43 deletions(-)

(limited to 'source3')

diff --git a/source3/client/mount.cifs.c b/source3/client/mount.cifs.c
index 5b19752f8b..7167859d7b 100755
--- a/source3/client/mount.cifs.c
+++ b/source3/client/mount.cifs.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <netdb.h>
 #include <string.h>
+#include <mntent.h>
 
 #define MOUNT_CIFS_VERSION "1"
 
@@ -22,6 +23,11 @@ char * thisprogram;
 int verboseflag = 0;
 static int got_password = 0;
 static int got_user = 0;
+static int got_domain = 0;
+static int got_ip = 0;
+static int got_unc = 0;
+static int got_uid = 0;
+static int got_gid = 0;
 static char * user_name = NULL;
 char * mountpassword = NULL;
 
@@ -32,7 +38,7 @@ void mount_cifs_usage()
 	printf("\nMount the remotetarget, specified as either a UNC name or ");
 	printf(" CIFS URL, to the local directory, dir.\n");
 
-	return;
+	exit(1);
 }
 
 /* caller frees username if necessary */
@@ -51,9 +57,137 @@ char * parse_cifs_url(unc_name)
 	printf("\ncifs url %s\n",unc_name);
 }
 
-char * parse_options(char * options)
+int parse_options(char * options)
 {
-	/* BB add missing code BB */
+	char * data;
+	char * value = 0;
+
+	if (!options)
+		return 1;
+
+	while ((data = strsep(&options, ",")) != NULL) {
+		if (!*data)
+			continue;
+		if ((value = strchr(data, '=')) != NULL) {
+			*value++ = '\0';
+		}
+		if (strncmp(data, "user", 4) == 0) {
+			if (!value || !*value) {
+				printf("invalid or missing username\n");
+				return 1;	/* needs_arg; */
+			}
+			if (strnlen(value, 260) < 260) {
+				got_user=1;
+				/* BB add check for format user%pass */
+				/* if(strchr(username%passw) got_password = 1) */
+			} else {
+				printf("username too long\n");
+				return 1;
+			}
+	} else if (strncmp(data, "pass", 4) == 0) {
+		if (!value || !*value) {
+			if(got_password) {
+				printf("password specified twice, ignoring second\n");
+			} else
+				got_password = 1;
+		} else if (strnlen(value, 17) < 17) {
+			got_password = 1;
+		} else {
+			printf("password too long\n");
+			return 1;
+		}
+	} else if (strncmp(data, "ip", 2) == 0) {
+		if (!value || !*value) {
+			printf("target ip address argument missing");
+		} else if (strnlen(value, 35) < 35) {
+			got_ip = 1;
+		} else {
+			printf("ip address too long\n");
+			return 1;
+		}
+	} else if ((strncmp(data, "unc", 3) == 0)
+		   || (strncmp(data, "target", 6) == 0)
+		   || (strncmp(data, "path", 4) == 0)) {
+		if (!value || !*value) {
+			printf("invalid path to network resource\n");
+			return 1;  /* needs_arg; */
+		} else if(strnlen(value,5) < 5) {
+			printf("UNC name too short");
+		}
+
+		if (strnlen(value, 300) < 300) {
+			got_unc = 1;
+			if (strncmp(value, "//", 2) == 0) {
+				if(got_unc)
+					printf("unc name specified twice, ignoring second\n");
+				else
+					got_unc = 1;
+			} else if (strncmp(value, "\\\\", 2) != 0) {	                   
+				printf("UNC Path does not begin with // or \\\\ \n");
+				return 1;
+			} else {
+				if(got_unc)
+					printf("unc name specified twice, ignoring second\n");
+				else
+					got_unc = 1;
+			}
+		} else {
+			printf("CIFS: UNC name too long\n");
+			return 1;
+		}
+	} else if ((strncmp(data, "domain", 3) == 0)
+		   || (strncmp(data, "workgroup", 5) == 0)) {
+		if (!value || !*value) {
+			printf("CIFS: invalid domain name\n");
+			return 1;	/* needs_arg; */
+		}
+		if (strnlen(value, 65) < 65) {
+			got_domain = 1;
+		} else {
+			printf("domain name too long\n");
+			return 1;
+		}
+	} else if (strncmp(data, "uid", 3) == 0) {
+		if (value && *value) {
+			got_uid = 1;
+		}
+	} else if (strncmp(data, "gid", 3) == 0) {
+		if (value && *value) {
+			got_gid = 1;
+		}
+	} /* else if (strnicmp(data, "file_mode", 4) == 0) {
+		if (value && *value) {
+			vol->file_mode =
+				simple_strtoul(value, &value, 0);
+		}
+	} else if (strnicmp(data, "dir_mode", 3) == 0) {
+		if (value && *value) {
+			vol->dir_mode =
+				simple_strtoul(value, &value, 0);
+		}
+	} else if (strnicmp(data, "port", 4) == 0) {
+		if (value && *value) {
+			vol->port =
+				simple_strtoul(value, &value, 0);
+		}
+	} else if (strnicmp(data, "rsize", 5) == 0) {
+		if (value && *value) {
+			vol->rsize =
+				simple_strtoul(value, &value, 0);
+		}
+	} else if (strnicmp(data, "wsize", 5) == 0) {
+		if (value && *value) {
+			vol->wsize =
+				simple_strtoul(value, &value, 0);
+		}
+	} else if (strnicmp(data, "version", 3) == 0) {
+		
+	} else if (strnicmp(data, "rw", 2) == 0) {
+		
+	} else
+		printf("CIFS: Unknown mount option %s\n",data); */
+	}
+	return 0;
 }
 
 /* Note that caller frees the returned buffer if necessary */
@@ -67,7 +201,6 @@ char * parse_server(char * unc_name)
 	int rc,j;
 	char temp[64];
 
-
 	if(length > 1023) {
 		printf("mount error: UNC name too long");
 		return 0;
@@ -89,8 +222,11 @@ char * parse_server(char * unc_name)
 			printf(" %s does not begin with \\\\ or //\n",unc_name);
 			return 0;
 		} else {
+			unc_name[0] = '\\';
+			unc_name[1] = '\\';
 			unc_name += 2;
-			if (share = strchr(unc_name, '/')) {
+			if ((share = strchr(unc_name, '/')) || 
+				(share = strchr(unc_name,'\\'))) {
 				*share = 0;  /* temporarily terminate the string */
 				share += 1;
 				host_entry = gethostbyname(unc_name);
@@ -102,7 +238,6 @@ char * parse_server(char * unc_name)
 					return 0;
 				}
 				else {
-					printf("Target server %s %x found\n",host_entry->h_name,host_entry->h_addr);	/* BB removeme */
 					/* BB should we pass an alternate version of the share name as Unicode */
 					/* BB what about ipv6? BB */
 					/* BB add retries with alternate servers in list */
@@ -159,12 +294,12 @@ int main(int argc, char ** argv)
 	int c;
 	int flags = MS_MANDLOCK | MS_MGC_VAL;
 	char * orgoptions = NULL;
-	char * options;
-	char * share_name;
+	char * share_name = NULL;
 	char * domain_name = NULL;
-	char * ipaddr;
-	char * mount_point;
+	char * ipaddr = NULL;
 	char * uuid = NULL;
+	char * mountpoint;
+	char * options;
 	int rc,i;
 	int rsize = 0;
 	int wsize = 0;
@@ -174,6 +309,8 @@ int main(int argc, char ** argv)
 	int optlen = 0;
 	struct stat statbuf;
 	struct utsname sysinfo;
+	struct mntent mountent;
+	FILE * pmntfile;
 
 	/* setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
@@ -186,12 +323,14 @@ int main(int argc, char ** argv)
 		thisprogram = "mount.cifs";
 
 	uname(&sysinfo);
-#ifdef _GNU_SOURCE
+	/* BB add workstation name and domain and pass down */
+/*#ifdef _GNU_SOURCE
 	printf(" node: %s machine: %s\n", sysinfo.nodename,sysinfo.machine);
-#endif
-	mount_cifs_usage();
+#endif*/
+	if(argc < 3)
+		mount_cifs_usage();
 	share_name = argv[1];
-	mount_point = argv[2];
+	mountpoint = argv[2];
 	/* add sharename in opts string as unc= parm */
 
 	while ((c = getopt_long (argc, argv, "afFhilL:no:O:rsU:vVwt:",
@@ -291,7 +430,7 @@ int main(int argc, char ** argv)
 			user_name = optarg;
 			break;
 		case 141:
-			 domain_name = optarg;
+			domain_name = optarg;
 			break;
 		case 142:
 			got_password = 1;
@@ -303,18 +442,14 @@ int main(int argc, char ** argv)
 		}
 	}
 
-	for(i = 0;i < argc;i++)  /* BB remove */
-		printf("\narg %d is %s",i,argv[i]);  /* BB remove */
-	printf("\n");  /* BB removeme */
-
 	/* canonicalize the path in argv[1]? */
 
-	if(stat (mount_point, &statbuf)) {
-		printf("mount error: mount point %s does not exist\n",mount_point);
+	if(stat (mountpoint, &statbuf)) {
+		printf("mount error: mount point %s does not exist\n",mountpoint);
 		return -1;
 	}
 	if (S_ISDIR(statbuf.st_mode) == 0) {
-		printf("mount error: mount point %s is not a directory\n",mount_point);
+		printf("mount error: mount point %s is not a directory\n",mountpoint);
 		return -1;
 	}
 
@@ -326,7 +461,8 @@ int main(int argc, char ** argv)
 	ipaddr = parse_server(share_name);
 /*	if(share_name == NULL)
 		return 1; */
-	parse_options(orgoptions);
+	if (parse_options(strdup(orgoptions)))
+		return 1;
 
 	if(got_user == 0)
 		user_name = getusername();
@@ -348,32 +484,50 @@ int main(int argc, char ** argv)
 			got_password = 1;
 		}
 	}
-
-	/* launch daemon (handles dfs name resolution and credential change) */
-	if(orgoptions)
+	/* FIXME launch daemon (handles dfs name resolution and credential change) 
+	   remember to clear parms and overwrite password field before launching */
+	if(orgoptions) {
 		optlen = strlen(orgoptions);
-	else
+	} else
 		optlen = 0;
-	options = malloc(optlen + 25 + strlen(share_name) + strlen(user_name)
-			+ strlen(ipaddr) + 1);
-	strcpy(options,"unc=");
+	if(share_name)
+		optlen += strlen(share_name) + 4;
+	if(user_name)
+		optlen += strlen(user_name) + 6;
+	if(ipaddr)
+		optlen += strlen(ipaddr) + 4;
+	if(mountpassword)
+		optlen += strlen(mountpassword) + 6;
+	options = malloc(optlen + 10);
+
+    options[0] = 0;
+	strncat(options,"unc=",4);
 	strcat(options,share_name);
-	strncat(options,",ip=",4);
-	strcat(options,ipaddr);
-	strncat(options,",user=",6);
-	strcat(options,user_name);
-	strncat(options,",pass=",6);
-	strcat(options,mountpassword);
+	if(ipaddr) {
+		strncat(options,",ip=",4);
+		strcat(options,ipaddr);
+	} 
+	if(user_name) {
+		strncat(options,",user=",6);
+		strcat(options,user_name);
+	} 
+	if(mountpassword) {
+		strncat(options,",pass=",6);
+		strcat(options,mountpassword);
+	}
 	strncat(options,",ver=",5);
 	strcat(options,MOUNT_CIFS_VERSION);
-	if(optlen)
+
+	if(orgoptions) {
+		strcat(options,",");
 		strcat(options,orgoptions);
-	printf("\noptions %s \n",options);
-	if(mount(share_name, mount_point, "cifs", flags, options)) {
+	}
+	/* printf("\noptions %s \n",options);*/
+	if(mount(share_name, mountpoint, "cifs", flags, options)) {
 	/* remember to kill daemon on error */
 		switch (errno) {
 		case 0:
-			printf(" success\n"); /* BB removeme */
+			printf("mount failed but no error number set\n");
 			return 0;
 		case ENODEV:
 			printf("mount error: cifs filesystem not supported by the system\n");
@@ -381,9 +535,23 @@ int main(int argc, char ** argv)
 		default:
 			printf("mount error %d = %s",errno,strerror(errno));
 		}
-		printf("\nRefer to the mount.cifs(8) manual page (e.g.man mount.cifs)\n");
+		printf("Refer to the mount.cifs(8) manual page (e.g.man mount.cifs)\n");
 		return -1;
-	} else
-		printf(" mount succeeded\n"); /* BB removeme */
+	} else {
+		pmntfile = setmntent(MOUNTED, "a+");
+		if(pmntfile) {
+			mountent.mnt_fsname = share_name;
+			mountent.mnt_dir = mountpoint; 
+			mountent.mnt_type = "cifs"; 
+			mountent.mnt_opts = "";
+			mountent.mnt_freq = 0;
+			mountent.mnt_passno = 0;
+			rc = addmntent(pmntfile,&mountent);
+			endmntent(pmntfile);
+		} else {
+		    printf("could not update mount table\n");
+		}
+	}
+	return 0;
 }
 
-- 
cgit 


From 4b6b03e1838a8cf06c56b6afdaa00402a8a7b83d Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 15 Mar 2003 22:57:00 +0000
Subject: Fix non-gmake syntax error. (This used to be commit
 97daece056516e52e56bf5a749676e7c53e087e3)

---
 source3/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 1a4d97e083..40abe5d71b 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -215,7 +215,7 @@ LIBMSRPC_OBJ = rpc_client/cli_lsarpc.o rpc_client/cli_samr.o \
 	       rpc_client/cli_reg.o rpc_client/cli_pipe.o \
 	       rpc_client/cli_spoolss.o rpc_client/cli_spoolss_notify.o  \
 	       rpc_client/cli_ds.o libsmb/namequery_dc.o
-	       
+
 LIBMSRPC_SERVER_OBJ = libsmb/trusts_util.o
 
 REGOBJS_OBJ = registry/reg_objects.o
-- 
cgit 


From 0dca6fab27039a8874c4b3ab0da5401975344fa9 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 15 Mar 2003 23:16:40 +0000
Subject: A hack to get us building on a slightly older heimdal kerberos.  It
 appears that we don't need this flag - heimdal's internal password change
 routines don't set it.

Andrew Bartlett
(This used to be commit 069825bd78f2bf125e8a4e72933da924d393f5a5)
---
 source3/include/ads.h | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'source3')

diff --git a/source3/include/ads.h b/source3/include/ads.h
index f90983e405..07bf6e4b3b 100644
--- a/source3/include/ads.h
+++ b/source3/include/ads.h
@@ -213,3 +213,10 @@ typedef void **ADS_MODLIST;
 #if defined(HAVE_ENCTYPE_ARCFOUR_HMAC_MD5)
 #define ENCTYPE_ARCFOUR_HMAC ENCTYPE_ARCFOUR_HMAC_MD5
 #endif
+
+/* The older versions of heimdal that don't have this
+   define don't seem to use it anyway.  I'm told they
+   always use a subkey */
+#ifndef AP_OPTS_USE_SUBKEY
+#define AP_OPTS_USE_SUBKEY 0
+#endif
-- 
cgit 


From 3a9bdacca98560706eeb4e625ef1ce7c92d4dfab Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sun, 16 Mar 2003 00:39:40 +0000
Subject: More work on my macro mess - we need function prototypes of different
 types, and we were missing the 'char' type.

Andrew Bartlett
(This used to be commit 193e80fafbda9e3af58fec1e629ec607f29b4099)
---
 source3/include/safe_string.h | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'source3')

diff --git a/source3/include/safe_string.h b/source3/include/safe_string.h
index 3e19659961..3bd38ea74e 100644
--- a/source3/include/safe_string.h
+++ b/source3/include/safe_string.h
@@ -48,10 +48,13 @@
 
 #endif /* !_SPLINT_ */
 
-
+/* We need a number of different prototypes for our 
+   non-existant fuctions */
 char * __unsafe_string_function_usage_here__(void);
 
-size_t __unsafe_string_function_usage_here2__(void);
+size_t __unsafe_string_function_usage_here_size_t__(void);
+
+size_t __unsafe_string_function_usage_here_char__(void);
 
 #ifdef HAVE_COMPILER_WILL_OPTIMIZE_OUT_FNS
 
@@ -62,10 +65,10 @@ size_t __unsafe_string_function_usage_here2__(void);
 #define CHECK_STRING_SIZE(d, len) (sizeof(d) != (len) && sizeof(d) != sizeof(char *))
 
 #define fstrterminate(d) (CHECK_STRING_SIZE(d, sizeof(fstring)) \
-    ? __unsafe_string_function_usage_here__() \
+    ? __unsafe_string_function_usage_here_char__() \
     : (((d)[sizeof(fstring)-1]) = '\0'))
 #define pstrterminate(d) (CHECK_STRING_SIZE(d, sizeof(pstring)) \
-    ? __unsafe_string_function_usage_here__() \
+    ? __unsafe_string_function_usage_here_char__() \
     : (((d)[sizeof(pstring)-1]) = '\0'))
 
 #define wpstrcpy(d,s) ((sizeof(d) != sizeof(wpstring) && sizeof(d) != sizeof(smb_ucs2_t *)) \
@@ -83,7 +86,7 @@ size_t __unsafe_string_function_usage_here2__(void);
 
 #define push_pstring_base(dest, src, pstring_base) \
     (CHECK_STRING_SIZE(pstring_base, sizeof(pstring)) \
-    ? __unsafe_string_function_usage_here2__() \
+    ? __unsafe_string_function_usage_here_size_t__() \
     : push_ascii(dest, src, sizeof(pstring)-PTR_DIFF(dest,pstring_base)-1, STR_TERMINATE))
 
 #else /* HAVE_COMPILER_WILL_OPTIMIZE_OUT_FNS */
@@ -175,22 +178,22 @@ size_t __unsafe_string_function_usage_here2__(void);
 
 #define push_string_fn2(fn_name, fn_line, base_ptr, dest, src, dest_len, flags) \
     (CHECK_STRING_SIZE(dest, dest_len) \
-    ? __unsafe_string_function_usage_here2__() \
+    ? __unsafe_string_function_usage_here_size_t__() \
     : push_string_fn(fn_name, fn_line, base_ptr, dest, src, dest_len, flags))
 
 #define pull_string_fn2(fn_name, fn_line, base_ptr, dest, src, dest_len, src_len, flags) \
     (CHECK_STRING_SIZE(dest, dest_len) \
-    ? __unsafe_string_function_usage_here2__() \
+    ? __unsafe_string_function_usage_here_size_t__() \
     : pull_string_fn(fn_name, fn_line, base_ptr, dest, src, dest_len, src_len, flags))
 
 #define clistr_push_fn2(fn_name, fn_line, cli, dest, src, dest_len, flags) \
     (CHECK_STRING_SIZE(dest, dest_len) \
-    ? __unsafe_string_function_usage_here2__() \
+    ? __unsafe_string_function_usage_here_size_t__() \
     : clistr_push_fn(fn_name, fn_line, cli, dest, src, dest_len, flags))
 
 #define clistr_pull_fn2(fn_name, fn_line, cli, dest, src, dest_len, srclen, flags) \
     (CHECK_STRING_SIZE(dest, dest_len) \
-    ? __unsafe_string_function_usage_here2__() \
+    ? __unsafe_string_function_usage_here_size_t__() \
     : clistr_pull_fn(fn_name, fn_line, cli, dest, src, dest_len, srclen, flags))
 
 #else
-- 
cgit 


From 2f62a72d9aebf3cfe9aa60a0bdc73f1ae477d5b2 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sun, 16 Mar 2003 02:14:05 +0000
Subject: Changes to help the kerberos change password code work on systems
 that have some of the labels 'duplicated' (ie, the defines double-up).

Also, to an ads_connect() to try and find our KDC. (So we don't segfualt
*every* time)

Andrew Bartlett
(This used to be commit 56dce7ddad118051c93c62507234efca3920bc9b)
---
 source3/libads/krb5_setpw.c | 66 ++++++++++++++++++++-------------------------
 source3/utils/net_ads.c     |  9 +++++++
 2 files changed, 38 insertions(+), 37 deletions(-)

(limited to 'source3')

diff --git a/source3/libads/krb5_setpw.c b/source3/libads/krb5_setpw.c
index 29bf1a427c..214871b3fb 100644
--- a/source3/libads/krb5_setpw.c
+++ b/source3/libads/krb5_setpw.c
@@ -178,47 +178,39 @@ static krb5_error_code build_kpasswd_request(uint16 pversion,
 	return 0;
 }
 
+static const struct kpasswd_errors {
+	int result_code;
+	const char *error_string;
+} kpasswd_errors[] = {
+	{KRB5_KPASSWD_MALFORMED, "Malformed request error"},
+	{KRB5_KPASSWD_HARDERROR, "Server error"},
+	{KRB5_KPASSWD_AUTHERROR, "Authentication error"},
+	{KRB5_KPASSWD_SOFTERROR, "Password change rejected"},
+	{KRB5_KPASSWD_ACCESSDENIED, "Client does not have proper authorization"},
+	{KRB5_KPASSWD_BAD_VERSION, "Protocol version not supported"},
+	{KRB5_KPASSWD_INITIAL_FLAG_NEEDED, "Authorization ticket must have initial flag set"},
+	{KRB5_KPASSWD_POLICY_REJECT, "Password rejected due to policy requirements"},
+	{KRB5_KPASSWD_BAD_PRINCIPAL, "Target principal does not exist"},
+	{KRB5_KPASSWD_ETYPE_NOSUPP, "Unsupported encryption type"},
+	{0, NULL}
+};
+
 static krb5_error_code krb5_setpw_result_code_string(krb5_context context,
 						     int result_code,
 						     const char **code_string)
 {
-   switch (result_code) {
-   case KRB5_KPASSWD_MALFORMED:
-      *code_string = "Malformed request error";
-      break;
-   case KRB5_KPASSWD_HARDERROR:
-      *code_string = "Server error";
-      break;
-   case KRB5_KPASSWD_AUTHERROR:
-      *code_string = "Authentication error";
-      break;
-   case KRB5_KPASSWD_SOFTERROR:
-      *code_string = "Password change rejected";
-      break;
-   case KRB5_KPASSWD_ACCESSDENIED:
-      *code_string = "Client does not have proper authorization";
-      break;
-   case KRB5_KPASSWD_BAD_VERSION:
-      *code_string = "Protocol version not supported";
-      break;
-   case KRB5_KPASSWD_INITIAL_FLAG_NEEDED:
-      *code_string = "Authorization ticket must have initial flag set";
-      break;
-   case KRB5_KPASSWD_POLICY_REJECT:
-      *code_string = "Password rejected due to policy requirements";
-      break;
-   case KRB5_KPASSWD_BAD_PRINCIPAL:
-      *code_string = "Target principal does not exist";
-      break;
-   case KRB5_KPASSWD_ETYPE_NOSUPP:
-      *code_string = "Unsupported encryption type";
-      break;
-   default:
-      *code_string = "Password change failed";
-      break;
-   }
-
-   return(0);
+        unsigned int idx = 0;
+
+	while (kpasswd_errors[idx].error_string != NULL) {
+		if (kpasswd_errors[idx].result_code == 
+                    result_code) {
+			*code_string = kpasswd_errors[idx].error_string;
+			return 0;
+		}
+		idx++;
+	}
+	*code_string = "Password change failed";
+        return (0);
 }
 
 static krb5_error_code parse_setpw_reply(krb5_context context, 
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 22b9d50ea1..0f2d673b4b 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -910,6 +910,15 @@ static int net_ads_password(int argc, const char **argv)
     in realms other than default */
     if (!(ads = ads_init(realm, NULL, NULL))) return -1;
 
+    /* we don't actually need a full connect, but it's the easy way to
+       fill in the KDC's addresss */
+    ads_connect(ads);
+    
+    if (!ads || !ads->config.realm) {
+	    d_printf("Didn't find the kerberos server!\n");
+	    return -1;
+    }
+
     asprintf(&prompt, "Enter new password for %s:", argv[0]);
 
     new_password = getpass(prompt);
-- 
cgit 


From 7cf0003dd23114947eec5fb6956f65f85efac7c1 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sun, 16 Mar 2003 03:21:58 +0000
Subject: Fix nmbd under -DDEVELOPER (pstrcpy on not-pstring).

Make a new macro to help in this situation, and add memcpy() parinoia

Andrew Bartlett
(This used to be commit 4d00626b6e003952df6715fa80615ec028facdf4)
---
 source3/include/safe_string.h |  2 ++
 source3/nmbd/nmbd_packets.c   | 15 ++++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'source3')

diff --git a/source3/include/safe_string.h b/source3/include/safe_string.h
index 3bd38ea74e..65ec05a5c6 100644
--- a/source3/include/safe_string.h
+++ b/source3/include/safe_string.h
@@ -110,6 +110,8 @@ size_t __unsafe_string_function_usage_here_char__(void);
 #define pstrcpy_base(dest, src, pstring_base) \
     safe_strcpy(dest, src, sizeof(pstring)-PTR_DIFF(dest,pstring_base)-1)
 
+#define safe_strcpy_base(dest, src, base, size) \
+    safe_strcpy(dest, src, size-PTR_DIFF(dest,base)-1)
 
 /* String copy functions - macro hell below adds 'type checking' (limited, but the best we can
    do in C) and may tag with function name/number to record the last 'clobber region' on
diff --git a/source3/nmbd/nmbd_packets.c b/source3/nmbd/nmbd_packets.c
index d83cd10d0c..6c3446d6c8 100644
--- a/source3/nmbd/nmbd_packets.c
+++ b/source3/nmbd/nmbd_packets.c
@@ -1929,7 +1929,7 @@ BOOL listen_for_packets(BOOL run_election)
 /****************************************************************************
   Construct and send a netbios DGRAM.
 **************************************************************************/
-BOOL send_mailslot(BOOL unique, const char *mailslot,char *buf,int len,
+BOOL send_mailslot(BOOL unique, const char *mailslot,char *buf, size_t len,
                    const char *srcname, int src_type,
                    const char *dstname, int dest_type,
                    struct in_addr dest_ip,struct in_addr src_ip,
@@ -1979,11 +1979,16 @@ BOOL send_mailslot(BOOL unique, const char *mailslot,char *buf,int len,
   SSVAL(ptr,smb_vwv15,1);
   SSVAL(ptr,smb_vwv16,2);
   p2 = smb_buf(ptr);
-  pstrcpy(p2,mailslot);
+  safe_strcpy_base(p2, mailslot, dgram->data, sizeof(dgram->data));
   p2 = skip_string(p2,1);
-
-  memcpy(p2,buf,len);
-  p2 += len;
+  
+  if (((p2+len) > dgram->data+sizeof(dgram->data)) || ((p2+len) < p2)) {
+	  DEBUG(0, ("send_mailslot: Cannot write beyond end of packet\n"));
+	  return False;
+  } else {
+	  memcpy(p2,buf,len);
+	  p2 += len;
+  }
 
   dgram->datasize = PTR_DIFF(p2,ptr+4); /* +4 for tcp length. */
 
-- 
cgit 


From 6ba75b540f7c7dab382b4ce223a4aba4c5e4eca0 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sun, 16 Mar 2003 13:15:29 +0000
Subject: New statcache internals - this time it's actually possible to follow
 what's going on.

In particular, add doxygen documentation.

Andrew Bartlett
(This used to be commit 7ff77ab46c63eca3b6edf18f39024eadb83a1a90)
---
 source3/smbd/statcache.c | 136 ++++++++++++++++++++++++++++-------------------
 1 file changed, 82 insertions(+), 54 deletions(-)

(limited to 'source3')

diff --git a/source3/smbd/statcache.c b/source3/smbd/statcache.c
index ac4ffcf575..812e0dde37 100644
--- a/source3/smbd/statcache.c
+++ b/source3/smbd/statcache.c
@@ -30,8 +30,10 @@ extern BOOL case_sensitive;
 *****************************************************************************/
 
 typedef struct {
-  int name_len;
-  char names[2]; /* This is extended via malloc... */
+	char *original_path;
+	char *translated_path;
+	size_t translated_path_length;
+	char names[2]; /* This is extended via malloc... */
 } stat_cache_entry;
 
 #define INIT_STAT_CACHE_SIZE 512
@@ -45,15 +47,16 @@ void stat_cache_add( char *full_orig_name, char *orig_translated_path)
 {
   stat_cache_entry *scp;
   stat_cache_entry *found_scp;
-  pstring orig_name;
-  pstring translated_path;
-  int namelen;
+  char *translated_path;
+  size_t translated_path_length;
+
+  char *original_path;
+  size_t original_path_length;
+
   hash_element *hash_elem;
 
   if (!lp_stat_cache()) return;
 
-  namelen = strlen(orig_translated_path);
-
   /*
    * Don't cache trivial valid directory entries.
    */
@@ -75,74 +78,97 @@ void stat_cache_add( char *full_orig_name, char *orig_translated_path)
    * translated path.
    */
 
-  pstrcpy(translated_path, orig_translated_path);
-  if(translated_path[namelen-1] == '/') {
-    translated_path[namelen-1] = '\0';
-    namelen--;
+  translated_path = strdup(orig_translated_path);
+  if (!translated_path)
+	  return;
+
+  translated_path_length = strlen(translated_path);
+
+  if(translated_path[translated_path_length-1] == '/') {
+    translated_path[translated_path_length-1] = '\0';
+    translated_path_length--;
   }
 
+  original_path = strdup(full_orig_name);
+  if (!original_path) 
+	  return;
+
+  original_path_length = strlen(original_path);
+
+  if(!case_sensitive)
+	  strupper(original_path);
+  
+#if 0
   /*
    * We will only replace namelen characters 
    * of full_orig_name.
    * StrnCpy always null terminates.
    */
 
-  StrnCpy(orig_name, full_orig_name, namelen);
+  smbStrnCpy(orig_name, full_orig_name, namelen);
   if(!case_sensitive)
     strupper( orig_name );
+#endif
 
   /*
    * Check this name doesn't exist in the cache before we 
    * add it.
    */
 
-  if ((hash_elem = hash_lookup(&stat_cache, orig_name))) {
-    found_scp = (stat_cache_entry *)(hash_elem->value);
-    if (strcmp((found_scp->names+found_scp->name_len+1), translated_path) == 0) {
-      return;
-    } else {
-      hash_remove(&stat_cache, hash_elem);
-      if((scp = (stat_cache_entry *)malloc(sizeof(stat_cache_entry)+2*namelen)) == NULL) {
-        DEBUG(0,("stat_cache_add: Out of memory !\n"));
-        return;
-      }
-      overmalloc_safe_strcpy(scp->names, orig_name, namelen);
-      overmalloc_safe_strcpy((scp->names+namelen+1), translated_path, namelen);
-      scp->name_len = namelen;
-      hash_insert(&stat_cache, (char *)scp, orig_name);
-    }
-    return;
-  } else {
+  if ((hash_elem = hash_lookup(&stat_cache, original_path))) {
+	  found_scp = (stat_cache_entry *)(hash_elem->value);
+	  if (strcmp((found_scp->translated_path), orig_translated_path) == 0) {
+		  /* already in hash table */
+		  return;
+	  }
+	  /* hash collision - remove before we re-add */
+	  hash_remove(&stat_cache, hash_elem);
+  }  
+  
+  /*
+   * New entry.
+   */
+  
+  if((scp = (stat_cache_entry *)malloc(sizeof(stat_cache_entry)
+				       +original_path_length
+				       +translated_path_length)) == NULL) {
+	  DEBUG(0,("stat_cache_add: Out of memory !\n"));
+	  return;
+  }
 
-    /*
-     * New entry.
-     */
+  scp->original_path = scp->names;
+  scp->translated_path = scp->names + original_path_length + 1;
+  safe_strcpy(scp->original_path, original_path, original_path_length);
+  safe_strcpy(scp->translated_path, translated_path, translated_path_length);
+  scp->translated_path_length = translated_path_length;
 
-    if((scp = (stat_cache_entry *)malloc(sizeof(stat_cache_entry)+2*namelen)) == NULL) {
-      DEBUG(0,("stat_cache_add: Out of memory !\n"));
-      return;
-    }
-    overmalloc_safe_strcpy(scp->names, orig_name, namelen);
-    overmalloc_safe_strcpy(scp->names+namelen+1, translated_path, namelen);
-    scp->name_len = namelen;
-    hash_insert(&stat_cache, (char *)scp, orig_name);
-  }
+  hash_insert(&stat_cache, (char *)scp, original_path);
 
-  DEBUG(5,("stat_cache_add: Added entry %s -> %s\n", scp->names, (scp->names+scp->name_len+1)));
+  DEBUG(5,("stat_cache_add: Added entry %s -> %s\n", scp->original_path, scp->translated_path));
 }
 
-/****************************************************************************
- Look through the stat cache for an entry - promote it to the top if found.
- Return True if we translated (and did a scuccessful stat on) the entire name.
-*****************************************************************************/
+/**
+ * Look through the stat cache for an entry
+ *
+ * The hash-table's internals will promote it to the top if found.
+ *
+ * @param conn    A connection struct to do the stat() with.
+ * @param name    The path we are attempting to cache, modified by this routine
+ *                to be correct as far as the cache can tell us
+ * @param dirpath The path as far as the stat cache told us.
+ * @param start   A pointer into name, for where to 'start' in fixing the rest of the name up.
+ * @param psd     A stat buffer, NOT from the cache, but just a side-effect.
+ *
+ * @return True if we translated (and did a scuccessful stat on) the entire name.
+ *
+ */
 
 BOOL stat_cache_lookup(connection_struct *conn, pstring name, pstring dirpath, 
 		       char **start, SMB_STRUCT_STAT *pst)
 {
   stat_cache_entry *scp;
-  char *trans_name;
   pstring chk_name;
-  int namelen;
+  size_t namelen;
   hash_element *hash_elem;
   char *sp;
 
@@ -191,18 +217,20 @@ BOOL stat_cache_lookup(connection_struct *conn, pstring name, pstring dirpath,
     } else {
       scp = (stat_cache_entry *)(hash_elem->value);
       DO_PROFILE_INC(statcache_hits);
-      trans_name = scp->names+scp->name_len+1;
-      if(vfs_stat(conn,trans_name, pst) != 0) {
+      if(vfs_stat(conn,scp->translated_path, pst) != 0) {
         /* Discard this entry - it doesn't exist in the filesystem.  */
         hash_remove(&stat_cache, hash_elem);
         return False;
       }
-      memcpy(name, trans_name, scp->name_len);
-      *start = &name[scp->name_len];
+      memcpy(name, scp->translated_path, MIN(sizeof(pstring)-1, scp->translated_path_length));
+
+      /* set pointer for 'where to start' on fixing the rest of the name */
+      *start = &name[scp->translated_path_length];
       if(**start == '/')
         ++*start;
-      StrnCpy( dirpath, trans_name, name - (*start));
-      return (namelen == scp->name_len);
+
+      pstrcpy(dirpath, scp->translated_path);
+      return (namelen == scp->translated_path_length);
     }
   }
 }
-- 
cgit 


From 644ab8e9b13970f6c6ea7f89760a01484b591172 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sun, 16 Mar 2003 13:16:42 +0000
Subject: Try to avoid dereferencing a null pointer.

Andrew Bartlett
(This used to be commit 4e96585b60512905776c2c6692c76d45241f089d)
---
 source3/smbd/sesssetup.c | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'source3')

diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index 674f6145d3..e36760c148 100644
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -273,10 +273,11 @@ static BOOL reply_spnego_ntlmssp(connection_struct *conn, char *outbuf,
 {
 	BOOL ret;
 	DATA_BLOB response;
-	struct auth_serversupplied_info *server_info;
-	server_info = (*auth_ntlmssp_state)->server_info;
+	struct auth_serversupplied_info *server_info = NULL;
 
-	if (!NT_STATUS_IS_OK(nt_status)) {
+	if (NT_STATUS_IS_OK(nt_status)) {
+		server_info = (*auth_ntlmssp_state)->server_info;
+	} else {
 		nt_status = do_map_to_guest(nt_status, 
 					    &server_info, 
 					    (*auth_ntlmssp_state)->ntlmssp_state->user, 
@@ -387,19 +388,22 @@ static int reply_spnego_auth(connection_struct *conn, char *inbuf, char *outbuf,
 			     DATA_BLOB blob1)
 {
 	DATA_BLOB auth, auth_reply;
-	NTSTATUS nt_status;
+	NTSTATUS nt_status = NT_STATUS_INVALID_PARAMETER;
 
 	if (!spnego_parse_auth(blob1, &auth)) {
 #if 0
 		file_save("auth.dat", blob1.data, blob1.length);
 #endif
-		return ERROR_NT(NT_STATUS_LOGON_FAILURE);
+		return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
 	}
-
-	if ( global_ntlmssp_state ) {
-	nt_status = auth_ntlmssp_update(global_ntlmssp_state, 
-					  auth, &auth_reply);
+	
+	if (!global_ntlmssp_state) {
+		/* auth before negotiatiate? */
+		return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
 	}
+	
+	nt_status = auth_ntlmssp_update(global_ntlmssp_state, 
+						auth, &auth_reply);
 
 	data_blob_free(&auth);
 
-- 
cgit 


From 400bb4bfab01a6c262b15658dee5c0d011d0e883 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sun, 16 Mar 2003 13:21:12 +0000
Subject:  - Make ReadDirName return a const char*.

 - Consequential changes from that

 - mark our fstring/pstring assumptions in function prototypes

Andrew Bartlett
(This used to be commit fe2bc64bc439b27387b8f326b0f4f3bfcc3d04a1)
---
 source3/client/client.c     |  2 +-
 source3/lib/util.c          |  2 +-
 source3/smbd/chgpasswd.c    |  2 +-
 source3/smbd/mangle.c       |  2 +-
 source3/smbd/mangle_hash2.c |  2 +-
 source3/smbd/mangle_map.c   |  2 +-
 source3/smbd/trans2.c       | 53 +++++++++++++++++++++++++--------------------
 7 files changed, 36 insertions(+), 29 deletions(-)

(limited to 'source3')

diff --git a/source3/client/client.c b/source3/client/client.c
index 99fc779a9e..1248c25659 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -1291,7 +1291,7 @@ static int file_find(struct file_list **list, const char *directory,
         int ret;
         char *path;
 	BOOL isdir;
-	char *dname;
+	const char *dname;
 
         dir = opendir(directory);
 	if (!dir) return -1;
diff --git a/source3/lib/util.c b/source3/lib/util.c
index 1f300a2815..4216310335 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -1435,7 +1435,7 @@ void smb_panic(const char *why)
  A readdir wrapper which just returns the file name.
 ********************************************************************/
 
-char *readdirname(DIR *p)
+const char *readdirname(DIR *p)
 {
 	SMB_STRUCT_DIRENT *ptr;
 	char *dname;
diff --git a/source3/smbd/chgpasswd.c b/source3/smbd/chgpasswd.c
index 401ab131ad..31c4fa7cc9 100644
--- a/source3/smbd/chgpasswd.c
+++ b/source3/smbd/chgpasswd.c
@@ -64,7 +64,7 @@ static int findpty(char **slave)
 	int master;
 	static fstring line;
 	DIR *dirp;
-	char *dpname;
+	const char *dpname;
 
 #if defined(HAVE_GRANTPT)
 	/* Try to open /dev/ptmx. If that fails, fall through to old method. */
diff --git a/source3/smbd/mangle.c b/source3/smbd/mangle.c
index f5c703a5bf..c5d7582c03 100644
--- a/source3/smbd/mangle.c
+++ b/source3/smbd/mangle.c
@@ -107,7 +107,7 @@ BOOL mangle_check_cache(char *s)
    map a long filename to a 8.3 name. 
  */
 
-void mangle_map(char *OutName, BOOL need83, BOOL cache83, int snum)
+void mangle_map(pstring OutName, BOOL need83, BOOL cache83, int snum)
 {
 	/* name mangling can be disabled for speed, in which case
 	   we just truncate the string */
diff --git a/source3/smbd/mangle_hash2.c b/source3/smbd/mangle_hash2.c
index eda509214d..cdce28e1bd 100644
--- a/source3/smbd/mangle_hash2.c
+++ b/source3/smbd/mangle_hash2.c
@@ -484,7 +484,7 @@ static BOOL is_legal_name(const char *name)
 
   the name parameter must be able to hold 13 bytes
 */
-static void name_map(char *name, BOOL need83, BOOL cache83)
+static void name_map(fstring name, BOOL need83, BOOL cache83)
 {
 	char *dot_p;
 	char lead_chars[7];
diff --git a/source3/smbd/mangle_map.c b/source3/smbd/mangle_map.c
index 5ae3ebd174..9e798fd41b 100644
--- a/source3/smbd/mangle_map.c
+++ b/source3/smbd/mangle_map.c
@@ -201,7 +201,7 @@ static void mangled_map(char *s, const char *MangledMap)
   front end routine to the mangled map code 
   personally I think that the whole idea of "mangled map" is completely bogus
 */
-void mangle_map_filename(char *fname, int snum)
+void mangle_map_filename(fstring fname, int snum)
 {
 	char *map;
 
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index bea09e9e37..4129852f77 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -460,7 +460,7 @@ static BOOL get_lanman2_dir_entry(connection_struct *conn,
 				 BOOL *out_of_space, BOOL *got_exact_match,
 				 int *last_name_off)
 {
-	char *dname;
+	const char *dname;
 	BOOL found = False;
 	SMB_STRUCT_STAT sbuf;
 	pstring mask;
@@ -1173,7 +1173,8 @@ resume_key = %d resume name = %s continue=%d level = %d\n",
 		 */
 
 		int current_pos, start_pos;
-		char *dname = NULL;
+		const char *dname = NULL;
+		pstring dname_pstring;
 		void *dirptr = conn->dirptr;
 		start_pos = TellDir(dirptr);
 		for(current_pos = start_pos; current_pos >= 0; current_pos--) {
@@ -1181,21 +1182,24 @@ resume_key = %d resume name = %s continue=%d level = %d\n",
 
 			SeekDir(dirptr, current_pos);
 			dname = ReadDirName(dirptr);
+			if (dname) {
+				/*
+				 * Remember, mangle_map is called by
+				 * get_lanman2_dir_entry(), so the resume name
+				 * could be mangled. Ensure we do the same
+				 * here.
+				 */
+				
+				/* make sure we get a copy that mangle_map can modify */
 
-			/*
-			 * Remember, mangle_map is called by
-			 * get_lanman2_dir_entry(), so the resume name
-			 * could be mangled. Ensure we do the same
-			 * here.
-			 */
-
-			if(dname != NULL)
-				mangle_map( dname, False, True, SNUM(conn));
-
-			if(dname && strcsequal( resume_name, dname)) {
-				SeekDir(dirptr, current_pos+1);
-				DEBUG(7,("call_trans2findnext: got match at pos %d\n", current_pos+1 ));
-				break;
+				pstrcpy(dname_pstring, dname);
+				mangle_map( dname_pstring, False, True, SNUM(conn));
+				
+				if(strcsequal( resume_name, dname_pstring)) {
+					SeekDir(dirptr, current_pos+1);
+					DEBUG(7,("call_trans2findnext: got match at pos %d\n", current_pos+1 ));
+					break;
+				}
 			}
 		}
 
@@ -1215,13 +1219,17 @@ resume_key = %d resume name = %s continue=%d level = %d\n",
 				 * here.
 				 */
 
-				if(dname != NULL)
-					mangle_map( dname, False, True, SNUM(conn));
+				if(dname) {
+					/* make sure we get a copy that mangle_map can modify */
+					
+					pstrcpy(dname_pstring, dname);
+					mangle_map(dname_pstring, False, True, SNUM(conn));
 
-				if(dname && strcsequal( resume_name, dname)) {
-					SeekDir(dirptr, current_pos+1);
-					DEBUG(7,("call_trans2findnext: got match at pos %d\n", current_pos+1 ));
-					break;
+					if(strcsequal( resume_name, dname_pstring)) {
+						SeekDir(dirptr, current_pos+1);
+						DEBUG(7,("call_trans2findnext: got match at pos %d\n", current_pos+1 ));
+						break;
+					}
 				}
 			} /* end for */
 		} /* end if current_pos */
@@ -1269,7 +1277,6 @@ resume_key = %d resume name = %s continue=%d level = %d\n",
 		dptr_close(&dptr_num); /* This frees up the saved mask */
 	}
 
-
 	/* Set up the return parameter block */
 	SSVAL(params,0,numentries);
 	SSVAL(params,2,finished);
-- 
cgit 


From c6cf08774114a906645a405dea8a7546d614de35 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sun, 16 Mar 2003 13:23:12 +0000
Subject: Add const. (This used to be commit
 5371720971bc60a4cfba0460614306f322aa10b8)

---
 source3/smbd/dir.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'source3')

diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index 95acf4a262..ec570d3a18 100644
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -578,7 +578,7 @@ BOOL dir_check_ftype(connection_struct *conn,int mode,SMB_STRUCT_STAT *st,int di
 	return True;
 }
 
-static BOOL mangle_mask_match(connection_struct *conn, char *filename, char *mask)
+static BOOL mangle_mask_match(connection_struct *conn, fstring filename, char *mask)
 {
 	mangle_map(filename,True,False,SNUM(conn));
 	return mask_match(filename,mask,False);
@@ -588,10 +588,10 @@ static BOOL mangle_mask_match(connection_struct *conn, char *filename, char *mas
  Get an 8.3 directory entry.
 ****************************************************************************/
 
-BOOL get_dir_entry(connection_struct *conn,char *mask,int dirtype,char *fname,
+BOOL get_dir_entry(connection_struct *conn,char *mask,int dirtype, pstring fname,
                    SMB_OFF_T *size,int *mode,time_t *date,BOOL check_descend)
 {
-	char *dname;
+	const char *dname;
 	BOOL found = False;
 	SMB_STRUCT_STAT sbuf;
 	pstring path;
@@ -627,8 +627,8 @@ BOOL get_dir_entry(connection_struct *conn,char *mask,int dirtype,char *fname,
 			see masktest for a demo
 		*/
 		if ((strcmp(mask,"*.*") == 0) ||
-				mask_match(filename,mask,False) ||
-				mangle_mask_match(conn,filename,mask)) {
+		    mask_match(filename,mask,False) ||
+		    mangle_mask_match(conn,filename,mask)) {
 			if (isrootdir && (strequal(filename,"..") || strequal(filename,".")))
 				continue;
 
@@ -907,7 +907,7 @@ void *OpenDir(connection_struct *conn, const char *name, BOOL use_veto)
 			dirp->current = dirp->data;
 		}
 
-		safe_strcpy(dirp->data+used,n, dirp->mallocsize - used - 1);
+		safe_strcpy_base(dirp->data+used,n, dirp->data, dirp->mallocsize);
 		used += l;
 		dirp->numentries++;
 	}
@@ -933,7 +933,7 @@ void CloseDir(void *p)
  Read from a directory.
 ********************************************************************/
 
-char *ReadDirName(void *p)
+const char *ReadDirName(void *p)
 {
 	char *ret;
 	Dir *dirp = (Dir *)p;
-- 
cgit 


From 7b18c5d1647b44f46cf973701b3bcc9aefb37e7d Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sun, 16 Mar 2003 13:24:36 +0000
Subject: Make sure we mark the assumption of a fstring parameter for
 'devicetype' in the function prototype, and change callers to respect this.

Andrew Bartlett
(This used to be commit 9f3d3c380120f16d76d68f346799282d61eec892)
---
 source3/rpc_server/srv_srvsvc_nt.c |  9 +++++++--
 source3/smbd/reply.c               |  4 ++--
 source3/smbd/service.c             | 12 ++++++------
 3 files changed, 15 insertions(+), 10 deletions(-)

(limited to 'source3')

diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c
index 6d2320d67d..815dd75d22 100644
--- a/source3/rpc_server/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srv_srvsvc_nt.c
@@ -1840,6 +1840,8 @@ WERROR _srv_net_file_query_secdesc(pipes_struct *p, SRV_Q_NET_FILE_QUERY_SECDESC
 	struct current_user user;
 	connection_struct *conn = NULL;
 	BOOL became_user = False; 
+	fstring dev;
+	fstrcpy(dev, "A:");
 
 	ZERO_STRUCT(st);
 
@@ -1853,7 +1855,7 @@ WERROR _srv_net_file_query_secdesc(pipes_struct *p, SRV_Q_NET_FILE_QUERY_SECDESC
 	get_current_user(&user, p);
 
 	become_root();
-	conn = make_connection(qualname, null_pw, "A:", user.vuid, &nt_status);
+	conn = make_connection(qualname, null_pw, dev, user.vuid, &nt_status);
 	unbecome_root();
 
 	if (conn == NULL) {
@@ -1943,9 +1945,12 @@ WERROR _srv_net_file_set_secdesc(pipes_struct *p, SRV_Q_NET_FILE_SET_SECDESC *q_
 	struct current_user user;
 	connection_struct *conn = NULL;
 	BOOL became_user = False;
+	fstring dev;
+	fstrcpy(dev, "A:");
 
 	ZERO_STRUCT(st);
 
+
 	r_u->status = WERR_OK;
 
 	unistr2_to_ascii(qualname, &q_u->uni_qual_name, sizeof(qualname));
@@ -1956,7 +1961,7 @@ WERROR _srv_net_file_set_secdesc(pipes_struct *p, SRV_Q_NET_FILE_SET_SECDESC *q_
 	get_current_user(&user, p);
 
 	become_root();
-	conn = make_connection(qualname, null_pw, "A:", user.vuid, &nt_status);
+	conn = make_connection(qualname, null_pw, dev, user.vuid, &nt_status);
 	unbecome_root();
 
 	if (conn == NULL) {
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 80f648981a..5ca0ae52de 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -148,7 +148,7 @@ int reply_tcon(connection_struct *conn,
 	const char *service;
 	pstring service_buf;
 	pstring password;
-	pstring dev;
+	fstring dev;
 	int outsize = 0;
 	uint16 vuid = SVAL(inbuf,smb_uid);
 	int pwlen=0;
@@ -204,7 +204,7 @@ int reply_tcon_and_X(connection_struct *conn, char *inbuf,char *outbuf,int lengt
 {
 	fstring service;
 	DATA_BLOB password;
-	pstring devicename;
+	fstring devicename;
 	NTSTATUS nt_status;
 	uint16 vuid = SVAL(inbuf,smb_uid);
 	int passlen = SVAL(inbuf,smb_vwv3);
diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index 1c7e4017b0..a47e6c1bbc 100644
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -218,7 +218,7 @@ int find_service(fstring service)
  do some basic sainity checks on the share.  
  This function modifies dev, ecode.
 ****************************************************************************/
-static NTSTATUS share_sanity_checks(int snum, pstring dev) 
+static NTSTATUS share_sanity_checks(int snum, fstring dev) 
 {
 	
 	if (!lp_snum_ok(snum) || 
@@ -233,9 +233,9 @@ static NTSTATUS share_sanity_checks(int snum, pstring dev)
 	
 	if (dev[0] == '?' || !dev[0]) {
 		if (lp_print_ok(snum)) {
-			pstrcpy(dev,"LPT1:");
+			fstrcpy(dev,"LPT1:");
 		} else {
-			pstrcpy(dev,"A:");
+			fstrcpy(dev,"A:");
 		}
 	}
 
@@ -248,7 +248,7 @@ static NTSTATUS share_sanity_checks(int snum, pstring dev)
 
 	/* Behave as a printer if we are supposed to */
 	if (lp_print_ok(snum) && (strcmp(dev, "A:") == 0)) {
-		pstrcpy(dev, "LPT1:");
+		fstrcpy(dev, "LPT1:");
 	}
 
 	return NT_STATUS_OK;
@@ -326,7 +326,7 @@ static void set_admin_user(connection_struct *conn, gid_t *groups, size_t n_grou
 
 static connection_struct *make_connection_snum(int snum, user_struct *vuser,
 					       DATA_BLOB password, 
-					       char *dev, NTSTATUS *status)
+					       fstring dev, NTSTATUS *status)
 {
 	struct passwd *pass = NULL;
 	BOOL guest = False;
@@ -747,7 +747,7 @@ connection_struct *make_connection_with_chdir(const char *service_in, DATA_BLOB
 ****************************************************************************/
 
 connection_struct *make_connection(const char *service_in, DATA_BLOB password, 
-				   char *dev, uint16 vuid, NTSTATUS *status)
+				   fstring dev, uint16 vuid, NTSTATUS *status)
 {
 	uid_t euid;
 	user_struct *vuser = NULL;
-- 
cgit 


From 3ecf5d663864cab17288b73426183e1a1499e37c Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sun, 16 Mar 2003 22:07:36 +0000
Subject: Missed one when I move 'share_sanity_checks' to use an fstring for
 'dev'.

Andrew Bartlett
(This used to be commit a0208a4f74f9c61eb1e346d9cb62dbe00ef4c24a)
---
 source3/smbd/service.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index a47e6c1bbc..dc471ab87e 100644
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -229,7 +229,7 @@ static NTSTATUS share_sanity_checks(int snum, fstring dev)
 
 	/* you can only connect to the IPC$ service as an ipc device */
 	if (strequal(lp_fstype(snum), "IPC"))
-		pstrcpy(dev,"IPC");
+		fstrcpy(dev,"IPC");
 	
 	if (dev[0] == '?' || !dev[0]) {
 		if (lp_print_ok(snum)) {
-- 
cgit 


From 1171b0c9ac59e7bd667bb82f48cda27c203721d8 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 17 Mar 2003 03:47:15 +0000
Subject: Fix memory leaks and add parinoioa code to our stat() cache.

Andrew Bartlett
(This used to be commit 3fd07bd25eefdb2a7a6891fa1169ab2425607249)
---
 source3/smbd/statcache.c | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

(limited to 'source3')

diff --git a/source3/smbd/statcache.c b/source3/smbd/statcache.c
index 812e0dde37..57ba6ada81 100644
--- a/source3/smbd/statcache.c
+++ b/source3/smbd/statcache.c
@@ -90,14 +90,28 @@ void stat_cache_add( char *full_orig_name, char *orig_translated_path)
   }
 
   original_path = strdup(full_orig_name);
-  if (!original_path) 
+  if (!original_path) {
+	  SAFE_FREE(translated_path);
 	  return;
+  }
 
   original_path_length = strlen(original_path);
 
+  if(original_path[original_path_length-1] == '/') {
+    original_path[original_path_length-1] = '\0';
+    original_path_length--;
+  }
+
   if(!case_sensitive)
 	  strupper(original_path);
-  
+
+  if(!(original_path_length == translated_path_length)) {
+	  DEBUG(0, ("OOPS - tried to store stat cache entry for non-equal length paths [%s] %u and [%s] %u)!\n", original_path, original_path_length, translated_path, translated_path_length));
+	  SAFE_FREE(original_path);
+	  SAFE_FREE(translated_path);
+	  return;
+  }
+
 #if 0
   /*
    * We will only replace namelen characters 
@@ -119,6 +133,8 @@ void stat_cache_add( char *full_orig_name, char *orig_translated_path)
 	  found_scp = (stat_cache_entry *)(hash_elem->value);
 	  if (strcmp((found_scp->translated_path), orig_translated_path) == 0) {
 		  /* already in hash table */
+		  SAFE_FREE(original_path);
+		  SAFE_FREE(translated_path);
 		  return;
 	  }
 	  /* hash collision - remove before we re-add */
@@ -133,6 +149,8 @@ void stat_cache_add( char *full_orig_name, char *orig_translated_path)
 				       +original_path_length
 				       +translated_path_length)) == NULL) {
 	  DEBUG(0,("stat_cache_add: Out of memory !\n"));
+	  SAFE_FREE(original_path);
+	  SAFE_FREE(translated_path);
 	  return;
   }
 
@@ -144,6 +162,9 @@ void stat_cache_add( char *full_orig_name, char *orig_translated_path)
 
   hash_insert(&stat_cache, (char *)scp, original_path);
 
+  SAFE_FREE(original_path);
+  SAFE_FREE(translated_path);
+
   DEBUG(5,("stat_cache_add: Added entry %s -> %s\n", scp->original_path, scp->translated_path));
 }
 
-- 
cgit 


From 077e093d8ae79519baa7edc0c4cbd5b4b853a19a Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Mon, 17 Mar 2003 03:56:58 +0000
Subject: Some cosmetic changes to make the popt --usage output look nicer.
 (This used to be commit 39124b9a62e1ba0f8089c36b27d6c79352a27973)

---
 source3/nsswitch/wbinfo.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'source3')

diff --git a/source3/nsswitch/wbinfo.c b/source3/nsswitch/wbinfo.c
index 68dc178bcd..4f621e7008 100644
--- a/source3/nsswitch/wbinfo.c
+++ b/source3/nsswitch/wbinfo.c
@@ -663,7 +663,7 @@ static BOOL wbinfo_ping(void)
 
 	/* Display response */
 
-        d_printf("'ping' to winbindd %s on fd %d\n", 
+        d_printf("Ping to winbindd %s on fd %d\n", 
                (result == NSS_STATUS_SUCCESS) ? "succeeded" : "failed", winbindd_fd);
 
         return result == NSS_STATUS_SUCCESS;
@@ -695,8 +695,8 @@ int main(int argc, char **argv)
 
 		{ "domain-users", 'u', POPT_ARG_NONE, 0, 'u', "Lists all domain users"},
 		{ "domain-groups", 'g', POPT_ARG_NONE, 0, 'g', "Lists all domain groups" },
-		{ "WINS-by-name", 'N', POPT_ARG_STRING, &string_arg, 'N', "Converts NetBIOS name to IP (WINS)", "NETBIOS-NAME" },
-		{ "WINS-by-ip", 'I', POPT_ARG_STRING, &string_arg, 'I', "Converts IP address to NetBIOS name (WINS)", "IP" },
+		{ "WINS-by-name", 'N', POPT_ARG_STRING, &string_arg, 'N', "Converts NetBIOS name to IP", "NETBIOS-NAME" },
+		{ "WINS-by-ip", 'I', POPT_ARG_STRING, &string_arg, 'I', "Converts IP address to NetBIOS name", "IP" },
 		{ "name-to-sid", 'n', POPT_ARG_STRING, &string_arg, 'n', "Converts name to sid", "NAME" },
 		{ "sid-to-name", 's', POPT_ARG_STRING, &string_arg, 's', "Converts sid to name", "SID" },
 		{ "uid-to-sid", 'U', POPT_ARG_INT, &int_arg, 'U', "Converts uid to sid" , "UID" },
@@ -705,12 +705,12 @@ int main(int argc, char **argv)
 		{ "sid-to-gid", 'Y', POPT_ARG_STRING, &string_arg, 'Y', "Converts sid to gid", "SID" },
 		{ "check-secret", 't', POPT_ARG_NONE, 0, 't', "Check shared secret" },
 		{ "trusted-domains", 'm', POPT_ARG_NONE, 0, 'm', "List trusted domains" },
-		{ "sequence", 0, POPT_ARG_NONE, 0, OPT_SEQUENCE, "show sequence numbers of all domains" },
+		{ "sequence", 0, POPT_ARG_NONE, 0, OPT_SEQUENCE, "Show sequence numbers of all domains" },
 		{ "user-groups", 'r', POPT_ARG_STRING, &string_arg, 'r', "Get user groups", "USER" },
  		{ "authenticate", 'a', POPT_ARG_STRING, &string_arg, 'a', "authenticate user", "user%password" },
 		{ "set-auth-user", 'A', POPT_ARG_STRING, &string_arg, OPT_SET_AUTH_USER, "Store user and password used by winbindd (root only)", "user%password" },
 		{ "get-auth-user", 0, POPT_ARG_NONE, NULL, OPT_GET_AUTH_USER, "Retrieve user and password used by winbindd (root only)", NULL },
-		{ "ping", 'p', POPT_ARG_NONE, 0, 'p', "'ping' winbindd to see if it is alive" },
+		{ "ping", 'p', POPT_ARG_NONE, 0, 'p', "Ping winbindd to see if it is alive" },
 		{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version},
 		{ 0, 0, 0, 0 }
 	};
-- 
cgit 


From 0ab29d6186135bd66c4154b545ac8323232a6f2e Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 17 Mar 2003 04:42:57 +0000
Subject: Fix a memory leak - 'smbcontrol smbd pool-usage' is your freind!

Andrew Bartlett
(This used to be commit a12e8524997e329a4f4cd766d6371e384698795a)
---
 source3/libsmb/trusts_util.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source3')

diff --git a/source3/libsmb/trusts_util.c b/source3/libsmb/trusts_util.c
index f7b2c2e3a6..b8f84ba890 100644
--- a/source3/libsmb/trusts_util.c
+++ b/source3/libsmb/trusts_util.c
@@ -155,6 +155,8 @@ BOOL is_trusted_domain(const char* dom_name)
 		}
 	} while (NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES));
 
+	talloc_destroy(mem_ctx);
+
 	/*
 	 * Query the trustdom_cache updated periodically. The only
 	 * way for domain member server.
-- 
cgit 


From 355bea4b2cd62bdd00bfbb3fba017c62b11ebc95 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Mon, 17 Mar 2003 05:46:54 +0000
Subject: Ignore .pyc files. (This used to be commit
 b20a357ac534b513383ad20046a99bb7f39bba25)

---
 source3/stf/.cvsignore | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 source3/stf/.cvsignore

(limited to 'source3')

diff --git a/source3/stf/.cvsignore b/source3/stf/.cvsignore
new file mode 100644
index 0000000000..7e99e367f8
--- /dev/null
+++ b/source3/stf/.cvsignore
@@ -0,0 +1 @@
+*.pyc
\ No newline at end of file
-- 
cgit 


From 1eae003fefaa8e4e9e131c9d5f2a299cec2b5e55 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Mon, 17 Mar 2003 05:55:41 +0000
Subject: Applied waider's patch to return DOS error codes for pipes that
 support it. (This used to be commit ac3df9a8051bd105e8e4192d36b3024fdf9f9506)

---
 source3/rpcclient/cmd_dfs.c      |  10 +-
 source3/rpcclient/cmd_ds.c       |   2 +-
 source3/rpcclient/cmd_lsarpc.c   |  28 ++---
 source3/rpcclient/cmd_netlogon.c |  10 +-
 source3/rpcclient/cmd_reg.c      |   4 +-
 source3/rpcclient/cmd_samr.c     |  36 +++---
 source3/rpcclient/cmd_spoolss.c  | 229 +++++++++++++++++++--------------------
 source3/rpcclient/cmd_srvsvc.c   |  32 +++---
 source3/rpcclient/rpcclient.c    |  48 +++++---
 source3/rpcclient/rpcclient.h    |  10 +-
 10 files changed, 217 insertions(+), 192 deletions(-)

(limited to 'source3')

diff --git a/source3/rpcclient/cmd_dfs.c b/source3/rpcclient/cmd_dfs.c
index 715174c824..44e97f9881 100644
--- a/source3/rpcclient/cmd_dfs.c
+++ b/source3/rpcclient/cmd_dfs.c
@@ -227,11 +227,11 @@ struct cmd_set dfs_commands[] = {
 
 	{ "DFS" },
 
-	{ "dfsexist",   cmd_dfs_exist,   PI_NETDFS, "Query DFS support",    "" },
-	{ "dfsadd",     cmd_dfs_add,     PI_NETDFS, "Add a DFS share",      "" },
-	{ "dfsremove",  cmd_dfs_remove,  PI_NETDFS, "Remove a DFS share",   "" },
-	{ "dfsgetinfo", cmd_dfs_getinfo, PI_NETDFS, "Query DFS share info", "" },
-	{ "dfsenum",    cmd_dfs_enum,    PI_NETDFS, "Enumerate dfs shares", "" },
+	{ "dfsexist",  RPC_RTYPE_NTSTATUS, cmd_dfs_exist,   NULL, PI_NETDFS, "Query DFS support",    "" },
+	{ "dfsadd",    RPC_RTYPE_NTSTATUS, cmd_dfs_add,     NULL, PI_NETDFS, "Add a DFS share",      "" },
+	{ "dfsremove", RPC_RTYPE_NTSTATUS, cmd_dfs_remove,  NULL, PI_NETDFS, "Remove a DFS share",   "" },
+	{ "dfsgetinfo",RPC_RTYPE_NTSTATUS, cmd_dfs_getinfo, NULL, PI_NETDFS, "Query DFS share info", "" },
+	{ "dfsenum",   RPC_RTYPE_NTSTATUS, cmd_dfs_enum,    NULL, PI_NETDFS, "Enumerate dfs shares", "" },
 
 	{ NULL }
 };
diff --git a/source3/rpcclient/cmd_ds.c b/source3/rpcclient/cmd_ds.c
index 9de6d6a9ec..4c2f52e291 100644
--- a/source3/rpcclient/cmd_ds.c
+++ b/source3/rpcclient/cmd_ds.c
@@ -53,7 +53,7 @@ struct cmd_set ds_commands[] = {
 
 	{ "LSARPC-DS" },
 
-	{ "dsroledominfo",	cmd_ds_dsrole_getprimarydominfo,       PI_LSARPC_DS, "Get Primary Domain Information", "" },
+	{ "dsroledominfo", RPC_RTYPE_NTSTATUS, cmd_ds_dsrole_getprimarydominfo, NULL, PI_LSARPC_DS, "Get Primary Domain Information", "" },
 
 	{ NULL }
 };
diff --git a/source3/rpcclient/cmd_lsarpc.c b/source3/rpcclient/cmd_lsarpc.c
index fab6a89ed5..808ef50a45 100644
--- a/source3/rpcclient/cmd_lsarpc.c
+++ b/source3/rpcclient/cmd_lsarpc.c
@@ -741,20 +741,20 @@ struct cmd_set lsarpc_commands[] = {
 
 	{ "LSARPC" },
 
-	{ "lsaquery", 	         cmd_lsa_query_info_policy,  PI_LSARPC, "Query info policy",                    "" },
-	{ "lookupsids",          cmd_lsa_lookup_sids,        PI_LSARPC, "Convert SIDs to names",                "" },
-	{ "lookupnames",         cmd_lsa_lookup_names,       PI_LSARPC, "Convert names to SIDs",                "" },
-	{ "enumtrust", 	         cmd_lsa_enum_trust_dom,     PI_LSARPC, "Enumerate trusted domains",            "Usage: [preferred max number] [enum context (0)]" },
-	{ "enumprivs", 	         cmd_lsa_enum_privilege,     PI_LSARPC, "Enumerate privileges",                 "" },
-	{ "getdispname",         cmd_lsa_get_dispname,       PI_LSARPC, "Get the privilege name",               "" },
-	{ "lsaenumsid",          cmd_lsa_enum_sids,          PI_LSARPC, "Enumerate the LSA SIDS",               "" },
-	{ "lsaenumprivsaccount", cmd_lsa_enum_privsaccounts, PI_LSARPC, "Enumerate the privileges of an SID",   "" },
-	{ "lsaenumacctrights",   cmd_lsa_enum_acct_rights,   PI_LSARPC, "Enumerate the rights of an SID",   "" },
-	{ "lsaenumacctwithright",cmd_lsa_enum_acct_with_right,PI_LSARPC,"Enumerate accounts with a right",   "" },
-	{ "lsaaddacctrights",    cmd_lsa_add_acct_rights,    PI_LSARPC, "Add rights to an account",   "" },
-	{ "lsaremoveacctrights", cmd_lsa_remove_acct_rights, PI_LSARPC, "Remove rights from an account",   "" },
-	{ "lsalookupprivvalue",  cmd_lsa_lookupprivvalue,    PI_LSARPC, "Get a privilege value given its name", "" },
-	{ "lsaquerysecobj",      cmd_lsa_query_secobj,       PI_LSARPC, "Query LSA security object", "" },
+	{ "lsaquery", 	         RPC_RTYPE_NTSTATUS, cmd_lsa_query_info_policy,  NULL, PI_LSARPC, "Query info policy",                    "" },
+	{ "lookupsids",          RPC_RTYPE_NTSTATUS, cmd_lsa_lookup_sids,        NULL, PI_LSARPC, "Convert SIDs to names",                "" },
+	{ "lookupnames",         RPC_RTYPE_NTSTATUS, cmd_lsa_lookup_names,       NULL, PI_LSARPC, "Convert names to SIDs",                "" },
+	{ "enumtrust", 	         RPC_RTYPE_NTSTATUS, cmd_lsa_enum_trust_dom,     NULL, PI_LSARPC, "Enumerate trusted domains",            "Usage: [preferred max number] [enum context (0)]" },
+	{ "enumprivs", 	         RPC_RTYPE_NTSTATUS, cmd_lsa_enum_privilege,     NULL, PI_LSARPC, "Enumerate privileges",                 "" },
+	{ "getdispname",         RPC_RTYPE_NTSTATUS, cmd_lsa_get_dispname,       NULL, PI_LSARPC, "Get the privilege name",               "" },
+	{ "lsaenumsid",          RPC_RTYPE_NTSTATUS, cmd_lsa_enum_sids,          NULL, PI_LSARPC, "Enumerate the LSA SIDS",               "" },
+	{ "lsaenumprivsaccount", RPC_RTYPE_NTSTATUS, cmd_lsa_enum_privsaccounts, NULL, PI_LSARPC, "Enumerate the privileges of an SID",   "" },
+	{ "lsaenumacctrights",   RPC_RTYPE_NTSTATUS, cmd_lsa_enum_acct_rights,   NULL, PI_LSARPC, "Enumerate the rights of an SID",   "" },
+	{ "lsaenumacctwithright",RPC_RTYPE_NTSTATUS, cmd_lsa_enum_acct_with_right,NULL, PI_LSARPC,"Enumerate accounts with a right",   "" },
+	{ "lsaaddacctrights",    RPC_RTYPE_NTSTATUS, cmd_lsa_add_acct_rights,    NULL, PI_LSARPC, "Add rights to an account",   "" },
+	{ "lsaremoveacctrights", RPC_RTYPE_NTSTATUS, cmd_lsa_remove_acct_rights, NULL, PI_LSARPC, "Remove rights from an account",   "" },
+	{ "lsalookupprivvalue",  RPC_RTYPE_NTSTATUS, cmd_lsa_lookupprivvalue,    NULL, PI_LSARPC, "Get a privilege value given its name", "" },
+	{ "lsaquerysecobj",      RPC_RTYPE_NTSTATUS, cmd_lsa_query_secobj,       NULL, PI_LSARPC, "Query LSA security object", "" },
 
 	{ NULL }
 };
diff --git a/source3/rpcclient/cmd_netlogon.c b/source3/rpcclient/cmd_netlogon.c
index 407bff3735..1421c4da26 100644
--- a/source3/rpcclient/cmd_netlogon.c
+++ b/source3/rpcclient/cmd_netlogon.c
@@ -332,11 +332,11 @@ struct cmd_set netlogon_commands[] = {
 
 	{ "NETLOGON" },
 
-	{ "logonctrl2", cmd_netlogon_logon_ctrl2, PI_NETLOGON, "Logon Control 2",     "" },
-	{ "logonctrl",  cmd_netlogon_logon_ctrl,  PI_NETLOGON, "Logon Control",       "" },
-	{ "samsync",    cmd_netlogon_sam_sync,    PI_NETLOGON, "Sam Synchronisation", "" },
-	{ "samdeltas",  cmd_netlogon_sam_deltas,  PI_NETLOGON, "Query Sam Deltas",    "" },
-        { "samlogon",   cmd_netlogon_sam_logon,   PI_NETLOGON, "Sam Logon",           "" },
+	{ "logonctrl2", RPC_RTYPE_NTSTATUS, cmd_netlogon_logon_ctrl2, NULL, PI_NETLOGON, "Logon Control 2",     "" },
+	{ "logonctrl",  RPC_RTYPE_NTSTATUS, cmd_netlogon_logon_ctrl,  NULL, PI_NETLOGON, "Logon Control",       "" },
+	{ "samsync",    RPC_RTYPE_NTSTATUS, cmd_netlogon_sam_sync,    NULL, PI_NETLOGON, "Sam Synchronisation", "" },
+	{ "samdeltas",  RPC_RTYPE_NTSTATUS, cmd_netlogon_sam_deltas,  NULL, PI_NETLOGON, "Query Sam Deltas",    "" },
+     { "samlogon",   RPC_RTYPE_NTSTATUS, cmd_netlogon_sam_logon,   NULL, PI_NETLOGON, "Sam Logon",           "" },
 
 	{ NULL }
 };
diff --git a/source3/rpcclient/cmd_reg.c b/source3/rpcclient/cmd_reg.c
index 8943331dab..bf85d21716 100644
--- a/source3/rpcclient/cmd_reg.c
+++ b/source3/rpcclient/cmd_reg.c
@@ -970,10 +970,10 @@ struct cmd_set reg_commands[] = {
 
 	{ "REG"  },
 
-	{ "shutdown",		cmd_reg_shutdown,		PI_WINREG, "Remote Shutdown",
+	{ "shutdown", RPC_RTYPE_NTSTATUS, cmd_reg_shutdown, NULL, PI_WINREG, "Remote Shutdown",
 				"syntax: shutdown [-m message] [-t timeout] [-r] [-h] [-f] (-r == reboot, -h == halt, -f == force)" },
 				
-	{ "abortshutdown",	cmd_reg_abort_shutdown,		PI_WINREG, "Abort Shutdown",
+	{ "abortshutdown", RPC_RTYPE_NTSTATUS, cmd_reg_abort_shutdown, NULL, PI_WINREG, "Abort Shutdown",
 				"syntax: abortshutdown" },
 /*
 	{ "regenum",		cmd_reg_enum,			"Registry Enumeration",
diff --git a/source3/rpcclient/cmd_samr.c b/source3/rpcclient/cmd_samr.c
index 95ea27562e..866381456b 100644
--- a/source3/rpcclient/cmd_samr.c
+++ b/source3/rpcclient/cmd_samr.c
@@ -1494,24 +1494,24 @@ struct cmd_set samr_commands[] = {
 
 	{ "SAMR" },
 
-	{ "queryuser", 		cmd_samr_query_user, 		PI_SAMR,	"Query user info",         "" },
-	{ "querygroup", 	cmd_samr_query_group, 		PI_SAMR,	"Query group info",        "" },
-	{ "queryusergroups", 	cmd_samr_query_usergroups, 	PI_SAMR,	"Query user groups",       "" },
-	{ "queryuseraliases", 	cmd_samr_query_useraliases, 	PI_SAMR,	"Query user aliases",      "" },
-	{ "querygroupmem", 	cmd_samr_query_groupmem, 	PI_SAMR,	"Query group membership",  "" },
-	{ "queryaliasmem", 	cmd_samr_query_aliasmem, 	PI_SAMR,	"Query alias membership",  "" },
-	{ "querydispinfo", 	cmd_samr_query_dispinfo, 	PI_SAMR,	"Query display info",      "" },
-	{ "querydominfo", 	cmd_samr_query_dominfo, 	PI_SAMR,	"Query domain info",       "" },
-	{ "enumdomusers",      cmd_samr_enum_dom_users,       PI_SAMR,	"Enumerate domain users", "" },
-	{ "enumdomgroups",      cmd_samr_enum_dom_groups,       PI_SAMR,	"Enumerate domain groups", "" },
-	{ "enumalsgroups",      cmd_samr_enum_als_groups,       PI_SAMR,	"Enumerate alias groups",  "" },
-
-	{ "createdomuser",      cmd_samr_create_dom_user,       PI_SAMR,	"Create domain user",      "" },
-	{ "samlookupnames",     cmd_samr_lookup_names,          PI_SAMR,	"Look up names",           "" },
-	{ "samlookuprids",      cmd_samr_lookup_rids,           PI_SAMR,	"Look up names",           "" },
-	{ "deletedomuser",      cmd_samr_delete_dom_user,       PI_SAMR,	"Delete domain user",      "" },
-	{ "samquerysecobj",     cmd_samr_query_sec_obj,         PI_SAMR, "Query SAMR security object",   "" },
-	{ "getdompwinfo",       cmd_samr_get_dom_pwinfo,        PI_SAMR, "Retrieve domain password info", "" },
+	{ "queryuser", 	RPC_RTYPE_NTSTATUS, cmd_samr_query_user, 		NULL, PI_SAMR,	"Query user info",         "" },
+	{ "querygroup", 	RPC_RTYPE_NTSTATUS, cmd_samr_query_group, 		NULL, PI_SAMR,	"Query group info",        "" },
+	{ "queryusergroups", 	RPC_RTYPE_NTSTATUS, cmd_samr_query_usergroups, 	NULL, PI_SAMR,	"Query user groups",       "" },
+	{ "queryuseraliases", 	RPC_RTYPE_NTSTATUS, cmd_samr_query_useraliases, 	NULL, PI_SAMR,	"Query user aliases",      "" },
+	{ "querygroupmem", 	RPC_RTYPE_NTSTATUS, cmd_samr_query_groupmem, 	NULL, PI_SAMR,	"Query group membership",  "" },
+	{ "queryaliasmem", 	RPC_RTYPE_NTSTATUS, cmd_samr_query_aliasmem, 	NULL, PI_SAMR,	"Query alias membership",  "" },
+	{ "querydispinfo", 	RPC_RTYPE_NTSTATUS, cmd_samr_query_dispinfo, 	NULL, PI_SAMR,	"Query display info",      "" },
+	{ "querydominfo", 	RPC_RTYPE_NTSTATUS, cmd_samr_query_dominfo, 	NULL, PI_SAMR,	"Query domain info",       "" },
+	{ "enumdomusers",      RPC_RTYPE_NTSTATUS, cmd_samr_enum_dom_users,       NULL, PI_SAMR,	"Enumerate domain users", "" },
+	{ "enumdomgroups",      RPC_RTYPE_NTSTATUS, cmd_samr_enum_dom_groups,       NULL, PI_SAMR,	"Enumerate domain groups", "" },
+	{ "enumalsgroups",      RPC_RTYPE_NTSTATUS, cmd_samr_enum_als_groups,       NULL, PI_SAMR,	"Enumerate alias groups",  "" },
+
+	{ "createdomuser",      RPC_RTYPE_NTSTATUS, cmd_samr_create_dom_user,       NULL, PI_SAMR,	"Create domain user",      "" },
+	{ "samlookupnames",     RPC_RTYPE_NTSTATUS, cmd_samr_lookup_names,          NULL, PI_SAMR,	"Look up names",           "" },
+	{ "samlookuprids",      RPC_RTYPE_NTSTATUS, cmd_samr_lookup_rids,           NULL, PI_SAMR,	"Look up names",           "" },
+	{ "deletedomuser",      RPC_RTYPE_NTSTATUS, cmd_samr_delete_dom_user,       NULL, PI_SAMR,	"Delete domain user",      "" },
+	{ "samquerysecobj",     RPC_RTYPE_NTSTATUS, cmd_samr_query_sec_obj,         NULL, PI_SAMR, "Query SAMR security object",   "" },
+	{ "getdompwinfo",       RPC_RTYPE_NTSTATUS, cmd_samr_get_dom_pwinfo,        NULL, PI_SAMR, "Retrieve domain password info", "" },
 
 	{ NULL }
 };
diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c
index 9686fd1e24..3ce7f9e6ac 100644
--- a/source3/rpcclient/cmd_spoolss.c
+++ b/source3/rpcclient/cmd_spoolss.c
@@ -84,19 +84,19 @@ BOOL get_short_archi(char *short_archi, const char *long_archi)
 /**********************************************************************
  * dummy function  -- placeholder
   */
-static NTSTATUS cmd_spoolss_not_implemented(struct cli_state *cli, 
+static WERROR cmd_spoolss_not_implemented(struct cli_state *cli, 
                                             TALLOC_CTX *mem_ctx,
                                             int argc, const char **argv)
 {
 	printf ("(*) This command is not currently implemented.\n");
-	return NT_STATUS_OK;
+	return WERR_OK;
 }
 #endif
 
 /***********************************************************************
  * Get printer information
  */
-static NTSTATUS cmd_spoolss_open_printer_ex(struct cli_state *cli, 
+static WERROR cmd_spoolss_open_printer_ex(struct cli_state *cli, 
                                             TALLOC_CTX *mem_ctx,
                                             int argc, const char **argv)
 {
@@ -107,11 +107,11 @@ static NTSTATUS cmd_spoolss_open_printer_ex(struct cli_state *cli,
 	
 	if (argc != 2) {
 		printf("Usage: %s <printername>\n", argv[0]);
-		return NT_STATUS_OK;
+		return WERR_OK;
 	}
 	
 	if (!cli)
-		return NT_STATUS_UNSUCCESSFUL;
+            return WERR_GENERAL_FAILURE;
 
 	slprintf (servername, sizeof(servername)-1, "\\\\%s", cli->desthost);
 	strupper (servername);
@@ -134,7 +134,7 @@ static NTSTATUS cmd_spoolss_open_printer_ex(struct cli_state *cli,
 		}
 	}
 
-	return W_ERROR_IS_OK(werror) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+	return werror;
 }
 
 
@@ -298,7 +298,7 @@ static void display_print_info_3(PRINTER_INFO_3 *i3)
 
 /* Enumerate printers */
 
-static NTSTATUS cmd_spoolss_enum_printers(struct cli_state *cli, 
+static WERROR cmd_spoolss_enum_printers(struct cli_state *cli, 
                                           TALLOC_CTX *mem_ctx,
                                           int argc, const char **argv)
 {
@@ -311,7 +311,7 @@ static NTSTATUS cmd_spoolss_enum_printers(struct cli_state *cli,
 	if (argc > 3) 
 	{
 		printf("Usage: %s [level] [name]\n", argv[0]);
-		return NT_STATUS_OK;
+		return WERR_OK;
 	}
 
 	if (argc == 2)
@@ -367,7 +367,7 @@ static NTSTATUS cmd_spoolss_enum_printers(struct cli_state *cli,
 	}
 	done:
 
-	return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+	return result;
 }
 
 /****************************************************************************
@@ -403,7 +403,7 @@ static void display_port_info_2(PORT_INFO_2 *i2)
 
 /* Enumerate ports */
 
-static NTSTATUS cmd_spoolss_enum_ports(struct cli_state *cli, 
+static WERROR cmd_spoolss_enum_ports(struct cli_state *cli, 
 				       TALLOC_CTX *mem_ctx, int argc, 
 				       const char **argv)
 {
@@ -414,7 +414,7 @@ static NTSTATUS cmd_spoolss_enum_ports(struct cli_state *cli,
 	
 	if (argc > 2) {
 		printf("Usage: %s [level]\n", argv[0]);
-		return NT_STATUS_OK;
+		return WERR_OK;
 	}
 	
 	if (argc == 2)
@@ -449,13 +449,13 @@ static NTSTATUS cmd_spoolss_enum_ports(struct cli_state *cli,
 		}
 	}
 	
-	return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+	return result;
 }
 
 /***********************************************************************
  * Set printer comment - use a level2 set.
  */
-static NTSTATUS cmd_spoolss_setprinter(struct cli_state *cli,
+static WERROR cmd_spoolss_setprinter(struct cli_state *cli,
                                        TALLOC_CTX *mem_ctx,
                                        int argc, const char **argv)
 {
@@ -473,7 +473,7 @@ static NTSTATUS cmd_spoolss_setprinter(struct cli_state *cli,
 	if (argc == 1 || argc > 3) {
 		printf("Usage: %s printername comment\n", argv[0]);
 
-		return NT_STATUS_OK;
+		return WERR_OK;
 	}
 
 	/* Open a printer handle */
@@ -519,13 +519,13 @@ static NTSTATUS cmd_spoolss_setprinter(struct cli_state *cli,
 	if (opened_hnd)
 		cli_spoolss_close_printer(cli, mem_ctx, &pol);
 
-	return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+	return result;
 }
 
 /***********************************************************************
  * Get printer information
  */
-static NTSTATUS cmd_spoolss_getprinter(struct cli_state *cli,
+static WERROR cmd_spoolss_getprinter(struct cli_state *cli,
                                        TALLOC_CTX *mem_ctx,
                                        int argc, const char **argv)
 {
@@ -541,7 +541,7 @@ static NTSTATUS cmd_spoolss_getprinter(struct cli_state *cli,
 
 	if (argc == 1 || argc > 3) {
 		printf("Usage: %s <printername> [level]\n", argv[0]);
-		return NT_STATUS_OK;
+		return WERR_OK;
 	}
 
 	/* Open a printer handle */
@@ -601,7 +601,7 @@ static NTSTATUS cmd_spoolss_getprinter(struct cli_state *cli,
 	if (opened_hnd) 
 		cli_spoolss_close_printer(cli, mem_ctx, &pol);
 
-	return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+	return result;
 }
 
 static void display_reg_value(REGISTRY_VALUE value)
@@ -644,7 +644,7 @@ static void display_reg_value(REGISTRY_VALUE value)
 /***********************************************************************
  * Get printer data
  */
-static NTSTATUS cmd_spoolss_getprinterdata(struct cli_state *cli,
+static WERROR cmd_spoolss_getprinterdata(struct cli_state *cli,
 					   TALLOC_CTX *mem_ctx,
 					   int argc, const char **argv)
 {
@@ -661,7 +661,7 @@ static NTSTATUS cmd_spoolss_getprinterdata(struct cli_state *cli,
 	if (argc != 3) {
 		printf("Usage: %s <printername> <valuename>\n", argv[0]);
 		printf("<printername> of . queries print server\n");
-		return NT_STATUS_OK;
+		return WERR_OK;
 	}
 	valuename = argv[2];
 
@@ -709,13 +709,13 @@ static NTSTATUS cmd_spoolss_getprinterdata(struct cli_state *cli,
 	if (opened_hnd) 
 		cli_spoolss_close_printer(cli, mem_ctx, &pol);
 
-	return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+	return result;
 }
 
 /***********************************************************************
  * Get printer data
  */
-static NTSTATUS cmd_spoolss_getprinterdataex(struct cli_state *cli,
+static WERROR cmd_spoolss_getprinterdataex(struct cli_state *cli,
 					     TALLOC_CTX *mem_ctx,
 					     int argc, const char **argv)
 {
@@ -733,7 +733,7 @@ static NTSTATUS cmd_spoolss_getprinterdataex(struct cli_state *cli,
 		printf("Usage: %s <printername> <keyname> <valuename>\n", 
 		       argv[0]);
 		printf("<printername> of . queries print server\n");
-		return NT_STATUS_OK;
+		return WERR_OK;
 	}
 	valuename = argv[3];
 	keyname = argv[2];
@@ -784,7 +784,7 @@ static NTSTATUS cmd_spoolss_getprinterdataex(struct cli_state *cli,
 	if (opened_hnd) 
 		cli_spoolss_close_printer(cli, mem_ctx, &pol);
 
-	return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+	return result;
 }
 
 /****************************************************************************
@@ -900,13 +900,12 @@ static void display_print_driver_3(DRIVER_INFO_3 *i1)
 /***********************************************************************
  * Get printer information
  */
-static NTSTATUS cmd_spoolss_getdriver(struct cli_state *cli, 
+static WERROR cmd_spoolss_getdriver(struct cli_state *cli, 
                                       TALLOC_CTX *mem_ctx,
                                       int argc, const char **argv)
 {
 	POLICY_HND 	pol;
 	WERROR          werror;
-	NTSTATUS	result;
 	uint32		info_level = 3;
 	BOOL 		opened_hnd = False;
 	PRINTER_DRIVER_CTR 	ctr;
@@ -918,7 +917,7 @@ static NTSTATUS cmd_spoolss_getdriver(struct cli_state *cli,
 	if ((argc == 1) || (argc > 3)) 
 	{
 		printf("Usage: %s <printername> [level]\n", argv[0]);
-		return NT_STATUS_OK;
+		return WERR_OK;
 	}
 
 	/* get the arguments need to open the printer handle */
@@ -935,11 +934,9 @@ static NTSTATUS cmd_spoolss_getdriver(struct cli_state *cli,
 					     PRINTER_ACCESS_USE,
 					     servername, user, &pol);
 
-	result = W_ERROR_IS_OK(werror) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
-
-	if (!NT_STATUS_IS_OK(result)) {
+	if (!W_ERROR_IS_OK(werror)) {
 		printf("Error opening printer handle for %s!\n", printername);
-		return result;
+		return werror;
 	}
 
 	opened_hnd = True;
@@ -984,13 +981,13 @@ static NTSTATUS cmd_spoolss_getdriver(struct cli_state *cli,
 	if (opened_hnd)
 		cli_spoolss_close_printer (cli, mem_ctx, &pol);
 	
-	return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+	return werror;
 }
 
 /***********************************************************************
  * Get printer information
  */
-static NTSTATUS cmd_spoolss_enum_drivers(struct cli_state *cli, 
+static WERROR cmd_spoolss_enum_drivers(struct cli_state *cli, 
                                          TALLOC_CTX *mem_ctx,
                                          int argc, const char **argv)
 {
@@ -1003,7 +1000,7 @@ static NTSTATUS cmd_spoolss_enum_drivers(struct cli_state *cli,
 	if (argc > 2) 
 	{
 		printf("Usage: enumdrivers [level]\n");
-		return NT_STATUS_OK;
+		return WERR_OK;
 	}
 
 	if (argc == 2)
@@ -1058,7 +1055,7 @@ static NTSTATUS cmd_spoolss_enum_drivers(struct cli_state *cli,
 		}
 	}
 	
-	return W_ERROR_IS_OK(werror) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+	return werror;
 }
 
 /****************************************************************************
@@ -1078,7 +1075,7 @@ static void display_printdriverdir_1(DRIVER_DIRECTORY_1 *i1)
 /***********************************************************************
  * Get printer driver directory information
  */
-static NTSTATUS cmd_spoolss_getdriverdir(struct cli_state *cli, 
+static WERROR cmd_spoolss_getdriverdir(struct cli_state *cli, 
                                          TALLOC_CTX *mem_ctx,
                                          int argc, const char **argv)
 {
@@ -1089,7 +1086,7 @@ static NTSTATUS cmd_spoolss_getdriverdir(struct cli_state *cli,
 
 	if (argc > 2) {
 		printf("Usage: %s [environment]\n", argv[0]);
-		return NT_STATUS_OK;
+		return WERR_OK;
 	}
 
 	/* Get the arguments need to open the printer handle */
@@ -1111,7 +1108,7 @@ static NTSTATUS cmd_spoolss_getdriverdir(struct cli_state *cli,
 	if (W_ERROR_IS_OK(result))
 		display_printdriverdir_1(ctr.info1);
 
-	return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+	return result;
 }
 
 /*******************************************************************************
@@ -1222,7 +1219,7 @@ static BOOL init_drv_info_3_members (
 }
 
 
-static NTSTATUS cmd_spoolss_addprinterdriver(struct cli_state *cli, 
+static WERROR cmd_spoolss_addprinterdriver(struct cli_state *cli, 
                                              TALLOC_CTX *mem_ctx,
                                              int argc, const char **argv)
 {
@@ -1241,7 +1238,7 @@ static NTSTATUS cmd_spoolss_addprinterdriver(struct cli_state *cli,
     		printf ("\t<Config File Name>:<Help File Name>:<Language Monitor Name>:\\\n");
 	    	printf ("\t<Default Data Type>:<Comma Separated list of Files>\n");
 
-		return NT_STATUS_OK;
+            return WERR_OK;
         }
 		
 	/* Fill in the DRIVER_INFO_3 struct */
@@ -1249,7 +1246,7 @@ static NTSTATUS cmd_spoolss_addprinterdriver(struct cli_state *cli,
 	if (!get_short_archi(arch, argv[1]))
 	{
 		printf ("Error Unknown architechture [%s]\n", argv[1]);
-		return NT_STATUS_INVALID_PARAMETER;
+		return WERR_INVALID_PARAM;
 	}
 	else
 		set_drv_info_3_env(&info3, arch);
@@ -1257,7 +1254,7 @@ static NTSTATUS cmd_spoolss_addprinterdriver(struct cli_state *cli,
 	if (!init_drv_info_3_members(mem_ctx, &info3, argv[2]))
 	{
 		printf ("Error Invalid parameter list - %s.\n", argv[2]);
-		return NT_STATUS_INVALID_PARAMETER;
+		return WERR_INVALID_PARAM;
 	}
 
 
@@ -1271,11 +1268,11 @@ static NTSTATUS cmd_spoolss_addprinterdriver(struct cli_state *cli,
 			driver_name);
 	}
 
-	return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+	return result;
 }
 
 
-static NTSTATUS cmd_spoolss_addprinterex(struct cli_state *cli, 
+static WERROR cmd_spoolss_addprinterex(struct cli_state *cli, 
                                          TALLOC_CTX *mem_ctx,
                                          int argc, const char **argv)
 {
@@ -1289,7 +1286,7 @@ static NTSTATUS cmd_spoolss_addprinterex(struct cli_state *cli,
 	if (argc != 5)
 	{
 		printf ("Usage: %s <name> <shared name> <driver> <port>\n", argv[0]);
-		return NT_STATUS_OK;
+		return WERR_OK;
         }
 	
         slprintf (servername, sizeof(servername)-1, "\\\\%s", cli->desthost);
@@ -1329,10 +1326,10 @@ static NTSTATUS cmd_spoolss_addprinterex(struct cli_state *cli,
 	if (W_ERROR_IS_OK(result))
 		printf ("Printer %s successfully installed.\n", argv[1]);
 
-	return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+	return result;
 }
 
-static NTSTATUS cmd_spoolss_setdriver(struct cli_state *cli, 
+static WERROR cmd_spoolss_setdriver(struct cli_state *cli, 
                                       TALLOC_CTX *mem_ctx,
                                       int argc, const char **argv)
 {
@@ -1351,7 +1348,7 @@ static NTSTATUS cmd_spoolss_setdriver(struct cli_state *cli,
 	if (argc != 3)
 	{
 		printf ("Usage: %s <printer> <driver>\n", argv[0]);
-		return NT_STATUS_OK;
+		return WERR_OK;
         }
 
 	slprintf (servername, sizeof(servername)-1, "\\\\%s", cli->desthost);
@@ -1406,11 +1403,11 @@ done:
 	if (opened_hnd)
 		cli_spoolss_close_printer(cli, mem_ctx, &pol);
 
-	return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+	return result;
 }
 
 
-static NTSTATUS cmd_spoolss_deletedriver(struct cli_state *cli, 
+static WERROR cmd_spoolss_deletedriver(struct cli_state *cli, 
                                          TALLOC_CTX *mem_ctx,
                                          int argc, const char **argv)
 {
@@ -1422,7 +1419,7 @@ static NTSTATUS cmd_spoolss_deletedriver(struct cli_state *cli,
 	if (argc != 2)
 	{
 		printf ("Usage: %s <driver>\n", argv[0]);
-		return NT_STATUS_OK;
+		return WERR_OK;
         }
 
 	slprintf (servername, sizeof(servername)-1, "\\\\%s", cli->desthost);
@@ -1449,10 +1446,10 @@ static NTSTATUS cmd_spoolss_deletedriver(struct cli_state *cli,
 		}
 	}
 		
-	return W_ERROR_IS_OK(result) || W_ERROR_EQUAL(result, WERR_UNKNOWN_PRINTER_DRIVER) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+	return result;
 }
 
-static NTSTATUS cmd_spoolss_getprintprocdir(struct cli_state *cli, 
+static WERROR cmd_spoolss_getprintprocdir(struct cli_state *cli, 
 					    TALLOC_CTX *mem_ctx,
 					    int argc, const char **argv)
 {
@@ -1464,17 +1461,17 @@ static NTSTATUS cmd_spoolss_getprintprocdir(struct cli_state *cli,
 	/* parse the command arguements */
 	if (argc > 2) {
 		printf ("Usage: %s [environment]\n", argv[0]);
-		return NT_STATUS_OK;
+		return WERR_OK;
         }
 
 	if (asprintf(&servername, "\\\\%s", cli->desthost) < 0)
-		return NT_STATUS_NO_MEMORY;
+		return WERR_NOMEM;
 	strupper(servername);
 
 	if (asprintf(&environment, "%s", (argc == 2) ? argv[1] : 
 		     PRINTER_DRIVER_ARCHITECTURE) < 0) {
 		SAFE_FREE(servername);
-		return NT_STATUS_NO_MEMORY;
+		return WERR_NOMEM;
 	}
 
 	result = cli_spoolss_getprintprocessordirectory(
@@ -1491,12 +1488,12 @@ static NTSTATUS cmd_spoolss_getprintprocdir(struct cli_state *cli,
 	SAFE_FREE(servername);
 	SAFE_FREE(environment);
 
-	return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+	return result;
 }
 
 /* Add a form */
 
-static NTSTATUS cmd_spoolss_addform(struct cli_state *cli, TALLOC_CTX *mem_ctx,
+static WERROR cmd_spoolss_addform(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 				    int argc, const char **argv)
 {
 	POLICY_HND handle;
@@ -1509,7 +1506,7 @@ static NTSTATUS cmd_spoolss_addform(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 
 	if (argc != 3) {
 		printf ("Usage: %s <printer> <formname>\n", argv[0]);
-		return NT_STATUS_OK;
+		return WERR_OK;
         }
 	
 	/* Get a printer handle */
@@ -1550,12 +1547,12 @@ static NTSTATUS cmd_spoolss_addform(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 	SAFE_FREE(servername);
 	SAFE_FREE(printername);
 
-	return W_ERROR_IS_OK(werror) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+	return werror;
 }
 
 /* Set a form */
 
-static NTSTATUS cmd_spoolss_setform(struct cli_state *cli, TALLOC_CTX *mem_ctx,
+static WERROR cmd_spoolss_setform(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 				    int argc, const char **argv)
 {
 	POLICY_HND handle;
@@ -1568,7 +1565,7 @@ static NTSTATUS cmd_spoolss_setform(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 
 	if (argc != 3) {
 		printf ("Usage: %s <printer> <formname>\n", argv[0]);
-		return NT_STATUS_OK;
+		return WERR_OK;
         }
 	
 	/* Get a printer handle */
@@ -1608,12 +1605,12 @@ static NTSTATUS cmd_spoolss_setform(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 	SAFE_FREE(servername);
 	SAFE_FREE(printername);
 
-	return W_ERROR_IS_OK(werror) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+	return werror;
 }
 
 /* Get a form */
 
-static NTSTATUS cmd_spoolss_getform(struct cli_state *cli, TALLOC_CTX *mem_ctx,
+static WERROR cmd_spoolss_getform(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 				    int argc, const char **argv)
 {
 	POLICY_HND handle;
@@ -1627,7 +1624,7 @@ static NTSTATUS cmd_spoolss_getform(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 
 	if (argc != 3) {
 		printf ("Usage: %s <printer> <formname>\n", argv[0]);
-		return NT_STATUS_OK;
+		return WERR_OK;
         }
 	
 	/* Get a printer handle */
@@ -1671,12 +1668,12 @@ static NTSTATUS cmd_spoolss_getform(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 	SAFE_FREE(servername);
 	SAFE_FREE(printername);
 
-	return W_ERROR_IS_OK(werror) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+	return werror;
 }
 
 /* Delete a form */
 
-static NTSTATUS cmd_spoolss_deleteform(struct cli_state *cli, 
+static WERROR cmd_spoolss_deleteform(struct cli_state *cli, 
 				       TALLOC_CTX *mem_ctx, int argc, 
 				       const char **argv)
 {
@@ -1689,7 +1686,7 @@ static NTSTATUS cmd_spoolss_deleteform(struct cli_state *cli,
 
 	if (argc != 3) {
 		printf ("Usage: %s <printer> <formname>\n", argv[0]);
-		return NT_STATUS_OK;
+		return WERR_OK;
         }
 	
 	/* Get a printer handle */
@@ -1718,12 +1715,12 @@ static NTSTATUS cmd_spoolss_deleteform(struct cli_state *cli,
 	SAFE_FREE(servername);
 	SAFE_FREE(printername);
 
-	return W_ERROR_IS_OK(werror) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+	return werror;
 }
 
 /* Enumerate forms */
 
-static NTSTATUS cmd_spoolss_enum_forms(struct cli_state *cli, 
+static WERROR cmd_spoolss_enum_forms(struct cli_state *cli, 
 				       TALLOC_CTX *mem_ctx, int argc, 
 				       const char **argv)
 {
@@ -1738,7 +1735,7 @@ static NTSTATUS cmd_spoolss_enum_forms(struct cli_state *cli,
 
 	if (argc != 2) {
 		printf ("Usage: %s <printer>\n", argv[0]);
-		return NT_STATUS_OK;
+		return WERR_OK;
         }
 	
 	/* Get a printer handle */
@@ -1788,10 +1785,10 @@ static NTSTATUS cmd_spoolss_enum_forms(struct cli_state *cli,
 	SAFE_FREE(servername);
 	SAFE_FREE(printername);
 
-	return W_ERROR_IS_OK(werror) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+	return werror;
 }
 
-static NTSTATUS cmd_spoolss_setprinterdata(struct cli_state *cli,
+static WERROR cmd_spoolss_setprinterdata(struct cli_state *cli,
 					    TALLOC_CTX *mem_ctx,
 					    int argc, const char **argv)
 {
@@ -1807,7 +1804,7 @@ static NTSTATUS cmd_spoolss_setprinterdata(struct cli_state *cli,
 	/* parse the command arguements */
 	if (argc != 4) {
 		printf ("Usage: %s <printer> <value> <data>\n", argv[0]);
-		return NT_STATUS_OK;
+		return WERR_OK;
         }
 
 	slprintf (servername, sizeof(servername)-1, "\\\\%s", cli->desthost);
@@ -1869,7 +1866,7 @@ done:
 	if (opened_hnd)
 		cli_spoolss_close_printer(cli, mem_ctx, &pol);
 
-	return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+	return result;
 }
 
 static void display_job_info_1(JOB_INFO_1 *job)
@@ -1910,7 +1907,7 @@ static void display_job_info_2(JOB_INFO_2 *job)
 
 /* Enumerate jobs */
 
-static NTSTATUS cmd_spoolss_enum_jobs(struct cli_state *cli, 
+static WERROR cmd_spoolss_enum_jobs(struct cli_state *cli, 
 				      TALLOC_CTX *mem_ctx, int argc, 
 				      const char **argv)
 {
@@ -1924,7 +1921,7 @@ static NTSTATUS cmd_spoolss_enum_jobs(struct cli_state *cli,
 	
 	if (argc < 2 || argc > 3) {
 		printf("Usage: %s printername [level]\n", argv[0]);
-		return NT_STATUS_OK;
+		return WERR_OK;
 	}
 	
 	if (argc == 3)
@@ -1980,12 +1977,12 @@ done:
 	if (got_hnd)
 		cli_spoolss_close_printer(cli, mem_ctx, &hnd);
 
-	return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+	return result;
 }
 
 /* enumerate data */
 
-static NTSTATUS cmd_spoolss_enum_data( struct cli_state *cli, 
+static WERROR cmd_spoolss_enum_data( struct cli_state *cli, 
 				       TALLOC_CTX *mem_ctx, int argc, 
 				       const char **argv)
 {
@@ -1998,7 +1995,7 @@ static NTSTATUS cmd_spoolss_enum_data( struct cli_state *cli,
 
 	if (argc != 2) {
 		printf("Usage: %s printername\n", argv[0]);
-		return NT_STATUS_OK;
+		return WERR_OK;
 	}
 	
 	/* Open printer handle */
@@ -2039,12 +2036,12 @@ done:
 	if (got_hnd)
 		cli_spoolss_close_printer(cli, mem_ctx, &hnd);
 
-	return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+	return result;
 }
 
 /* enumerate data for a given key */
 
-static NTSTATUS cmd_spoolss_enum_data_ex( struct cli_state *cli, 
+static WERROR cmd_spoolss_enum_data_ex( struct cli_state *cli, 
 					  TALLOC_CTX *mem_ctx, int argc, 
 					  const char **argv)
 {
@@ -2059,7 +2056,7 @@ static NTSTATUS cmd_spoolss_enum_data_ex( struct cli_state *cli,
 
 	if (argc != 3) {
 		printf("Usage: %s printername <keyname>\n", argv[0]);
-		return NT_STATUS_OK;
+		return WERR_OK;
 	}
 	
 	keyname = argv[2];
@@ -2104,12 +2101,12 @@ done:
 	if (got_hnd)
 		cli_spoolss_close_printer(cli, mem_ctx, &hnd);
 
-	return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+	return result;
 }
 
 /* enumerate subkeys */
 
-static NTSTATUS cmd_spoolss_enum_printerkey( struct cli_state *cli, 
+static WERROR cmd_spoolss_enum_printerkey( struct cli_state *cli, 
 					     TALLOC_CTX *mem_ctx, int argc, 
 					     const char **argv)
 {
@@ -2124,7 +2121,7 @@ static NTSTATUS cmd_spoolss_enum_printerkey( struct cli_state *cli,
 
 	if (argc < 2 || argc > 3) {
 		printf("Usage: %s printername [keyname]\n", argv[0]);
-		return NT_STATUS_OK;
+		return WERR_OK;
 	}
 	
 	if (argc == 3)
@@ -2178,10 +2175,10 @@ done:
 	if (got_hnd)
 		cli_spoolss_close_printer(cli, mem_ctx, &hnd);
 
-	return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+	return result;
 }
 
-static NTSTATUS cmd_spoolss_rffpcnex(struct cli_state *cli, 
+static WERROR cmd_spoolss_rffpcnex(struct cli_state *cli, 
 				     TALLOC_CTX *mem_ctx, int argc, 
 				     const char **argv)
 {
@@ -2257,7 +2254,7 @@ done:
 	if (got_hnd)
 		cli_spoolss_close_printer(cli, mem_ctx, &hnd);
 
-	return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+	return result;
 }
 
 /* List of commands exported by this module */
@@ -2265,33 +2262,33 @@ struct cmd_set spoolss_commands[] = {
 
 	{ "SPOOLSS"  },
 
-	{ "adddriver",		cmd_spoolss_addprinterdriver,	PI_SPOOLSS, "Add a print driver",                  "" },
-	{ "addprinter",		cmd_spoolss_addprinterex,	PI_SPOOLSS, "Add a printer",                       "" },
-	{ "deldriver",		cmd_spoolss_deletedriver,	PI_SPOOLSS, "Delete a printer driver",             "" },
-	{ "enumdata",		cmd_spoolss_enum_data,		PI_SPOOLSS, "Enumerate printer data",              "" },
-	{ "enumdataex",		cmd_spoolss_enum_data_ex,	PI_SPOOLSS, "Enumerate printer data for a key",    "" },
-	{ "enumkey",		cmd_spoolss_enum_printerkey,	PI_SPOOLSS, "Enumerate printer keys",              "" },
-	{ "enumjobs",		cmd_spoolss_enum_jobs,          PI_SPOOLSS, "Enumerate print jobs",                "" },
-	{ "enumports", 		cmd_spoolss_enum_ports, 	PI_SPOOLSS, "Enumerate printer ports",             "" },
-	{ "enumdrivers", 	cmd_spoolss_enum_drivers, 	PI_SPOOLSS, "Enumerate installed printer drivers", "" },
-	{ "enumprinters", 	cmd_spoolss_enum_printers, 	PI_SPOOLSS, "Enumerate printers",                  "" },
-	{ "getdata",		cmd_spoolss_getprinterdata,	PI_SPOOLSS, "Get print driver data",               "" },
-	{ "getdataex",		cmd_spoolss_getprinterdataex,	PI_SPOOLSS, "Get printer driver data with keyname", ""},
-	{ "getdriver",		cmd_spoolss_getdriver,		PI_SPOOLSS, "Get print driver information",        "" },
-	{ "getdriverdir",	cmd_spoolss_getdriverdir,	PI_SPOOLSS, "Get print driver upload directory",   "" },
-	{ "getprinter", 	cmd_spoolss_getprinter, 	PI_SPOOLSS, "Get printer info",                    "" },
-	{ "getprintprocdir",	cmd_spoolss_getprintprocdir,    PI_SPOOLSS, "Get print processor directory",       "" },
-	{ "openprinter",	cmd_spoolss_open_printer_ex,	PI_SPOOLSS, "Open printer handle",                 "" },
-	{ "setdriver",		cmd_spoolss_setdriver,		PI_SPOOLSS, "Set printer driver",                  "" },
-	{ "getprintprocdir",	cmd_spoolss_getprintprocdir,    PI_SPOOLSS, "Get print processor directory",       "" },
-	{ "addform",            cmd_spoolss_addform,            PI_SPOOLSS, "Add form",                            "" },
-	{ "setform",            cmd_spoolss_setform,            PI_SPOOLSS, "Set form",                            "" },
-	{ "getform",            cmd_spoolss_getform,            PI_SPOOLSS, "Get form",                            "" },
-	{ "deleteform",         cmd_spoolss_deleteform,         PI_SPOOLSS, "Delete form",                         "" },
-	{ "enumforms",          cmd_spoolss_enum_forms,         PI_SPOOLSS, "Enumerate forms",                     "" },
-	{ "setprinter",	        cmd_spoolss_setprinter,         PI_SPOOLSS, "Set printer comment",                 "" },
-	{ "setprinterdata",	cmd_spoolss_setprinterdata,     PI_SPOOLSS, "Set REG_SZ printer data",             "" },
-	{ "rffpcnex",           cmd_spoolss_rffpcnex,           PI_SPOOLSS, "Rffpcnex test", "" },
+	{ "adddriver",		RPC_RTYPE_WERROR, NULL, cmd_spoolss_addprinterdriver,	PI_SPOOLSS, "Add a print driver",                  "" },
+	{ "addprinter",	RPC_RTYPE_WERROR, NULL, cmd_spoolss_addprinterex,	PI_SPOOLSS, "Add a printer",                       "" },
+	{ "deldriver",		RPC_RTYPE_WERROR, NULL, cmd_spoolss_deletedriver,	PI_SPOOLSS, "Delete a printer driver",             "" },
+	{ "enumdata",		RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_data,		PI_SPOOLSS, "Enumerate printer data",              "" },
+	{ "enumdataex",	RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_data_ex,	PI_SPOOLSS, "Enumerate printer data for a key",    "" },
+	{ "enumkey",		RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_printerkey,	PI_SPOOLSS, "Enumerate printer keys",              "" },
+	{ "enumjobs",		RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_jobs,          PI_SPOOLSS, "Enumerate print jobs",                "" },
+	{ "enumports", 	RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_ports, 	PI_SPOOLSS, "Enumerate printer ports",             "" },
+	{ "enumdrivers", 	RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_drivers, 	PI_SPOOLSS, "Enumerate installed printer drivers", "" },
+	{ "enumprinters", 	RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_printers, 	PI_SPOOLSS, "Enumerate printers",                  "" },
+	{ "getdata",		RPC_RTYPE_WERROR, NULL, cmd_spoolss_getprinterdata,	PI_SPOOLSS, "Get print driver data",               "" },
+	{ "getdataex",		RPC_RTYPE_WERROR, NULL, cmd_spoolss_getprinterdataex,	PI_SPOOLSS, "Get printer driver data with keyname", ""},
+	{ "getdriver",		RPC_RTYPE_WERROR, NULL, cmd_spoolss_getdriver,		PI_SPOOLSS, "Get print driver information",        "" },
+	{ "getdriverdir",	RPC_RTYPE_WERROR, NULL, cmd_spoolss_getdriverdir,	PI_SPOOLSS, "Get print driver upload directory",   "" },
+	{ "getprinter", 	RPC_RTYPE_WERROR, NULL, cmd_spoolss_getprinter, 	PI_SPOOLSS, "Get printer info",                    "" },
+	{ "getprintprocdir",RPC_RTYPE_WERROR, NULL, cmd_spoolss_getprintprocdir,    PI_SPOOLSS, "Get print processor directory",       "" },
+	{ "openprinter",	RPC_RTYPE_WERROR, NULL, cmd_spoolss_open_printer_ex,	PI_SPOOLSS, "Open printer handle",                 "" },
+	{ "setdriver", 	RPC_RTYPE_WERROR, NULL, cmd_spoolss_setdriver,		PI_SPOOLSS, "Set printer driver",                  "" },
+	{ "getprintprocdir",	RPC_RTYPE_WERROR, NULL, cmd_spoolss_getprintprocdir,    PI_SPOOLSS, "Get print processor directory",       "" },
+	{ "addform",		RPC_RTYPE_WERROR, NULL, cmd_spoolss_addform,            PI_SPOOLSS, "Add form",                            "" },
+	{ "setform",		RPC_RTYPE_WERROR, NULL, cmd_spoolss_setform,            PI_SPOOLSS, "Set form",                            "" },
+	{ "getform",		RPC_RTYPE_WERROR, NULL, cmd_spoolss_getform,            PI_SPOOLSS, "Get form",                            "" },
+	{ "deleteform",	RPC_RTYPE_WERROR, NULL, cmd_spoolss_deleteform,         PI_SPOOLSS, "Delete form",                         "" },
+	{ "enumforms",		RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_forms,         PI_SPOOLSS, "Enumerate forms",                     "" },
+	{ "setprinter",	RPC_RTYPE_WERROR, NULL, cmd_spoolss_setprinter,         PI_SPOOLSS, "Set printer comment",                 "" },
+	{ "setprinterdata",	RPC_RTYPE_WERROR, NULL, cmd_spoolss_setprinterdata,     PI_SPOOLSS, "Set REG_SZ printer data",             "" },
+	{ "rffpcnex",		RPC_RTYPE_WERROR, NULL, cmd_spoolss_rffpcnex,           PI_SPOOLSS, "Rffpcnex test", "" },
 
 	{ NULL }
 };
diff --git a/source3/rpcclient/cmd_srvsvc.c b/source3/rpcclient/cmd_srvsvc.c
index 8597c7bc2e..3e569f51ce 100644
--- a/source3/rpcclient/cmd_srvsvc.c
+++ b/source3/rpcclient/cmd_srvsvc.c
@@ -179,7 +179,7 @@ static void display_srv_info_102(SRV_INFO_102 *sv102)
 }
 
 /* Server query info */
-static NTSTATUS cmd_srvsvc_srv_query_info(struct cli_state *cli, 
+static WERROR cmd_srvsvc_srv_query_info(struct cli_state *cli, 
                                           TALLOC_CTX *mem_ctx,
                                           int argc, const char **argv)
 {
@@ -189,7 +189,7 @@ static NTSTATUS cmd_srvsvc_srv_query_info(struct cli_state *cli,
 
 	if (argc > 2) {
 		printf("Usage: %s [infolevel]\n", argv[0]);
-		return NT_STATUS_OK;
+		return WERR_OK;
 	}
 
 	if (argc == 2)
@@ -217,7 +217,7 @@ static NTSTATUS cmd_srvsvc_srv_query_info(struct cli_state *cli,
 	}
 
  done:
-	return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+	return result;
 }
 
 static void display_share_info_1(SRV_SHARE_INFO_1 *info1)
@@ -246,7 +246,7 @@ static void display_share_info_2(SRV_SHARE_INFO_2 *info2)
 	printf("\tpassword:\t%s\n", passwd);
 }
 
-static NTSTATUS cmd_srvsvc_net_share_enum(struct cli_state *cli, 
+static WERROR cmd_srvsvc_net_share_enum(struct cli_state *cli, 
                                           TALLOC_CTX *mem_ctx,
                                           int argc, const char **argv)
 {
@@ -258,7 +258,7 @@ static NTSTATUS cmd_srvsvc_net_share_enum(struct cli_state *cli,
 
 	if (argc > 2) {
 		printf("Usage: %s [infolevel]\n", argv[0]);
-		return NT_STATUS_OK;
+		return WERR_OK;
 	}
 
 	if (argc == 2)
@@ -289,10 +289,10 @@ static NTSTATUS cmd_srvsvc_net_share_enum(struct cli_state *cli,
 	}
 
  done:
-	return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+	return result;
 }
 
-static NTSTATUS cmd_srvsvc_net_remote_tod(struct cli_state *cli, 
+static WERROR cmd_srvsvc_net_remote_tod(struct cli_state *cli, 
                                           TALLOC_CTX *mem_ctx,
                                           int argc, const char **argv)
 {
@@ -301,7 +301,7 @@ static NTSTATUS cmd_srvsvc_net_remote_tod(struct cli_state *cli,
 
 	if (argc > 1) {
 		printf("Usage: %s\n", argv[0]);
-		return NT_STATUS_OK;
+		return WERR_OK;
 	}
 
 	result = cli_srvsvc_net_remote_tod(
@@ -311,10 +311,10 @@ static NTSTATUS cmd_srvsvc_net_remote_tod(struct cli_state *cli,
 		goto done;
 
  done:
-	return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+	return result;
 }
 
-static NTSTATUS cmd_srvsvc_net_file_enum(struct cli_state *cli, 
+static WERROR cmd_srvsvc_net_file_enum(struct cli_state *cli, 
 					 TALLOC_CTX *mem_ctx,
 					 int argc, const char **argv)
 {
@@ -326,7 +326,7 @@ static NTSTATUS cmd_srvsvc_net_file_enum(struct cli_state *cli,
 
 	if (argc > 2) {
 		printf("Usage: %s [infolevel]\n", argv[0]);
-		return NT_STATUS_OK;
+		return WERR_OK;
 	}
 
 	if (argc == 2)
@@ -343,7 +343,7 @@ static NTSTATUS cmd_srvsvc_net_file_enum(struct cli_state *cli,
 		goto done;
 
  done:
-	return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+	return result;
 }
 
 /* List of commands exported by this module */
@@ -352,10 +352,10 @@ struct cmd_set srvsvc_commands[] = {
 
 	{ "SRVSVC" },
 
-	{ "srvinfo",    cmd_srvsvc_srv_query_info,  PI_SRVSVC, "Server query info", "" },
-	{ "netshareenum", cmd_srvsvc_net_share_enum, PI_SRVSVC, "Enumerate shares", "" },
-	{ "netfileenum", cmd_srvsvc_net_file_enum, PI_SRVSVC, "Enumerate open files", "" },
-	{ "netremotetod", cmd_srvsvc_net_remote_tod, PI_SRVSVC, "Fetch remote time of day", "" },
+	{ "srvinfo",     RPC_RTYPE_WERROR, NULL, cmd_srvsvc_srv_query_info, PI_SRVSVC, "Server query info", "" },
+	{ "netshareenum",RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_share_enum, PI_SRVSVC, "Enumerate shares", "" },
+	{ "netfileenum", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_file_enum,  PI_SRVSVC, "Enumerate open files", "" },
+	{ "netremotetod",RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_remote_tod, PI_SRVSVC, "Fetch remote time of day", "" },
 
 	{ NULL }
 };
diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c
index c3b2cd4ea1..2338d72f19 100644
--- a/source3/rpcclient/rpcclient.c
+++ b/source3/rpcclient/rpcclient.c
@@ -73,7 +73,10 @@ static char **completion_fn(char *text, int start, int end)
 		for (i=0; commands->cmd_set[i].name; i++)
 		{
 			if ((strncmp(text, commands->cmd_set[i].name, strlen(text)) == 0) &&
-				commands->cmd_set[i].fn) 
+				(( commands->cmd_set[i].returntype == RPC_RTYPE_NTSTATUS &&
+                        commands->cmd_set[i].ntfn ) || 
+                      ( commands->cmd_set[i].returntype == RPC_RTYPE_WERROR &&
+                        commands->cmd_set[i].wfn)))
 			{
 				matches[count] = strdup(commands->cmd_set[i].name);
 				if (!matches[count]) 
@@ -393,18 +396,18 @@ static struct cmd_set rpcclient_commands[] = {
 
 	{ "GENERAL OPTIONS" },
 
-	{ "help", 	cmd_help, 	  -1,	"Get help on commands", "[command]" },
-	{ "?", 		cmd_help, 	  -1,	"Get help on commands", "[command]" },
-	{ "debuglevel", cmd_debuglevel,   -1,	"Set debug level", "level" },
-	{ "list",	cmd_listcommands, -1,	"List available commands on <pipe>", "pipe" },
-	{ "exit", 	cmd_quit, 	  -1,	"Exit program", "" },
-	{ "quit", 	cmd_quit, 	  -1,	"Exit program", "" },
+	{ "help", RPC_RTYPE_NTSTATUS, cmd_help, NULL, 	  -1,	"Get help on commands", "[command]" },
+	{ "?", 	RPC_RTYPE_NTSTATUS, cmd_help, NULL,	  -1,	"Get help on commands", "[command]" },
+	{ "debuglevel", RPC_RTYPE_NTSTATUS, cmd_debuglevel, NULL,   -1,	"Set debug level", "level" },
+	{ "list",	RPC_RTYPE_NTSTATUS, cmd_listcommands, NULL, -1,	"List available commands on <pipe>", "pipe" },
+	{ "exit", RPC_RTYPE_NTSTATUS, cmd_quit, NULL,   -1,	"Exit program", "" },
+	{ "quit", RPC_RTYPE_NTSTATUS, cmd_quit, NULL,	  -1,	"Exit program", "" },
 
 	{ NULL }
 };
 
 static struct cmd_set separator_command[] = {
-	{ "---------------", NULL,	-1,	"----------------------" },
+	{ "---------------", MAX_RPC_RETURN_TYPE, NULL, NULL,	-1,	"----------------------" },
 	{ NULL }
 };
 
@@ -458,7 +461,8 @@ static NTSTATUS do_cmd(struct cli_state *cli,
 		       struct cmd_set *cmd_entry,
 		       int argc, char **argv)
 {
-	NTSTATUS result;
+     NTSTATUS ntresult;
+     WERROR wresult;
 	
 	TALLOC_CTX *mem_ctx;
 
@@ -477,9 +481,22 @@ static NTSTATUS do_cmd(struct cli_state *cli,
 			return NT_STATUS_UNSUCCESSFUL;
 		}
 
-	/* Run command */
-
-	result = cmd_entry->fn(cli, mem_ctx, argc, (const char **) argv);
+     /* Run command */
+
+     if ( cmd_entry->returntype == RPC_RTYPE_NTSTATUS ) {
+          ntresult = cmd_entry->ntfn(cli, mem_ctx, argc, (const char **) argv);
+          if (!NT_STATUS_IS_OK(ntresult)) {
+              printf("result was %s\n", nt_errstr(ntresult));
+          }
+     } else {
+          wresult = cmd_entry->wfn( cli, mem_ctx, argc, (const char **) argv);
+          /* print out the DOS error */
+          if (!W_ERROR_IS_OK(wresult)) {
+                  printf( "result was %s\n", dos_errstr(wresult));
+          }
+          ntresult = W_ERROR_IS_OK(wresult)?NT_STATUS_OK:NT_STATUS_UNSUCCESSFUL;
+     }
+            
 
 	/* Cleanup */
 
@@ -488,7 +505,7 @@ static NTSTATUS do_cmd(struct cli_state *cli,
 
 	talloc_destroy(mem_ctx);
 
-	return result;
+	return ntresult;
 }
 
 
@@ -517,7 +534,8 @@ static NTSTATUS process_cmd(struct cli_state *cli, char *cmd)
 
 		while (temp_set->name) {
 			if (strequal(argv[0], temp_set->name)) {
-				if (!temp_set->fn) {
+				if (!(temp_set->returntype == RPC_RTYPE_NTSTATUS && temp_set->ntfn ) &&
+                         !(temp_set->returntype == RPC_RTYPE_WERROR && temp_set->wfn )) {
 					fprintf (stderr, "Invalid command\n");
 					goto out_free;
 				}
@@ -535,9 +553,11 @@ static NTSTATUS process_cmd(struct cli_state *cli, char *cmd)
 	}
 
 out_free:
+/* moved to do_cmd()
 	if (!NT_STATUS_IS_OK(result)) {
 		printf("result was %s\n", nt_errstr(result));
 	}
+*/
 
 	if (argv) {
 		/* NOTE: popt allocates the whole argv, including the
diff --git a/source3/rpcclient/rpcclient.h b/source3/rpcclient/rpcclient.h
index 1bd3c1a641..1db4246d37 100644
--- a/source3/rpcclient/rpcclient.h
+++ b/source3/rpcclient/rpcclient.h
@@ -22,10 +22,18 @@
 #ifndef RPCCLIENT_H
 #define RPCCLIENT_H
 
+typedef enum {
+        RPC_RTYPE_NTSTATUS = 0,
+        RPC_RTYPE_WERROR,
+        MAX_RPC_RETURN_TYPE,
+} RPC_RETURN_TYPE;
+
 struct cmd_set {
 	const char *name;
-	NTSTATUS (*fn)(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, 
+        RPC_RETURN_TYPE returntype;
+	NTSTATUS (*ntfn)(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, 
                        const char **argv);
+        WERROR (*wfn)(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv);
         int pipe_idx;
 	const char *description;
 	const char *usage;
-- 
cgit 


From a564fed756a82d944ebde45da1ce4ea932011f10 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 17 Mar 2003 08:03:08 +0000
Subject: More statcache fixes - and add a bit more doco.

Andrew Bartlett
(This used to be commit 0e8dd52f6973ac5219e2c2dd53824de71f512083)
---
 source3/smbd/statcache.c | 34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

(limited to 'source3')

diff --git a/source3/smbd/statcache.c b/source3/smbd/statcache.c
index 57ba6ada81..b1cb0f6e0f 100644
--- a/source3/smbd/statcache.c
+++ b/source3/smbd/statcache.c
@@ -39,11 +39,19 @@ typedef struct {
 #define INIT_STAT_CACHE_SIZE 512
 static hash_table stat_cache;
 
-/****************************************************************************
- Add an entry into the stat cache.
-*****************************************************************************/
+/**
+ * Add an entry into the stat cache.
+ *
+ * @param full_orig_name       The original name as specified by the client
+ * @param orig_translated_path The name on our filesystem.
+ * 
+ * @note Only the first strlen(orig_translated_path) characters are stored 
+ *       into the cache.  This means that full_orig_name will be internally
+ *       truncated.
+ *
+ */
 
-void stat_cache_add( char *full_orig_name, char *orig_translated_path)
+void stat_cache_add( const char *full_orig_name, const char *orig_translated_path)
 {
   stat_cache_entry *scp;
   stat_cache_entry *found_scp;
@@ -105,11 +113,19 @@ void stat_cache_add( char *full_orig_name, char *orig_translated_path)
   if(!case_sensitive)
 	  strupper(original_path);
 
-  if(!(original_path_length == translated_path_length)) {
-	  DEBUG(0, ("OOPS - tried to store stat cache entry for non-equal length paths [%s] %u and [%s] %u)!\n", original_path, original_path_length, translated_path, translated_path_length));
-	  SAFE_FREE(original_path);
-	  SAFE_FREE(translated_path);
-	  return;
+  if (original_path_length != translated_path_length) {
+	  if (original_path_length < translated_path_length) {
+		  DEBUG(0, ("OOPS - tried to store stat cache entry for werid length paths [%s] %u and [%s] %u)!\n", original_path, original_path_length, translated_path, translated_path_length));
+		  SAFE_FREE(original_path);
+		  SAFE_FREE(translated_path);
+		  return;
+	  }
+
+	  /* we only want to store the first part of translated_path,
+	     up to the length of original_path */
+
+	  translated_path[original_path_length] = '\0';
+	  translated_path_length = original_path_length;
   }
 
 #if 0
-- 
cgit 


From 1331a361bd6c5cde775da4db8aade78983ca71b1 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 17 Mar 2003 09:08:34 +0000
Subject: Add const. (This used to be commit
 02f81719c7c179b61663bdf789c01ab62286fea2)

---
 source3/smbd/dir.c      | 2 +-
 source3/smbd/filename.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'source3')

diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index ec570d3a18..6cf56fd373 100644
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -1008,7 +1008,7 @@ static ubi_dlNewList( dir_cache );
  Output: None.
 *****************************************************************************/
 
-void DirCacheAdd( const char *path, char *name, char *dname, int snum )
+void DirCacheAdd( const char *path, const char *name, const char *dname, int snum )
 {
 	int pathlen;
 	int namelen;
diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
index 7d3527402e..ad707a2b9d 100644
--- a/source3/smbd/filename.c
+++ b/source3/smbd/filename.c
@@ -39,7 +39,7 @@ static BOOL scan_directory(const char *path, char *name,size_t maxlength,
  This needs to be careful about whether we are case sensitive.
 ****************************************************************************/
 
-static BOOL fname_equal(char *name1, char *name2)
+static BOOL fname_equal(const char *name1, const char *name2)
 {
 	/* Normal filename handling */
 	if (case_sensitive)
@@ -52,7 +52,7 @@ static BOOL fname_equal(char *name1, char *name2)
  Mangle the 2nd name and check if it is then equal to the first name.
 ****************************************************************************/
 
-static BOOL mangled_equal(char *name1, const char *name2, int snum)
+static BOOL mangled_equal(const char *name1, const char *name2, int snum)
 {
 	pstring tmpname;
 	
@@ -439,7 +439,7 @@ static BOOL scan_directory(const char *path, char *name, size_t maxlength,
 			   connection_struct *conn,BOOL docache)
 {
 	void *cur_dir;
-	char *dname;
+	const char *dname;
 	BOOL mangled;
 
 	mangled = mangle_is_mangled(name);
-- 
cgit 


From 0273df0bf75f135a781ca6b58cc4c7e3247e5aef Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 17 Mar 2003 09:18:06 +0000
Subject: Fix const warnings.

Andrew Bartlett
(This used to be commit fc1408d5d1a8b64dfd20268ab6f4a5f2a007614b)
---
 source3/smbd/reply.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'source3')

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 5ca0ae52de..138870453d 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -1305,7 +1305,7 @@ NTSTATUS unlink_internals(connection_struct *conn, int dirtype, char *name)
 		}
 	} else {
 		void *dirptr = NULL;
-		char *dname;
+		const char *dname;
 		
 		if (check_name(directory,conn))
 			dirptr = OpenDir(conn, directory, True);
@@ -2861,7 +2861,7 @@ int reply_mkdir(connection_struct *conn, char *inbuf,char *outbuf, int dum_size,
 
 static BOOL recursive_rmdir(connection_struct *conn, char *directory)
 {
-	char *dname = NULL;
+	const char *dname = NULL;
 	BOOL ret = False;
 	void *dirptr = OpenDir(conn, directory, False);
 
@@ -2926,7 +2926,7 @@ BOOL rmdir_internals(connection_struct *conn, char *directory)
 		 * do a recursive delete) then fail the rmdir.
 		 */
 		BOOL all_veto_files = True;
-		char *dname;
+		const char *dname;
 		void *dirptr = OpenDir(conn, directory, False);
 
 		if(dirptr != NULL) {
@@ -3285,7 +3285,7 @@ directory = %s, newname = %s, newname_last_component = %s, is_8_3 = %d\n",
 		 * Wildcards - process each file that matches.
 		 */
 		void *dirptr = NULL;
-		char *dname;
+		const char *dname;
 		pstring destname;
 		
 		if (check_name(directory,conn))
@@ -3574,7 +3574,7 @@ int reply_copy(connection_struct *conn, char *inbuf,char *outbuf, int dum_size,
 		}
 	} else {
 		void *dirptr = NULL;
-		char *dname;
+		const char *dname;
 		pstring destname;
 
 		if (check_name(directory,conn))
-- 
cgit 


From 99e5d02f747dcc44800b2e47fa45aa1dff9c5bf7 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 17 Mar 2003 10:58:05 +0000
Subject: Brain fart - make sure we truncate the right string...

Andrew Bartlett
(This used to be commit 32eb2cdca62a784d96207507e273bbbf77b0c6c3)
---
 source3/smbd/statcache.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'source3')

diff --git a/source3/smbd/statcache.c b/source3/smbd/statcache.c
index b1cb0f6e0f..1e06b2b103 100644
--- a/source3/smbd/statcache.c
+++ b/source3/smbd/statcache.c
@@ -121,11 +121,11 @@ void stat_cache_add( const char *full_orig_name, const char *orig_translated_pat
 		  return;
 	  }
 
-	  /* we only want to store the first part of translated_path,
-	     up to the length of original_path */
+	  /* we only want to store the first part of original_path,
+	     up to the length of translated_path */
 
-	  translated_path[original_path_length] = '\0';
-	  translated_path_length = original_path_length;
+	  original_path[translated_path_length] = '\0';
+	  original_path_length = translated_path_length;
   }
 
 #if 0
-- 
cgit 


From a9034ec179239274bdb0f7dffbe87c11c4a0539d Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 17 Mar 2003 10:59:11 +0000
Subject: Fix invalid SAFE_FREE() of talloc()ed memory.

Andrew Bartlett
(This used to be commit 21add5f97d0d112094e34a02e6319991a1d2af4d)
---
 source3/passdb/secrets.c | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'source3')

diff --git a/source3/passdb/secrets.c b/source3/passdb/secrets.c
index 4b0913a624..4c9802dd29 100644
--- a/source3/passdb/secrets.c
+++ b/source3/passdb/secrets.c
@@ -535,7 +535,6 @@ NTSTATUS secrets_get_trusted_domains(TALLOC_CTX* ctx, int* enum_ctx, unsigned in
 
 		if (size != packed_size) {
 			DEBUG(2, ("Secrets record %s is invalid!\n", secrets_key));
-			SAFE_FREE(pass);
 			if (size) SAFE_FREE(packed_pass);
 
 			return NT_STATUS_UNSUCCESSFUL;
@@ -554,8 +553,6 @@ NTSTATUS secrets_get_trusted_domains(TALLOC_CTX* ctx, int* enum_ctx, unsigned in
 			dom = talloc_zero(ctx, sizeof(*dom));
 			if (!dom) {
 				/* free returned tdb record */
-				SAFE_FREE(pass);
-				
 				return NT_STATUS_NO_MEMORY;
 			}
 			
-- 
cgit 


From 0a8e719a4bc6ac88bea6b76e7a7d840bb0fed403 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Mon, 17 Mar 2003 22:09:06 +0000
Subject: Fix memory leak.

Volker
(This used to be commit e8975d6e7bdcceb78a83a3446cf1430e1e3f1a72)
---
 source3/passdb/pdb_ldap.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source3')

diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index 548d7bc60d..46e0994379 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -1838,12 +1838,14 @@ static NTSTATUS ldapsam_update_sam_account(struct pdb_methods *my_methods, SAM_A
 	
 	rc = ldapsam_search_one_user_by_name(ldap_state, pdb_get_username(newpwd), &result);
 	if (rc != LDAP_SUCCESS) {
+		ldap_mods_free(mods, 1);
 		return NT_STATUS_UNSUCCESSFUL;
 	}
 
 	if (ldap_count_entries(ldap_state->ldap_struct, result) == 0) {
 		DEBUG(0, ("No user to modify!\n"));
 		ldap_msgfree(result);
+		ldap_mods_free(mods, 1);
 		return NT_STATUS_UNSUCCESSFUL;
 	}
 
-- 
cgit 


From e0e31ca14a12635886110cd5ae7100365fd2cc88 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 17 Mar 2003 22:22:46 +0000
Subject: Add copyright. (This used to be commit
 a7f9c3657ff052e382e290059f50f1d9812b8221)

---
 source3/smbd/statcache.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/smbd/statcache.c b/source3/smbd/statcache.c
index 1e06b2b103..0f42a3a83f 100644
--- a/source3/smbd/statcache.c
+++ b/source3/smbd/statcache.c
@@ -3,7 +3,7 @@
    stat cache code
    Copyright (C) Andrew Tridgell 1992-2000
    Copyright (C) Jeremy Allison 1999-2000
-   
+   Copyright (C) Andrew Bartlett <abartlet@samba.org> 2003
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-- 
cgit 


From 2e20359a8add2a5b5880116f5354cfe2cad3cde2 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Tue, 18 Mar 2003 01:32:51 +0000
Subject: Start of a unit test for info3 caching.  Much unfrastructure required
 before this can be fully implemented.  )-: (This used to be commit
 a040a8471f884cb295100f841594d86ddf754bb6)

---
 source3/stf/info3cache.py | 54 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100755 source3/stf/info3cache.py

(limited to 'source3')

diff --git a/source3/stf/info3cache.py b/source3/stf/info3cache.py
new file mode 100755
index 0000000000..96d5a1d459
--- /dev/null
+++ b/source3/stf/info3cache.py
@@ -0,0 +1,54 @@
+#!/usr/bin/python
+#
+# Upon a winbindd authentication, test that an info3 record is cached in
+# netsamlogon_cache.tdb and cache records are removed from winbindd_cache.tdb
+#
+
+import comfychair, stf
+from samba import tdb, winbind
+
+#
+# We want to implement the following test on a win2k native mode domain.
+#
+# 1. trash netsamlogon_cache.tdb
+# 2. wbinfo -r DOMAIN\Administrator                    [FAIL]
+# 3. wbinfo --auth-crap DOMAIN\Administrator%password  [PASS]
+# 4. wbinfo -r DOMAIN\Administrator                    [PASS]
+#
+# Also for step 3 we want to try 'wbinfo --auth-smbd' and
+# 'wbinfo --auth-plaintext'
+#
+
+#
+# TODO: To implement this test we need to be able to
+#
+#  - pass username%password combination for an invidivual winbindd request
+#    (so we can get the administrator SID so we can clear the info3 cache)
+#
+#  - start/restart winbindd (to trash the winbind cache)
+#
+#  - from samba import dynconfig (to find location of info3 cache)
+#
+#  - be able to modify the winbindd cache (to set/reset individual winbind
+#    cache entries)
+#
+#  - have --auth-crap present in HEAD
+#
+
+class WinbindAuthCrap(comfychair.TestCase):
+    def runtest(self):
+        raise comfychair.NotRunError, "not implemented"
+        
+class WinbindAuthSmbd(comfychair.TestCase):
+    def runtest(self):
+        # Grr - winbindd in HEAD doesn't contain the auth_smbd function
+        raise comfychair.NotRunError, "no auth_smbd in HEAD"
+
+class WinbindAuthPlaintext(comfychair.TestCase):
+    def runtest(self):
+        raise comfychair.NotRunError, "not implemented"
+
+tests = [WinbindAuthCrap, WinbindAuthSmbd, WinbindAuthPlaintext]
+
+if __name__ == "__main__":
+    comfychair.main(tests)
-- 
cgit 


From 47b547c69da1e02fcc218ccb44793e2ef38521b8 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Tue, 18 Mar 2003 01:34:09 +0000
Subject: Added #ifdef'ed out implementation of auth_smbd python fn.  Uncomment
 when auth_smbd functionality merged to HEAD. (This used to be commit
 2b6d13672dc1e4a46fc2600e729c22d0ee7e534b)

---
 source3/python/py_winbind.c | 72 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 71 insertions(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/python/py_winbind.c b/source3/python/py_winbind.c
index e9fc4b7dd8..20bbe9dba4 100644
--- a/source3/python/py_winbind.c
+++ b/source3/python/py_winbind.c
@@ -3,7 +3,7 @@
 
    Python wrapper for winbind client functions.
 
-   Copyright (C) Tim Potter      2002
+   Copyright (C) Tim Potter      2002-2003
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -452,6 +452,65 @@ static PyObject *py_auth_crap(PyObject *self, PyObject *args, PyObject *kw)
 	return PyInt_FromLong(response.data.auth.nt_status);
 }
 
+#if 0				/* Include when auth_smbd merged to HEAD */
+
+/* Challenge/response authentication, with secret */
+
+static PyObject *py_auth_smbd(PyObject *self, PyObject *args, PyObject *kw)
+{
+	static char *kwlist[] = 
+		{"username", "password", "use_lm_hash", "use_nt_hash", NULL };
+	struct winbindd_request request;
+	struct winbindd_response response;
+	char *username, *password;
+	int use_lm_hash = 1, use_nt_hash = 1;
+
+	if (!PyArg_ParseTupleAndKeywords(
+		    args, kw, "ss|ii", kwlist, &username, &password, 
+		    &use_lm_hash, &use_nt_hash))
+		return NULL;
+
+	ZERO_STRUCT(request);
+	ZERO_STRUCT(response);
+
+	fstrcpy(request.data.smbd_auth_crap.user, username);
+
+	generate_random_buffer(request.data.smbd_auth_crap.chal, 8, False);
+        
+	if (use_lm_hash) {
+		SMBencrypt((uchar *)password, 
+			   request.data.smbd_auth_crap.chal, 
+			   (uchar *)request.data.smbd_auth_crap.lm_resp);
+		request.data.smbd_auth_crap.lm_resp_len = 24;
+	}
+
+	if (use_nt_hash) {
+		SMBNTencrypt((uchar *)password, 
+			     request.data.smbd_auth_crap.chal,
+			     (uchar *)request.data.smbd_auth_crap.nt_resp);
+		request.data.smbd_auth_crap.nt_resp_len = 24;
+	}
+
+	if (!secrets_fetch_trust_account_password(
+		    lp_workgroup(), request.data.smbd_auth_crap.proof, NULL)) {
+		PyErr_SetString(
+			winbind_error, "unable to fetch domain secret");
+		return NULL;
+	}
+
+
+
+	if (winbindd_request(WINBINDD_SMBD_AUTH_CRAP, &request, &response) 
+	    != NSS_STATUS_SUCCESS) {
+		PyErr_SetString(winbind_error, "lookup failed");
+		return NULL;		
+	}
+	
+	return PyInt_FromLong(response.data.auth.nt_status);
+}
+
+#endif /* 0 */
+
 /* Get user info from name */
 
 static PyObject *py_getpwnam(PyObject *self, PyObject *args)
@@ -648,6 +707,17 @@ Authenticate a username and password using the challenge/response
 protocol.  The NT status code is returned with zero indicating
 success." },
 
+#if 0				/* Include when smbd_auth merged to HEAD */
+
+	{ "auth_smbd", (PyCFunction)py_auth_crap, METH_VARARGS,
+	  "auth_smbd(s, s) -> int
+
+Authenticate a username and password using the challenge/response
+protocol but using the domain secret to prove we are root.  The NT 
+status code is returned with zero indicating success." },
+
+#endif
+
 	{ NULL }
 };
 
-- 
cgit 


From 1b0033dac6e1044ee276d82d5e08bab78c99ef8b Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Tue, 18 Mar 2003 03:07:39 +0000
Subject: Decode waitstatus values when a command fails. (This used to be
 commit e1baab1ee04b27447445351d0d88b0c02a5fa85d)

---
 source3/stf/comfychair.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'source3')

diff --git a/source3/stf/comfychair.py b/source3/stf/comfychair.py
index d7e23efc10..8ff7726955 100644
--- a/source3/stf/comfychair.py
+++ b/source3/stf/comfychair.py
@@ -1,6 +1,7 @@
 #! /usr/bin/env python
 
 # Copyright (C) 2002, 2003 by Martin Pool <mbp@samba.org>
+# Copyright (C) 2003 by Tim Potter <tpot@samba.org>
 # 
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -20,6 +21,7 @@
 """comfychair: a Python-based instrument of software torture.
 
 Copyright (C) 2002, 2003 by Martin Pool <mbp@samba.org>
+Copyright (C) 2003 by Tim Potter <tpot@samba.org>
 
 This is a test framework designed for testing programs written in
 Python, or (through a fork/exec interface) any other language.
@@ -163,9 +165,10 @@ why."""
                ("%s terminated with signal %d", cmd, os.WTERMSIG(waitstatus))
         rc = os.WEXITSTATUS(waitstatus)
         self.test_log = self.test_log + ("""Run command: %s
-Wait status: %#x
+Wait status: %#x (exit code %d, signal %d)
 Output:
-%s""" % (cmd, waitstatus, output))
+%s""" % (cmd, waitstatus, os.WEXITSTATUS(waitstatus), os.WTERMSIG(waitstatus),
+         output))
         if skip_on_noexec and rc == 127:
             # Either we could not execute the command or the command
             # returned exit code 127.  According to system(3) we can't
-- 
cgit 


From eb8374894061e9dc3bc83e397a92248d23b99f22 Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Tue, 18 Mar 2003 05:00:02 +0000
Subject: global_globber_region_function/line ought to be recorded before
 clobbering the region, just in case clobbering causes us to crash
 immediately.  (That might happen if we just shot ourselves in the stack and
 strcpy was not inlined.)

Also, in DEVELOPER mode and when Valgrind is available, mark the
clobbered region as uninitialized.  This is an even stronger
protection than clobbering with 0xf1.
(This used to be commit 5653a42ae695f4b8f4c14d3184ca76523d38b51b)
---
 source3/lib/util_str.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'source3')

diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c
index 7643c2807e..b734452867 100644
--- a/source3/lib/util_str.c
+++ b/source3/lib/util_str.c
@@ -424,15 +424,27 @@ size_t count_chars(const char *s,char c)
  *
  * This is meant to catch possible string overflows, even if the
  * actual string copied is not big enough to cause an overflow.
+ *
+ * In addition, under Valgrind the buffer is marked as uninitialized.
  **/
 void clobber_region(const char *fn, unsigned int line, char *dest, size_t len)
 {
 #ifdef DEVELOPER
-	/* F1 is odd and 0xf1f1f1f1 shouldn't be a valid pointer */
-	memset(dest, 0xF1, len);
 	global_clobber_region_function = fn;
 	global_clobber_region_line = line;
-#endif
+
+	/* F1 is odd and 0xf1f1f1f1 shouldn't be a valid pointer */
+	memset(dest, 0xF1, len);
+#ifdef VALGRIND
+	/* Even though we just wrote to this, from the application's
+	 * point of view it is not initialized.
+	 *
+	 * (This is not redundant with the clobbering above.  The
+	 * marking might not actually take effect if we're not running
+	 * under valgrind or not with --client-perms.) */
+	VALGRIND_MAKE_WRITABLE(dest, len);
+#endif /* VALGRIND */
+#endif /* DEVELOPER */
 }
 
 
-- 
cgit 


From b9a8ad5f3bcf8f0d75c39b8f993010f3d1fded7e Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Tue, 18 Mar 2003 05:04:44 +0000
Subject: Speling fixes and a little extra documentation. (This used to be
 commit 8da383bb3e63d25ceb0204c775580f2f1b3336ec)

---
 source3/include/safe_string.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'source3')

diff --git a/source3/include/safe_string.h b/source3/include/safe_string.h
index 65ec05a5c6..d01a6c6321 100644
--- a/source3/include/safe_string.h
+++ b/source3/include/safe_string.h
@@ -129,12 +129,12 @@ size_t __unsafe_string_function_usage_here_char__(void);
     safe_strcpy(dest, src, sizeof(pstring)-PTR_DIFF(dest,pstring_base)-1)
 
 
-/* inside the _fn varients of these is a call to 'clobber_region' - which might
-   destory the stack on a buggy function.  Help the debugging process by putting
-   the function and line it was last called from into a static buffer
-
-   But only for developers */
-
+/* Inside the _fn variants of these is a call to clobber_region(), -
+ * which might destroy the stack on a buggy function.  We help the
+ * debugging process by putting the function and line who last caused
+ * a clobbering into a static buffer.  If the program crashes at
+ * address 0xf1f1f1f1 then this function is probably, but not
+ * necessarily, to blame. */
 #ifdef DEVELOPER
 #define overmalloc_safe_strcpy(dest,src,maxlength)	safe_strcpy_fn(__FUNCTION__,__LINE__,dest,src,maxlength)
 #define safe_strcpy(dest,src,maxlength)	safe_strcpy_fn2(__FUNCTION__,__LINE__,dest,src,maxlength)
-- 
cgit 


From 556fea4e1e68d9d0c711a87905d9be310add7f83 Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Tue, 18 Mar 2003 05:30:15 +0000
Subject: Update comment: Valgrind 1.9.4 seems to always respect client
 requests, without needing --client-perms=yes. (This used to be commit
 412a8780c35ee9449c9682e3ef73afb2c4933285)

---
 source3/lib/util_str.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c
index b734452867..3836d42872 100644
--- a/source3/lib/util_str.c
+++ b/source3/lib/util_str.c
@@ -441,7 +441,7 @@ void clobber_region(const char *fn, unsigned int line, char *dest, size_t len)
 	 *
 	 * (This is not redundant with the clobbering above.  The
 	 * marking might not actually take effect if we're not running
-	 * under valgrind or not with --client-perms.) */
+	 * under valgrind.) */
 	VALGRIND_MAKE_WRITABLE(dest, len);
 #endif /* VALGRIND */
 #endif /* DEVELOPER */
-- 
cgit 


From 2f07f71d787dc2dfcefac6a1f723c2cde76d4884 Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Tue, 18 Mar 2003 05:31:52 +0000
Subject: The new string macros catch a bug at compile that previously only
 trapped at runtime, which is great.  So we have to try a little harder to
 provoke an overflow -- which is still caught nicely in developer mode. (This
 used to be commit cea126f62ad411f5efbebc7c5d39297fd8ef9efb)

---
 source3/torture/t_stringoverflow.c | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'source3')

diff --git a/source3/torture/t_stringoverflow.c b/source3/torture/t_stringoverflow.c
index b0503adb8f..ec14d81189 100644
--- a/source3/torture/t_stringoverflow.c
+++ b/source3/torture/t_stringoverflow.c
@@ -3,6 +3,7 @@
  int main(void)
 {
 	fstring dest;
+	char *ptr = dest;
 
 	printf("running on valgrind? %d\n", RUNNING_ON_VALGRIND);
 
@@ -10,7 +11,13 @@
 	 * will actually fit, but this is still wrong because you
 	 * can't pstrcpy into an fstring.  This should trap in a
 	 * developer build. */
+
+#if 0
+	/* As of CVS 20030318, this will be trapped at compile time! */
 	pstrcpy(dest, "hello");
+#endif /* 0 */
+
+	pstrcpy(ptr, "hello!");
 
 	return 0;
 }
-- 
cgit 


From 29fa4c1631d70daf564a52cf23740c6e1b5316f6 Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Tue, 18 Mar 2003 05:37:23 +0000
Subject: Remove static libbigballofmud, which just does not seem to link.

Add bin/t_stringoverflow test case.  Not built by default.
(This used to be commit 7741bb8d18e7ba16522c00513174f2909d75535d)
---
 source3/Makefile.in | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'source3')

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 40abe5d71b..a2290e8f57 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -894,9 +894,10 @@ bin/libbigballofmud.@SHLIBEXT@: $(LIBBIGBALLOFMUD_PICOBJS)
 	$(SHLD) $(LDSHFLAGS) -o $@ $(LIBBIGBALLOFMUD_PICOBJS) $(LIBS) \
 		@SONAMEFLAG@`basename $@`.$(LIBBIGBALLOFMUD_MAJOR)
 
-bin/libbigballofmud.a: $(LIBBIGBALLOFMUD_OBJS)
-	@echo Linking bigballofmud non-shared library $@
-	-$(AR) -rc $@ $(LIBBIGBALLOFMUD_OBJS)
+# It would be nice to build a static bigballofmud too, but when I try
+# I get linker errors about dl_open and similar things.  I'm not sure
+# if it can be fixed or if they just can't be called from a static
+# library.
 
 libsmbclient: $(LIBSMBCLIENT)
 
@@ -1027,6 +1028,9 @@ bin/tdbbackup@EXEEXT@: $(TDBBACKUP_OBJ) bin/.dummy
 	@echo Linking $@
 	@$(CC) $(FLAGS) -o $@ $(TDBBACKUP_OBJ)
 
+bin/t_stringoverflow: bin/libbigballofmud.@SHLIBEXT@ torture/t_stringoverflow.o
+	$(CC) $(FLAGS) -o $@ torture/t_stringoverflow.o -L./bin -lbigballofmud
+
 install: installbin installman installscripts installdat installswat 
 
 # DESTDIR is used here to prevent packagers wasting their time
-- 
cgit 


From c52a31b21a656928caedc48211905b713779801a Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Tue, 18 Mar 2003 05:42:53 +0000
Subject: Comment about deprecated macro overmalloc_safe_strcpy(). (This used
 to be commit 5ac062580690eee9b4bd423dbb82631c0cdb8b30)

---
 source3/include/safe_string.h | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'source3')

diff --git a/source3/include/safe_string.h b/source3/include/safe_string.h
index d01a6c6321..61ef4bdf96 100644
--- a/source3/include/safe_string.h
+++ b/source3/include/safe_string.h
@@ -135,6 +135,12 @@ size_t __unsafe_string_function_usage_here_char__(void);
  * a clobbering into a static buffer.  If the program crashes at
  * address 0xf1f1f1f1 then this function is probably, but not
  * necessarily, to blame. */
+
+/* overmalloc_safe_strcpy: DEPRECATED!  Used when you know the
+ * destination buffer is longer than maxlength, but you don't know how
+ * long.  This is not a good situation, because we can't do the normal
+ * sanity checks. Don't use in new code! */
+
 #ifdef DEVELOPER
 #define overmalloc_safe_strcpy(dest,src,maxlength)	safe_strcpy_fn(__FUNCTION__,__LINE__,dest,src,maxlength)
 #define safe_strcpy(dest,src,maxlength)	safe_strcpy_fn2(__FUNCTION__,__LINE__,dest,src,maxlength)
-- 
cgit 


From 8cfec8554e54429654a8fef7335cb857ac481221 Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Tue, 18 Mar 2003 05:51:41 +0000
Subject: Ignore .po and .po32 files. (This used to be commit
 8d64419625dda242fdb7a5d956644b052b43a2ea)

---
 source3/rpc_client/.cvsignore | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 source3/rpc_client/.cvsignore

(limited to 'source3')

diff --git a/source3/rpc_client/.cvsignore b/source3/rpc_client/.cvsignore
new file mode 100644
index 0000000000..07da2225c7
--- /dev/null
+++ b/source3/rpc_client/.cvsignore
@@ -0,0 +1,3 @@
+*.po
+*.po32
+
-- 
cgit 


From 6cb8656c2601254ebd04a71cc68650edcba53869 Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Tue, 18 Mar 2003 05:52:05 +0000
Subject: Ignore t_stringoverflow binary. (This used to be commit
 195582c4cb7906ab95e47f5a2aea4ae86a7ab023)

---
 source3/bin/.cvsignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/bin/.cvsignore b/source3/bin/.cvsignore
index 5cad4ba406..f03ce48d2c 100644
--- a/source3/bin/.cvsignore
+++ b/source3/bin/.cvsignore
@@ -2,6 +2,7 @@
 .dummy
 .libs
 debug2html
+editreg
 locktest
 locktest2
 make_printerdef
@@ -36,6 +37,7 @@ smbtorture
 smbtree
 smbumount
 swat
+t_stringoverflow
 talloctort
 tdbbackup
 testparm
@@ -44,4 +46,3 @@ vfstest
 wbinfo
 winbindd
 wrepld
-editreg
-- 
cgit 


From a084f06fe33eb9903489763bc34c7092080a0a5e Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Tue, 18 Mar 2003 07:09:23 +0000
Subject: Split "clobber" function and variables into its own file before it
 grows too much larger. (This used to be commit
 4bbddbfc6a97ebb11e299aa7bd07ebebeab42c65)

---
 source3/Makefile.in    |  2 +-
 source3/lib/clobber.c  | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++
 source3/lib/util_str.c | 39 --------------------------------
 3 files changed, 61 insertions(+), 40 deletions(-)
 create mode 100644 source3/lib/clobber.c

(limited to 'source3')

diff --git a/source3/Makefile.in b/source3/Makefile.in
index a2290e8f57..88e616de47 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -154,7 +154,7 @@ LIB_OBJ = lib/charcnv.o lib/debug.o lib/fault.o \
 	  lib/util_getent.o lib/util_pw.o lib/access.o lib/smbrun.o \
 	  lib/bitmap.o lib/crc32.o lib/snprintf.o lib/dprintf.o \
 	  lib/xfile.o lib/wins_srv.o \
-	  lib/util_str.o lib/util_sid.o lib/util_uuid.o \
+	  lib/util_str.o lib/clobber.o lib/util_sid.o lib/util_uuid.o \
 	  lib/util_unistr.o lib/util_file.o lib/data_blob.o \
 	  lib/util.o lib/util_sock.o lib/util_sec.o \
 	  lib/talloc.o lib/hash.o lib/substitute.o lib/fsusage.o \
diff --git a/source3/lib/clobber.c b/source3/lib/clobber.c
new file mode 100644
index 0000000000..fb3a0dc281
--- /dev/null
+++ b/source3/lib/clobber.c
@@ -0,0 +1,60 @@
+/* 
+   Unix SMB/CIFS implementation.
+   Samba utility functions
+   Copyright (C) Martin Pool     2003
+   Copyright (C) Andrew Bartlett 2003
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "includes.h"
+
+#ifdef DEVELOPER
+const char *global_clobber_region_function;
+unsigned int global_clobber_region_line;
+#endif
+
+/**
+ * In developer builds, clobber a region of memory.
+ *
+ * If we think a string buffer is longer than it really is, this ought
+ * to make the failure obvious, by segfaulting (if in the heap) or by
+ * killing the return address (on the stack), or by trapping under a
+ * memory debugger.
+ *
+ * This is meant to catch possible string overflows, even if the
+ * actual string copied is not big enough to cause an overflow.
+ *
+ * In addition, under Valgrind the buffer is marked as uninitialized.
+ **/
+void clobber_region(const char *fn, unsigned int line, char *dest, size_t len)
+{
+#ifdef DEVELOPER
+	global_clobber_region_function = fn;
+	global_clobber_region_line = line;
+
+	/* F1 is odd and 0xf1f1f1f1 shouldn't be a valid pointer */
+	memset(dest, 0xF1, len);
+#ifdef VALGRIND
+	/* Even though we just wrote to this, from the application's
+	 * point of view it is not initialized.
+	 *
+	 * (This is not redundant with the clobbering above.  The
+	 * marking might not actually take effect if we're not running
+	 * under valgrind.) */
+	VALGRIND_MAKE_WRITABLE(dest, len);
+#endif /* VALGRIND */
+#endif /* DEVELOPER */
+}
diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c
index 3836d42872..8ef4ddade6 100644
--- a/source3/lib/util_str.c
+++ b/source3/lib/util_str.c
@@ -21,11 +21,6 @@
 
 #include "includes.h"
 
-#ifdef DEVELOPER
-const char *global_clobber_region_function;
-unsigned int global_clobber_region_line;
-#endif
-
 /**
  * Get the next token from a string, return False if none found.
  * Handles double-quotes.
@@ -414,40 +409,6 @@ size_t count_chars(const char *s,char c)
 	return(count);
 }
 
-/**
- * In developer builds, clobber a region of memory.
- *
- * If we think a string buffer is longer than it really is, this ought
- * to make the failure obvious, by segfaulting (if in the heap) or by
- * killing the return address (on the stack), or by trapping under a
- * memory debugger.
- *
- * This is meant to catch possible string overflows, even if the
- * actual string copied is not big enough to cause an overflow.
- *
- * In addition, under Valgrind the buffer is marked as uninitialized.
- **/
-void clobber_region(const char *fn, unsigned int line, char *dest, size_t len)
-{
-#ifdef DEVELOPER
-	global_clobber_region_function = fn;
-	global_clobber_region_line = line;
-
-	/* F1 is odd and 0xf1f1f1f1 shouldn't be a valid pointer */
-	memset(dest, 0xF1, len);
-#ifdef VALGRIND
-	/* Even though we just wrote to this, from the application's
-	 * point of view it is not initialized.
-	 *
-	 * (This is not redundant with the clobbering above.  The
-	 * marking might not actually take effect if we're not running
-	 * under valgrind.) */
-	VALGRIND_MAKE_WRITABLE(dest, len);
-#endif /* VALGRIND */
-#endif /* DEVELOPER */
-}
-
-
 /**
  Safe string copy into a known length string. maxlength does not
  include the terminating zero.
-- 
cgit