[src/netbsd-1-5]: src/crypto/dist/krb4/lib/krb Pullup 1.2 [assar]:

[tv <tv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6dc5fe69110b
branches:  netbsd-1-5
changeset: 490297:6dc5fe69110b
user:      tv <tv%NetBSD.org@localhost>
date:      Tue Dec 12 21:57:00 2000 +0000

description:
Pullup 1.2 [assar]:
remove (obsolete) support for environment variables.

diffstat:

 crypto/dist/krb4/lib/krb/extra.c |  27 +--------------------------
 1 files changed, 1 insertions(+), 26 deletions(-)

diffs (51 lines):

diff -r f69bb6e1fbd0 -r 6dc5fe69110b crypto/dist/krb4/lib/krb/extra.c
--- a/crypto/dist/krb4/lib/krb/extra.c  Tue Dec 12 21:56:37 2000 +0000
+++ b/crypto/dist/krb4/lib/krb/extra.c  Tue Dec 12 21:57:00 2000 +0000
@@ -33,7 +33,7 @@
 
 #include "krb_locl.h"
 
-RCSID("$Id: extra.c,v 1.1.1.1 2000/06/16 18:45:52 thorpej Exp $");
+RCSID("$Id: extra.c,v 1.1.1.1.2.1 2000/12/12 21:57:00 tv Exp $");
 
 struct value {
     char *variable;
@@ -70,30 +70,6 @@
 
 #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 @@
     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)