Merge of Andrew's changes in 2.2.

[jra/samba/.git] / source / smbd / service.c

diff --git a/source/smbd/service.c b/source/smbd/service.c
index 375587b539d490806606ea4fcca43c1693d88680..9fb2dd9eeb59097f6aa45592b86a7b1cf63cafab 100644 (file)
--- a/source/smbd/service.c
+++ b/source/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);
 }