summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2006-03-23 17:32:21 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:15:43 -0500
commitd7174c1a5171fca5c0b4436f3f1e11cbf39f245c (patch)
treefa6407fe9b448faccba6ae99d4090ecc09e8f9ae /source3
parenta0e36ddb688d88e60a50c90c170cdb861e6a7013 (diff)
downloadsamba-d7174c1a5171fca5c0b4436f3f1e11cbf39f245c.tar.gz
samba-d7174c1a5171fca5c0b4436f3f1e11cbf39f245c.tar.bz2
samba-d7174c1a5171fca5c0b4436f3f1e11cbf39f245c.zip
r14682: Small cleanup in ads_verify_ticket.
Guenther (This used to be commit 90df68634b508b0a58f0a15ab62e9cead85765b6)
Diffstat (limited to 'source3')
-rw-r--r--source3/libads/kerberos_verify.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/source3/libads/kerberos_verify.c b/source3/libads/kerberos_verify.c
index 83bdb3f862..934c1131eb 100644
--- a/source3/libads/kerberos_verify.c
+++ b/source3/libads/kerberos_verify.c
@@ -399,10 +399,10 @@ NTSTATUS ads_verify_ticket(TALLOC_CTX *mem_ctx,
DEBUG(3,("ads_verify_ticket: krb5_rd_req with auth failed (%s)\n",
error_message(ret)));
goto out;
- } else {
- authtime = get_authtime_from_tkt(tkt);
- client_principal = get_principal_from_tkt(tkt);
- }
+ }
+
+ authtime = get_authtime_from_tkt(tkt);
+ client_principal = get_principal_from_tkt(tkt);
ret = krb5_mk_rep(context, auth_context, &packet);
if (ret) {
@@ -459,8 +459,7 @@ NTSTATUS ads_verify_ticket(TALLOC_CTX *mem_ctx,
#endif
#endif
- if ((ret = krb5_unparse_name(context, get_principal_from_tkt(tkt),
- principal))) {
+ if ((ret = krb5_unparse_name(context, client_principal, principal))) {
DEBUG(3,("ads_verify_ticket: krb5_unparse_name failed (%s)\n",
error_message(ret)));
sret = NT_STATUS_LOGON_FAILURE;