conditionalize v4 support

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

diff --git a/src/kdc/Imakefile b/src/kdc/Imakefile
index 047c96e7537e59ed4a9342f6d0b01826d6cd4543..ff0722f97960ec2efa8e1152298b27339e4cb1dd 100644 (file)
--- a/src/kdc/Imakefile
+++ b/src/kdc/Imakefile
@@ -7,7 +7,14 @@
 #  For copying and distribution information, please see the file
 #  <krb5/copyright.h>.
 # 
-DEFINES = -DBACKWARD_COMPAT
+
+#ifdef Krb4KDCCompat
+KRB4DEF = -DKRB4
+#else
+KRB4DEF =
+#endif
+DEFINES = -DBACKWARD_COMPAT $(KRB4DEF)
+
 INCLUDES = $(KRB4INCLUDES)
 SRCS= \
        kdc5_err.c \

diff --git a/src/kdc/dispatch.c b/src/kdc/dispatch.c
index e2048b57b472705e9812dcf0a68a5bf9251fd570..463504b147139de9edec8b52898e5a0a78d0c5dc 100644 (file)
--- a/src/kdc/dispatch.c
+++ b/src/kdc/dispatch.c
@@ -45,8 +45,11 @@ krb5_data **response;
            retval = process_as_req(as_req, from, response);
            krb5_free_kdc_req(as_req);
        }
-    } else if (pkt->data[0] == 4)              /* XXX old version */
+    }
+#ifdef KRB4
+    else if (pkt->data[0] == 4)                /* XXX old version */
        return(process_v4(pkt, from, response));
+#endif
     else
        retval = KRB5KRB_AP_ERR_MSG_TYPE;
     return retval;

diff --git a/src/kdc/kerberos_v4.c b/src/kdc/kerberos_v4.c
index 8955092e174a0d8371486b007cd84d37a4f7ae8a..62a5278197fc590766b9c474b0017514a91c0b0e 100644 (file)
--- a/src/kdc/kerberos_v4.c
+++ b/src/kdc/kerberos_v4.c
@@ -9,11 +9,13 @@
  * <mit-copyright.h>.
  */
 
+#ifdef KRB4
 #ifndef lint
-static char *rcsid_kerberos_c =
-"$Header$";
+static char rcsid_kerberos_c[] =
+"$Id$";
 #endif  /* lint */
 
+
 #ifdef __STDC__
 #include <stdarg.h>
 #else
@@ -1150,3 +1152,4 @@ hang()
     }
 }
 #endif /* BACKWARD_COMPAT */
+#endif /* KRB4 */