aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2017-06-26 17:31:37 -0400
committerGreg Hudson <ghudson@mit.edu>2017-07-17 19:28:32 -0400
commit902d335537b67061ba4c61193592fe556a8fe295 (patch)
treedd40688769f5ce54a5f3809791a5227ccdea7b6d
parenta27b0a9fedd4f1902546426aeef73998a234ece8 (diff)
downloadkrb5-902d335537b67061ba4c61193592fe556a8fe295.zip
krb5-902d335537b67061ba4c61193592fe556a8fe295.tar.gz
krb5-902d335537b67061ba4c61193592fe556a8fe295.tar.bz2
Fix kadm5 setkey operation with LDAP KDB
Add mask assignments to kadm5_setv4key_principal() and kadm5_setkey_principal_4() so that their changes to the principal are properly written to KDB modules which use the mask flag, such as the LDAP KDB module. Reported by Frank Lonigro. (cherry picked from commit f8ed1bde848a16dfda5c6558ffe4326acc37bc95) ticket: 8589 version_fixed: 1.15.2
-rw-r--r--src/lib/kadm5/srv/svr_principal.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/lib/kadm5/srv/svr_principal.c b/src/lib/kadm5/srv/svr_principal.c
index 0640b47..8f4da0e 100644
--- a/src/lib/kadm5/srv/svr_principal.c
+++ b/src/lib/kadm5/srv/svr_principal.c
@@ -1788,6 +1788,9 @@ kadm5_setv4key_principal(void *server_handle,
/* unlock principal on this KDC */
kdb->fail_auth_count = 0;
+ /* key data changed, let the database provider know */
+ kdb->mask = KADM5_KEY_DATA | KADM5_FAIL_AUTH_COUNT;
+
if ((ret = kdb_put_entry(handle, kdb, &adb)))
goto done;
@@ -2038,6 +2041,9 @@ kadm5_setkey_principal_4(void *server_handle, krb5_principal principal,
/* Unlock principal on this KDC. */
kdb->fail_auth_count = 0;
+ /* key data changed, let the database provider know */
+ kdb->mask = KADM5_KEY_DATA | KADM5_FAIL_AUTH_COUNT;
+
ret = kdb_put_entry(handle, kdb, &adb);
if (ret)
goto done;