summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2011-03-10 16:19:17 +0100
committerVolker Lendecke <vl@samba.org>2011-03-10 18:48:34 +0100
commit16b007c2232cc8432fa9e93409e16367d72b149e (patch)
treed153e075fecbc79bf255d1f30aa3662942c965aa /source3
parent8d0e2415309ee15fbf509d44caf3e1df5b900620 (diff)
downloadsamba-16b007c2232cc8432fa9e93409e16367d72b149e.tar.gz
samba-16b007c2232cc8432fa9e93409e16367d72b149e.tar.bz2
samba-16b007c2232cc8432fa9e93409e16367d72b149e.zip
Quite some callers of sid_split_rid do not care about the rid
Diffstat (limited to 'source3')
-rw-r--r--source3/auth/token_util.c4
-rw-r--r--source3/lib/util_sid.c3
-rw-r--r--source3/libads/ldap.c3
-rw-r--r--source3/passdb/lookup_sid.c3
-rw-r--r--source3/passdb/machine_sid.c3
-rw-r--r--source3/passdb/util_builtin.c5
-rw-r--r--source3/passdb/util_unixsids.c6
-rw-r--r--source3/passdb/util_wellknown.c5
8 files changed, 11 insertions, 21 deletions
diff --git a/source3/auth/token_util.c b/source3/auth/token_util.c
index 4f617c4201..4942740ed0 100644
--- 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 0a026a1e05..f6210c13fd 100644
--- 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 c1af5b575b..3ce7a7e869 100644
--- 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 0901319c8c..23566b657d 100644
--- 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 4de51b82c9..977cd20eb9 100644
--- 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 a2cbbc76f6..9cd6780784 100644
--- 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 1f830b35c5..00cab22deb 100644
--- 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 5ca26db711..2d83ebef12 100644
--- 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);
}