Merge sf/master

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

diff --git a/etc/afpd/status.h b/etc/afpd/status.h
index 4b927fad07e62daef83c55714e2e7fc36d839cb7..ae16bb49c0cc2fb6d1cf50088e667e6351c60ff1 100644 (file)
--- a/etc/afpd/status.h
+++ b/etc/afpd/status.h
@@ -1,14 +1,11 @@
-/*
- * $Id: status.h,v 1.8 2009-10-13 22:55:37 didg Exp $
- */
-
 #ifndef AFPD_STATUS_H
 #define AFPD_STATUS_H 1
 
 #include <sys/cdefs.h>
 #include <atalk/dsi.h>
 #include <atalk/asp.h>
-#include "globals.h"
+#include <atalk/globals.h>
+
 #include "afp_config.h"
 
 /* we use these to prevent whacky alignment problems */
@@ -39,11 +36,13 @@
 #define PASSWD_NOSAVE  (1 << 1)
 #define PASSWD_ALL     (PASSWD_SET | PASSWD_NOSAVE)
 
-extern void status_versions (char * /*status*/);
+extern void status_versions (char * /*status*/, const ASP, const DSI *);
 extern void status_uams (char * /*status*/, const char * /*authlist*/);
-extern void status_reset (void );
 extern void status_init (AFPConfig *, AFPConfig *,
                                  const struct afp_options *);
-extern int      afp_getsrvrinfo (AFPObj *, char *, int, char *, int *);
+extern void set_signature(struct afp_options *);
+
+/* FP functions */
+int afp_getsrvrinfo (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf,  size_t *rbuflen);
 
 #endif