summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEzra Peisach <epeisach@mit.edu>1995-10-02 21:47:13 +0000
committerEzra Peisach <epeisach@mit.edu>1995-10-02 21:47:13 +0000
commit44643b02aff3039c1d0e202121247f98893a14ea (patch)
tree2b1a5545abffa37ddd5c04da2f9ff9ec541ecada
parent823a3df4b5a14fc00c33491a4f92fbd200188e65 (diff)
downloadkrb5-44643b02aff3039c1d0e202121247f98893a14ea.tar.gz
krb5-44643b02aff3039c1d0e202121247f98893a14ea.tar.xz
krb5-44643b02aff3039c1d0e202121247f98893a14ea.zip
Put back in the KRB5_CONFIG getenv that was accidentally removed
in the DEFAULT_PROFILE_PATH change. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6924 dc483132-0cff-0310-8789-dd5450dbe970
-rw-r--r--src/lib/krb5/os/ChangeLog5
-rw-r--r--src/lib/krb5/os/init_os_ctx.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index 77749c969..c488e188a 100644
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,3 +1,8 @@
+Mon Oct 2 17:36:38 1995 Ezra Peisach <epeisach@kangaroo.mit.edu>
+
+ * init_os_ctx.c (krb5_os_init_context): Put back in the
+ KRB5_CONFIG environment before setting to default.
+
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
diff --git a/src/lib/krb5/os/init_os_ctx.c b/src/lib/krb5/os/init_os_ctx.c
index eebc651ef..9d21c9423 100644
--- a/src/lib/krb5/os/init_os_ctx.c
+++ b/src/lib/krb5/os/init_os_ctx.c
@@ -147,6 +147,7 @@ krb5_os_init_context(ctx)
* When the profile routines are later enhanced, we will try
* including a config file from user's home directory here.
*/
+ name = getenv("KRB5_CONFIG");
if(!name) name = DEFAULT_PROFILE_PATH;
retval = profile_init_path(name, &ctx->profile);