sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-12 09:18:10 +03:00
Code

Added other_safe_chars to alpha_strcpy(). Needs testing but is a better

Browse Source 
fix for the problem.
Jeremy.
This commit is contained in:
Jeremy Allison 0001-01-01 00:00:00 +00:00
parent 17c3faa367
commit e059fffd03
5 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/include/smb.h
View File

@ -1662,6 +1662,8 @@ typedef struct user_struct
#define MAP_TO_GUEST_ON_BAD_USER 1
#define MAP_TO_GUEST_ON_BAD_PASSWORD 2
#define SAFE_NETBIOS_CHARS ". -_"
#include "nsswitch/winbindd_nss.h"
#include "smb_acls.h"

12
source/lib/util_str.c
View File

@ -933,11 +933,12 @@ char *safe_strcat(char *dest, const char *src, size_t maxlength)
/*******************************************************************
Paranoid strcpy into a buffer of given length (includes terminating
zero. Strips out all but 'a-Z0-9' and replaces with '_'. Deliberately
does *NOT* check for multibyte characters. Don't change it !
zero. Strips out all but 'a-Z0-9' and the character in other_safe_chars
and replaces with '_'. Deliberately does *NOT* check for multibyte
characters. Don't change it !
********************************************************************/
char *alpha_strcpy(char *dest, const char *src, size_t maxlength)
char *alpha_strcpy(char *dest, const char *src, const char *other_safe_chars, size_t maxlength)
{
size_t len, i;
@ -955,9 +956,12 @@ char *alpha_strcpy(char *dest, const char *src, size_t maxlength)
if (len >= maxlength)
len = maxlength - 1;
if (!other_safe_chars)
other_safe_chars = "";
for(i = 0; i < len; i++) {
int val = (src[i] & 0xff);
if(isupper(val) ||islower(val) || isdigit(val))
if(isupper(val) || islower(val) || isdigit(val) || strchr(other_safe_chars, val))
dest[i] = src[i];
else
dest[i] = '_';

8
source/lib/util_unistr.c
View File

@ -1453,9 +1453,10 @@ BOOL str_is_all_w(const smb_ucs2_t *s,smb_ucs2_t c)
maxlength is in ucs2 units.
********************************************************************/
smb_ucs2_t *alpha_strcpy_w(smb_ucs2_t *dest, const smb_ucs2_t *src, size_t maxlength)
smb_ucs2_t *alpha_strcpy_w(smb_ucs2_t *dest, const smb_ucs2_t *src, const smb_ucs2_t *other_safe_chars, size_t maxlength)
{
size_t len, i;
smb_ucs2_t nullstr_w = (smb_ucs2_t)0;
if (!dest) {
DEBUG(0,("ERROR: NULL dest in alpha_strcpy_w\n"));
@ -1471,9 +1472,12 @@ smb_ucs2_t *alpha_strcpy_w(smb_ucs2_t *dest, const smb_ucs2_t *src, size_t maxle
if (len >= maxlength)
len = maxlength - 1;
if (!other_safe_chars)
other_safe_chars = &nullstr_w;
for(i = 0; i < len; i++) {
smb_ucs2_t val = src[i];
if(isupper_w(val) ||islower_w(val) || isdigit_w(val))
if(isupper_w(val) ||islower_w(val) || isdigit_w(val) || strchr_w(other_safe_chars, val))
dest[i] = src[i];
else
dest[i] = (smb_ucs2_t)'_';

4
source/smbd/message.c
View File

@ -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);

4
source/smbd/reply.c
View File

@ -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 ---