diff options
Diffstat (limited to 'source3/lib/winbind_util.c')
-rw-r--r-- | source3/lib/winbind_util.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/source3/lib/winbind_util.c b/source3/lib/winbind_util.c index 0c904ac569..9b95809aee 100644 --- a/source3/lib/winbind_util.c +++ b/source3/lib/winbind_util.c @@ -41,7 +41,7 @@ struct passwd * winbind_getpwnam(const char * name) return pwd; } -struct passwd * winbind_getpwsid(const DOM_SID *sid) +struct passwd * winbind_getpwsid(const struct dom_sid *sid) { wbcErr result; struct passwd * tmp_pwd = NULL; @@ -63,7 +63,7 @@ struct passwd * winbind_getpwsid(const DOM_SID *sid) /* Call winbindd to convert a name to a sid */ -bool winbind_lookup_name(const char *dom_name, const char *name, DOM_SID *sid, +bool winbind_lookup_name(const char *dom_name, const char *name, struct dom_sid *sid, enum lsa_SidType *name_type) { struct wbcDomainSid dom_sid; @@ -74,7 +74,7 @@ bool winbind_lookup_name(const char *dom_name, const char *name, DOM_SID *sid, if (result != WBC_ERR_SUCCESS) return false; - memcpy(sid, &dom_sid, sizeof(DOM_SID)); + memcpy(sid, &dom_sid, sizeof(struct dom_sid)); *name_type = (enum lsa_SidType)type; return true; @@ -82,7 +82,7 @@ bool winbind_lookup_name(const char *dom_name, const char *name, DOM_SID *sid, /* Call winbindd to convert sid to name */ -bool winbind_lookup_sid(TALLOC_CTX *mem_ctx, const DOM_SID *sid, +bool winbind_lookup_sid(TALLOC_CTX *mem_ctx, const struct dom_sid *sid, const char **domain, const char **name, enum lsa_SidType *name_type) { @@ -134,7 +134,7 @@ bool winbind_ping(void) /* Call winbindd to convert SID to uid */ -bool winbind_sid_to_uid(uid_t *puid, const DOM_SID *sid) +bool winbind_sid_to_uid(uid_t *puid, const struct dom_sid *sid) { struct wbcDomainSid dom_sid; wbcErr result; @@ -148,14 +148,14 @@ bool winbind_sid_to_uid(uid_t *puid, const DOM_SID *sid) /* Call winbindd to convert uid to sid */ -bool winbind_uid_to_sid(DOM_SID *sid, uid_t uid) +bool winbind_uid_to_sid(struct dom_sid *sid, uid_t uid) { struct wbcDomainSid dom_sid; wbcErr result; result = wbcUidToSid(uid, &dom_sid); if (result == WBC_ERR_SUCCESS) { - memcpy(sid, &dom_sid, sizeof(DOM_SID)); + memcpy(sid, &dom_sid, sizeof(struct dom_sid)); } else { sid_copy(sid, &global_sid_NULL); } @@ -165,7 +165,7 @@ bool winbind_uid_to_sid(DOM_SID *sid, uid_t uid) /* Call winbindd to convert SID to gid */ -bool winbind_sid_to_gid(gid_t *pgid, const DOM_SID *sid) +bool winbind_sid_to_gid(gid_t *pgid, const struct dom_sid *sid) { struct wbcDomainSid dom_sid; wbcErr result; @@ -179,14 +179,14 @@ bool winbind_sid_to_gid(gid_t *pgid, const DOM_SID *sid) /* Call winbindd to convert gid to sid */ -bool winbind_gid_to_sid(DOM_SID *sid, gid_t gid) +bool winbind_gid_to_sid(struct dom_sid *sid, gid_t gid) { struct wbcDomainSid dom_sid; wbcErr result; result = wbcGidToSid(gid, &dom_sid); if (result == WBC_ERR_SUCCESS) { - memcpy(sid, &dom_sid, sizeof(DOM_SID)); + memcpy(sid, &dom_sid, sizeof(struct dom_sid)); } else { sid_copy(sid, &global_sid_NULL); } @@ -213,7 +213,7 @@ wbcErr wb_is_trusted_domain(const char *domain) /* Lookup a set of rids in a given domain */ bool winbind_lookup_rids(TALLOC_CTX *mem_ctx, - const DOM_SID *domain_sid, + const struct dom_sid *domain_sid, int num_rids, uint32 *rids, const char **domain_name, const char ***names, enum lsa_SidType **types) @@ -295,8 +295,8 @@ bool winbind_get_groups(TALLOC_CTX * mem_ctx, const char *account, uint32_t *num } bool winbind_get_sid_aliases(TALLOC_CTX *mem_ctx, - const DOM_SID *dom_sid, - const DOM_SID *members, + const struct dom_sid *dom_sid, + const struct dom_sid *members, size_t num_members, uint32_t **pp_alias_rids, size_t *p_num_alias_rids) @@ -346,12 +346,12 @@ struct passwd * winbind_getpwnam(const char * name) return NULL; } -struct passwd * winbind_getpwsid(const DOM_SID *sid) +struct passwd * winbind_getpwsid(const struct dom_sid *sid) { return NULL; } -bool winbind_lookup_name(const char *dom_name, const char *name, DOM_SID *sid, +bool winbind_lookup_name(const char *dom_name, const char *name, struct dom_sid *sid, enum lsa_SidType *name_type) { return false; @@ -359,7 +359,7 @@ bool winbind_lookup_name(const char *dom_name, const char *name, DOM_SID *sid, /* Call winbindd to convert sid to name */ -bool winbind_lookup_sid(TALLOC_CTX *mem_ctx, const DOM_SID *sid, +bool winbind_lookup_sid(TALLOC_CTX *mem_ctx, const struct dom_sid *sid, const char **domain, const char **name, enum lsa_SidType *name_type) { @@ -375,28 +375,28 @@ bool winbind_ping(void) /* Call winbindd to convert SID to uid */ -bool winbind_sid_to_uid(uid_t *puid, const DOM_SID *sid) +bool winbind_sid_to_uid(uid_t *puid, const struct dom_sid *sid) { return false; } /* Call winbindd to convert uid to sid */ -bool winbind_uid_to_sid(DOM_SID *sid, uid_t uid) +bool winbind_uid_to_sid(struct dom_sid *sid, uid_t uid) { return false; } /* Call winbindd to convert SID to gid */ -bool winbind_sid_to_gid(gid_t *pgid, const DOM_SID *sid) +bool winbind_sid_to_gid(gid_t *pgid, const struct dom_sid *sid) { return false; } /* Call winbindd to convert gid to sid */ -bool winbind_gid_to_sid(DOM_SID *sid, gid_t gid) +bool winbind_gid_to_sid(struct dom_sid *sid, gid_t gid) { return false; } @@ -411,7 +411,7 @@ wbcErr wb_is_trusted_domain(const char *domain) /* Lookup a set of rids in a given domain */ bool winbind_lookup_rids(TALLOC_CTX *mem_ctx, - const DOM_SID *domain_sid, + const struct dom_sid *domain_sid, int num_rids, uint32 *rids, const char **domain_name, const char ***names, enum lsa_SidType **types) @@ -439,8 +439,8 @@ bool winbind_get_groups(TALLOC_CTX *mem_ctx, const char *account, uint32_t *num_ } bool winbind_get_sid_aliases(TALLOC_CTX *mem_ctx, - const DOM_SID *dom_sid, - const DOM_SID *members, + const struct dom_sid *dom_sid, + const struct dom_sid *members, size_t num_members, uint32_t **pp_alias_rids, size_t *p_num_alias_rids) |