summaryrefslogtreecommitdiffstats
path: root/source/smbd/ipc.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2000-04-19 04:01:16 +0000
committerAndrew Tridgell <tridge@samba.org>2000-04-19 04:01:16 +0000
commit2c2d95d77d3667eaa9252506a82b9054b0d0e01c (patch)
tree917217f5a8545a9b5b1f770ccb95f7a4447f261b /source/smbd/ipc.c
parent8a99d824c0e9a43c8a8c81140f8c9005c7e2621a (diff)
downloadsamba-2c2d95d77d3667eaa9252506a82b9054b0d0e01c.tar.gz
samba-2c2d95d77d3667eaa9252506a82b9054b0d0e01c.tar.xz
samba-2c2d95d77d3667eaa9252506a82b9054b0d0e01c.zip
- got rid of the "passive" option
- cleaned up the standard_sub_*() calls a lot
Diffstat (limited to 'source/smbd/ipc.c')
-rw-r--r--source/smbd/ipc.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/source/smbd/ipc.c b/source/smbd/ipc.c
index 17aa83b72b4..64ec05b0176 100644
--- a/source/smbd/ipc.c
+++ b/source/smbd/ipc.c
@@ -80,7 +80,7 @@ static int CopyExpanded(connection_struct *conn,
StrnCpy(buf,src,sizeof(buf)/2);
pstring_sub(buf,"%S",lp_servicename(snum));
- standard_sub(conn,buf);
+ standard_sub_conn(conn,buf);
StrnCpy(*dst,buf,*n);
l = strlen(*dst) + 1;
(*dst) += l;
@@ -105,7 +105,7 @@ static int StrlenExpanded(connection_struct *conn, int snum, char* s)
if (!s) return(0);
StrnCpy(buf,s,sizeof(buf)/2);
pstring_sub(buf,"%S",lp_servicename(snum));
- standard_sub(conn,buf);
+ standard_sub_conn(conn,buf);
return strlen(buf) + 1;
}
@@ -115,7 +115,7 @@ static char* Expand(connection_struct *conn, int snum, char* s)
if (!s) return(NULL);
StrnCpy(buf,s,sizeof(buf)/2);
pstring_sub(buf,"%S",lp_servicename(snum));
- standard_sub(conn,buf);
+ standard_sub_conn(conn,buf);
return &buf[0];
}
@@ -2137,7 +2137,7 @@ static BOOL api_RNetServerGetInfo(connection_struct *conn,uint16 vuid, char *par
SIVAL(p,6,0);
} else {
SIVAL(p,6,PTR_DIFF(p2,*rdata));
- standard_sub(conn,comment);
+ standard_sub_conn(conn,comment);
StrnCpy(p2,comment,MAX(mdrcnt - struct_len,0));
p2 = skip_string(p2,1);
}
@@ -2519,7 +2519,7 @@ static BOOL api_RNetUserGetInfo(connection_struct *conn,uint16 vuid, char *param
SSVAL(p,52,0); /* flags */
SIVAL(p,54,PTR_DIFF(p2,*rdata)); /* script_path */
pstrcpy(p2,lp_logon_script());
- standard_sub( conn, p2 );
+ standard_sub_conn( conn, p2 );
p2 = skip_string(p2,1);
if (uLevel == 2)
{
@@ -2544,7 +2544,7 @@ static BOOL api_RNetUserGetInfo(connection_struct *conn,uint16 vuid, char *param
SSVALS(p,104,-1); /* num_logons */
SIVAL(p,106,PTR_DIFF(p2,*rdata)); /* logon_server */
pstrcpy(p2,"\\\\%L");
- standard_sub_basic(p2);
+ standard_sub_conn(conn, p2);
p2 = skip_string(p2,1);
SSVAL(p,110,49); /* country_code */
SSVAL(p,112,860); /* code page */
@@ -2667,7 +2667,7 @@ static BOOL api_WWkstaUserLogon(connection_struct *conn,uint16 vuid, char *param
{
pstring logon_script;
pstrcpy(logon_script,lp_logon_script());
- standard_sub( conn, logon_script );
+ standard_sub_conn( conn, logon_script );
PACKS(&desc,"z", logon_script); /* script path */
}
/* End of JHT mods */