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

API fix for the problem.
Jeremy.

2 files changed, 14 insertions, 6 deletions

diff --git a/source/lib/util_str.c b/source/lib/util_str.c
index 50c6605d5c3..07c91805cc7 100644
--- a/source/lib/util_str.c
+++ b/source/lib/util_str.c
@@ -918,11 +918,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;
 
@@ -940,9 +941,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] = '_';
diff --git a/source/lib/util_unistr.c b/source/lib/util_unistr.c
index f6bb7e80681..9b3e25dd7ea 100644
--- a/source/lib/util_unistr.c
+++ b/source/lib/util_unistr.c
@@ -1580,9 +1580,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"));
@@ -1598,9 +1599,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)'_';