X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fatalk%2Fglobals.h;h=aadbb13ae40d0dbdbe0fbc9850579ee2460d02c9;hb=af3a18cef2dc7a03e2ba40e0907b64b7a9d50e2c;hp=e25efdbd12fd585cb66e3de7e38f6e6e47e194f1;hpb=e00467826a7ea8dd706d0728191b13894d25618d;p=netatalk.git

diff --git a/include/atalk/globals.h b/include/atalk/globals.h
index e25efdbd..aadbb13a 100644
--- a/include/atalk/globals.h
+++ b/include/atalk/globals.h
@@ -7,11 +7,8 @@
 #define AFPD_GLOBALS_H 1
 
 #include <sys/param.h>
-
-#ifdef ADMIN_GRP
 #include <grp.h>
 #include <sys/types.h>
-#endif /* ADMIN_GRP */
 
 #ifdef HAVE_NETDB_H
 #include <netdb.h>  /* this isn't header-protected under ultrix */
@@ -38,14 +35,15 @@
 #define OPTION_CLOSEVOL      (1 << 1)
 #define OPTION_SERVERNOTIF   (1 << 2)
 #define OPTION_NOSENDFILE    (1 << 3)
-#define OPTION_CUSTOMICON    (1 << 4)
+/* #define OPTION_CUSTOMICON    (1 << 4) */
+#define OPTION_AFP_READ_LOCK (1 << 5) /* whether to do AFP spec conforming read locks (default: no) */
 #define OPTION_ANNOUNCESSH   (1 << 6)
 #define OPTION_UUID          (1 << 7)
 #define OPTION_ACL2MACCESS   (1 << 8)
 #define OPTION_NOZEROCONF    (1 << 9)
 #define OPTION_KEEPSESSIONS  (1 << 10) /* preserve sessions across master afpd restart with SIGQUIT */
 #define OPTION_SHARE_RESERV  (1 << 11) /* whether to use Solaris fcntl F_SHARE locks */
-
+#define OPTION_SPOTLIGHT     (1 << 12) /* whether to enable Spotlight support */
 #define PASSWD_NONE     0
 #define PASSWD_SET     (1 << 0)
 #define PASSWD_NOSAVE  (1 << 1)
@@ -88,7 +86,7 @@ struct afp_options {
     char *uampath, *fqdn;
     char *sigconffile;
     char *uuidconf;
-    char *guest, *loginmesg, *keyfile, *passwdfile;
+    char *guest, *loginmesg, *keyfile, *passwdfile, *extmapfile;
     char *uamlist;
     char *signatureopt;
     unsigned char signature[16];
@@ -97,16 +95,15 @@ struct afp_options {
     charset_t maccharset, unixcharset; 
     mode_t umask;
     mode_t save_mask;
-#ifdef ADMIN_GRP
     gid_t admingid;
-#endif /* ADMIN_GRP */
     int    volnamelen;
     /* default value for winbind authentication */
-    char *ntdomain, *ntseparator;
+    char *ntdomain, *ntseparator, *addomain;
     char *logconfig;
     char *logfile;
     char *mimicmodel;
     char *adminauthuser;
+    char *slmod_path;
     struct afp_volume_name volfile;
 };
 
@@ -151,14 +148,9 @@ extern const char         *Cnid_port;
 extern int  get_afp_errno   (const int param);
 extern void afp_options_init (struct afp_options *);
 extern void afp_options_parse_cmdline(AFPObj *obj, int ac, char **av);
-extern void afp_options_free(struct afp_options *);
 extern void setmessage (const char *);
 extern void readmessage (AFPObj *);
 
-/* gettok.c */
-extern void initline   (int, char *);
-extern int  parseline  (int, char *);
-
 /* afp_util.c */
 extern const char *AfpNum2name (int );
 extern const char *AfpErr2name(int err);
@@ -167,5 +159,5 @@ extern const char *AfpErr2name(int err);
 extern struct dir rootParent;
 
 extern void afp_over_dsi (AFPObj *);
-
+extern void afp_over_dsi_sighandlers(AFPObj *obj);
 #endif /* globals.h */