-#define OPTION_KEEPSESSIONS (1 << 10) /* preserve sessions across master afpd restart with SIGQUIT */
-
-#ifdef FORCE_UIDGID
-/* set up a structure for this */
-typedef struct uidgidset_t {
- uid_t uid;
- gid_t gid;
-} uidgidset;
-#endif /* FORCE_UIDGID */
-
-/* a couple of these options could get stuck in unions to save
- * space. */
+#define OPTION_ACL2MODE (1 << 10)
+#define OPTION_SHARE_RESERV (1 << 11) /* whether to use Solaris fcntl F_SHARE locks */
+#define OPTION_DBUS_AFPSTATS (1 << 12) /* whether to run dbus thread for afpstats */
+#define OPTION_SPOTLIGHT (1 << 13) /* whether to enable Spotlight support */
+
+#define PASSWD_NONE 0
+#define PASSWD_SET (1 << 0)
+#define PASSWD_NOSAVE (1 << 1)
+#define PASSWD_ALL (PASSWD_SET | PASSWD_NOSAVE)
+
+#define IS_AFP_SESSION(obj) ((obj)->dsi && (obj)->dsi->serversock == -1)
+
+/**********************************************************************************************
+ * Ini config sections
+ **********************************************************************************************/
+
+#define INISEC_GLOBAL "Global"
+#define INISEC_HOMES "Homes"
+
+struct DSI;
+#define AFPOBJ_TMPSIZ (MAXPATHLEN)
+