From: Gerald Carter <jerry@samba.org>
Date: Mon, 10 Jan 2005 13:17:36 +0000 (+0000)
Subject: r4645: patch from Rob to fix the build breakage in vfstest after the reload_printers... 
X-Git-Tag: samba-misc-tags/initial-v3-0-unstable~5435
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=054b64fb86328556288d097e1201a24d53d0bec9;p=thirdparty%2Fsamba.git

r4645: patch from Rob to fix the build breakage in vfstest after the reload_printers() cleanup
---

diff --git a/source/Makefile.in b/source/Makefile.in
index eaf1482b3ee..79579b21c12 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -136,7 +136,7 @@ BIN_PROGS3 = bin/smbpasswd@EXEEXT@ bin/rpcclient@EXEEXT@ bin/smbcacls@EXEEXT@ \
 
 TORTURE_PROGS = bin/smbtorture@EXEEXT@ bin/msgtest@EXEEXT@ \
 	bin/masktest@EXEEXT@ bin/locktest@EXEEXT@ \
-	bin/locktest2@EXEEXT@ bin/nsstest@EXEEXT@
+	bin/locktest2@EXEEXT@ bin/nsstest@EXEEXT@ bin/vfstest@EXEEXT@
 
 BIN_PROGS = $(BIN_PROGS1) $(BIN_PROGS2) $(BIN_PROGS3) @EXTRA_BIN_PROGS@
 
diff --git a/source/torture/vfstest.c b/source/torture/vfstest.c
index 48556aa2570..3296a660960 100644
--- a/source/torture/vfstest.c
+++ b/source/torture/vfstest.c
@@ -418,6 +418,11 @@ int smbd_server_fd(void)
 		return server_fd;
 }
 
+void reload_printers(void)
+{
+	return;
+}
+
 /****************************************************************************
  Reload the services file.
 **************************************************************************/
@@ -445,8 +450,6 @@ BOOL reload_services(BOOL test)
 	
 	ret = lp_load(dyn_CONFIGFILE, False, False, True);
 
-	load_printers();
-
 	/* perhaps the config filename is now set */
 	if (!test)
 		reload_services(True);