First patch import

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

diff --git a/etc/afpd/globals.h b/etc/afpd/globals.h
index f5be0bc358004c1369f4dc728238c4439071ce4e..40c9601be635ec38e07ea13b3489b5d4ef8fdb09 100644 (file)
--- a/etc/afpd/globals.h
+++ b/etc/afpd/globals.h
@@ -1,6 +1,4 @@
 /*
- * $Id: globals.h,v 1.32 2010-03-08 19:49:59 franklahm Exp $
- *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
  */
@@ -37,6 +35,8 @@
 #define OPTION_NOSLP         (1 << 5)
 #define OPTION_ANNOUNCESSH   (1 << 6)
 #define OPTION_UUID          (1 << 7)
+#define OPTION_ACL2OS9MODE   (1 << 8)
+#define OPTION_NOZEROCONF    (1 << 9)
 
 #ifdef FORCE_UIDGID
 /* set up a structure for this */
@@ -56,20 +56,22 @@ struct afp_volume_name {
 };
 
 struct afp_options {
-    int connections, transports, tickleval, timeout, server_notif, flags;
+    int connections, transports, tickleval, timeout, server_notif, flags, dircachesize;
     unsigned char passwdbits, passwdminlen, loginmaxfail;
     u_int32_t server_quantum;
     char hostname[MAXHOSTNAMELEN + 1], *server, *ipaddr, *port, *configfile;
     struct at_addr ddpaddr;
     char *uampath, *fqdn;
     char *pidfile;
+    char *sigconffile;
     struct afp_volume_name defaultvol, systemvol, uservol;
     int  closevol;
 
     char *guest, *loginmesg, *keyfile, *passwdfile;
     char *uamlist;
     char *authprintdir;
-    char *signature;
+    char *signatureopt;
+    unsigned char signature[16];
     char *k5service, *k5realm, *k5keytab;
     char *unixcodepage,*maccodepage;
     charset_t maccharset, unixcharset; 
@@ -142,6 +144,9 @@ extern int  parseline  (int, char *);
 extern const char *AfpNum2name (int );
 extern const char *AfpErr2name(int err);
 
+/* directory.c */
+extern struct dir rootParent;
+
 #ifndef NO_DDP
 extern void afp_over_asp (AFPObj *);
 #endif /* NO_DDP */