Use getaddrinfo() in kprop and kpropd, and recognize IPv6 addresses

when setting up krb5_address structures.  kpropd still only binds to
one socket to avoid the need for a select() loop, so we turn off
IPV6_V6ONLY on that socket to ensure that IPv4 connections will still
be accepted.

Based on a patch from Michael Stapelberg <michael@stapelberg.de>.

ticket: 6686

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

1 files changed, 69 insertions, 0 deletions

diff --git a/src/slave/kprop_sock.c b/src/slave/kprop_sock.c
new file mode 100644
index 0000000..54479c9
--- /dev/null
+++ b/src/slave/kprop_sock.c
@@ -0,0 +1,69 @@
+/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ * slave/kprop_sock.c
+ *
+ * Copyright (C) 2010 by the Massachusetts Institute of Technology.
+ * All rights reserved.
+ *
+ * Export of this software from the United States of America may
+ *   require a specific license from the United States Government.
+ *   It is the responsibility of any person or organization contemplating
+ *   export to obtain such a license before exporting.
+ *
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * this permission notice appear in supporting documentation, and that
+ * the name of M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission.  Furthermore if you modify this software you must label
+ * your software as modified software and not distribute it in such a
+ * fashion that it might be confused with the original M.I.T. software.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is" without express
+ * or implied warranty.
+ *
+ *
+ * sockaddr2krbaddr() utility function used by kprop and kpropd.
+ */
+
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+
+#include "k5-int.h"
+#include "kprop.h"
+
+/*
+ * Convert an IPv4 or IPv6 socket address to a newly allocated krb5_address.
+ * There is similar code elsewhere in the tree, so this should possibly become
+ * a libkrb5 API in the future.
+ */
+krb5_error_code
+sockaddr2krbaddr(krb5_context context, int family, struct sockaddr *sa,
+		 krb5_address **dest)
+{
+    krb5_address addr;
+
+    if (family == AF_INET) {
+	struct sockaddr_in *sa4 = (struct sockaddr_in *) sa;
+	addr.addrtype = ADDRTYPE_INET;
+	addr.length = sizeof(sa4->sin_addr);
+	addr.contents = (krb5_octet *) &sa4->sin_addr;
+    } else if (family == AF_INET6) {
+	struct sockaddr_in6 *sa6 = (struct sockaddr_in6 *) sa;
+        if (IN6_IS_ADDR_V4MAPPED(&sa6->sin6_addr)) {
+            addr.addrtype = ADDRTYPE_INET;
+            addr.contents = (krb5_octet *) &sa6->sin6_addr + 12;
+            addr.length = 4;
+        } else {
+	    addr.addrtype = ADDRTYPE_INET6;
+	    addr.length = sizeof(sa6->sin6_addr);
+	    addr.contents = (krb5_octet *) &sa6->sin6_addr;
+	}
+    } else
+	return KRB5_PROG_ATYPE_NOSUPP;
+
+    return krb5_copy_addr(context, &addr, dest);
+}