Merge from branch-2-1

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

diff --git a/include/atalk/ldapconfig.h b/include/atalk/ldapconfig.h
index ca14e972e7c5542fec84bb22b384f84f5eadac14..70f9f628c7c61c0c0fe7018b91bfceb884865f43 100644 (file)
--- a/include/atalk/ldapconfig.h
+++ b/include/atalk/ldapconfig.h
@@ -1,4 +1,4 @@
-#ifdef HAVE_NFSv4_ACLS
+#ifdef HAVE_ACLS
 
 #ifndef LDAPCONFIG_H
 #define LDAPCONFIG_H
@@ -21,15 +21,15 @@ extern char *ldap_uid_attr;
 struct ldap_pref {
     void *pref;
     char *name;
-    int strorint;
-    int intfromarray;
-    int valid;
+    int strorint;     /* string to just store in char * or convert to int ? */
+    int intfromarray; /* convert to int, but use string to int mapping array pref_array[] */
+    int valid;        /* -1 = mandatory, 0 = omittable/valid */
 };
 
 struct pref_array {
-    char *pref;
-    char *valuestring;
-    int  value;
+    char *pref;         /* name of pref from ldap_prefs[] to which this value corresponds */
+    char *valuestring;  /* config string */
+    int  value;         /* corresponding value */
 };
 
 /* For parsing */
@@ -37,6 +37,6 @@ extern struct ldap_pref ldap_prefs[];
 extern struct pref_array prefs_array[];
 extern int ldap_config_valid;
 
-#endif
+#endif /* LDAPCONFIG_H */
 
-#endif
+#endif /* HAVE_ACLS */