r4904: sync up with 3.0 for 3.0.11pre2

2 files changed, 10 insertions, 3 deletions

diff --git a/source/torture/rpctorture.c b/source/torture/rpctorture.c
index d95c0cee0fe..98e36983b09 100644
--- a/source/torture/rpctorture.c
+++ b/source/torture/rpctorture.c
@@ -285,7 +285,11 @@ enum client_action
 	ZERO_STRUCT(cli_info.dom.level5_sid);
 	pstrcpy(cli_info.dom.level5_dom, "");
 
-	smb_cli->nt_pipe_fnum   = 0xffff;
+	{
+		int i;
+		for (i=0; i<PI_MAX_PIPES; i++)
+			smb_cli->nt_pipe_fnum[i]   = 0xffff;
+	}
 
 	setup_logging(pname, True);
 
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);