Merge branch 'develop' into spotlight

[netatalk.git] / include / atalk / globals.h

diff --git a/include/atalk/globals.h b/include/atalk/globals.h
index a8313a36b6d24f34875c36479aecd2bd8e5de0b6..3fb8e4f65c4819f79527e85be836d9abda17f29c 100644 (file)
--- a/include/atalk/globals.h
+++ b/include/atalk/globals.h
@@ -41,9 +41,8 @@
 #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)
@@ -98,11 +97,12 @@ struct afp_options {
     gid_t admingid;
     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;
 };
 
@@ -147,7 +147,6 @@ 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 *);