sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

s4-pac-glue: Do not add an empty PAC_TYPE_LOGON_NAME with MIT

Browse Source 
MIT Kerberos will insert an empty PAC_TYPE_LOGON_NAME during
krb5_pac_sign().

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlet <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Andreas Schneider 2016-09-29 08:38:58 +02:00 committed by Andreas Schneider
parent a72eecd5bf
commit 9c33e9635e
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source4/kdc/pac-glue.c
View File

@ -420,10 +420,13 @@ krb5_error_code samba_make_krb5_pac(krb5_context context,
krb5_data cred_data;
krb5_data upn_data;
krb5_data deleg_data;
krb5_data null_data;
krb5_error_code ret;
ZERO_STRUCT(null_data);
#ifdef SAMBA4_USES_HEIMDAL
krb5_data null_data = {
.length = 0,
.data = NULL,
};
#endif
/* The user account may be set not to want the PAC */
if (logon_blob == NULL) {
@ -503,10 +506,13 @@ krb5_error_code samba_make_krb5_pac(krb5_context context,
}
}
#ifdef SAMBA4_USES_HEIMDAL
/*
* null_data will be filled by the generic KDC code in the caller
* here we just add it in order to have it before
* PAC_TYPE_UPN_DNS_INFO
*
* Not needed with MIT Kerberos - asn
*/
ret = krb5_pac_add_buffer(context, *pac,
PAC_TYPE_LOGON_NAME,
@ -516,6 +522,7 @@ krb5_error_code samba_make_krb5_pac(krb5_context context,
smb_krb5_free_data_contents(context, &deleg_data);
return ret;
}
#endif
if (upn_blob != NULL) {
ret = krb5_pac_add_buffer(context, *pac,