Merge branch 'ipv6' of ssh://sts-a//home/msp/djansa/src/git/qarsh into ipv6

Conflicts:
	qarsh.c
	sockutil.c

1 files changed, 1 insertions, 1 deletions

diff --git a/btimed.c b/btimed.c
index 83a5af6..0ba6c91 100644
--- a/btimed.c
+++ b/btimed.c
@@ -44,7 +44,7 @@ main(int argc, char **argv)
 	char btimeonly[BTIME_MSGLEN];
 	char cookiemsg[BTIME_MSGLEN];
 	char *outmsg;
-	struct sockaddr_in cli_addr;
+	struct sockaddr_storage cli_addr;
 	socklen_t cli_addr_len;
 	ssize_t nbytes;
 	unsigned int local_btime;