From 7bce96c418d9538d6c9dd4a42d2c4f2c0a2e8088 Mon Sep 17 00:00:00 2001 From: Frank Lahm Date: Fri, 24 Feb 2012 15:34:35 +0100 Subject: [PATCH] Some option name changes --- etc/cnid_dbd/cnid_metad.c | 2 +- libatalk/util/netatalk_conf.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/etc/cnid_dbd/cnid_metad.c b/etc/cnid_dbd/cnid_metad.c index 817bce4a..3709b3a8 100644 --- 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, "listen", "localhost:4700"); + host = iniparser_getstrdup(obj.iniconfig, INISEC_CNID, "cnid listen", "localhost:4700"); if (port = strrchr(host, ':')) *port++ = 0; else diff --git a/libatalk/util/netatalk_conf.c b/libatalk/util/netatalk_conf.c index 2b5fae90..82e1695c 100644 --- a/libatalk/util/netatalk_conf.c +++ b/libatalk/util/netatalk_conf.c @@ -946,7 +946,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, "preset", NULL))) { + if ((p = iniparser_getstring(obj->iniconfig, INISEC_AFP, "vol preset", NULL))) { default_preset = p; LOG(log_debug, logtype_afpd, "readvolfile: default_preset: %s", default_preset); } @@ -972,7 +972,7 @@ static int readvolfile(AFPObj *obj, const struct passwd *pwent) continue; } - preset = iniparser_getstring(obj->iniconfig, secname, "preset", NULL); + preset = iniparser_getstring(obj->iniconfig, secname, "vol preset", NULL); creatvol(obj, pwent, path, volname, preset ? preset : default_preset ? default_preset : NULL); } @@ -1248,11 +1248,11 @@ int afp_config_parse(AFPObj *AFPObj) 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, "port", "548"); + 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, "listen", 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); -- 2.39.2