Quite some callers of sid_split_rid do not care about the rid

diff --git a/libcli/security/util_sid.c b/libcli/security/util_sid.c
index 535e81cbdbeee27fdd31428fff4568e895823c28..cf1f7f368fd51d8e68dbf6c8f8af6c3a5594cf9b 100644 (file)
--- a/libcli/security/util_sid.c
+++ b/libcli/security/util_sid.c
@@ -167,7 +167,9 @@ bool sid_split_rid(struct dom_sid *sid, uint32_t *rid)
 {
        if (sid->num_auths > 0) {
                sid->num_auths--;
-               *rid = sid->sub_auths[sid->num_auths];
+               if (rid != NULL) {
+                       *rid = sid->sub_auths[sid->num_auths];
+               }
                return true;
        }
        return false;

diff --git a/source3/auth/token_util.c b/source3/auth/token_util.c
index 4f617c420148233d4b0be81b80449b9a4b9101fa..4942740ed063ecbff65a9661ce05fe1f1f7a1af0 100644 (file)
--- a/source3/auth/token_util.c
+++ b/source3/auth/token_util.c
@@ -849,8 +849,6 @@ NTSTATUS create_token_from_username(TALLOC_CTX *mem_ctx, const char *username,
                 * correct info. AD might prohibit winbind looking up that
                 * information. */
 
-               uint32 dummy;
-
                /* We must always assign the *uid. */
                if (!sid_to_uid(&user_sid, uid)) {
                        DEBUG(1, ("winbindd case, sid_to_uid for %s (%s) failed\n",
@@ -868,7 +866,7 @@ NTSTATUS create_token_from_username(TALLOC_CTX *mem_ctx, const char *username,
                }
 
                sid_copy(&group_sids[0], &user_sid);
-               sid_split_rid(&group_sids[0], &dummy);
+               sid_split_rid(&group_sids[0], NULL);
                sid_append_rid(&group_sids[0], DOMAIN_RID_USERS);
 
                if (!sid_to_gid(&group_sids[0], gid)) {

diff --git a/source3/lib/util_sid.c b/source3/lib/util_sid.c
index 0a026a1e052a4f1b3752d57eaa8321b017bbf5f1..f6210c13fd9caf2710ad1b56d72bc1b12e9c9b8b 100644 (file)
--- a/source3/lib/util_sid.c
+++ b/source3/lib/util_sid.c
@@ -95,10 +95,9 @@ bool sid_linearize(char *outbuf, size_t len, const struct dom_sid *sid)
 bool non_mappable_sid(struct dom_sid *sid)
 {
        struct dom_sid dom;
-       uint32 rid;
 
        sid_copy(&dom, sid);
-       sid_split_rid(&dom, &rid);
+       sid_split_rid(&dom, NULL);
 
        if (dom_sid_equal(&dom, &global_sid_Builtin))
                return True;

diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index c1af5b575b16c745d27147b8b9257d300a4da65c..3ce7a7e869a185a53bef7742b22a5af98259f9c7 100644 (file)
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -3644,11 +3644,10 @@ ADS_STATUS ads_leave_realm(ADS_STRUCT *ads, const char *hostname)
                 * domsid */
 
                struct dom_sid domsid;
-               uint32 dummy_rid;
 
                sid_copy(&domsid, &tmp_user_sid);
 
-               if (!sid_split_rid(&domsid, &dummy_rid)) {
+               if (!sid_split_rid(&domsid, NULL)) {
                        ads_msgfree(ads, res);
                        return ADS_ERROR_LDAP(LDAP_NO_MEMORY);
                }

diff --git a/source3/passdb/lookup_sid.c b/source3/passdb/lookup_sid.c
index 0901319c8cc9870a95d1c287c33ce101641d9fa7..23566b657d1d1ae675a1831aceaf283e963b2871 100644 (file)
--- a/source3/passdb/lookup_sid.c
+++ b/source3/passdb/lookup_sid.c
@@ -259,7 +259,6 @@ bool lookup_name(TALLOC_CTX *mem_ctx,
 
        if (IS_DC && winbind_lookup_name("", name, &sid, &type)) {
                struct dom_sid dom_sid;
-               uint32 tmp_rid;
                enum lsa_SidType domain_type;
 
                if (type == SID_NAME_DOMAIN) {
@@ -273,7 +272,7 @@ bool lookup_name(TALLOC_CTX *mem_ctx,
                 * domain it figured out itself. Maybe fix that later... */
 
                sid_copy(&dom_sid, &sid);
-               sid_split_rid(&dom_sid, &tmp_rid);
+               sid_split_rid(&dom_sid, NULL);
 
                if (!winbind_lookup_sid(tmp_ctx, &dom_sid, &domain, NULL,
                                        &domain_type) ||

diff --git a/source3/passdb/machine_sid.c b/source3/passdb/machine_sid.c
index 4de51b82c921ae283fde6ff2f19a36cea90d9c46..977cd20eb9cbbabf92265a9f5a236cfee1adde47 100644 (file)
--- a/source3/passdb/machine_sid.c
+++ b/source3/passdb/machine_sid.c
@@ -243,9 +243,8 @@ bool sid_check_is_domain(const struct dom_sid *sid)
 bool sid_check_is_in_our_domain(const struct dom_sid *sid)
 {
        struct dom_sid dom_sid;
-       uint32 rid;
 
        sid_copy(&dom_sid, sid);
-       sid_split_rid(&dom_sid, &rid);
+       sid_split_rid(&dom_sid, NULL);
        return sid_check_is_domain(&dom_sid);
 }

diff --git a/source3/passdb/util_builtin.c b/source3/passdb/util_builtin.c
index a2cbbc76f685fc7337fbe0eedf86ea9a9f829a77..9cd6780784d1166afd8aa3824d32d9900de0d338 100644 (file)
--- a/source3/passdb/util_builtin.c
+++ b/source3/passdb/util_builtin.c
@@ -115,11 +115,10 @@ bool sid_check_is_builtin(const struct dom_sid *sid)
 bool sid_check_is_in_builtin(const struct dom_sid *sid)
 {
        struct dom_sid dom_sid;
-       uint32 rid;
 
        sid_copy(&dom_sid, sid);
-       sid_split_rid(&dom_sid, &rid);
-       
+       sid_split_rid(&dom_sid, NULL);
+
        return sid_check_is_builtin(&dom_sid);
 }
 

diff --git a/source3/passdb/util_unixsids.c b/source3/passdb/util_unixsids.c
index 1f830b35c5e8948b5c0854880bc86caa1feb92b4..00cab22debce36b4383fc7e194ff9652e9a4a04b 100644 (file)
--- a/source3/passdb/util_unixsids.c
+++ b/source3/passdb/util_unixsids.c
@@ -28,10 +28,9 @@ bool sid_check_is_unix_users(const struct dom_sid *sid)
 bool sid_check_is_in_unix_users(const struct dom_sid *sid)
 {
        struct dom_sid dom_sid;
-       uint32 rid;
 
        sid_copy(&dom_sid, sid);
-       sid_split_rid(&dom_sid, &rid);
+       sid_split_rid(&dom_sid, NULL);
 
        return sid_check_is_unix_users(&dom_sid);
 }
@@ -86,10 +85,9 @@ bool sid_check_is_unix_groups(const struct dom_sid *sid)
 bool sid_check_is_in_unix_groups(const struct dom_sid *sid)
 {
        struct dom_sid dom_sid;
-       uint32 rid;
 
        sid_copy(&dom_sid, sid);
-       sid_split_rid(&dom_sid, &rid);
+       sid_split_rid(&dom_sid, NULL);
 
        return sid_check_is_unix_groups(&dom_sid);
 }

diff --git a/source3/passdb/util_wellknown.c b/source3/passdb/util_wellknown.c
index 5ca26db71135c198a7e2c00bbc70c2125b9e41d5..2d83ebef1265ce33012d1f3350c473689021c254 100644 (file)
--- a/source3/passdb/util_wellknown.c
+++ b/source3/passdb/util_wellknown.c
@@ -89,11 +89,10 @@ bool sid_check_is_wellknown_domain(const struct dom_sid *sid, const char **name)
 bool sid_check_is_in_wellknown_domain(const struct dom_sid *sid)
 {
        struct dom_sid dom_sid;
-       uint32 rid;
 
        sid_copy(&dom_sid, sid);
-       sid_split_rid(&dom_sid, &rid);
-       
+       sid_split_rid(&dom_sid, NULL);
+
        return sid_check_is_wellknown_domain(&dom_sid, NULL);
 }