diff options
| author | Paul Park <pjpark@mit.edu> | 1995-08-25 21:41:40 +0000 |
|---|---|---|
| committer | Paul Park <pjpark@mit.edu> | 1995-08-25 21:41:40 +0000 |
| commit | 4bcfaa8a8fa5b5701af377c3d71e66be059e1bd5 (patch) | |
| tree | c925a0823221c7d75cafc5baa9e51a18918cfa94 /src | |
| parent | e9af2b8cca76dfa15c35a9e66bdec9f6cca5f7cf (diff) | |
| download | krb5-4bcfaa8a8fa5b5701af377c3d71e66be059e1bd5.tar.gz krb5-4bcfaa8a8fa5b5701af377c3d71e66be059e1bd5.tar.xz krb5-4bcfaa8a8fa5b5701af377c3d71e66be059e1bd5.zip | |
Fix automatic generation of changepw service
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6590 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/kadmin/v5server/ChangeLog | 5 | ||||
| -rw-r--r-- | src/kadmin/v5server/srv_key.c | 15 |
2 files changed, 13 insertions, 7 deletions
diff --git a/src/kadmin/v5server/ChangeLog b/src/kadmin/v5server/ChangeLog index a81e3349c..f3ad056f0 100644 --- a/src/kadmin/v5server/ChangeLog +++ b/src/kadmin/v5server/ChangeLog @@ -1,4 +1,9 @@ +Fri Aug 25 17:40:52 EDT 1995 Paul Park (pjpark@mit.edu) + * srv_key.c - Fix automatic generation of changepw service which got + screwed up when the database changes went in. + + Thu Aug 17 13:50:28 EDT 1995 Paul Park (pjpark@mit.edu) * srv_key.c, kadm5_defs.h - Add key_{open,close}_db(). Close database after initialization. diff --git a/src/kadmin/v5server/srv_key.c b/src/kadmin/v5server/srv_key.c index 1450f6ce3..89a06023b 100644 --- a/src/kadmin/v5server/srv_key.c +++ b/src/kadmin/v5server/srv_key.c @@ -200,6 +200,7 @@ key_get_admin_entry(kcontext) madmin_entry.princ = admin_principal; madmin_entry.max_life = KEY_DEF_MAX_LIFE; madmin_entry.max_renewable_life = KEY_DEF_MAX_RLIFE; + madmin_entry.len = KRB5_KDB_V1_BASE_LENGTH; number_of_entries = 1; krb5_timeofday(kcontext, &now); @@ -531,13 +532,6 @@ key_init(kcontext, debug_level, enc_type, key_type, master_key_name, manual, } mrand_init = 1; - /* - * We're almost home. We now want to find our service entry and if there - * is none, then we want to create it. This way, kadmind5 becomes just - * a plug in and go kind of utility. - */ - kret = key_get_admin_entry(kcontext, debug_level); - if (!kret) { if (key_num_ktents = nktent) key_ktents = ktents; @@ -548,6 +542,13 @@ key_init(kcontext, debug_level, enc_type, key_type, master_key_name, manual, key_ktents_inited = 1; } + /* + * We're almost home. We now want to find our service entry and if there + * is none, then we want to create it. This way, kadmind5 becomes just + * a plug in and go kind of utility. + */ + kret = key_get_admin_entry(kcontext, debug_level); + cleanup: if (kret) { if (mrand_init) { |