Merge master

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

diff --git a/include/atalk/ldapconfig.h b/include/atalk/ldapconfig.h
index f170f036d01c8deebd591f6cf4bec44295b42b2d..90a1c95b6eddb3a450d9e6f272f7277a78f17f4f 100644 (file)
--- a/include/atalk/ldapconfig.h
+++ b/include/atalk/ldapconfig.h
@@ -3,8 +3,10 @@
 #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;
@@ -20,7 +22,7 @@ extern char *ldap_group_attr;
 extern char *ldap_uid_attr;
 
 struct ldap_pref {
-    void *pref;
+    const void *pref;
     char *name;
     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[] */
@@ -28,7 +30,7 @@ struct ldap_pref {
 };
 
 struct pref_array {
-    char *pref;         /* name of pref from ldap_prefs[] to which this value corresponds */
+    const char *pref;         /* name of pref from ldap_prefs[] to which this value corresponds */
     char *valuestring;  /* config string */
     int  value;         /* corresponding value */
 };