Volname mangling. Fixes bug #2611981, from HAT. Also add new logger doc to afpd.conf...

[netatalk.git] / etc / afpd / globals.h

diff --git a/etc/afpd/globals.h b/etc/afpd/globals.h
index 0dd634157a6aa9f28763f26e54d5261aee80f589..d5aa7b61273d816b09db683010534c9adf181733 100644 (file)
--- a/etc/afpd/globals.h
+++ b/etc/afpd/globals.h
@@ -1,5 +1,5 @@
 /*
- * $Id: globals.h,v 1.21 2005-04-28 20:49:43 bfernhomberg Exp $
+ * $Id: globals.h,v 1.26 2009-03-16 13:59:12 franklahm Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -26,12 +26,8 @@
 #include <atalk/unicode.h>
 #include <atalk/uam.h>
 
-/* test for inline */
-#ifndef __inline__
-#define __inline__
-#endif
-
 #define MACFILELEN 31
+#define MAXUSERLEN 256
 
 #define OPTION_DEBUG         (1 << 0)
 #define OPTION_USERVOLFIRST  (1 << 1)
@@ -40,6 +36,7 @@
 #define OPTION_CUSTOMICON    (1 << 4)
 #define OPTION_NOSLP         (1 << 5)
 #define OPTION_ANNOUNCESSH   (1 << 6)
+#define OPTION_UUID          (1 << 7)
 
 #ifdef FORCE_UIDGID
 /* set up a structure for this */
@@ -82,6 +79,10 @@ struct afp_options {
 #ifdef ADMIN_GRP
     gid_t admingid;
 #endif /* ADMIN_GRP */
+    int    volnamelen;
+
+    /* default value for winbind authentication */
+    char *ntdomain, *ntseparator;
 };
 
 #define AFPOBJ_TMPSIZ (MAXPATHLEN)
@@ -91,7 +92,7 @@ typedef struct AFPObj {
     void *handle, *config;
     struct afp_options options;
     char *Obj, *Type, *Zone;
-    char username[MACFILELEN + 1];
+    char username[MAXUSERLEN];
     void (*logout)(void), (*exit)(int);
     int (*reply)(void *, int);
     int (*attention)(void *, AFPUserBytes);