diff options
| author | Volker Lendecke <vl@samba.org> | 2011-03-10 16:19:17 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2011-03-10 18:48:34 +0100 |
| commit | 16b007c2232cc8432fa9e93409e16367d72b149e (patch) | |
| tree | d153e075fecbc79bf255d1f30aa3662942c965aa /source3/passdb | |
| parent | 8d0e2415309ee15fbf509d44caf3e1df5b900620 (diff) | |
| download | samba-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/passdb')
| -rw-r--r-- | source3/passdb/lookup_sid.c | 3 | ||||
| -rw-r--r-- | source3/passdb/machine_sid.c | 3 | ||||
| -rw-r--r-- | source3/passdb/util_builtin.c | 5 | ||||
| -rw-r--r-- | source3/passdb/util_unixsids.c | 6 | ||||
| -rw-r--r-- | source3/passdb/util_wellknown.c | 5 |
5 files changed, 8 insertions, 14 deletions
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); } |