summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBarry Jaspan <bjaspan@mit.edu>1996-11-06 21:22:52 +0000
committerBarry Jaspan <bjaspan@mit.edu>1996-11-06 21:22:52 +0000
commit659b61a48aee8c82c161c1f6a5fdb850bfebd0e5 (patch)
tree7e3dea6136502c91c8a8aff609b337617d09fa64 /src
parentae4b48ec014a77fb9b7fa6c83973b5edd492fab3 (diff)
downloadkrb5-659b61a48aee8c82c161c1f6a5fdb850bfebd0e5.tar.gz
krb5-659b61a48aee8c82c161c1f6a5fdb850bfebd0e5.tar.xz
krb5-659b61a48aee8c82c161c1f6a5fdb850bfebd0e5.zip
* svr_principal.c (kadm5_modify_principal): don't free the
caller's tl_data (oops) git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9306 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r--src/lib/kadm5/srv/ChangeLog5
-rw-r--r--src/lib/kadm5/srv/svr_principal.c9
2 files changed, 12 insertions, 2 deletions
diff --git a/src/lib/kadm5/srv/ChangeLog b/src/lib/kadm5/srv/ChangeLog
index 0faa215fc..a0885bf31 100644
--- a/src/lib/kadm5/srv/ChangeLog
+++ b/src/lib/kadm5/srv/ChangeLog
@@ -1,3 +1,8 @@
+Wed Nov 6 16:22:05 1996 Barry Jaspan <bjaspan@mit.edu>
+
+ * svr_principal.c (kadm5_modify_principal): don't free the
+ caller's tl_data (oops)
+
Fri Nov 1 13:18:40 1996 Barry Jaspan <bjaspan@mit.edu>
* svr_principal.c (kadm5_modify_principal): update for new tl_data
diff --git a/src/lib/kadm5/srv/svr_principal.c b/src/lib/kadm5/srv/svr_principal.c
index 380cf1f74..ecd2d2d3f 100644
--- a/src/lib/kadm5/srv/svr_principal.c
+++ b/src/lib/kadm5/srv/svr_principal.c
@@ -522,8 +522,13 @@ kadm5_modify_principal(void *server_handle,
kdb.n_tl_data = entry->n_tl_data;
}
- if ((ret = kdb_put_entry(handle, &kdb, &adb)))
- goto done;
+ ret = kdb_put_entry(handle, &kdb, &adb);
+ if (mask & KADM5_TL_DATA) {
+ /* prevent kdb_free_entry from freeing the caller's data */
+ kdb.tl_data = NULL;
+ kdb.n_tl_data = 0;
+ }
+ if (ret) goto done;
ret = KADM5_OK;
done: