diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/kadm5/ChangeLog | 6 | ||||
| -rw-r--r-- | src/lib/kadm5/admin.h | 4 | ||||
| -rw-r--r-- | src/lib/kadm5/alt_prof.c | 17 |
3 files changed, 26 insertions, 1 deletions
diff --git a/src/lib/kadm5/ChangeLog b/src/lib/kadm5/ChangeLog index d929b0333..230b9cb51 100644 --- a/src/lib/kadm5/ChangeLog +++ b/src/lib/kadm5/ChangeLog @@ -1,3 +1,9 @@ +Tue Jan 20 23:06:36 1998 Tom Yu <tlyu@mit.edu> + + * alt_prof.c (kadm5_get_config_params): Add support for Cygnus chpw. + + * admin.h: Add support for Cygnus chpw. + Mon Oct 13 10:48:24 1997 Ezra Peisach <epeisach@mit.edu> * alt_prof.c (kadm5_get_config_params): When KADM5_CONFIG_ENCTYPES diff --git a/src/lib/kadm5/admin.h b/src/lib/kadm5/admin.h index 8ba242ab3..597ca0eb7 100644 --- a/src/lib/kadm5/admin.h +++ b/src/lib/kadm5/admin.h @@ -94,7 +94,8 @@ typedef long kadm5_ret_t; #define KADM5_CONFIG_ADMIN_SERVER 0x010000 #define KADM5_CONFIG_DICT_FILE 0x020000 #define KADM5_CONFIG_MKEY_FROM_KBD 0x040000 - +#define KADM5_CONFIG_KPASSWD_PORT 0x080000 + /* * permission bits */ @@ -187,6 +188,7 @@ typedef struct _kadm5_config_params { char * realm; char * profile; int kadmind_port; + int kpasswd_port; char * admin_server; diff --git a/src/lib/kadm5/alt_prof.c b/src/lib/kadm5/alt_prof.c index 810ad200a..a9094d9b0 100644 --- a/src/lib/kadm5/alt_prof.c +++ b/src/lib/kadm5/alt_prof.c @@ -471,6 +471,23 @@ krb5_error_code kadm5_get_config_params(context, kdcprofile, kdcenv, } } + /* Get the value for the kpasswd port */ + if (! (params.mask & KADM5_CONFIG_KPASSWD_PORT)) { + hierarchy[2] = "kpasswd_port"; + if (params_in->mask & KADM5_CONFIG_KPASSWD_PORT) { + params.mask |= KADM5_CONFIG_KPASSWD_PORT; + params.kpasswd_port = params_in->kpasswd_port; + } else if (aprofile && + !krb5_aprof_get_int32(aprofile, hierarchy, TRUE, + &ivalue)) { + params.kpasswd_port = ivalue; + params.mask |= KADM5_CONFIG_KPASSWD_PORT; + } else { + params.kpasswd_port = DEFAULT_KPASSWD_PORT; + params.mask |= KADM5_CONFIG_KPASSWD_PORT; + } + } + /* Get the value for the master key name */ hierarchy[2] = "master_key_name"; if (params_in->mask & KADM5_CONFIG_MKEY_NAME) { |