From 612682354fa978d7b883028b3aace52a2882adca Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 19 Apr 2000 04:01:16 +0000
Subject: - got rid of the "passive" option - cleaned up the standard_sub_*()
 calls a lot (This used to be commit 2c2d95d77d3667eaa9252506a82b9054b0d0e01c)

---
 source3/smbd/service.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'source3/smbd/service.c')

diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index 24ba79906b..b7942906df 100644
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -488,7 +488,7 @@ connection_struct *make_connection(char *service,char *user,char *password, int
 	{
 		pstring s;
 		pstrcpy(s,lp_pathname(snum));
-		standard_sub(conn,s);
+		standard_sub_conn(conn,s);
 		string_set(&conn->connectpath,s);
 		DEBUG(3,("Connect path is %s\n",s));
 	}
@@ -523,7 +523,7 @@ connection_struct *make_connection(char *service,char *user,char *password, int
 	if (*lp_rootpreexec(SNUM(conn))) {
 		pstring cmd;
 		pstrcpy(cmd,lp_rootpreexec(SNUM(conn)));
-		standard_sub(conn,cmd);
+		standard_sub_conn(conn,cmd);
 		DEBUG(5,("cmd=%s\n",cmd));
 		ret = smbrun(cmd,NULL,False);
 		if (ret != 0 && lp_rootpreexec_close(SNUM(conn))) {
@@ -584,7 +584,7 @@ connection_struct *make_connection(char *service,char *user,char *password, int
 	if (*lp_preexec(SNUM(conn))) {
 		pstring cmd;
 		pstrcpy(cmd,lp_preexec(SNUM(conn)));
-		standard_sub(conn,cmd);
+		standard_sub_conn(conn,cmd);
 		ret = smbrun(cmd,NULL,False);
 		if (ret != 0 && lp_preexec_close(SNUM(conn))) {
 			DEBUG(1,("preexec gave %d - failing connection\n", ret));
@@ -680,7 +680,7 @@ void close_cnum(connection_struct *conn, uint16 vuid)
 	    become_user(conn, vuid))  {
 		pstring cmd;
 		pstrcpy(cmd,lp_postexec(SNUM(conn)));
-		standard_sub(conn,cmd);
+		standard_sub_conn(conn,cmd);
 		smbrun(cmd,NULL,False);
 		unbecome_user();
 	}
@@ -690,7 +690,7 @@ void close_cnum(connection_struct *conn, uint16 vuid)
 	if (*lp_rootpostexec(SNUM(conn)))  {
 		pstring cmd;
 		pstrcpy(cmd,lp_rootpostexec(SNUM(conn)));
-		standard_sub(conn,cmd);
+		standard_sub_conn(conn,cmd);
 		smbrun(cmd,NULL,False);
 	}
 	
-- 
cgit