From 312a29e40134231ecd2a61d8e1eaa2dae8a30cb4 Mon Sep 17 00:00:00 2001 From: Johan Danielsson Date: Sat, 3 Jan 1998 21:25:07 +0000 Subject: [PATCH] Add context to all krb5_config_*get_*. git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@4263 ec53bebd-3082-4978-b11e-865c3cabbd6b --- admin/kdb_edit.c | 8 ++++++-- kadmin/kadmin.c | 5 +++-- kadmin/kadmind.c | 5 +++-- kdc/config.c | 20 +++++++++++--------- kdc/kerberos5.c | 5 +++-- kdc/log.c | 7 ++++--- kpasswd/kpasswdd.c | 4 ++-- 7 files changed, 32 insertions(+), 22 deletions(-) diff --git a/admin/kdb_edit.c b/admin/kdb_edit.c index 1800e238c..fe68104d1 100644 --- a/admin/kdb_edit.c +++ b/admin/kdb_edit.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997 Kungliga Tekniska Högskolan + * Copyright (c) 1997, 1998 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -169,7 +169,11 @@ main(int argc, char **argv) config_file = HDB_DB_DIR "/kdc.conf"; if(krb5_config_parse_file(config_file, &cf) == 0) { - const char *p = krb5_config_get_string (cf, "kdc", "key-file", NULL); + const char *p = krb5_config_get_string (context, + cf, + "kdc", + "key-file", + NULL); if (p) keyfile = strdup(p); } diff --git a/kadmin/kadmin.c b/kadmin/kadmin.c index a99c52158..7f10e3961 100644 --- a/kadmin/kadmin.c +++ b/kadmin/kadmin.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997 Kungliga Tekniska Högskolan + * Copyright (c) 1997, 1998 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -169,7 +169,8 @@ main(int argc, char **argv) config_file = HDB_DB_DIR "/kdc.conf"; if(krb5_config_parse_file(config_file, &cf) == 0) { - const char *p = krb5_config_get_string (cf, "kdc", "key-file", NULL); + const char *p = krb5_config_get_string (context, cf, + "kdc", "key-file", NULL); if (p) keyfile = strdup(p); } diff --git a/kadmin/kadmind.c b/kadmin/kadmind.c index 122ef44ab..63fe54f68 100644 --- a/kadmin/kadmind.c +++ b/kadmin/kadmind.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997 Kungliga Tekniska Högskolan + * Copyright (c) 1997, 1998 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -177,7 +177,8 @@ main(int argc, char **argv) config_file = HDB_DB_DIR "/kdc.conf"; if(krb5_config_parse_file(config_file, &cf) == 0) { - const char *p = krb5_config_get_string (cf, "kdc", "key-file", NULL); + const char *p = krb5_config_get_string (context, cf, + "kdc", "key-file", NULL); if (p) keyfile = strdup(p); } diff --git a/kdc/config.c b/kdc/config.c index 11c0221e1..640d9458e 100644 --- a/kdc/config.c +++ b/kdc/config.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997 Kungliga Tekniska Högskolan + * Copyright (c) 1997, 1998 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -143,7 +143,7 @@ configure(int argc, char **argv) goto end; if(keyfile == NULL){ - p = krb5_config_get_string (cf, + p = krb5_config_get_string (context, cf, "kdc", "key-file", NULL); @@ -152,7 +152,7 @@ configure(int argc, char **argv) } if(database == NULL){ - p = krb5_config_get_string (cf, "kdc", "database", NULL); + p = krb5_config_get_string (context, cf, "kdc", "database", NULL); if(p) database = strdup(p); } @@ -161,7 +161,8 @@ configure(int argc, char **argv) } if(max_request == 0){ - p = krb5_config_get_string (cf, + p = krb5_config_get_string (context, + cf, "kdc", "max-request", NULL); @@ -170,18 +171,19 @@ configure(int argc, char **argv) } if(require_preauth == -1) - require_preauth = krb5_config_get_bool(cf, "kdc", + require_preauth = krb5_config_get_bool(context, cf, "kdc", "require-preauth", NULL); if(port_str == NULL){ - p = krb5_config_get_string(cf, "kdc", "ports", NULL); + p = krb5_config_get_string(context, cf, "kdc", "ports", NULL); port_str = (char*)p; } if(enable_http == -1) - enable_http = krb5_config_get_bool(cf, "kdc", "enable-http", NULL); + enable_http = krb5_config_get_bool(context, cf, "kdc", + "enable-http", NULL); #ifdef KRB4 if(v4_realm == NULL){ - p = krb5_config_get_string (cf, + p = krb5_config_get_string (context, cf, "kdc", "v4-realm", NULL); @@ -190,7 +192,7 @@ configure(int argc, char **argv) } #endif - kdc_warn_pwexpire = krb5_config_get_time (cf, + kdc_warn_pwexpire = krb5_config_get_time (context, cf, "kdc", "kdc_warn_pwexpire", NULL); diff --git a/kdc/kerberos5.c b/kdc/kerberos5.c index a1a964155..742b4d833 100644 --- a/kdc/kerberos5.c +++ b/kdc/kerberos5.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997 Kungliga Tekniska Högskolan + * Copyright (c) 1997, 1998 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -1045,7 +1045,8 @@ is_krbtgt(PrincipalName *p) static Realm find_rpath(Realm r) { - const char *new_realm = krb5_config_get_string(context->cf, + const char *new_realm = krb5_config_get_string(context, + NULL, "libdefaults", "capath", r, diff --git a/kdc/log.c b/kdc/log.c index 7d6a5f7b3..1278dddd1 100644 --- a/kdc/log.c +++ b/kdc/log.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997 Kungliga Tekniska Högskolan + * Copyright (c) 1997, 1998 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -47,16 +47,17 @@ kdc_openlog(krb5_config_section *cf) char **s = NULL, **p; krb5_initlog(context, "kdc", &logf); if(cf) - s = krb5_config_get_strings(cf, "kdc", "logging", NULL); + s = krb5_config_get_strings(context, cf, "kdc", "logging", NULL); if(s == NULL) - s = krb5_config_get_strings(context->cf, "logging", "kdc", NULL); + s = krb5_config_get_strings(context, NULL, "logging", "kdc", NULL); if(s){ for(p = s; *p; p++) krb5_addlog_dest(context, logf, *p); krb5_config_free_strings(s); }else krb5_addlog_dest(context, logf, "0-1/FILE:" HDB_DB_DIR "/kdc.log"); + krb5_set_warn_dest(context, logf); } char* diff --git a/kpasswd/kpasswdd.c b/kpasswd/kpasswdd.c index af4345239..1543004e5 100644 --- a/kpasswd/kpasswdd.c +++ b/kpasswd/kpasswdd.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997 Kungliga Tekniska Högskolan + * Copyright (c) 1997, 1998 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -332,7 +332,7 @@ change (krb5_auth_context auth_context, } ent.modified_by = e; if (ent.pw_end){ - int t = krb5_config_get_time(context->cf, + int t = krb5_config_get_time(context, NULL, "libdefaults", "pw_expiration", NULL); if(t > 0)