summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2001-06-23 07:22:16 +0000
committerJeremy Allison <jra@samba.org>2001-06-23 07:22:16 +0000
commit37eb0d6c74ce158b1cc268cea446b33789550048 (patch)
tree53db3f7b7c381be854d8493ef7ac3e353bd640e4 /source3/smbd
parent7133aed083612480a94a7b61d6a0a0308c304b6e (diff)
downloadsamba-37eb0d6c74ce158b1cc268cea446b33789550048.tar.gz
samba-37eb0d6c74ce158b1cc268cea446b33789550048.tar.bz2
samba-37eb0d6c74ce158b1cc268cea446b33789550048.zip
Added other_safe_chars to alpha_strcpy(). Needs testing but is a better
fix for the problem. Jeremy. (This used to be commit e059fffd03a1382fb2b7059b6de369d9fc765a17)
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/message.c4
-rw-r--r--source3/smbd/reply.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/source3/smbd/message.c b/source3/smbd/message.c
index a023650c74..bae9f6c906 100644
--- a/source3/smbd/message.c
+++ b/source3/smbd/message.c
@@ -86,8 +86,8 @@ static void msg_deliver(void)
pstring s;
pstrcpy(s,lp_msg_command());
- pstring_sub(s,"%f",alpha_strcpy(alpha_msgfrom,msgfrom,sizeof(alpha_msgfrom)));
- pstring_sub(s,"%t",alpha_strcpy(alpha_msgto,msgto,sizeof(alpha_msgto)));
+ pstring_sub(s,"%f",alpha_strcpy(alpha_msgfrom,msgfrom,NULL,sizeof(alpha_msgfrom)));
+ pstring_sub(s,"%t",alpha_strcpy(alpha_msgto,msgto,NULL,sizeof(alpha_msgto)));
standard_sub_basic(s);
pstring_sub(s,"%s",name);
smbrun(s,NULL);
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 0c40e5f2b3..da4659dfa1 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -96,7 +96,7 @@ int reply_special(char *inbuf,char *outbuf)
remote_machine[15] = 0;
trim_string(remote_machine," "," ");
strlower(remote_machine);
- alpha_strcpy(remote_machine,remote_machine,sizeof(remote_machine)-1);
+ alpha_strcpy(remote_machine,remote_machine,SAFE_NETBIOS_CHARS,sizeof(remote_machine)-1);
fstrcpy(local_machine,name1);
len = strlen(local_machine);
@@ -106,7 +106,7 @@ int reply_special(char *inbuf,char *outbuf)
}
trim_string(local_machine," "," ");
strlower(local_machine);
- alpha_strcpy(local_machine,local_machine,sizeof(local_machine)-1);
+ alpha_strcpy(local_machine,local_machine,SAFE_NETBIOS_CHARS,sizeof(local_machine)-1);
if (name_type == 'R') {
/* We are being asked for a pathworks session ---