IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix ipasam ipaNThash magic regen to actually fetch updated password

Browse Source 
With this change ipasam is able to ask for ipaNTHash generation and if
corresponding Kerberos key is available, will be able to retrieve generated ipaNTHash.

Part 1 of https://fedorahosted.org/freeipa/ticket/3016
This commit is contained in:
Alexander Bokovoy
2012-08-22 14:19:54 +03:00
parent 14c48ba6fb
commit 6171d0a01b
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
daemons/ipa-sam/ipa_sam.c
View File

@@ -2417,7 +2417,7 @@ static bool ipasam_nthash_retrieve(struct ldapsam_privates *ldap_state,
};
ret = smbldap_search(smbldap_state, entry_dn,
LDAP_SCOPE_BASE, "", attr_list, 0,
LDAP_SCOPE_BASE, "(objectclass=*)", attr_list, 0,
&result);
if (ret != LDAP_SUCCESS) {
DEBUG(1, ("Failed to get NT hash: %s\n",
@@ -2453,15 +2453,13 @@ static bool ipasam_nthash_regen(struct ldapsam_privates *ldap_state,
TALLOC_CTX *mem_ctx,
char * entry_dn)
{
LDAPMod **mods;
LDAPMod **mods = NULL;
int ret;
mods = NULL;
smbldap_make_mod(ldap_state->smbldap_state->ldap_struct,
NULL, &mods, LDAP_ATTRIBUTE_NTHASH, "MagicRegen");
smbldap_set_mod(&mods, LDAP_MOD_ADD, LDAP_ATTRIBUTE_NTHASH, "MagicRegen");
talloc_autofree_ldapmod(mem_ctx, mods);
ret = smbldap_add(ldap_state->smbldap_state, entry_dn, mods);
ret = smbldap_modify(ldap_state->smbldap_state, entry_dn, mods);
if (ret != LDAP_SUCCESS) {
DEBUG(5, ("ipasam: attempt to regen ipaNTHash failed\n"));
}
@@ -2585,13 +2583,11 @@ static bool init_sam_from_ldap(struct ldapsam_privates *ldap_state,
* */
temp = smbldap_talloc_dn(tmp_ctx, ldap_state->smbldap_state->ldap_struct, entry);
if (temp) {
retval = ipasam_nthash_regen(tmp_ctx,
ldap_state->smbldap_state->ldap_struct,
temp);
retval = ipasam_nthash_regen(ldap_state,
tmp_ctx, temp);
if (retval) {
retval = ipasam_nthash_retrieve(tmp_ctx,
ldap_state->smbldap_state->ldap_struct,
temp, &nthash);
retval = ipasam_nthash_retrieve(ldap_state,
tmp_ctx, temp, &nthash);
}
}
}