From: Ezra Peisach <epeisach@mit.edu>
Date: Thu, 21 Jun 2001 13:46:51 +0000 (+0000)
Subject:         * login.c (read_env_vars_from_file: Only define if
X-Git-Tag: krb5-1.3-alpha1~1339
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=98a8168a5cac1cee0e8568f63f1389c498b705c3;p=krb5.git

    * login.c (read_env_vars_from_file: Only define if
        /etc/environment or /etc/timezone exists on machine.

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

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index c3a2cb585..ff4e9b9cf 100644
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-20  Ezra Peisach  <epeisach@mit.edu>
+
+	* login.c (read_env_vars_from_file: Only define if
+	/etc/environment or /etc/timezone exists on machine.
+
 2001-06-20  Ezra Peisach  <epeisach@mit.edu>
 
 	* kcmd.c: Get rid of prototypes for krb5_write_message(),
diff --git a/src/appl/bsd/login.c b/src/appl/bsd/login.c
index 46a6c6467..b5de2a48a 100644
--- a/src/appl/bsd/login.c
+++ b/src/appl/bsd/login.c
@@ -973,6 +973,7 @@ afs_cleanup ()
     exit(1); \
 }
 
+#if defined(HAVE_ETC_ENVIRONMENT) || defined(HAVE_ETC_TIMEZONE)
 static void
 read_env_vars_from_file (filename)
     char *filename;
@@ -998,6 +999,7 @@ read_env_vars_from_file (filename)
 	fclose(fp);
     }
 }
+#endif
 
 static void
 log_repeated_failures (tty, hostname)