Merge master

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

diff --git a/include/atalk/ldapconfig.h b/include/atalk/ldapconfig.h
index ca14e972e7c5542fec84bb22b384f84f5eadac14..90a1c95b6eddb3a450d9e6f272f7277a78f17f4f 100644 (file)
--- a/include/atalk/ldapconfig.h
+++ b/include/atalk/ldapconfig.h
@@ -1,10 +1,12 @@
-#ifdef HAVE_NFSv4_ACLS
+#ifdef HAVE_LDAP
 
 #ifndef LDAPCONFIG_H
 #define LDAPCONFIG_H
 
+#include <atalk/iniparser.h>
+
 /* One function does the whole job */
-extern int acl_ldap_readconfig(char *name);
+extern int acl_ldap_readconfig(dictionary *iniconfig);
 
 /* These are the prefvalues */
 extern char *ldap_server;
@@ -14,22 +16,23 @@ extern char *ldap_auth_pw;
 extern char *ldap_userbase;
 extern char *ldap_groupbase;
 extern char *ldap_uuid_attr;
+extern char *ldap_uuid_string;
 extern char *ldap_name_attr;
 extern char *ldap_group_attr;
 extern char *ldap_uid_attr;
 
 struct ldap_pref {
-    void *pref;
+    const 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;
+    const 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 +40,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_LDAP */