aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAssar Westerlund <assar@FreeBSD.org>2000-12-10 20:59:35 +0000
committerAssar Westerlund <assar@FreeBSD.org>2000-12-10 20:59:35 +0000
commitfcbc584c3b3186fb9d39b27cfa2c73f110d05dbd (patch)
tree100a2164b8265d67716bb3b9463c16cee375470b
parent9c47a2dba1007fd197b62cd96f24ae587ca942d0 (diff)
downloadsrc-fcbc584c3b3186fb9d39b27cfa2c73f110d05dbd.tar.gz
src-fcbc584c3b3186fb9d39b27cfa2c73f110d05dbd.zip
merge fix from vendor for not looking at environment variables
Notes
Notes: svn path=/vendor-crypto/kerberosIV/dist/; revision=69830
-rw-r--r--crypto/kerberosIV/lib/krb/extra.c25
1 files changed, 0 insertions, 25 deletions
diff --git a/crypto/kerberosIV/lib/krb/extra.c b/crypto/kerberosIV/lib/krb/extra.c
index c90767e87a68..0668e17836db 100644
--- a/crypto/kerberosIV/lib/krb/extra.c
+++ b/crypto/kerberosIV/lib/krb/extra.c
@@ -70,30 +70,6 @@ define_variable(const char *variable, const char *value)
#ifndef WIN32
-struct obsolete {
- const char *from;
- const char *to;
-} obsolete [] = {
- { "KDC_TIMESYNC", "kdc_timesync" },
- { "KRB_REVERSE_DIRECTION", "reverse_lsb_test"},
- { "krb4_proxy", "krb4_proxy"},
- { NULL, NULL }
-};
-
-static void
-check_obsolete(void)
-{
- struct obsolete *r;
- for(r = obsolete; r->from; r++) {
- if(getenv(r->from)) {
- krb_warning("The environment variable `%s' is obsolete;\n"
- "set `%s' in your `krb.extra' file instead\n",
- r->from, r->to);
- define_variable(r->to, getenv(r->from));
- }
- }
-}
-
static int
read_extra_file(void)
{
@@ -103,7 +79,6 @@ read_extra_file(void)
if(_krb_extra_read)
return 0;
_krb_extra_read = 1;
- check_obsolete();
while(krb_get_krbextra(i++, file, sizeof(file)) == 0) {
FILE *f = fopen(file, "r");
if(f == NULL)