Reintroduce file extension type/creator mapping

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

diff --git a/include/atalk/globals.h b/include/atalk/globals.h
index 2e27cde15c46c8c412c191a22e053e5a5a116d87..a8313a36b6d24f34875c36479aecd2bd8e5de0b6 100644 (file)
--- 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 */
@@ -37,25 +34,29 @@
 #define OPTION_DEBUG         (1 << 0)
 #define OPTION_CLOSEVOL      (1 << 1)
 #define OPTION_SERVERNOTIF   (1 << 2)
-#define OPTION_CUSTOMICON    (1 << 4)
+#define OPTION_NOSENDFILE    (1 << 3)
+/* #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 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_AFP    "AFP"
-#define INISEC_CNID   "CNID"
+#define INISEC_HOMES  "Homes"
 
 struct DSI;
 #define AFPOBJ_TMPSIZ (MAXPATHLEN)
@@ -85,19 +86,16 @@ struct afp_options {
     char *uampath, *fqdn;
     char *sigconffile;
     char *uuidconf;
-    char *guest, *loginmesg, *keyfile, *passwdfile;
+    char *guest, *loginmesg, *keyfile, *passwdfile, *extmapfile;
     char *uamlist;
-    char *authprintdir;
     char *signatureopt;
     unsigned char signature[16];
     char *k5service, *k5realm, *k5keytab;
-    char *unixcodepage,*maccodepage;
+    char *unixcodepage, *maccodepage, *volcodepage;
     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;
@@ -122,10 +120,9 @@ typedef struct AFPObj {
     struct session_info  sinfo;
     uid_t uid;         /* client running user id */
     int ipc_fd; /* anonymous PF_UNIX socket for IPC with afpd parent */
-
     gid_t *groups;
     int ngroups;
-
+    int afp_version;
     /* Functions */
     void (*logout)(void);
     void (*exit)(int);
@@ -154,10 +151,6 @@ 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);
@@ -166,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 */