kauth-retire-SPECIAL-macro-20010711

SPECIAL macro was presumably for conversion to special key cache environment
and is no longer needed

diff --git a/src/kauth/Makefile b/src/kauth/Makefile
index 998c9add79b9b973a5b0cb6f2b70183292e71b1c..3647b939ea53fdd9a40d4dcca6f296dfcdf12638 100644 (file)
--- a/src/kauth/Makefile
+++ b/src/kauth/Makefile
@@ -82,18 +82,10 @@ kautils.o: kautils.c ${INCLS}
 kalocalcell.o: kalocalcell.c ${INCLS}
 
 kadatabase.o: kadatabase.c ${INCLS}
-       ${CC} ${CFLAGS} -c kadatabase.c -DSPECIAL=1
-
-xkaprocs: kaprocs.c ${INCLS}
-       ${CC} ${CFLAGS} -c kaprocs.c -DAUTOCPWINTERVAL=30 -DAUTOCPWUPDATES=3
-
-# Installations using Auth2 conversion server should specify the GETPASSWORD
-# flag.  This also means logins to machines running this server must be
-# tightly controlled.
-#      ${CC} ${CFLAGS} -c kaprocs.c -DSPECIAL=1 -DGETPASSWORD
+       ${CC} ${CFLAGS} -c kadatabase.c 
 
 kaprocs.o: kaprocs.c ${INCLS} kaport.h
-       ${CC} ${CFLAGS} -c kaprocs.c -DSPECIAL=1
+       ${CC} ${CFLAGS} -c kaprocs.c 
 
 authclient.o: authclient.c ${INCLS}
 

diff --git a/src/kauth/kadatabase.c b/src/kauth/kadatabase.c
index 29034526fe200387461cd75919c82e7bb17cecc3..d4288ea2103dd9077889acce65fcee627e343d13 100644 (file)
--- a/src/kauth/kadatabase.c
+++ b/src/kauth/kadatabase.c
@@ -388,9 +388,6 @@ afs_int32 ka_NewKey (tt, tentryaddr, tentry, key)
   afs_int32 newtotalkeyentries = 0, oldtotalkeyentries = 0, keyentries;
   int   foundcurrentkey = 0, addednewkey = 0, modified;
 
-#if !SPECIAL
-    if ((ntohl(tentry->flags) & KAFSPECIAL) == 0) return KANOTSPECIAL;
-#endif
     es_Report ("Newkey for %s.%s\n", tentry->userID.name, tentry->userID.instance);
 
     newkeyver = ntohl(tentry->key_version) + 1;
@@ -550,10 +547,6 @@ afs_int32 ka_DelKey (tt, tentryaddr, tentry)
     afs_int32 prevptr = 0;
     Date  now = time(0);
 
-#if !SPECIAL
-    if ((ntohl(tentry->flags) & KAFSPECIAL) == 0) return KANOTSPECIAL;
-#endif
-
     es_Report ("DelKey for %s.%s\n", tentry->userID.name, tentry->userID.instance);
 
     /* An entry may have more than one oldkeys blocks. The entry
@@ -721,9 +714,6 @@ afs_int32 ka_LookupKvno (tt, name, inst, kvno, key)
     code = FindBlock (tt, name, inst, &to, &tentry);
     if (code) return code;
     if (to == 0) return KANOENT;
-#if !SPECIAL
-    if ((ntohl(tentry.flags) & KAFSPECIAL) == 0) return KANOTSPECIAL; 
-#endif
 
     /* first check the current key */
     if (tentry.key_version == htonl(kvno)) {
@@ -787,9 +777,6 @@ afs_int32 ka_LookupKey (tt, name, inst, kvno, key)
     code = FindBlock (tt, name, inst, &to, &tentry);
     if (code) return code;
     if (to == 0) return KANOENT;
-#if !SPECIAL
-    if ((ntohl(tentry.flags) & KAFSPECIAL) == 0) return KANOTSPECIAL;
-#endif
     bcopy (&tentry.key, key, sizeof(*key));
     *kvno = ntohl(tentry.key_version);
     ka_Encache (name, inst, *kvno, key, NEVERDATE);

diff --git a/src/kauth/kaprocs.c b/src/kauth/kaprocs.c
index 34a356b405d304f3f372fac17f7964dcb3748794..ddd1193e9a8759895f3950e5620760609eea4712 100644 (file)
--- a/src/kauth/kaprocs.c
+++ b/src/kauth/kaprocs.c
@@ -772,9 +772,7 @@ set_password (tt, name, instance, password, kvno, caller)
     
 
     if (special_name (name, instance)) { /* set key over rides key_version */
-#if SPECIAL
        tentry.flags = htonl (ntohl(tentry.flags) | KAFSPECIAL);
-#endif
        if (code = ka_NewKey (tt, to, &tentry, password)) return(code);
     }
     else {