Merge remote-tracking branch 'origin/branch-netatalk-3-0' into develop

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

diff --git a/etc/afpd/status.h b/etc/afpd/status.h
index ae16bb49c0cc2fb6d1cf50088e667e6351c60ff1..343774aebb9681df85c00244f875e409f5263822 100644 (file)
--- a/etc/afpd/status.h
+++ b/etc/afpd/status.h
@@ -1,9 +1,7 @@
 #ifndef AFPD_STATUS_H
 #define AFPD_STATUS_H 1
 
-#include <sys/cdefs.h>
 #include <atalk/dsi.h>
-#include <atalk/asp.h>
 #include <atalk/globals.h>
 
 #include "afp_config.h"
@@ -14,6 +12,7 @@
 #define AFPSTATUS_UAMSOFF     4
 #define AFPSTATUS_ICONOFF     6
 #define AFPSTATUS_FLAGOFF     8
+
 /* AFPSTATUS_PRELEN is the number of bytes for status data prior to 
  * the ServerName field.
  *
@@ -21,6 +20,7 @@
  * UAMCount, VolumeIconAndMask, and the 16-bit "Fixed" status flags.
  */
 #define AFPSTATUS_PRELEN     10
+
 /* AFPSTATUS_POSTLEN is the number of bytes for offset records
  * after the ServerName field.
  *
@@ -30,16 +30,12 @@
 #define AFPSTATUS_POSTLEN     8
 #define AFPSTATUS_LEN        (AFPSTATUS_PRELEN + AFPSTATUS_POSTLEN)
 
+/* AFPSTATUS_MACHLEN is the number of characters for the MachineType. */
+#define AFPSTATUS_MACHLEN     16
 
-#define PASSWD_NONE     0
-#define PASSWD_SET     (1 << 0)
-#define PASSWD_NOSAVE  (1 << 1)
-#define PASSWD_ALL     (PASSWD_SET | PASSWD_NOSAVE)
-
-extern void status_versions (char * /*status*/, const ASP, const DSI *);
+extern void status_versions (char * /*status*/, const DSI *);
 extern void status_uams (char * /*status*/, const char * /*authlist*/);
-extern void status_init (AFPConfig *, AFPConfig *,
-                                 const struct afp_options *);
+extern void status_init (AFPObj *, DSI *dsi);
 extern void set_signature(struct afp_options *);
 
 /* FP functions */