If secure_profile is set in the context, do not allow the default

keytab file to be overridden by an environment variable.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6953 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index 7b3596ffa7df0cd1329aac3a99635fe6b6adb0c1..7e253c86315440e08def8bc0ab5f0fa9508521a6 100644 (file)
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,3 +1,9 @@
+Mon Oct  9 19:05:24 1995  Ezra Peisach  <epeisach@kangaroo.mit.edu>
+
+       * ktdefname.c (krb5_kt_default_name): If profile_secure flag is
+               set in the context then do not allow changing the location
+               of the default keytab with an environment variable.
+
 Fri Oct  6 22:04:57 1995  Theodore Y. Ts'o  <tytso@dcl>
 
        * Makefile.in: Remove ##DOS!include of config/windows.in.

diff --git a/src/lib/krb5/os/ktdefname.c b/src/lib/krb5/os/ktdefname.c
index d911b996d33e0be79c93332cbfe5a7be74fe5a8a..5db076f5a2c372f76ba210d61308e65451154a9e 100644 (file)
--- a/src/lib/krb5/os/ktdefname.c
+++ b/src/lib/krb5/os/ktdefname.c
@@ -34,9 +34,9 @@ krb5_kt_default_name(context, name, namesize)
     char *name;
     int namesize;
 {
-    char *cp;
+    char *cp = 0;
 
-    cp = getenv("KRB5_KTNAME");
+    if (context->profile_secure == FALSE) cp = getenv("KRB5_KTNAME");
     if (cp) {
        strncpy(name, cp, namesize);
        if (strlen(cp) >= (size_t) namesize)