From 2b27c93a9a8471693d7dcb5fdbe8afe65b22ff66 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Fri, 8 Sep 2006 14:28:06 +0000 Subject: r18271: Big change: * autogenerate lsa ndr code * rename 'enum SID_NAME_USE' to 'enum lsa_SidType' * merge a log more security descriptor functions from gen_ndr/ndr_security.c in SAMBA_4_0 The most embarassing thing is the "#define strlen_m strlen" We need a real implementation in SAMBA_3_0 which I'll work on after this code is in. (This used to be commit 3da9f80c28b1e75ef6d46d38fbb81ade6b9fa951) --- source3/nsswitch/winbindd_group.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'source3/nsswitch/winbindd_group.c') diff --git a/source3/nsswitch/winbindd_group.c b/source3/nsswitch/winbindd_group.c index 80d103336a..2067c43f8b 100644 --- a/source3/nsswitch/winbindd_group.c +++ b/source3/nsswitch/winbindd_group.c @@ -58,7 +58,7 @@ static BOOL fill_grent(struct winbindd_gr *gr, const char *dom_name, static BOOL fill_grent_mem(struct winbindd_domain *domain, DOM_SID *group_sid, - enum SID_NAME_USE group_name_type, + enum lsa_SidType group_name_type, size_t *num_gr_mem, char **gr_mem, size_t *gr_mem_len) { DOM_SID *sid_mem = NULL; @@ -204,7 +204,7 @@ void winbindd_getgrnam(struct winbindd_cli_state *state) DOM_SID group_sid, tmp_sid; uint32 grp_rid; struct winbindd_domain *domain; - enum SID_NAME_USE name_type; + enum lsa_SidType name_type; fstring name_domain, name_group; char *tmp, *gr_mem; size_t gr_mem_len; @@ -332,7 +332,7 @@ void winbindd_getgrnam(struct winbindd_cli_state *state) static void getgrgid_got_sid(struct winbindd_cli_state *state, DOM_SID group_sid) { struct winbindd_domain *domain; - enum SID_NAME_USE name_type; + enum lsa_SidType name_type; fstring dom_name; fstring group_name; size_t gr_mem_len; @@ -392,7 +392,7 @@ static void getgrgid_got_sid(struct winbindd_cli_state *state, DOM_SID group_sid static void getgrgid_recv(void *private_data, BOOL success, const char *sid) { struct winbindd_cli_state *state = talloc_get_type_abort(private_data, struct winbindd_cli_state); - enum SID_NAME_USE name_type; + enum lsa_SidType name_type; DOM_SID group_sid; if (success) { @@ -747,7 +747,7 @@ void winbindd_getgrent(struct winbindd_cli_state *state) if (!NT_STATUS_IS_OK(idmap_sid_to_gid(&group_sid, &group_gid, 0))) { union unid_t id; - enum SID_NAME_USE type; + enum lsa_SidType type; DEBUG(10, ("SID %s not in idmap\n", sid_string_static(&group_sid))); @@ -1002,7 +1002,7 @@ struct getgroups_state { }; static void getgroups_usersid_recv(void *private_data, BOOL success, - const DOM_SID *sid, enum SID_NAME_USE type); + const DOM_SID *sid, enum lsa_SidType type); static void getgroups_tokensids_recv(void *private_data, BOOL success, DOM_SID *token_sids, size_t num_token_sids); static void getgroups_sid2gid_recv(void *private_data, BOOL success, gid_t gid); @@ -1072,7 +1072,7 @@ void winbindd_getgroups(struct winbindd_cli_state *state) } static void getgroups_usersid_recv(void *private_data, BOOL success, - const DOM_SID *sid, enum SID_NAME_USE type) + const DOM_SID *sid, enum lsa_SidType type) { struct getgroups_state *s = (struct getgroups_state *)private_data; -- cgit