X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Fglobals.h;h=dc64fb15d40775b4657f5c5f3d55ea94d908b345;hb=be96d276348da0a7e66eeec844b306e8a5fa8fac;hp=5fbb048b1bde766f2304fc59499db22bcdb91763;hpb=b3bcbf9805a3b6538ec71f41a9f537e03e81adcd;p=netatalk.git

diff --git a/etc/afpd/globals.h b/etc/afpd/globals.h
index 5fbb048b..dc64fb15 100644
--- a/etc/afpd/globals.h
+++ b/etc/afpd/globals.h
@@ -7,7 +7,6 @@
 #define AFPD_GLOBALS_H 1
 
 #include <sys/param.h>
-#include <sys/cdefs.h>
 
 #ifdef ADMIN_GRP
 #include <grp.h>
@@ -35,17 +34,9 @@
 #define OPTION_NOSLP         (1 << 5)
 #define OPTION_ANNOUNCESSH   (1 << 6)
 #define OPTION_UUID          (1 << 7)
-#define OPTION_ACL2OS9MODE   (1 << 8)
+#define OPTION_ACL2MACCESS   (1 << 8)
 #define OPTION_NOZEROCONF    (1 << 9)
 
-#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. */
 struct afp_volume_name {
@@ -57,10 +48,11 @@ struct afp_volume_name {
 
 struct afp_options {
     int connections, transports, tickleval, timeout, server_notif, flags, dircachesize;
+    int sleep;                  /* Maximum time allowed to sleep (in tickles) */
+    int disconnected;           /* Maximum time in disconnected state (in tickles) */
     unsigned char passwdbits, passwdminlen, loginmaxfail;
     u_int32_t server_quantum;
     char hostname[MAXHOSTNAMELEN + 1], *server, *ipaddr, *port, *configfile;
-    struct at_addr ddpaddr;
     char *uampath, *fqdn;
     char *pidfile;
     char *sigconffile;
@@ -78,7 +70,6 @@ struct afp_options {
     charset_t maccharset, unixcharset; 
     mode_t umask;
     mode_t save_mask;
-    int    sleep;
 #ifdef ADMIN_GRP
     gid_t admingid;
 #endif /* ADMIN_GRP */
@@ -86,6 +77,7 @@ struct afp_options {
 
     /* default value for winbind authentication */
     char *ntdomain, *ntseparator;
+    char *logconfig;
 };
 
 #define AFPOBJ_TMPSIZ (MAXPATHLEN)
@@ -106,11 +98,7 @@ typedef struct _AFPObj {
     void *uam_cookie; /* cookie for uams */
     struct session_info  sinfo;
     uid_t uid; 	/* client running user id */
-
-#ifdef FORCE_UIDGID
-    int                 force_uid;
-    uidgidset		uidgid;
-#endif
+    int ipc_fd; /* anonymous PF_UNIX socket for IPC with afpd parent */
 } AFPObj;
 
 /* typedef for AFP functions handlers */
@@ -149,9 +137,6 @@ extern const char *AfpErr2name(int err);
 /* directory.c */
 extern struct dir rootParent;
 
-#ifndef NO_DDP
-extern void afp_over_asp (AFPObj *);
-#endif /* NO_DDP */
 extern void afp_over_dsi (AFPObj *);
 
 #endif /* globals.h */