[SCM] Samba Shared Repository - branch master updated - 6bfd63e0104d3f8d57e20492e27fc280695bcbb1

Michael Adam obnox at samba.org
Sat Sep 27 20:27:17 GMT 2008


The branch, master has been updated
       via  6bfd63e0104d3f8d57e20492e27fc280695bcbb1 (commit)
       via  21c4061414f0e1af9106c50958dd5653a6f5368d (commit)
      from  3b02b9e40ee5b1c4dbdf503fdeb0351832a1e9c9 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 6bfd63e0104d3f8d57e20492e27fc280695bcbb1
Author: Michael Adam <obnox at samba.org>
Date:   Sat Sep 27 22:08:02 2008 +0200

    [s3]build: build the new test_lp_load command.
    
    Michael

commit 21c4061414f0e1af9106c50958dd5653a6f5368d
Author: Michael Adam <obnox at samba.org>
Date:   Sat Sep 27 22:06:27 2008 +0200

    [s3]loadparm: add a command test_lp_load to test the lp_load function.
    
    This is not like testparm, just a simple tool that runs
    lp_load_with_registry_shares the requested number of times.
    
    Michael

-----------------------------------------------------------------------

Summary of changes:
 source3/Makefile.in          |   11 +++++
 source3/param/test_lp_load.c |   88 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 99 insertions(+), 0 deletions(-)
 create mode 100644 source3/param/test_lp_load.c


Changeset truncated at 500 lines:

diff --git a/source3/Makefile.in b/source3/Makefile.in
index c8ee9be..61e946e 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -739,6 +739,10 @@ TESTPARM_OBJ = utils/testparm.o \
                $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) \
 	       $(LIBSAMBA_OBJ)
 
+TEST_LP_LOAD_OBJ = param/test_lp_load.o \
+		   $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
+		   $(POPT_LIB_OBJ) $(LIBSAMBA_OBJ)
+
 PASSWD_UTIL_OBJ = utils/passwd_util.o
 
 SMBPASSWD_OBJ = utils/smbpasswd.o $(PASSWD_UTIL_OBJ) $(PASSCHANGE_OBJ) \
@@ -2494,6 +2498,13 @@ bin/rpc_open_tcp at EXEEXT@: $(BINARY_PREREQS) $(RPC_OPEN_TCP_OBJ) @LIBTALLOC_SHARE
 		$(LIBS) $(LIBTALLOC_LIBS) @LIBTDB_SHARED@ $(WINBIND_LIBS) \
 		$(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS)
 
+bin/test_lp_load at EXEEXT@: $(BINARY_PREREQS) $(TEST_LP_LOAD_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
+	@echo "Linking $@"
+	@$(CC) $(FLAGS) -o $@ $(TEST_LP_LOAD_OBJ) \
+		$(LDFLAGS) $(DYNEEXP) $(LIBS) \
+		$(LDAP_LIBS) \
+		$(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
+
 install:: installservers installbin @INSTALL_CIFSMOUNT@ @INSTALL_CIFSUPCALL@ installman \
 		installscripts installdat installmodules @SWAT_INSTALL_TARGETS@ \
 		@INSTALL_PAM_MODULES@ installlibs
diff --git a/source3/param/test_lp_load.c b/source3/param/test_lp_load.c
new file mode 100644
index 0000000..db1bad4
--- /dev/null
+++ b/source3/param/test_lp_load.c
@@ -0,0 +1,88 @@
+/*
+ * Unix SMB/CIFS implementation.
+ * Test for lp_load()
+ * Copyright (C) Michael Adam 2008
+ *
+ * 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 3 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "includes.h"
+
+extern bool AllowDebugChange;
+
+int main(int argc, const char **argv)
+{
+	const char *config_file = get_dyn_CONFIGFILE();
+	int ret = 0;
+	poptContext pc;
+	char *count_str = NULL;
+	int i, count = 1;
+
+	struct poptOption long_options[] = {
+		POPT_AUTOHELP
+		{"count", 'c', POPT_ARG_STRING, &count_str, 1,
+		 "Load config <count> number of times"},
+		POPT_COMMON_DEBUGLEVEL
+		POPT_TABLEEND
+	};
+
+	TALLOC_CTX *frame = talloc_stackframe();
+
+	load_case_tables();
+	DEBUGLEVEL_CLASS[DBGC_ALL] = 0;
+
+	pc = poptGetContext(NULL, argc, argv, long_options,
+			    POPT_CONTEXT_KEEP_FIRST);
+	poptSetOtherOptionHelp(pc, "[OPTION...] <config-file>");
+
+	while(poptGetNextOpt(pc) != -1);
+
+	setup_logging(poptGetArg(pc), True);
+
+	if (poptPeekArg(pc)) {
+		config_file = poptGetArg(pc);
+	}
+
+	poptFreeContext(pc);
+
+	if (count_str != NULL) {
+		count = atoi(count_str);
+	}
+
+	dbf = x_stderr;
+	/* Don't let the debuglevel be changed by smb.conf. */
+	AllowDebugChange = False;
+
+	for (i=0; i < count; i++) {
+		printf("call lp_load() #%d: ", i+1);
+		if (!lp_load_with_registry_shares(config_file,
+						  False, /* global only */
+						  True,  /* save defaults */
+						  False, /*add_ipc */
+						  True)) /*init globals */
+		{
+			printf("ERROR.\n");
+			ret = 1;
+			goto done;
+		}
+		printf("ok.\n");
+	}
+
+
+done:
+	TALLOC_FREE(frame);
+	gfree_loadparm();
+	return ret;
+}
+


-- 
Samba Shared Repository


More information about the samba-cvs mailing list