diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2008-06-19 18:30:02 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2008-06-19 18:30:02 +0000 |
| commit | 484f8941b0023107cafd67d103268df733210448 (patch) | |
| tree | 6c10000f833b72f31eeb5d4fdfa3cea38ad6210b | |
| parent | b373cb972a855b6faef4811d02b55dc63cfff7b6 (diff) | |
| download | krb5-484f8941b0023107cafd67d103268df733210448.zip krb5-484f8941b0023107cafd67d103268df733210448.tar.gz krb5-484f8941b0023107cafd67d103268df733210448.tar.bz2 | |
Make iprop port number and log file required parameters
git-svn-id: svn://anonsvn.mit.edu/krb5/branches/sun-iprop@20422 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/lib/kadm5/srv/server_init.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/lib/kadm5/srv/server_init.c b/src/lib/kadm5/srv/server_init.c index e5d7fdd..88d4dbd 100644 --- a/src/lib/kadm5/srv/server_init.c +++ b/src/lib/kadm5/srv/server_init.c @@ -240,12 +240,26 @@ kadm5_ret_t kadm5_init(char *client_name, char *pass, KADM5_CONFIG_MAX_LIFE | KADM5_CONFIG_MAX_RLIFE | \ KADM5_CONFIG_EXPIRATION | KADM5_CONFIG_ENCTYPES) +#define IPROP_REQUIRED_PARAMS \ + (KADM5_CONFIG_IPROP_ENABLED | \ + KADM5_CONFIG_IPROP_LOGFILE | \ + KADM5_CONFIG_IPROP_PORT) + if ((handle->params.mask & REQUIRED_PARAMS) != REQUIRED_PARAMS) { krb5_free_context(handle->context); free_db_args(handle); free(handle); return KADM5_MISSING_CONF_PARAMS; } + if ((handle->params.mask & KADM5_CONFIG_IPROP_ENABLED) == KADM5_CONFIG_IPROP_ENABLED + && handle->params.iprop_enabled) { + if ((handle->params.mask & IPROP_REQUIRED_PARAMS) != IPROP_REQUIRED_PARAMS) { + krb5_free_context(handle->context); + free_db_args(handle); + free(handle); + return KADM5_MISSING_CONF_PARAMS; + } + } ret = krb5_set_default_realm(handle->context, handle->params.realm); if (ret) { |