diff options
| author | Gerald Carter <jerry@samba.org> | 2005-01-10 13:17:36 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:53:49 -0500 |
| commit | aedb05350a32ba75cb2400001c30aa45e5cf0d4d (patch) | |
| tree | 9daeaf1053af5b9880f009ffad3655f246cc1b5e | |
| parent | c28a0992fdf5a5dc48a5797f52edf879f07142df (diff) | |
| download | samba-aedb05350a32ba75cb2400001c30aa45e5cf0d4d.tar.gz samba-aedb05350a32ba75cb2400001c30aa45e5cf0d4d.tar.bz2 samba-aedb05350a32ba75cb2400001c30aa45e5cf0d4d.zip | |
r4645: patch from Rob to fix the build breakage in vfstest after the reload_printers() cleanup
(This used to be commit 054b64fb86328556288d097e1201a24d53d0bec9)
| -rw-r--r-- | source3/Makefile.in | 2 | ||||
| -rw-r--r-- | source3/torture/vfstest.c | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index eaf1482b3e..79579b21c1 100644 --- a/source3/Makefile.in +++ b/source3/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/source3/torture/vfstest.c b/source3/torture/vfstest.c index 48556aa257..3296a66096 100644 --- a/source3/torture/vfstest.c +++ b/source3/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); |