Changeset 988 for vendor/current/lib/util/substitute.c

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/lib/util/substitute.c (modified) (8 diffs)

vendor/current/lib/util/substitute.c

@@ -22 +22 @@
 */
 
-#include "includes.h"
+#include "replace.h"
+#include "debug.h"
+#ifndef SAMBA_UTIL_CORE_ONLY
+#include "charset/charset.h"
+#else
+#include "charset_compat.h"
+#endif
+#include "substitute.h"
 
 /**
@@ -30 +37 @@
 
 /**
- Substitute a string for a pattern in another string. Make sure there is 
+ Substitute a string for a pattern in another string. Make sure there is
  enough room!
 
- This routine looks for pattern in s and replaces it with 
- insert. It may do multiple replacements.
+ This routine looks for pattern in s and replaces it with
+ insert. It may do multiple replacements or just one.
 
  Any of " ; ' $ or ` in the insert string are replaced with _
@@ -41 +48 @@
 **/
 
-_PUBLIC_ void string_sub(char *s, const char *pattern, const char *insert, size_t len)
+static void string_sub2(char *s,const char *pattern, const char *insert, size_t len,
+                        bool remove_unsafe_characters, bool replace_once,
+                        bool allow_trailing_dollar)
 {
         char *p;
@@ -56 +65 @@
                 len = ls + 1; /* len is number of *bytes* */
 
-        while (lp <= ls && (p = strstr(s, pattern))) {
+        while (lp <= ls && (p = strstr_m(s,pattern))) {
                 if (ls + (li-lp) >= len) {
-                        DEBUG(0,("ERROR: string overflow by %d in string_sub(%.50s, %d)\n", 
+                        DEBUG(0,("ERROR: string overflow by "
+                                "%d in string_sub(%.50s, %d)\n",
                                  (int)(ls + (li-lp) - len),
                                  pattern, (int)len));
@@ -68 +78 @@
                 for (i=0;i<li;i++) {
                         switch (insert[i]) {
+                        case '$':
+                                /* allow a trailing $
+                                 * (as in machine accounts) */
+                                if (allow_trailing_dollar && (i == li - 1 )) {
+                                        p[i] = insert[i];
+                                        break;
+                                }
                         case '`':
                         case '"':
                         case '\'':
                         case ';':
-                        case '$':
                         case '%':
                         case '\r':
                         case '\n':
-                                p[i] = '_';
-                                break;
+                                if ( remove_unsafe_characters ) {
+                                        p[i] = '_';
+                                        /* yes this break should be here
+                                         * since we want to fall throw if
+                                         * not replacing unsafe chars */
+                                        break;
+                                }
                         default:
                                 p[i] = insert[i];
@@ -84 +105 @@
                 s = p + li;
                 ls += (li-lp);
-        }
+
+                if (replace_once)
+                        break;
+        }
+}
+
+void string_sub_once(char *s, const char *pattern,
+                const char *insert, size_t len)
+{
+        string_sub2( s, pattern, insert, len, true, true, false );
+}
+
+void string_sub(char *s,const char *pattern, const char *insert, size_t len)
+{
+        string_sub2( s, pattern, insert, len, true, false, false );
 }
 
@@ -119 +154 @@
                 return NULL;
 
-        SMB_ASSERT(ret[len] == '\0');
+        if (ret[len] != '\0') {
+                DEBUG(0,("Internal error at %s(%d): string not terminated\n",
+                         __FILE__, __LINE__));
+                abort();
+        }
 
         talloc_set_name_const(ret, ret);
@@ -147 +186 @@
         if (!*pattern)
                 return;
-        
+
         if (len == 0)
                 len = ls + 1; /* len is number of *bytes* */
-        
-        while (lp <= ls && (p = strstr(s,pattern))) {
+
+        while (lp <= ls && (p = strstr_m(s,pattern))) {
                 if (ls + (li-lp) >= len) {
-                        DEBUG(0,("ERROR: string overflow by %d in all_string_sub(%.50s, %d)\n", 
+                        DEBUG(0,("ERROR: string overflow by "
+                                "%d in all_string_sub(%.50s, %d)\n",
                                  (int)(ls + (li-lp) - len),
                                  pattern, (int)len));