move IP address before FQDN in getstatus addresses reply

diff --git a/etc/afpd/status.c b/etc/afpd/status.c
index cbd9abe8ff735103b55e2d6e5a6afbf70cd687ca..937b517f4bf842c2b49243a250affdd952a5902d 100644 (file)
--- a/etc/afpd/status.c
+++ b/etc/afpd/status.c
@@ -1,5 +1,5 @@
 /*
- * $Id: status.c,v 1.13.6.4 2004-01-22 19:37:46 bfernhomberg Exp $
+ * $Id: status.c,v 1.13.6.5 2004-06-09 01:31:14 bfernhomberg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -254,15 +254,6 @@ static int status_netaddress(char *data, int *servoffset,
        we turn off the status flag for tcp/ip. */
     *data++ = ((fqdn && dsi)? 1 : 0) + (dsi ? 1 : 0) + (asp ? 1 : 0);
 
-    /* handle DNS names */
-    if (fqdn && dsi) {
-        int len = strlen(fqdn);
-        *data++ = len +2;
-        *data++ = 0x04;
-        memcpy(data, fqdn, len);
-        data += len;
-    }
-
     /* ip address */
     if (dsi) {
         const struct sockaddr_in *inaddr = &dsi->server;
@@ -285,6 +276,15 @@ static int status_netaddress(char *data, int *servoffset,
         }
     }
 
+    /* handle DNS names */
+    if (fqdn && dsi) {
+        int len = strlen(fqdn);
+        *data++ = len +2;
+        *data++ = 0x04;
+        memcpy(data, fqdn, len);
+        data += len;
+    }
+
 #ifndef NO_DDP
     if (asp) {
         const struct sockaddr_at *ddpaddr = atp_sockaddr(asp->asp_atp);