sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

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

Browse Source 
(This used to be commit 054b64fb86)
This commit is contained in:
Gerald Carter 2005-01-10 13:17:36 +00:00 committed by Gerald (Jerry) Carter
parent c28a0992fd
commit aedb05350a
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/Makefile.in
View File

@ -136,7 +136,7 @@ BIN_PROGS3 = bin/smbpasswd@EXEEXT@ bin/rpcclient@EXEEXT@ bin/smbcacls@EXEEXT@ \
TORTURE_PROGS = bin/smbtorture@EXEEXT@ bin/msgtest@EXEEXT@ \ TORTURE_PROGS = bin/smbtorture@EXEEXT@ bin/msgtest@EXEEXT@ \
bin/masktest@EXEEXT@ bin/locktest@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@ BIN_PROGS = $(BIN_PROGS1) $(BIN_PROGS2) $(BIN_PROGS3) @EXTRA_BIN_PROGS@

7
source3/torture/vfstest.c
View File

@ -418,6 +418,11 @@ int smbd_server_fd(void)
return server_fd; return server_fd;
} }
void reload_printers(void)
{
return;
}
/**************************************************************************** /****************************************************************************
Reload the services file. Reload the services file.
**************************************************************************/ **************************************************************************/
@ -445,8 +450,6 @@ BOOL reload_services(BOOL test)
ret = lp_load(dyn_CONFIGFILE, False, False, True); ret = lp_load(dyn_CONFIGFILE, False, False, True);
load_printers();
/* perhaps the config filename is now set */ /* perhaps the config filename is now set */
if (!test) if (!test)
reload_services(True); reload_services(True);