don't create an adouble file in ad_metadata for noadouble volume

[netatalk.git] / etc / afpd / status.c

diff --git a/etc/afpd/status.c b/etc/afpd/status.c
index 745d349c5765768ce49960dfbd121312d55f97a0..96fb97d1f1e86fd876b8fe56d1920a9eb895ebfd 100644 (file)
--- a/etc/afpd/status.c
+++ b/etc/afpd/status.c
@@ -1,5 +1,5 @@
 /*
- * $Id: status.c,v 1.27 2009-11-05 14:38:07 franklahm Exp $
+ * $Id: status.c,v 1.30 2009-11-23 19:04:14 franklahm Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -14,6 +14,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <sys/types.h>
+#include <sys/socket.h>
 #include <atalk/logger.h>
 
 #ifdef BSD4_4
@@ -524,6 +525,7 @@ void status_init(AFPConfig *aspconfig, AFPConfig *dsiconfig,
     } else
         asp = NULL;
        
+    ipok = 0;
     if (dsiconfig) {
         status = dsiconfig->status;
         maxstatuslen=sizeof(dsiconfig->status);
@@ -533,7 +535,6 @@ void status_init(AFPConfig *aspconfig, AFPConfig *dsiconfig,
             ipok = sa4->sin_addr.s_addr ? 1 : 0;
         } else { /* IPv6 */
             const struct sockaddr_in6 *sa6 = (struct sockaddr_in6 *)&dsi->server;
-            ipok = 0;
             for (int i=0; i<16; i++) {
                 if (sa6->sin6_addr.s6_addr[i]) {
                     ipok = 1;
@@ -574,7 +575,7 @@ void status_init(AFPConfig *aspconfig, AFPConfig *dsiconfig,
     c = status_server(status, options->server ? options->server :
                       options->hostname, options);
     status_machine(status);
-    status_versions(status);
+    status_versions(status, asp, dsi);
     status_uams(status, options->uamlist);
     if (options->flags & OPTION_CUSTOMICON)
         status_icon(status, icon, sizeof(icon), c);