mirror of
https://github.com/samba-team/samba.git
synced 2025-01-12 09:18:10 +03:00
r21557: indent only fix. No code change.
Guenther
(This used to be commit 8ff0903a17
)
This commit is contained in:
parent
3e946cbb85
commit
59e8bd617b
@ -88,63 +88,63 @@ static BOOL ads_keytab_verify_ticket(krb5_context context, krb5_auth_context aut
|
||||
goto out;
|
||||
}
|
||||
|
||||
while (!auth_ok && (krb5_kt_next_entry(context, keytab, &kt_entry, &kt_cursor) == 0)) {
|
||||
ret = smb_krb5_unparse_name(context, kt_entry.principal, &entry_princ_s);
|
||||
if (ret) {
|
||||
DEBUG(1, ("ads_keytab_verify_ticket: smb_krb5_unparse_name failed (%s)\n",
|
||||
error_message(ret)));
|
||||
goto out;
|
||||
}
|
||||
while (!auth_ok && (krb5_kt_next_entry(context, keytab, &kt_entry, &kt_cursor) == 0)) {
|
||||
ret = smb_krb5_unparse_name(context, kt_entry.principal, &entry_princ_s);
|
||||
if (ret) {
|
||||
DEBUG(1, ("ads_keytab_verify_ticket: smb_krb5_unparse_name failed (%s)\n",
|
||||
error_message(ret)));
|
||||
goto out;
|
||||
}
|
||||
|
||||
for (i = 0; i < sizeof(valid_princ_formats) / sizeof(valid_princ_formats[0]); i++) {
|
||||
if (strequal(entry_princ_s, valid_princ_formats[i])) {
|
||||
number_matched_principals++;
|
||||
p_packet->length = ticket->length;
|
||||
p_packet->data = (char *)ticket->data;
|
||||
*pp_tkt = NULL;
|
||||
for (i = 0; i < sizeof(valid_princ_formats) / sizeof(valid_princ_formats[0]); i++) {
|
||||
if (strequal(entry_princ_s, valid_princ_formats[i])) {
|
||||
number_matched_principals++;
|
||||
p_packet->length = ticket->length;
|
||||
p_packet->data = (char *)ticket->data;
|
||||
*pp_tkt = NULL;
|
||||
|
||||
ret = krb5_rd_req_return_keyblock_from_keytab(context, &auth_context, p_packet,
|
||||
kt_entry.principal, keytab,
|
||||
NULL, pp_tkt, keyblock);
|
||||
ret = krb5_rd_req_return_keyblock_from_keytab(context, &auth_context, p_packet,
|
||||
kt_entry.principal, keytab,
|
||||
NULL, pp_tkt, keyblock);
|
||||
|
||||
if (ret) {
|
||||
DEBUG(10,("ads_keytab_verify_ticket: "
|
||||
"krb5_rd_req_return_keyblock_from_keytab(%s) failed: %s\n",
|
||||
entry_princ_s, error_message(ret)));
|
||||
if (ret) {
|
||||
DEBUG(10,("ads_keytab_verify_ticket: "
|
||||
"krb5_rd_req_return_keyblock_from_keytab(%s) failed: %s\n",
|
||||
entry_princ_s, error_message(ret)));
|
||||
|
||||
/* workaround for MIT:
|
||||
* as krb5_ktfile_get_entry will
|
||||
* explicitly close the
|
||||
* krb5_keytab as soon as
|
||||
* krb5_rd_req has sucessfully
|
||||
* decrypted the ticket but the
|
||||
* ticket is not valid yet (due
|
||||
* to clockskew) there is no
|
||||
* point in querying more
|
||||
* keytab entries - Guenther */
|
||||
/* workaround for MIT:
|
||||
* as krb5_ktfile_get_entry will
|
||||
* explicitly close the
|
||||
* krb5_keytab as soon as
|
||||
* krb5_rd_req has sucessfully
|
||||
* decrypted the ticket but the
|
||||
* ticket is not valid yet (due
|
||||
* to clockskew) there is no
|
||||
* point in querying more
|
||||
* keytab entries - Guenther */
|
||||
|
||||
if (ret == KRB5KRB_AP_ERR_TKT_NYV ||
|
||||
ret == KRB5KRB_AP_ERR_TKT_EXPIRED) {
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
DEBUG(3,("ads_keytab_verify_ticket: "
|
||||
"krb5_rd_req_return_keyblock_from_keytab succeeded for principal %s\n",
|
||||
entry_princ_s));
|
||||
auth_ok = True;
|
||||
if (ret == KRB5KRB_AP_ERR_TKT_NYV ||
|
||||
ret == KRB5KRB_AP_ERR_TKT_EXPIRED) {
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
DEBUG(3,("ads_keytab_verify_ticket: "
|
||||
"krb5_rd_req_return_keyblock_from_keytab succeeded for principal %s\n",
|
||||
entry_princ_s));
|
||||
auth_ok = True;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/* Free the name we parsed. */
|
||||
SAFE_FREE(entry_princ_s);
|
||||
|
||||
/* Free the entry we just read. */
|
||||
smb_krb5_kt_free_entry(context, &kt_entry);
|
||||
ZERO_STRUCT(kt_entry);
|
||||
}
|
||||
krb5_kt_end_seq_get(context, keytab, &kt_cursor);
|
||||
|
||||
/* Free the name we parsed. */
|
||||
SAFE_FREE(entry_princ_s);
|
||||
|
||||
/* Free the entry we just read. */
|
||||
smb_krb5_kt_free_entry(context, &kt_entry);
|
||||
ZERO_STRUCT(kt_entry);
|
||||
}
|
||||
krb5_kt_end_seq_get(context, keytab, &kt_cursor);
|
||||
|
||||
ZERO_STRUCT(kt_cursor);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user