The branch, master has been updated
via 91e1c8d s3:lib: allow_trailing_dollar should only allow '$'
from 40850b3 Fix a couple of missing checks on talloc returns.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 91e1c8dc383757c3ff0e67c499db4b11242f5800
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Feb 2 23:41:17 2011 +0100
s3:lib: allow_trailing_dollar should only allow '$'
metze
Autobuild-User: Stefan Metzmacher <me...@samba.org>
Autobuild-Date: Thu Feb 3 00:33:48 CET 2011 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
source3/lib/util_str.c | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c
index 61b46ed..fcc4b8d 100644
--- a/source3/lib/util_str.c
+++ b/source3/lib/util_str.c
@@ -820,10 +820,6 @@ void string_sub2(char *s,const char *pattern, const char
*insert, size_t len,
}
for (i=0;i<li;i++) {
switch (insert[i]) {
- case '`':
- case '"':
- case '\'':
- case ';':
case '$':
/* allow a trailing $
* (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];
break;
}
+ case '`':
+ case '"':
+ case '\'':
+ case ';':
case '%':
case '\r':
case '\n':
@@ -902,16 +902,16 @@ char *realloc_string_sub2(char *string,
ld = li - lp;
for (i=0;i<li;i++) {
switch (in[i]) {
- case '`':
- case '"':
- case '\'':
- case ';':
case '$':
/* allow a trailing $
* (as in machine accounts) */
if (allow_trailing_dollar && (i == li - 1 )) {
break;
}
+ case '`':
+ case '"':
+ case '\'':
+ case ';':
case '%':
case '\r':
case '\n':
@@ -997,16 +997,16 @@ char *talloc_string_sub2(TALLOC_CTX *mem_ctx, const char
*src,
for (i=0;i<li;i++) {
switch (in[i]) {
- case '`':
- case '"':
- case '\'':
- case ';':
case '$':
/* allow a trailing $
* (as in machine accounts) */
if (allow_trailing_dollar && (i == li - 1 )) {
break;
}
+ case '`':
+ case '"':
+ case '\'':
+ case ';':
case '%':
case '\r':
case '\n':
--
Samba Shared Repository
