r4645: patch from Rob to fix the build breakage in vfstest after the reload_printers...

diff --git a/source/Makefile.in b/source/Makefile.in
index eaf1482b3eee72f97db194ff180a9c7748758a2c..79579b21c12d8fc3db5624de36e668864f4b4ee6 100644 (file)
--- 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 48556aa25705de025777ecd6d2d28e269c6c552d..3296a6609605fac27b9067c7a39570b5e3e56fb4 100644 (file)
--- 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);