s4:cosmetic - the SID attribute is called objectSid - not objectSID

diff --git a/source4/cldap_server/netlogon.c b/source4/cldap_server/netlogon.c
index aa5533dc9892fa3cbb5cb1d25bc5de853bf39c83..d1fde899a5616f24337c94709a6f705557edec3b 100644 (file)
--- a/source4/cldap_server/netlogon.c
+++ b/source4/cldap_server/netlogon.c
@@ -146,7 +146,7 @@ NTSTATUS fill_netlogon_samlogon_response(struct ldb_context *sam_ctx,
                        ret = ldb_search(sam_ctx, mem_ctx, &dom_res,
                                                 NULL, LDB_SCOPE_SUBTREE, 
                                                 dom_attrs, 
-                                                "(&(objectCategory=DomainDNS)(objectSID=%s))", 
+                                                "(&(objectCategory=DomainDNS)(objectSid=%s))",
                                                 ldb_binary_encode(mem_ctx, sid_val));
                }
                

diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c
index c409adbbe32930991573724da1a288c8724c8e67..d52590cd663e82c4b1a195d2f9dba801984a3ba2 100644 (file)
--- a/source4/dsdb/common/util.c
+++ b/source4/dsdb/common/util.c
@@ -2525,7 +2525,7 @@ int dsdb_find_sid_by_dn(struct ldb_context *ldb,
 {
        int ret;
        struct ldb_result *res;
-       const char *attrs[] = { "objectSID", NULL };
+       const char *attrs[] = { "objectSid", NULL };
        TALLOC_CTX *tmp_ctx = talloc_new(ldb);
        struct dom_sid *s;
 
@@ -2540,7 +2540,7 @@ int dsdb_find_sid_by_dn(struct ldb_context *ldb,
                talloc_free(tmp_ctx);
                return LDB_ERR_NO_SUCH_OBJECT;
        }
-       s = samdb_result_dom_sid(tmp_ctx, res->msgs[0], "objectSID");
+       s = samdb_result_dom_sid(tmp_ctx, res->msgs[0], "objectSid");
        if (s == NULL) {
                talloc_free(tmp_ctx);
                return LDB_ERR_NO_SUCH_OBJECT;
@@ -2570,7 +2570,7 @@ int dsdb_find_dn_by_sid(struct ldb_context *ldb,
                          DSDB_SEARCH_SEARCH_ALL_PARTITIONS |
                          DSDB_SEARCH_SHOW_EXTENDED_DN |
                          DSDB_SEARCH_ONE_ONLY,
-                         "objectSID=%s", sid_str);
+                         "objectSid=%s", sid_str);
        talloc_free(sid_str);
        if (ret != LDB_SUCCESS) {
                return ret;
@@ -3871,7 +3871,7 @@ int dsdb_validate_dsa_guid(struct ldb_context *ldb,
             - remove "NTDS Settings" component from DN
            - do a base search on that DN for serverReference with
              extended-dn enabled
-            - extract objectSID from resulting serverReference
+            - extract objectSid from resulting serverReference
               attribute
            - check this sid matches the sid argument
        */

diff --git a/source4/dsdb/samdb/ldb_modules/extended_dn_out.c b/source4/dsdb/samdb/ldb_modules/extended_dn_out.c
index 07c0bff6d5b16df285694347553f9b1c2647ffca..ad197b81389fee2e3a92d08f27f180e5483a054a 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/extended_dn_out.c
+++ b/source4/dsdb/samdb/ldb_modules/extended_dn_out.c
@@ -134,7 +134,7 @@ static int inject_extended_dn_out(struct ldb_reply *ares,
        const DATA_BLOB *sid_blob;
 
        guid_blob = ldb_msg_find_ldb_val(ares->message, "objectGUID");
-       sid_blob = ldb_msg_find_ldb_val(ares->message, "objectSID");
+       sid_blob = ldb_msg_find_ldb_val(ares->message, "objectSid");
 
        if (!guid_blob) {
                ldb_set_errstring(ldb, "Did not find objectGUID to inject into extended DN");
@@ -157,7 +157,7 @@ static int inject_extended_dn_out(struct ldb_reply *ares,
        }
 
        if (sid_blob && remove_sid) {
-               ldb_msg_remove_attr(ares->message, "objectSID");
+               ldb_msg_remove_attr(ares->message, "objectSid");
        }
 
        return LDB_SUCCESS;
@@ -207,9 +207,9 @@ static int handle_dereference_openldap(struct ldb_dn *dn,
                ldb_dn_set_extended_component(dn, "GUID", &guid_blob);
        }
        
-       sid_blob = ldb_msg_find_ldb_val(&fake_msg, "objectSID");
+       sid_blob = ldb_msg_find_ldb_val(&fake_msg, "objectSid");
        
-       /* Look for the objectSID */
+       /* Look for the objectSid */
        if (sid_blob) {
                ldb_dn_set_extended_component(dn, "SID", sid_blob);
        }
@@ -261,7 +261,7 @@ static int handle_dereference_fds(struct ldb_dn *dn,
                ldb_dn_set_extended_component(dn, "GUID", &guid_blob);
        }
        
-       /* Look for the objectSID */
+       /* Look for the objectSid */
 
        sidBlob = ldb_msg_find_ldb_val(&fake_msg, "sambaSID");
        if (sidBlob) {
@@ -610,7 +610,7 @@ static int extended_dn_out_search(struct ldb_module *module, struct ldb_request
                        if (! is_attr_in_list(req->op.search.attrs, "objectGUID")) {
                                ac->remove_guid = true;
                        }
-                       if (! is_attr_in_list(req->op.search.attrs, "objectSID")) {
+                       if (! is_attr_in_list(req->op.search.attrs, "objectSid")) {
                                ac->remove_sid = true;
                        }
                        if (ac->remove_guid || ac->remove_sid) {
@@ -624,7 +624,7 @@ static int extended_dn_out_search(struct ldb_module *module, struct ldb_request
                                                return ldb_operr(ldb);
                                }
                                if (ac->remove_sid) {
-                                       if (!add_attrs(ac, &new_attrs, "objectSID"))
+                                       if (!add_attrs(ac, &new_attrs, "objectSid"))
                                                return ldb_operr(ldb);
                                }
                                const_attrs = (const char * const *)new_attrs;
@@ -815,7 +815,7 @@ static int extended_dn_out_openldap_init(struct ldb_module *module)
 {
        static const char *attrs[] = {
                "entryUUID",
-               "objectSID",
+               "objectSid",
                NULL
        };
 

diff --git a/source4/dsdb/samdb/ldb_modules/samba3sid.c b/source4/dsdb/samdb/ldb_modules/samba3sid.c
index 9368e0d007d11cea96df8fc0dd0cab67072aa347..ef142002d1bbc4165dd4fbbe61a12a7f0b280986 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/samba3sid.c
+++ b/source4/dsdb/samdb/ldb_modules/samba3sid.c
@@ -19,7 +19,7 @@
 */
 
 /*
-  add objectSID to users and groups using samba3 nextRid method
+  add objectSid to users and groups using samba3 nextRid method
  */
 
 #include "includes.h"

diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c
index 75621220162815e5ad0b59532366e1c7d41833e4..acf796f20fe62eac06b02b36164996711ca2d37e 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/samldb.c
+++ b/source4/dsdb/samdb/ldb_modules/samldb.c
@@ -799,7 +799,7 @@ static int samldb_fill_object(struct samldb_ctx *ac, const char *type)
        lp_ctx = talloc_get_type(ldb_get_opaque(ldb, "loadparm"),
                 struct loadparm_context);
 
-       /* don't allow objectSID to be specified without the RELAX control */
+       /* don't allow objectSid to be specified without the RELAX control */
        sid = samdb_result_dom_sid(ac, ac->msg, "objectSid");
        if (sid && !ldb_request_get_control(ac->req, LDB_CONTROL_RELAX_OID) &&
            !dsdb_module_am_system(ac->module)) {
@@ -1282,7 +1282,7 @@ static int samldb_prim_group_users_check(struct samldb_ctx *ac)
        ldb = ldb_module_get_ctx(ac->module);
 
        /* Finds out the SID/RID of the SAM object */
-       sid = samdb_search_dom_sid(ldb, ac, ac->req->op.del.dn, "objectSID",
+       sid = samdb_search_dom_sid(ldb, ac, ac->req->op.del.dn, "objectSid",
                                   NULL);
        if (sid == NULL) {
                /* No SID - it might not be a SAM object - therefore ok */

diff --git a/source4/dsdb/schema/schema_init.c b/source4/dsdb/schema/schema_init.c
index 7bcdf858dddcb75966543eb60de6c393ec831a23..a95e7ec2af3d0130ec0e06c7dc5e39b40e1a83f9 100644 (file)
--- a/source4/dsdb/schema/schema_init.c
+++ b/source4/dsdb/schema/schema_init.c
@@ -392,7 +392,7 @@ WERROR dsdb_read_prefixes_from_ldb(struct ldb_context *ldb, TALLOC_CTX *mem_ctx,
  */
 static bool dsdb_schema_unique_attribute(const char *attr)
 {
-       const char *attrs[] = { "objectGUID", "objectSID" , NULL };
+       const char *attrs[] = { "objectGUID", "objectSid" , NULL };
        unsigned int i;
        for (i=0;attrs[i];i++) {
                if (strcasecmp(attr, attrs[i]) == 0) {