diff options
| author | Noel Power <noel.power@suse.com> | 2015-06-10 13:13:25 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2015-07-11 21:59:25 +0200 |
| commit | 7e05f6024cc6ae593fb3bcc7592018495b6f74d9 (patch) | |
| tree | 2cc483e207ce7124ea12b6890cfdd856cdd9462a | |
| parent | 8ddab98ae07a69920dccb387ba1554e4ff364c33 (diff) | |
| download | samba-7e05f6024cc6ae593fb3bcc7592018495b6f74d9.tar.gz | |
kerberos auth info3 should contain resource group ids available from pac_logon
successful pam auth (e.g. from ssh) will cache group sids (but not any
resource group sids)) The subsequent cached entry used for groups lookups
can be missing those resource groups
Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
(cherry picked from commit efadcb31215f9ccaf7942341c698a8eb2ac166ce)
Conflicts:
source3/winbindd/winbindd_pam.c
| -rw-r--r-- | source3/winbindd/winbindd_pam.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c index 88fa14debb6..987354d9406 100644 --- a/source3/winbindd/winbindd_pam.c +++ b/source3/winbindd/winbindd_pam.c @@ -576,6 +576,7 @@ static NTSTATUS winbindd_raw_kerberos_login(TALLOC_CTX *mem_ctx, time_t time_offset = 0; const char *user_ccache_file; struct PAC_LOGON_INFO *logon_info = NULL; + struct netr_SamInfo3 *info3_copy = NULL; *info3 = NULL; @@ -664,11 +665,14 @@ static NTSTATUS winbindd_raw_kerberos_login(TALLOC_CTX *mem_ctx, goto failed; } - *info3 = &logon_info->info3; - DEBUG(10,("winbindd_raw_kerberos_login: winbindd validated ticket of %s\n", principal_s)); + result = create_info3_from_pac_logon_info(mem_ctx, logon_info, &info3_copy); + if (!NT_STATUS_IS_OK(result)) { + goto failed; + } + /* if we had a user's ccache then return that string for the pam * environment */ @@ -704,7 +708,7 @@ static NTSTATUS winbindd_raw_kerberos_login(TALLOC_CTX *mem_ctx, } } - + *info3 = info3_copy; return NT_STATUS_OK; failed: |