Changeset 989 for vendor/current/source4/dsdb

Timestamp:

Nov 25, 2016, 8:04:54 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.7

Location:

vendor/current/source4/dsdb/samdb/ldb_modules

Files:

• objectclass_attrs.c (modified) (1 diff)
• ranged_results.c (modified) (2 diffs)

vendor/current/source4/dsdb/samdb/ldb_modules/objectclass_attrs.c

@@ -420 +420 @@
         }
 
+        /*
+         * We skip this check under dbcheck to allow fixing of other
+         * attributes even if an attribute is missing.  This matters
+         * for CN=RID Set as the required attribute rIDNextRid is not
+         * replicated.
+         */
         if (found_must_contain[0] != NULL &&
-            ldb_msg_check_string_attribute(msg, "isDeleted", "TRUE") == 0) {
+            ldb_msg_check_string_attribute(msg, "isDeleted", "TRUE") == 0 &&
+            ldb_request_get_control(ac->req, DSDB_CONTROL_DBCHECK) == NULL) {
                 ldb_asprintf_errstring(ldb, "objectclass_attrs: at least one mandatory attribute ('%s') on entry '%s' wasn't specified!",
                                        found_must_contain[0],

vendor/current/source4/dsdb/samdb/ldb_modules/ranged_results.c

@@ -202 +202 @@
         for (i = 0; req->op.search.attrs && req->op.search.attrs[i]; i++) {
                 char *p;
+                size_t range_len = strlen(";range=");
+
                 new_attrs = talloc_realloc(req, new_attrs, const char *, i+2);
                 new_attrs[i] = req->op.search.attrs[i];
@@ -209 +211 @@
                         continue;
                 }
-                if (strncasecmp(p, ";range=", strlen(";range=")) != 0) {
+                if (strncasecmp(p, ";range=", range_len) != 0) {
                         continue;
                 }
                 end = (unsigned int)-1;
-                if (sscanf(p, ";range=%u-*", &start) != 1) {
-                        if (sscanf(p, ";range=%u-%u", &start, &end) != 2) {
+                if (sscanf(p + range_len, "%u-*", &start) != 1) {
+                        if (sscanf(p + range_len, "%u-%u", &start, &end) != 2) {
                                 ldb_asprintf_errstring(ldb,
                                         "range request error: "