summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEzra Peisach <epeisach@mit.edu>1995-10-10 01:26:35 +0000
committerEzra Peisach <epeisach@mit.edu>1995-10-10 01:26:35 +0000
commit995ef6259b3f58d88dbec6487df3baef74d1da74 (patch)
tree6a7786d2d94d82135fc77543b1aded71a254ee86
parent822edab3a8884a8098df757e8c697b9ab21d2c85 (diff)
downloadkrb5-995ef6259b3f58d88dbec6487df3baef74d1da74.tar.gz
krb5-995ef6259b3f58d88dbec6487df3baef74d1da74.tar.xz
krb5-995ef6259b3f58d88dbec6487df3baef74d1da74.zip
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
-rw-r--r--src/lib/krb5/os/ChangeLog6
-rw-r--r--src/lib/krb5/os/ktdefname.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index 7b3596ffa..7e253c863 100644
--- 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 d911b996d..5db076f5a 100644
--- 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)