sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-03 04:22:09 +03:00
Code Activity

s4-kdc Use msDS-SecondaryKrbTgtNumber to fill in the full KVNO

Browse Source 
Andrew Bartlett
This commit is contained in:
Andrew Bartlett
2010-09-28 12:49:44 +10:00
parent 8b57482fa8
commit 85f7bce865
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source4/auth/sam.c
View File

@ -36,6 +36,7 @@
"userPrincipalName", \ "userPrincipalName", \
"servicePrincipalName", \ "servicePrincipalName", \
"msDS-KeyVersionNumber", \ "msDS-KeyVersionNumber", \
"msDS-SecondaryKrbTgtNumber" \
"msDS-SupportedEncryptionTypes", \ "msDS-SupportedEncryptionTypes", \
"supplementalCredentials", \ "supplementalCredentials", \
\ \

19
source4/kdc/db-glue.c
View File

@ -212,6 +212,8 @@ static krb5_error_code samba_kdc_message2entry_keys(krb5_context context,
struct package_PrimaryKerberosCtr4 *pkb4 = NULL; struct package_PrimaryKerberosCtr4 *pkb4 = NULL;
uint16_t i; uint16_t i;
uint16_t allocated_keys = 0; uint16_t allocated_keys = 0;
int rodc_krbtgt_number = 0;
bool is_rodc = false;
/* Supported Enc for this entry */ /* Supported Enc for this entry */
uint32_t supported_enctypes = ENC_ALL_TYPES; /* by default, we support all enc types */ uint32_t supported_enctypes = ENC_ALL_TYPES; /* by default, we support all enc types */
@ -225,7 +227,19 @@ static krb5_error_code samba_kdc_message2entry_keys(krb5_context context,
} }
supported_enctypes = ldb_msg_find_attr_as_uint(msg, "msDS-SupportedEncryptionTypes", supported_enctypes = ldb_msg_find_attr_as_uint(msg, "msDS-SupportedEncryptionTypes",
supported_enctypes); supported_enctypes);
if (rid == DOMAIN_RID_KRBTGT) { /* Is this the krbtgt or a RODC */
if (ldb_msg_find_element(msg, "msDS-SecondaryKrbTgtNumber")) {
is_rodc = true;
rodc_krbtgt_number = ldb_msg_find_attr_as_int(msg, "msDS-SecondaryKrbTgtNumber", -1);
if (rodc_krbtgt_number == -1) {
return EINVAL;
}
}
if (rid == DOMAIN_RID_KRBTGT || is_rodc) {
/* Be double-sure never to use DES here */ /* Be double-sure never to use DES here */
supported_enctypes &= ~(ENC_CRC32|ENC_RSA_MD5); supported_enctypes &= ~(ENC_CRC32|ENC_RSA_MD5);
} }
@ -251,6 +265,9 @@ static krb5_error_code samba_kdc_message2entry_keys(krb5_context context,
entry_ex->entry.keys.len = 0; entry_ex->entry.keys.len = 0;
entry_ex->entry.kvno = ldb_msg_find_attr_as_int(msg, "msDS-KeyVersionNumber", 0); entry_ex->entry.kvno = ldb_msg_find_attr_as_int(msg, "msDS-KeyVersionNumber", 0);
if (is_rodc) {
entry_ex->entry.kvno |= (rodc_krbtgt_number << 16);
}
/* Get keys from the db */ /* Get keys from the db */