diff options
| author | Volker Lendecke <vl@samba.org> | 2010-07-11 17:30:53 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-07-11 17:33:34 +0200 |
| commit | c186f92437a918a256b84be84dcf6de569f0cc20 (patch) | |
| tree | 30b981e766510627f6241b567326f86a1ab03471 /source3/auth | |
| parent | c6a6d884f98aead1f449bc94aee19c3069efca27 (diff) | |
| download | samba-c186f92437a918a256b84be84dcf6de569f0cc20.tar.gz samba-c186f92437a918a256b84be84dcf6de569f0cc20.tar.bz2 samba-c186f92437a918a256b84be84dcf6de569f0cc20.zip | |
s3: [ug]id_to_unix_... can not fail
Remove some silly failure checks
Diffstat (limited to 'source3/auth')
| -rw-r--r-- | source3/auth/auth_util.c | 12 | ||||
| -rw-r--r-- | source3/auth/token_util.c | 7 |
2 files changed, 5 insertions, 14 deletions
diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c index 32f9d13aac..16fa421f8b 100644 --- a/source3/auth/auth_util.c +++ b/source3/auth/auth_util.c @@ -498,20 +498,14 @@ NTSTATUS create_local_token(struct auth_serversupplied_info *server_info) * the nt token. */ - if (!uid_to_unix_users_sid(server_info->utok.uid, &tmp_sid)) { - DEBUG(1,("create_local_token: Failed to create SID " - "for uid %u!\n", (unsigned int)server_info->utok.uid)); - } + uid_to_unix_users_sid(server_info->utok.uid, &tmp_sid); + add_sid_to_array_unique(server_info->ptok, &tmp_sid, &server_info->ptok->user_sids, &server_info->ptok->num_sids); for ( i=0; i<server_info->utok.ngroups; i++ ) { - if (!gid_to_unix_groups_sid( server_info->utok.groups[i], &tmp_sid ) ) { - DEBUG(1,("create_local_token: Failed to create SID " - "for gid %u!\n", (unsigned int)server_info->utok.groups[i])); - continue; - } + gid_to_unix_groups_sid(server_info->utok.groups[i], &tmp_sid); add_sid_to_array_unique(server_info->ptok, &tmp_sid, &server_info->ptok->user_sids, &server_info->ptok->num_sids); diff --git a/source3/auth/token_util.c b/source3/auth/token_util.c index 660fcf6192..3a288ddcf2 100644 --- a/source3/auth/token_util.c +++ b/source3/auth/token_util.c @@ -926,11 +926,8 @@ NTSTATUS create_token_from_username(TALLOC_CTX *mem_ctx, const char *username, if ( lp_idmap_gid(&low, &high) && (gids[i] >= low) && (gids[i] <= high) ) continue; - if ( !gid_to_unix_groups_sid( gids[i], &unix_group_sid ) ) { - DEBUG(1,("create_token_from_username: Failed to create SID " - "for gid %u!\n", (unsigned int)gids[i])); - continue; - } + gid_to_unix_groups_sid(gids[i], &unix_group_sid); + result = add_sid_to_array_unique(tmp_ctx, &unix_group_sid, &group_sids, &num_group_sids); if (!NT_STATUS_IS_OK(result)) { |