* 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

diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index a53263f62f72ff13d486b984b5254f45f57905cc..77749c96957f70cd60bc522508bf93b254dada69 100644 (file)
--- 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 1f96f4c818e31b04f6c256753f0707c3ddd84d24..eebc651ef0f62af3d8ad93f6ddf5b47e3059ff4a 100644 (file)
--- 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;