From 68b76a3aeee96ea0ee4cc2c29cda882aa300891b Mon Sep 17 00:00:00 2001 From: Johan Danielsson Date: Tue, 24 Jul 2001 12:07:20 +0000 Subject: [PATCH] add support for type KRB5_ADDRESS_ADDRPORT git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10393 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/krb5/addr_families.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/krb5/addr_families.c b/lib/krb5/addr_families.c index 7926da4fd..1e107222e 100644 --- a/lib/krb5/addr_families.c +++ b/lib/krb5/addr_families.c @@ -349,8 +349,7 @@ ipv6_parse_addr (krb5_context context, const char *address, krb5_address *addr) * table */ -#define AF_ARANGE (-100) -#define KRB5_ADDRESS_ARANGE AF_ARANGE +#define KRB5_ADDRESS_ARANGE (-100) struct arange { krb5_address low; @@ -526,8 +525,10 @@ static struct addr_operations at[] = { ipv6_h_addr2addr, ipv6_uninteresting, ipv6_anyaddr, ipv6_print_addr, ipv6_parse_addr} , #endif + {KRB5_ADDRESS_ADDRPORT, KRB5_ADDRESS_ADDRPORT, 0, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }, /* fake address type */ - {AF_ARANGE, KRB5_ADDRESS_ARANGE, sizeof(struct arange), + {KRB5_ADDRESS_ARANGE, KRB5_ADDRESS_ARANGE, sizeof(struct arange), NULL, NULL, NULL, NULL, NULL, NULL, NULL, arange_print_addr, arange_parse_addr, arange_order_addr, arange_free, arange_copy } @@ -773,6 +774,8 @@ krb5_address_order(krb5_context context, if(addr1->addr_type != addr2->addr_type) return addr1->addr_type - addr2->addr_type; + if(addr1->address.length != addr2->address.length) + return addr1->address.length - addr2->address.length; return memcmp (addr1->address.data, addr2->address.data, addr1->address.length);