From cba7f8b8273e661d3c43652900d93e5a8eab4e5f Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 21 May 2010 11:25:01 +1000 Subject: s3:dom_sid Global replace of DOM_SID with struct dom_sid MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This matches the structure that new code is being written to, and removes one more of the old-style named structures, and the need to know that is is just an alias for struct dom_sid. Andrew Bartlett Signed-off-by: Günther Deschner --- source3/winbindd/winbindd_cache.c | 64 +++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 32 deletions(-) (limited to 'source3/winbindd/winbindd_cache.c') diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c index db2f3b6b8b..b92ef2fabb 100644 --- a/source3/winbindd/winbindd_cache.c +++ b/source3/winbindd/winbindd_cache.c @@ -807,7 +807,7 @@ static void centry_put_hash16(struct cache_entry *centry, const uint8 val[16]) centry->ofs += 16; } -static void centry_put_sid(struct cache_entry *centry, const DOM_SID *sid) +static void centry_put_sid(struct cache_entry *centry, const struct dom_sid *sid) { fstring sid_string; centry_put_string(centry, sid_to_fstring(sid_string, sid)); @@ -895,7 +895,7 @@ static void centry_end(struct cache_entry *centry, const char *format, ...) static void wcache_save_name_to_sid(struct winbindd_domain *domain, NTSTATUS status, const char *domain_name, - const char *name, const DOM_SID *sid, + const char *name, const struct dom_sid *sid, enum lsa_SidType type) { struct cache_entry *centry; @@ -915,7 +915,7 @@ static void wcache_save_name_to_sid(struct winbindd_domain *domain, } static void wcache_save_sid_to_name(struct winbindd_domain *domain, NTSTATUS status, - const DOM_SID *sid, const char *domain_name, const char *name, enum lsa_SidType type) + const struct dom_sid *sid, const char *domain_name, const char *name, enum lsa_SidType type) { struct cache_entry *centry; fstring sid_string; @@ -1212,7 +1212,7 @@ do_query: return status; } -NTSTATUS wcache_cached_creds_exist(struct winbindd_domain *domain, const DOM_SID *sid) +NTSTATUS wcache_cached_creds_exist(struct winbindd_domain *domain, const struct dom_sid *sid) { struct winbind_cache *cache = get_cache(domain); TDB_DATA data; @@ -1247,7 +1247,7 @@ NTSTATUS wcache_cached_creds_exist(struct winbindd_domain *domain, const DOM_SID NTSTATUS wcache_get_creds(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx, - const DOM_SID *sid, + const struct dom_sid *sid, const uint8 **cached_nt_pass, const uint8 **cached_salt) { @@ -1328,7 +1328,7 @@ NTSTATUS wcache_get_creds(struct winbindd_domain *domain, NTSTATUS wcache_save_creds(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx, - const DOM_SID *sid, + const struct dom_sid *sid, const uint8 nt_pass[NT_HASH_LEN]) { struct cache_entry *centry; @@ -1766,7 +1766,7 @@ static NTSTATUS name_to_sid(struct winbindd_domain *domain, const char *domain_name, const char *name, uint32_t flags, - DOM_SID *sid, + struct dom_sid *sid, enum lsa_SidType *type) { NTSTATUS status; @@ -1875,7 +1875,7 @@ NTSTATUS wcache_sid_to_name(struct winbindd_domain *domain, given */ static NTSTATUS sid_to_name(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx, - const DOM_SID *sid, + const struct dom_sid *sid, char **domain_name, char **name, enum lsa_SidType *type) @@ -1938,7 +1938,7 @@ static NTSTATUS sid_to_name(struct winbindd_domain *domain, static NTSTATUS rids_to_names(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx, - const DOM_SID *domain_sid, + const struct dom_sid *domain_sid, uint32 *rids, size_t num_rids, char **domain_name, @@ -1976,7 +1976,7 @@ static NTSTATUS rids_to_names(struct winbindd_domain *domain, have_mapped = have_unmapped = false; for (i=0; istatus)) { - DOM_SID sid; + struct dom_sid sid; (void)centry_sid(centry, &sid); } @@ -3556,7 +3556,7 @@ static int validate_u(TALLOC_CTX *mem_ctx, const char *keystr, TDB_DATA dbuf, struct tdb_validation_status *state) { struct cache_entry *centry = create_centry_validate(keystr, dbuf, state); - DOM_SID sid; + struct dom_sid sid; if (!centry) { return 1; @@ -3664,7 +3664,7 @@ static int validate_ul(TALLOC_CTX *mem_ctx, const char *keystr, TDB_DATA dbuf, num_entries = (int32)centry_uint32(centry); for (i=0; i< num_entries; i++) { - DOM_SID sid; + struct dom_sid sid; (void)centry_string(centry, mem_ctx); (void)centry_string(centry, mem_ctx); (void)centry_string(centry, mem_ctx); @@ -3722,7 +3722,7 @@ static int validate_ug(TALLOC_CTX *mem_ctx, const char *keystr, TDB_DATA dbuf, num_groups = centry_uint32(centry); for (i=0; i< num_groups; i++) { - DOM_SID sid; + struct dom_sid sid; centry_sid(centry, &sid); } @@ -3773,7 +3773,7 @@ static int validate_gm(TALLOC_CTX *mem_ctx, const char *keystr, TDB_DATA dbuf, num_names = centry_uint32(centry); for (i=0; i< num_names; i++) { - DOM_SID sid; + struct dom_sid sid; centry_sid(centry, &sid); (void)centry_string(centry, mem_ctx); (void)centry_uint32(centry); @@ -4524,7 +4524,7 @@ void wcache_tdc_clear( void ) static void wcache_save_user_pwinfo(struct winbindd_domain *domain, NTSTATUS status, - const DOM_SID *user_sid, + const struct dom_sid *user_sid, const char *homedir, const char *shell, const char *gecos, @@ -4549,7 +4549,7 @@ static void wcache_save_user_pwinfo(struct winbindd_domain *domain, } NTSTATUS nss_get_info_cached( struct winbindd_domain *domain, - const DOM_SID *user_sid, + const struct dom_sid *user_sid, TALLOC_CTX *ctx, ADS_STRUCT *ads, LDAPMessage *msg, const char **homedir, const char **shell, -- cgit