summaryrefslogtreecommitdiff
path: root/source3/smbd/server.c
diff options
context:
space:
mode:
authorSamba Release Account <samba-bugs@samba.org>1997-08-27 19:27:25 +0000
committerSamba Release Account <samba-bugs@samba.org>1997-08-27 19:27:25 +0000
commit38dc53828e6e9a3ba9589c722fba40a4df167d75 (patch)
tree2e3cf884e1dbdea94092cb76708314db1700466d /source3/smbd/server.c
parent5c2d12119c7d2e8c8563f22ffa23ab7d213242fb (diff)
downloadsamba-38dc53828e6e9a3ba9589c722fba40a4df167d75.tar.gz
samba-38dc53828e6e9a3ba9589c722fba40a4df167d75.tar.bz2
samba-38dc53828e6e9a3ba9589c722fba40a4df167d75.zip
doing that irritating compiler clash warning with the protos for standard_sub
and standard_sub_basic. again. lkcl (This used to be commit b60ef755cf594ee9751660467709ea4f7a669a2c)
Diffstat (limited to 'source3/smbd/server.c')
-rw-r--r--source3/smbd/server.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index aaf62fdcad..4259bda958 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -3471,12 +3471,12 @@ void exit_server(char *reason)
/****************************************************************************
do some standard substitutions in a string
****************************************************************************/
-void standard_sub(int cnum,char *string)
+void standard_sub(int cnum,char *str)
{
if (VALID_CNUM(cnum)) {
char *p, *s, *home;
- for ( s=string ; (p=strchr(s, '%')) != NULL ; s=p ) {
+ for ( s=str ; (p=strchr(s, '%')) != NULL ; s=p ) {
switch (*(p+1)) {
case 'H' : if ((home = get_home_dir(Connections[cnum].user))!=NULL)
string_sub(p,"%H",home);
@@ -3492,7 +3492,7 @@ void standard_sub(int cnum,char *string)
}
}
}
- standard_sub_basic(string);
+ standard_sub_basic(str);
}
/*