summaryrefslogtreecommitdiffstats
path: root/src/kdc/kdc_util.h
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2012-02-28 16:15:56 +0000
committerKen Raeburn <raeburn@mit.edu>2012-02-28 16:15:56 +0000
commit666d801d3b1a288f59dc458ea1fb438dc4f4329a (patch)
tree91607b94c04d76786167c769d86aad6793b76d69 /src/kdc/kdc_util.h
parent7c08c875b8617f2df0fd98510eb0ad3ce12bcc86 (diff)
downloadkrb5-666d801d3b1a288f59dc458ea1fb438dc4f4329a.tar.gz
krb5-666d801d3b1a288f59dc458ea1fb438dc4f4329a.tar.xz
krb5-666d801d3b1a288f59dc458ea1fb438dc4f4329a.zip
Require IPv6 support
The configure-time options to enable and disable IPv6 support have been deprecated for some time, but the checks for OS support were kept. This removes those checks, and unconditionally compiles in the IPv6 support. There was a configure-time test to see if the macro INET6 needed to be defined in order to enable (visibility of) OS support for IPv6, which was needed on an IRIX system we tested with. That check is retained, but the revised code is untested on IRIX. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25719 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kdc/kdc_util.h')
-rw-r--r--src/kdc/kdc_util.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/kdc/kdc_util.h b/src/kdc/kdc_util.h
index e80ce106f6..982508a886 100644
--- a/src/kdc/kdc_util.h
+++ b/src/kdc/kdc_util.h
@@ -409,13 +409,8 @@ struct krb5_kdcpreauth_rock_st {
#define max(a, b) ((a) > (b) ? (a) : (b))
#endif
-#ifdef KRB5_USE_INET6
#define ADDRTYPE2FAMILY(X) \
((X) == ADDRTYPE_INET6 ? AF_INET6 : (X) == ADDRTYPE_INET ? AF_INET : -1)
-#else
-#define ADDRTYPE2FAMILY(X) \
- ((X) == ADDRTYPE_INET ? AF_INET : -1)
-#endif
/* RFC 4120: KRB5KDC_ERR_KEY_TOO_WEAK
* RFC 4556: KRB5KDC_ERR_DH_KEY_PARAMETERS_NOT_ACCEPTED */