Merge of Andrew's changes in 2.2.

Jeremy.
(This used to be commit fc76681812b1469208ad6c8847afdfc68bc6db49)

4 files changed, 8 insertions, 8 deletions

diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index 10c9539834..45df9b2e0d 100644
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -58,7 +58,7 @@ static void check_magic(files_struct *fsp,connection_struct *conn)
       slprintf(magic_output,sizeof(fname)-1, "%s.out",fname);
 
     chmod(fname,0755);
-    ret = smbrun(fname,&tmp_fd,magic_output);
+    ret = smbrun(fname,&tmp_fd);
     DEBUG(3,("Invoking magic command %s gave %d\n",fname,ret));
     unlink(fname);
 	if (ret != 0 || tmp_fd == -1) {
diff --git a/source3/smbd/message.c b/source3/smbd/message.c
index 01b5f51acc..98eb336c0a 100644
--- a/source3/smbd/message.c
+++ b/source3/smbd/message.c
@@ -91,7 +91,7 @@ static void msg_deliver(void)
       pstring_sub(s,"%t",alpha_strcpy(alpha_msgto,msgto,sizeof(alpha_msgto)));
       standard_sub_basic(s);
       pstring_sub(s,"%s",name);
-      smbrun(s,NULL,NULL);
+      smbrun(s,NULL);
     }
 
   msgpos = 0;
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index b4e0d490ab..9d517dcaa9 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -493,7 +493,7 @@ int smb_create_user(char *unix_user, char *homedir)
   all_string_sub(add_script, "%u", unix_user, sizeof(pstring));
   if (homedir)
     all_string_sub(add_script, "%H", homedir, sizeof(pstring));
-  ret = smbrun(add_script,NULL,NULL);
+  ret = smbrun(add_script,NULL);
   DEBUG(3,("smb_create_user: Running the command `%s' gave %d\n",add_script,ret));
   return ret;
 }
@@ -510,7 +510,7 @@ static int smb_delete_user(char *unix_user)
   pstrcpy(del_script, lp_deluser_script());
   if (! *del_script) return -1;
   all_string_sub(del_script, "%u", unix_user, sizeof(pstring));
-  ret = smbrun(del_script,NULL,NULL);
+  ret = smbrun(del_script,NULL);
   DEBUG(3,("smb_delete_user: Running the command `%s' gave %d\n",del_script,ret));
   return ret;
 }
diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index 375587b539..9fb2dd9eeb 100644
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -559,7 +559,7 @@ connection_struct *make_connection(char *service,char *user,char *password, int
 		pstrcpy(cmd,lp_rootpreexec(SNUM(conn)));
 		standard_sub_conn(conn,cmd);
 		DEBUG(5,("cmd=%s\n",cmd));
-		ret = smbrun(cmd,NULL,NULL);
+		ret = smbrun(cmd,NULL);
 		if (ret != 0 && lp_rootpreexec_close(SNUM(conn))) {
 			DEBUG(1,("preexec gave %d - failing connection\n", ret));
 			conn_free(conn);
@@ -611,7 +611,7 @@ connection_struct *make_connection(char *service,char *user,char *password, int
 		pstring cmd;
 		pstrcpy(cmd,lp_preexec(SNUM(conn)));
 		standard_sub_conn(conn,cmd);
-		ret = smbrun(cmd,NULL,NULL);
+		ret = smbrun(cmd,NULL);
 		if (ret != 0 && lp_preexec_close(SNUM(conn))) {
 			DEBUG(1,("preexec gave %d - failing connection\n", ret));
 			conn_free(conn);
@@ -688,7 +688,7 @@ void close_cnum(connection_struct *conn, uint16 vuid)
 		pstring cmd;
 		pstrcpy(cmd,lp_postexec(SNUM(conn)));
 		standard_sub_conn(conn,cmd);
-		smbrun(cmd,NULL,NULL);
+		smbrun(cmd,NULL);
 		unbecome_user();
 	}
 
@@ -698,7 +698,7 @@ void close_cnum(connection_struct *conn, uint16 vuid)
 		pstring cmd;
 		pstrcpy(cmd,lp_rootpostexec(SNUM(conn)));
 		standard_sub_conn(conn,cmd);
-		smbrun(cmd,NULL,NULL);
+		smbrun(cmd,NULL);
 	}
 	conn_free(conn);
 }