Fixes

diff --git a/etc/afpd/afp_config.c b/etc/afpd/afp_config.c
index d78c2742a5ea819a6295136990b0c5024231e5b2..0001eb13a05a2d2c53580eb73a19787fb758e97d 100644 (file)
--- a/etc/afpd/afp_config.c
+++ b/etc/afpd/afp_config.c
@@ -128,15 +128,15 @@ int configinit(AFPObj *obj)
         zeroconf_register(obj);
     }
 
-    if ((r = iniparser_getstring(obj->iniconfig, INISEC_AFP, "fcelistener", NULL))) {
+    if ((r = iniparser_getstring(obj->iniconfig, INISEC_GLOBAL, "fcelistener", NULL))) {
                LOG(log_note, logtype_afpd, "Adding FCE listener: %s", r);
                fce_add_udp_socket(r);
     }
-    if ((r = iniparser_getstring(obj->iniconfig, INISEC_AFP, "fcecoalesce", NULL))) {
+    if ((r = iniparser_getstring(obj->iniconfig, INISEC_GLOBAL, "fcecoalesce", NULL))) {
                LOG(log_note, logtype_afpd, "Fce coalesce: %s", r);
                fce_set_coalesce(r);
     }
-    if ((r = iniparser_getstring(obj->iniconfig, INISEC_AFP, "fceevents", NULL))) {
+    if ((r = iniparser_getstring(obj->iniconfig, INISEC_GLOBAL, "fceevents", NULL))) {
                LOG(log_note, logtype_afpd, "Fce events: %s", r);
                fce_set_events(r);
     }

diff --git a/etc/cnid_dbd/cnid_metad.c b/etc/cnid_dbd/cnid_metad.c
index 3709b3a87a700c0de31f5d3e266a4055fb69f65e..c7426713c6d34cdb1e0e43a55d54a6d227a4d9f2 100644 (file)
--- a/etc/cnid_dbd/cnid_metad.c
+++ b/etc/cnid_dbd/cnid_metad.c
@@ -492,7 +492,7 @@ int main(int argc, char *argv[])
 
     (void)setlimits();
 
-    host = iniparser_getstrdup(obj.iniconfig, INISEC_CNID, "cnid listen", "localhost:4700");
+    host = iniparser_getstrdup(obj.iniconfig, INISEC_GLOBAL, "cnid listen", "localhost:4700");
     if (port = strrchr(host, ':'))
         *port++ = 0;
     else

diff --git a/include/atalk/globals.h b/include/atalk/globals.h
index 69a60aaa0499067e0481bcb5e7377e61c7a123c1..60ba4ffb27c4756b505fd900284a8ea9ad306f52 100644 (file)
--- a/include/atalk/globals.h
+++ b/include/atalk/globals.h
@@ -54,8 +54,6 @@
  **********************************************************************************************/
 
 #define INISEC_GLOBAL "Global"
-#define INISEC_AFP    "AFP"
-#define INISEC_CNID   "CNID"
 
 struct DSI;
 #define AFPOBJ_TMPSIZ (MAXPATHLEN)

diff --git a/include/atalk/ldapconfig.h b/include/atalk/ldapconfig.h
index 76f5561b4df5a7952a7a4f6f23cbbf14af185b83..49f2ef0af7a049737c4077ce2c9556a7083824e1 100644 (file)
--- a/include/atalk/ldapconfig.h
+++ b/include/atalk/ldapconfig.h
@@ -21,7 +21,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[] */
@@ -29,7 +29,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 */
 };

diff --git a/libatalk/acl/ldap_config.c b/libatalk/acl/ldap_config.c
index 88cc44a6157b8aa6223ca6d748fdb0e97980a56d..6cf554a8fec1921c9239092e0c45f78150d041ba 100644 (file)
--- a/libatalk/acl/ldap_config.c
+++ b/libatalk/acl/ldap_config.c
@@ -33,12 +33,12 @@
 int acl_ldap_readconfig(dictionary *iniconfig)
 {
     int i, j;
-    char *val;
+    const char *val;
 
     i = 0;
     /* now see if its a correct pref */
     for (i = 0; ldap_prefs[i].name != NULL; i++) {
-        if ((val = iniparser_getstring(iniconfig, INISEC_AFP, ldap_prefs[i].name, NULL))) {
+        if ((val = iniparser_getstring(iniconfig, INISEC_GLOBAL, ldap_prefs[i].name, NULL))) {
             /* check if we have pre-defined values */
             if (ldap_prefs[i].intfromarray == 0) {
                 /* no, its just a string */
@@ -48,7 +48,7 @@ int acl_ldap_readconfig(dictionary *iniconfig)
                     *((int *)(ldap_prefs[i].pref)) = atoi(val);
                 else
                     /* store string as string */
-                    *((char **)(ldap_prefs[i].pref)) = val;
+                    *((const char **)(ldap_prefs[i].pref)) = val;
             } else {
                 /* ok, we have string to int mapping for this pref
                    eg. "none", "simple", "sasl" map to 0, 128, 129 */

diff --git a/libatalk/util/netatalk_conf.c b/libatalk/util/netatalk_conf.c
index 82e1695c39c1f5dd03a02550adaa289a0bcd4245..805a9ad0d081723501d4831af35733f6adcfb258 100644 (file)
--- a/libatalk/util/netatalk_conf.c
+++ b/libatalk/util/netatalk_conf.c
@@ -918,10 +918,6 @@ static int vol_section(const char *sec)
 {
     if (STRCMP(sec, ==, INISEC_GLOBAL))
         return 0;
-    if (STRCMP(sec, ==, INISEC_AFP))
-        return 0;
-    if (STRCMP(sec, ==, INISEC_CNID))
-        return 0;
     return 1;
 }
 
@@ -946,7 +942,7 @@ static int readvolfile(AFPObj *obj, const struct passwd *pwent)
     LOG(log_debug, logtype_afpd, "readvolfile: sections: %d", secnum);
     const char *secname;
 
-    if ((p = iniparser_getstring(obj->iniconfig, INISEC_AFP, "vol preset", NULL))) {
+    if ((p = iniparser_getstring(obj->iniconfig, INISEC_GLOBAL, "vol preset", NULL))) {
         default_preset = p;
         LOG(log_debug, logtype_afpd, "readvolfile: default_preset: %s", default_preset);
     }
@@ -1210,7 +1206,7 @@ int afp_config_parse(AFPObj *AFPObj)
     options->logfile   = iniparser_getstrdup(config, INISEC_GLOBAL, "logfile",  NULL);
 
     /* [AFP] "options" options wo values */
-    if (p = iniparser_getstrdup(config, INISEC_AFP, "options", NULL)) {
+    if (p = iniparser_getstrdup(config, INISEC_GLOBAL, "options", NULL)) {
         if (p = strtok(q, ", ")) {
             while (p) {
                 if (strcasecmp(p, "nozeroconf"))
@@ -1243,35 +1239,35 @@ int afp_config_parse(AFPObj *AFPObj)
     }
     /* figure out options w values */
 
-    options->loginmesg      = iniparser_getstrdup(config, INISEC_AFP, "loginmesg",      "");
-    options->guest          = iniparser_getstrdup(config, INISEC_AFP, "guestname",      "nobody");
-    options->passwdfile     = iniparser_getstrdup(config, INISEC_AFP, "passwdfile",     _PATH_AFPDPWFILE);
-    options->uampath        = iniparser_getstrdup(config, INISEC_AFP, "uampath",        _PATH_AFPDUAMPATH);
-    options->uamlist        = iniparser_getstrdup(config, INISEC_AFP, "uamlist",        "uams_dhx.so,uams_dhx2.so");
-    options->port           = iniparser_getstrdup(config, INISEC_AFP, "afp port",       "548");
-    options->signatureopt   = iniparser_getstrdup(config, INISEC_AFP, "signature",      "auto");
-    options->k5service      = iniparser_getstrdup(config, INISEC_AFP, "k5service",      NULL);
-    options->k5realm        = iniparser_getstrdup(config, INISEC_AFP, "k5realm",        NULL);
-    options->listen         = iniparser_getstrdup(config, INISEC_AFP, "afp listen",     NULL);
-    options->ntdomain       = iniparser_getstrdup(config, INISEC_AFP, "ntdomain",       NULL);
-    options->ntseparator    = iniparser_getstrdup(config, INISEC_AFP, "ntseparator",    NULL);
-    options->mimicmodel     = iniparser_getstrdup(config, INISEC_AFP, "mimicmodel",     NULL);
-    options->adminauthuser  = iniparser_getstrdup(config, INISEC_AFP, "adminauthuser",  NULL);
-    options->connections    = iniparser_getint   (config, INISEC_AFP, "maxcon",         200);
-    options->passwdminlen   = iniparser_getint   (config, INISEC_AFP, "passwdminlen",   0);
-    options->tickleval      = iniparser_getint   (config, INISEC_AFP, "tickleval",      30);
-    options->timeout        = iniparser_getint   (config, INISEC_AFP, "timeout",        4);
-    options->dsireadbuf     = iniparser_getint   (config, INISEC_AFP, "dsireadbuf",     12);
-    options->server_quantum = iniparser_getint   (config, INISEC_AFP, "server_quantum", DSI_SERVQUANT_DEF);
-    options->volnamelen     = iniparser_getint   (config, INISEC_AFP, "volnamelen",     80);
-    options->dircachesize   = iniparser_getint   (config, INISEC_AFP, "dircachesize",   DEFAULT_MAX_DIRCACHE_SIZE);
-    options->tcp_sndbuf     = iniparser_getint   (config, INISEC_AFP, "tcpsndbuf",      0);
-    options->tcp_rcvbuf     = iniparser_getint   (config, INISEC_AFP, "tcprcvbuf",      0);
-    options->fce_fmodwait   = iniparser_getint   (config, INISEC_AFP, "fceholdfmod",    60);
-    options->sleep          = iniparser_getint   (config, INISEC_AFP, "sleep",          10);
-    options->disconnected   = iniparser_getint   (config, INISEC_AFP, "disconnect",     24);
-
-    if ((p = iniparser_getstring(config, INISEC_AFP, "hostname", NULL))) {
+    options->loginmesg      = iniparser_getstrdup(config, INISEC_GLOBAL, "loginmesg",      "");
+    options->guest          = iniparser_getstrdup(config, INISEC_GLOBAL, "guestname",      "nobody");
+    options->passwdfile     = iniparser_getstrdup(config, INISEC_GLOBAL, "passwdfile",     _PATH_AFPDPWFILE);
+    options->uampath        = iniparser_getstrdup(config, INISEC_GLOBAL, "uampath",        _PATH_AFPDUAMPATH);
+    options->uamlist        = iniparser_getstrdup(config, INISEC_GLOBAL, "uamlist",        "uams_dhx.so,uams_dhx2.so");
+    options->port           = iniparser_getstrdup(config, INISEC_GLOBAL, "afp port",       "548");
+    options->signatureopt   = iniparser_getstrdup(config, INISEC_GLOBAL, "signature",      "auto");
+    options->k5service      = iniparser_getstrdup(config, INISEC_GLOBAL, "k5service",      NULL);
+    options->k5realm        = iniparser_getstrdup(config, INISEC_GLOBAL, "k5realm",        NULL);
+    options->listen         = iniparser_getstrdup(config, INISEC_GLOBAL, "afp listen",     NULL);
+    options->ntdomain       = iniparser_getstrdup(config, INISEC_GLOBAL, "ntdomain",       NULL);
+    options->ntseparator    = iniparser_getstrdup(config, INISEC_GLOBAL, "ntseparator",    NULL);
+    options->mimicmodel     = iniparser_getstrdup(config, INISEC_GLOBAL, "mimicmodel",     NULL);
+    options->adminauthuser  = iniparser_getstrdup(config, INISEC_GLOBAL, "adminauthuser",  NULL);
+    options->connections    = iniparser_getint   (config, INISEC_GLOBAL, "maxcon",         200);
+    options->passwdminlen   = iniparser_getint   (config, INISEC_GLOBAL, "passwdminlen",   0);
+    options->tickleval      = iniparser_getint   (config, INISEC_GLOBAL, "tickleval",      30);
+    options->timeout        = iniparser_getint   (config, INISEC_GLOBAL, "timeout",        4);
+    options->dsireadbuf     = iniparser_getint   (config, INISEC_GLOBAL, "dsireadbuf",     12);
+    options->server_quantum = iniparser_getint   (config, INISEC_GLOBAL, "server_quantum", DSI_SERVQUANT_DEF);
+    options->volnamelen     = iniparser_getint   (config, INISEC_GLOBAL, "volnamelen",     80);
+    options->dircachesize   = iniparser_getint   (config, INISEC_GLOBAL, "dircachesize",   DEFAULT_MAX_DIRCACHE_SIZE);
+    options->tcp_sndbuf     = iniparser_getint   (config, INISEC_GLOBAL, "tcpsndbuf",      0);
+    options->tcp_rcvbuf     = iniparser_getint   (config, INISEC_GLOBAL, "tcprcvbuf",      0);
+    options->fce_fmodwait   = iniparser_getint   (config, INISEC_GLOBAL, "fceholdfmod",    60);
+    options->sleep          = iniparser_getint   (config, INISEC_GLOBAL, "sleep",          10);
+    options->disconnected   = iniparser_getint   (config, INISEC_GLOBAL, "disconnect",     24);
+
+    if ((p = iniparser_getstring(config, INISEC_GLOBAL, "hostname", NULL))) {
         EC_NULL_LOG( options->hostname = strdup(p) );
     } else {
         if (gethostname(val, sizeof(val)) < 0 ) {
@@ -1283,21 +1279,21 @@ int afp_config_parse(AFPObj *AFPObj)
         options->hostname = strdup(val);
     }
 
-    if ((p = iniparser_getstring(config, INISEC_AFP, "k5keytab", NULL))) {
+    if ((p = iniparser_getstring(config, INISEC_GLOBAL, "k5keytab", NULL))) {
         EC_NULL_LOG( options->k5keytab = malloc(strlen(p) + 14) );
         snprintf(options->k5keytab, strlen(p) + 14, "KRB5_KTNAME=%s", p);
         putenv(options->k5keytab);
     }
 
 #ifdef ADMIN_GRP
-    if ((p = iniparser_getstring(config, INISEC_AFP, "admingroup",  NULL))) {
+    if ((p = iniparser_getstring(config, INISEC_GLOBAL, "admingroup",  NULL))) {
          struct group *gr = getgrnam(p);
          if (gr != NULL)
              options->admingid = gr->gr_gid;
     }
 #endif /* ADMIN_GRP */
 
-    q = iniparser_getstrdup(config, INISEC_AFP, "cnidserver", "localhost:4700");
+    q = iniparser_getstrdup(config, INISEC_GLOBAL, "cnidserver", "localhost:4700");
     r = strrchr(q, ':');
     if (r)
         *r = 0;
@@ -1310,7 +1306,7 @@ int afp_config_parse(AFPObj *AFPObj)
     if (q)
         free(q);
 
-    if ((q = iniparser_getstrdup(config, INISEC_AFP, "fqdn", NULL))) {
+    if ((q = iniparser_getstrdup(config, INISEC_GLOBAL, "fqdn", NULL))) {
         /* do a little checking for the domain name. */
         r = strchr(q, ':');
         if (r)
@@ -1325,7 +1321,7 @@ int afp_config_parse(AFPObj *AFPObj)
         free(q);
     }
 
-    if (!(p = iniparser_getstring(config, INISEC_AFP, "unixcodepage", NULL))) {
+    if (!(p = iniparser_getstring(config, INISEC_GLOBAL, "unixcodepage", NULL))) {
         options->unixcharset = CH_UNIX;
         options->unixcodepage = strdup("LOCALE");
     } else {
@@ -1338,7 +1334,7 @@ int afp_config_parse(AFPObj *AFPObj)
         }
     }
        
-    if (!(p = iniparser_getstring(config, INISEC_AFP, "maccodepage", NULL))) {
+    if (!(p = iniparser_getstring(config, INISEC_GLOBAL, "maccodepage", NULL))) {
         options->maccharset = CH_MAC;
         options->maccodepage = strdup("MAC_ROMAN");
     } else {