Changeset 988 for vendor/current/source4/utils/oLschema2ldif.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/source4/utils/oLschema2ldif.c (modified) (6 diffs)

vendor/current/source4/utils/oLschema2ldif.c

@@ -34 +34 @@
 #include "includes.h"
 #include "ldb.h"
-#include "tools/cmdline.h"
 #include "dsdb/samdb/samdb.h"
 #include "../lib/crypto/sha256.h"
@@ -83 +82 @@
                 if (c == NULL) return 1;
                 if (*c == '(') b++;
-                if (*c == ')') b--;
+                if (*c == ')') {
+                        b--;
+                        if (*(c - 1) != ' ' && c && (*(c + 1) == '\0')) {
+                                return 2;
+                        }
+                }
                 c++;
         }
@@ -349 +353 @@
 
         ctx = talloc_new(mem_ctx);
+        if (ctx == NULL) {
+                return NULL;
+        }
         msg = ldb_msg_new(ctx);
+        if (msg == NULL) {
+                goto failed;
+        }
 
         ldb_msg_add_string(msg, "objectClass", "top");
@@ -393 +403 @@
         }
 
-        SHA256_Init(&sha256_context);
-        SHA256_Update(&sha256_context, (uint8_t*)s, strlen(s));
-        SHA256_Final(digest, &sha256_context);
+        samba_SHA256_Init(&sha256_context);
+        samba_SHA256_Update(&sha256_context, (uint8_t*)s, strlen(s));
+        samba_SHA256_Final(digest, &sha256_context);
 
         memcpy(&guid, digest, sizeof(struct GUID));
@@ -539 +549 @@
                 do { 
                         if (c == '\n') {
-                                entry[t] = '\0';        
-                                if (check_braces(entry) == 0) {
+                                int ret2 = 0;
+                                entry[t] = '\0';
+                                ret2 = check_braces(entry);
+                                if (ret2 == 0) {
                                         ret.count++;
                                         ldif.msg = process_entry(ctx, entry);
@@ -549 +561 @@
                                         }
                                         ldb_ldif_write_file(ldb_ctx, out, &ldif);
+                                        break;
+                                }
+                                if (ret2 == 2) {
+                                        fprintf(stderr, "Invalid entry %s, closing braces need to be preceded by a space\n", entry);
+                                        ret.failures++;
                                         break;
                                 }