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

s3:lib: allow_trailing_dollar should only allow '$'

Browse Source 
metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Thu Feb  3 00:33:48 CET 2011 on sn-devel-104
This commit is contained in:
Stefan Metzmacher 2011-02-02 23:41:17 +01:00
parent 40850b3b27
commit 91e1c8dc38
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
source3/lib/util_str.c
View File

@ -820,10 +820,6 @@ void string_sub2(char *s,const char *pattern, const char *insert, size_t len,
} }
for (i=0;i<li;i++) { for (i=0;i<li;i++) {
switch (insert[i]) { switch (insert[i]) {
case '`':
case '"':
case '\'':
case ';':
case '$': case '$':
/* allow a trailing $ /* allow a trailing $
* (as in machine accounts) */ * (as in machine accounts) */
@ -831,6 +827,10 @@ void string_sub2(char *s,const char *pattern, const char *insert, size_t len,
p[i] = insert[i]; p[i] = insert[i];
break; break;
} }
case '`':
case '"':
case '\'':
case ';':
case '%': case '%':
case '\r': case '\r':
case '\n': case '\n':
@ -902,16 +902,16 @@ char *realloc_string_sub2(char *string,
ld = li - lp; ld = li - lp;
for (i=0;i<li;i++) { for (i=0;i<li;i++) {
switch (in[i]) { switch (in[i]) {
case '`':
case '"':
case '\'':
case ';':
case '$': case '$':
/* allow a trailing $ /* allow a trailing $
* (as in machine accounts) */ * (as in machine accounts) */
if (allow_trailing_dollar && (i == li - 1 )) { if (allow_trailing_dollar && (i == li - 1 )) {
break; break;
} }
case '`':
case '"':
case '\'':
case ';':
case '%': case '%':
case '\r': case '\r':
case '\n': case '\n':
@ -997,16 +997,16 @@ char *talloc_string_sub2(TALLOC_CTX *mem_ctx, const char *src,
for (i=0;i<li;i++) { for (i=0;i<li;i++) {
switch (in[i]) { switch (in[i]) {
case '`':
case '"':
case '\'':
case ';':
case '$': case '$':
/* allow a trailing $ /* allow a trailing $
* (as in machine accounts) */ * (as in machine accounts) */
if (allow_trailing_dollar && (i == li - 1 )) { if (allow_trailing_dollar && (i == li - 1 )) {
break; break;
} }
case '`':
case '"':
case '\'':
case ';':
case '%': case '%':
case '\r': case '\r':
case '\n': case '\n':