From 887c2b9d5e251c99a39824feb9b71a0f1a833894 Mon Sep 17 00:00:00 2001
From: Assar Westerlund <assar@sics.se>
Date: Thu, 15 Feb 2001 04:28:36 +0000
Subject: [PATCH] (main): use a `struct sockaddr_storage' to be able to store
 all types of addresses

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@9683 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 kadmin/kadmind.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/kadmin/kadmind.c b/kadmin/kadmind.c
index 6a5affee7..8bde0b0b4 100644
--- a/kadmin/kadmind.c
+++ b/kadmin/kadmind.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997-2000 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997-2001 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -143,11 +143,12 @@ main(int argc, char **argv)
 
     {
 	int fd = 0;
-	struct sockaddr sa;
-	socklen_t sa_size;
+	struct sockaddr_storage __ss;
+	struct sockaddr *sa = (struct sockaddr *)&__ss;
+	socklen_t sa_size = sizeof(__ss);
 	krb5_auth_context ac = NULL;
 	int debug_port;
-	sa_size = sizeof(sa);
+
 	if(debug_flag) {
 	    if(port_str == NULL)
 		debug_port = krb5_getportbyname (context, "kerberos-adm", 
@@ -155,7 +156,7 @@ main(int argc, char **argv)
 	    else
 		debug_port = htons(atoi(port_str));
 	    mini_inetd(debug_port);
-	} else if(roken_getsockname(STDIN_FILENO, &sa, &sa_size) < 0 && 
+	} else if(roken_getsockname(STDIN_FILENO, sa, &sa_size) < 0 && 
 		   errno == ENOTSOCK) {
 	    parse_ports(context, port_str ? port_str : "+");
 	    pidfile(NULL);