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 124c398865500dac322c971d9ae7f7234093c426..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 */
@@ -38,7 +35,7 @@
 #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)
@@ -89,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];
@@ -98,9 +95,7 @@ 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;
@@ -156,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);
@@ -168,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 */