Proper check whether code runs in an AFP session context or not

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

diff --git a/include/atalk/globals.h b/include/atalk/globals.h
index ad90c1c20fbb505dddfea8c3fa4effe939267cf2..e34f4ee829e33ccef3842880511c89abfb08a863 100644 (file)
--- a/include/atalk/globals.h
+++ b/include/atalk/globals.h
@@ -37,6 +37,7 @@
 #define OPTION_DEBUG         (1 << 0)
 #define OPTION_CLOSEVOL      (1 << 1)
 #define OPTION_SERVERNOTIF   (1 << 2)
+#define OPTION_NOSENDFILE    (1 << 3)
 #define OPTION_CUSTOMICON    (1 << 4)
 #define OPTION_ANNOUNCESSH   (1 << 6)
 #define OPTION_UUID          (1 << 7)
@@ -49,13 +50,14 @@
 #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)
@@ -90,7 +92,7 @@ struct afp_options {
     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;
@@ -121,10 +123,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);