sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

r23587: Cleanup redundant code in the krb5 renew function.

Browse Source 
Guenther
This commit is contained in:
Günther Deschner 2007-06-22 14:50:15 +00:00 committed by Gerald (Jerry) Carter
parent 1e4a7af993
commit 0b9acc8610
1 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
source/libsmb/clikrb5.c
View File

@ -1159,22 +1159,22 @@ out:
goto done; goto done;
} }
if (client_string) {
ret = smb_krb5_parse_name(context, client_string, &client);
if (ret) {
goto done;
}
} else {
ret = krb5_cc_get_principal(context, ccache, &client);
if (ret) {
goto done;
}
}
#ifdef HAVE_KRB5_GET_RENEWED_CREDS /* MIT */ #ifdef HAVE_KRB5_GET_RENEWED_CREDS /* MIT */
{ {
krb5_creds creds; krb5_creds creds;
if (client_string) {
ret = smb_krb5_parse_name(context, client_string, &client);
if (ret) {
goto done;
}
} else {
ret = krb5_cc_get_principal(context, ccache, &client);
if (ret) {
goto done;
}
}
ret = krb5_get_renewed_creds(context, &creds, client, ccache, CONST_DISCARD(char *, service_string)); ret = krb5_get_renewed_creds(context, &creds, client, ccache, CONST_DISCARD(char *, service_string));
if (ret) { if (ret) {
DEBUG(10,("smb_krb5_renew_ticket: krb5_get_kdc_cred failed: %s\n", error_message(ret))); DEBUG(10,("smb_krb5_renew_ticket: krb5_get_kdc_cred failed: %s\n", error_message(ret)));
@ -1204,16 +1204,9 @@ out:
memset(&creds_in, 0, sizeof(creds_in)); memset(&creds_in, 0, sizeof(creds_in));
if (client_string) { ret = krb5_copy_principal(context, client, &creds_in.client);
ret = smb_krb5_parse_name(context, client_string, &creds_in.client); if (ret) {
if (ret) { goto done;
goto done;
}
} else {
ret = krb5_cc_get_principal(context, ccache, &creds_in.client);
if (ret) {
goto done;
}
} }
if (service_string) { if (service_string) {