diff options
| author | Mark Eichin <eichin@mit.edu> | 1995-10-02 19:21:45 +0000 |
|---|---|---|
| committer | Mark Eichin <eichin@mit.edu> | 1995-10-02 19:21:45 +0000 |
| commit | 38d15018a9981248beb529772c84e993d8ada014 (patch) | |
| tree | adf9c38ea728b089e7453423e8eeb64c44cb73b4 /src/lib | |
| parent | d84652a447e184c33946a146c7e5518f080c21fc (diff) | |
* init_os_ctx.c (krb5_os_init_context): use profile_init_path for
unix, and DEFAULT_PROFILE_PATH.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6915 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/krb5/os/ChangeLog | 5 | ||||
| -rw-r--r-- | src/lib/krb5/os/init_os_ctx.c | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog index a53263f62..77749c969 100644 --- a/src/lib/krb5/os/ChangeLog +++ b/src/lib/krb5/os/ChangeLog @@ -1,3 +1,8 @@ +Tue Sep 26 22:46:01 1995 Mark Eichin <eichin@cygnus.com> + + * init_os_ctx.c (krb5_os_init_context): use profile_init_path for + unix, and DEFAULT_PROFILE_PATH. + Fri Sep 29 16:31:47 1995 Theodore Y. Ts'o <tytso@dcl> * osconfig.c: Remove krb5_lname_file; it's not used any more. diff --git a/src/lib/krb5/os/init_os_ctx.c b/src/lib/krb5/os/init_os_ctx.c index 1f96f4c81..eebc651ef 100644 --- a/src/lib/krb5/os/init_os_ctx.c +++ b/src/lib/krb5/os/init_os_ctx.c @@ -135,22 +135,24 @@ krb5_os_init_context(ctx) filenames[1] = 0; } + retval = profile_init(filenames, &ctx->profile); + #else /* _WINDOWS */ #ifdef _MACINTOSH filenames[0] = GetMacProfilePathName(); filenames[1] = 0; + retval = profile_init(filenames, &ctx->profile); #else /* * When the profile routines are later enhanced, we will try * including a config file from user's home directory here. */ - name = getenv("KRB5_CONFIG"); - filenames[0] = name ? name : DEFAULT_PROFILE_FILENAME; - filenames[1] = 0; + if(!name) name = DEFAULT_PROFILE_PATH; + + retval = profile_init_path(name, &ctx->profile); #endif /* _MACINTOSH */ #endif /* _WINDOWS */ - retval = profile_init(filenames, &ctx->profile); if (retval) ctx->profile = 0; |