From 2fe34f87efd142240e7e03443d7b63f79e6cd8ca Mon Sep 17 00:00:00 2001 From: assar Date: Sun, 10 Dec 2000 20:59:35 +0000 Subject: merge fix from vendor for not looking at environment variables --- crypto/kerberosIV/lib/krb/extra.c | 25 ------------------------- 1 file changed, 25 deletions(-) (limited to 'crypto') diff --git a/crypto/kerberosIV/lib/krb/extra.c b/crypto/kerberosIV/lib/krb/extra.c index c90767e..0668e17 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) -- cgit v1.1