svn commit: samba r4645 - in branches/SAMBA_3_0/source: . torture

jerry at samba.org jerry at samba.org
Mon Jan 10 13:17:37 GMT 2005


Author: jerry
Date: 2005-01-10 13:17:36 +0000 (Mon, 10 Jan 2005)
New Revision: 4645

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

Log:
patch from Rob to fix the build breakage in vfstest after the reload_printers() cleanup
Modified:
   branches/SAMBA_3_0/source/Makefile.in
   branches/SAMBA_3_0/source/torture/vfstest.c


Changeset:
Modified: branches/SAMBA_3_0/source/Makefile.in
===================================================================
--- branches/SAMBA_3_0/source/Makefile.in	2005-01-10 12:56:34 UTC (rev 4644)
+++ branches/SAMBA_3_0/source/Makefile.in	2005-01-10 13:17:36 UTC (rev 4645)
@@ -136,7 +136,7 @@
 
 TORTURE_PROGS = bin/smbtorture at EXEEXT@ bin/msgtest at EXEEXT@ \
 	bin/masktest at EXEEXT@ bin/locktest at EXEEXT@ \
-	bin/locktest2 at EXEEXT@ bin/nsstest at EXEEXT@
+	bin/locktest2 at EXEEXT@ bin/nsstest at EXEEXT@ bin/vfstest at EXEEXT@
 
 BIN_PROGS = $(BIN_PROGS1) $(BIN_PROGS2) $(BIN_PROGS3) @EXTRA_BIN_PROGS@
 

Modified: branches/SAMBA_3_0/source/torture/vfstest.c
===================================================================
--- branches/SAMBA_3_0/source/torture/vfstest.c	2005-01-10 12:56:34 UTC (rev 4644)
+++ branches/SAMBA_3_0/source/torture/vfstest.c	2005-01-10 13:17:36 UTC (rev 4645)
@@ -418,6 +418,11 @@
 		return server_fd;
 }
 
+void reload_printers(void)
+{
+	return;
+}
+
 /****************************************************************************
  Reload the services file.
 **************************************************************************/
@@ -445,8 +450,6 @@
 	
 	ret = lp_load(dyn_CONFIGFILE, False, False, True);
 
-	load_printers();
-
 	/* perhaps the config filename is now set */
 	if (!test)
 		reload_services(True);



More information about the samba-cvs mailing list