#include <inttypes.h>
#include <time.h>
#include <regex.h>
+#if HAVE_LOCALE_H
+#include <locale.h>
+#endif
+#if HAVE_LANGINFO_H
+#include <langinfo.h>
+#endif
#include <atalk/afp.h>
#include <atalk/util.h>
if(ftell(fp) == 0) { /* size = 0 */
fprintf(fp, "# DON'T TOUCH NOR COPY THOUGHTLESSLY!\n");
fprintf(fp, "# This file is auto-generated by afpd\n");
- fprintf(fp, "# and stores UUIDs for TM volumes.\n\n");
+ fprintf(fp, "# and stores UUIDs for Time Machine volumes.\n\n");
} else {
fseek(fp, -1L, SEEK_END);
if(fgetc(fp) != '\n') fputc('\n', fp); /* last char is \n? */
q++;
}
} else if (IS_VAR(p, "$c")) {
- DSI *dsi = obj->dsi;
- len = sprintf(dest, "%s:%u",
- getip_string((struct sockaddr *)&dsi->client),
- getip_port((struct sockaddr *)&dsi->client));
- dest += len;
- destlen -= len;
+ if (IS_AFP_SESSION(obj)) {
+ DSI *dsi = obj->dsi;
+ len = sprintf(dest, "%s:%u",
+ getip_string((struct sockaddr *)&dsi->client),
+ getip_port((struct sockaddr *)&dsi->client));
+ dest += len;
+ destlen -= len;
+ }
} else if (IS_VAR(p, "$d")) {
q = path;
} else if (pwd && IS_VAR(p, "$f")) {
q = getip_string((struct sockaddr *)&dsi->client);
} else if (IS_VAR(p, "$s")) {
q = obj->options.hostname;
- } else if (obj->username && IS_VAR(p, "$u")) {
+ } else if (obj->username[0] && IS_VAR(p, "$u")) {
char* sep = NULL;
if ( obj->options.ntseparator && (sep = strchr(obj->username, obj->options.ntseparator[0])) != NULL)
q = sep+1;
* @param conf (r) config handle
* @param vol (r) volume name (must be section name ie wo vars expanded)
* @param opt (r) option
- * @param def (r) if "option" is not found in "name", try to find it in section "def"
+ * @param defsec (r) if "option" is not found in "vol", try to find it in section "defsec"
+ * @param defval (r) if neither "vol" nor "defsec" contain "opt" return "defval"
*
- * @returns const option string or NULL
+ * @returns const option string from "vol" or "defsec", or "defval" if not found
*/
-static const char *getoption(const dictionary *conf, const char *vol, const char *opt, const char *def)
+static const char *getoption(const dictionary *conf, const char *vol, const char *opt, const char *defsec, const char *defval)
{
EC_INIT;
- const char *result = NULL;
+ const char *result;
- if ((!(result = iniparser_getstring(conf, vol, opt, NULL))) && (def != NULL))
- result = iniparser_getstring(conf, def, opt, NULL);
+ if ((!(result = iniparser_getstring(conf, vol, opt, NULL))) && (defsec != NULL))
+ result = iniparser_getstring(conf, defsec, opt, NULL);
EC_CLEANUP:
+ if (result == NULL)
+ result = defval;
+ return result;
+}
+
+/*!
+ * Get boolean option from config, use default value if not set
+ *
+ * @param conf (r) config handle
+ * @param vol (r) volume name (must be section name ie wo vars expanded)
+ * @param opt (r) option
+ * @param defsec (r) if "option" is not found in "vol", try to find it in section "defsec"
+ * @param defval (r) if neither "vol" nor "defsec" contain "opt" return "defval"
+ *
+ * @returns const option string from "vol" or "defsec", or "defval" if not found
+ */
+static int getoption_bool(const dictionary *conf, const char *vol, const char *opt, const char *defsec, int defval)
+{
+ EC_INIT;
+ int result;
+
+ if (((result = iniparser_getboolean(conf, vol, opt, -1)) == -1) && (defsec != NULL))
+ result = iniparser_getboolean(conf, defsec, opt, -1);
+
+EC_CLEANUP:
+ if (result == -1)
+ result = defval;
return result;
}
* deny -> either no list (-1), or not in list (0)
*/
if (pwd) {
- if (accessvol(obj, getoption(obj->iniconfig, section, "invalid users", preset), pwd->pw_name) == 1)
+ if (accessvol(obj, getoption(obj->iniconfig, section, "invalid users", preset, NULL), pwd->pw_name) == 1)
goto EC_CLEANUP;
- if (accessvol(obj, getoption(obj->iniconfig, section, "valid users", preset), pwd->pw_name) == 0)
+ if (accessvol(obj, getoption(obj->iniconfig, section, "valid users", preset, NULL), pwd->pw_name) == 0)
goto EC_CLEANUP;
- if (hostaccessvol(obj, section, getoption(obj->iniconfig, section, "hosts deny", preset)) == 1)
+ if (hostaccessvol(obj, section, getoption(obj->iniconfig, section, "hosts deny", preset, NULL)) == 1)
goto EC_CLEANUP;
- if (hostaccessvol(obj, section, getoption(obj->iniconfig, section, "hosts allow", preset)) == 0)
+ if (hostaccessvol(obj, section, getoption(obj->iniconfig, section, "hosts allow", preset, NULL)) == 0)
goto EC_CLEANUP;
}
EC_NULL( volume = calloc(1, sizeof(struct vol)) );
- volume->v_flags = AFPVOL_USEDOTS | AFPVOL_UNIX_PRIV;
EC_NULL( volume->v_configname = strdup(section));
-#ifdef HAVE_ACLS
- volume->v_flags |= AFPVOL_ACLS;
-#endif
volume->v_vfs_ea = AFPVOL_EA_AUTO;
volume->v_umask = obj->options.umask;
- if (val = getoption(obj->iniconfig, section, "password", preset))
+ if (val = getoption(obj->iniconfig, section, "password", preset, NULL))
EC_NULL( volume->v_password = strdup(val) );
- if (val = getoption(obj->iniconfig, section, "veto files", preset))
+ if (val = getoption(obj->iniconfig, section, "veto files", preset, NULL))
EC_NULL( volume->v_veto = strdup(val) );
/* vol charset is in [G] and [V] */
- if (val = getoption(obj->iniconfig, section, "vol charset", preset))
+ if (val = getoption(obj->iniconfig, section, "vol charset", preset, NULL)) {
+ if (strcasecmp(val, "UTF-8") == 0) {
+ val = strdup("UTF8");
+ }
EC_NULL( volume->v_volcodepage = strdup(val) );
+ }
else
EC_NULL( volume->v_volcodepage = strdup(obj->options.volcodepage) );
/* mac charset is in [G] and [V] */
- if (val = getoption(obj->iniconfig, section, "mac charset", preset))
+ if (val = getoption(obj->iniconfig, section, "mac charset", preset, NULL)) {
+ if (strncasecmp(val, "MAC", 3) != 0) {
+ LOG(log_warning, logtype_afpd, "Is '%s' really mac charset? ", val);
+ }
EC_NULL( volume->v_maccodepage = strdup(val) );
+ }
else
- EC_NULL( volume->v_maccodepage = strdup(obj->options.maccodepage) );
+ EC_NULL( volume->v_maccodepage = strdup(obj->options.maccodepage) );
bstring dbpath;
EC_NULL_LOG( val = iniparser_getstring(obj->iniconfig, INISEC_GLOBAL, "vol dbpath", _PATH_STATEDIR "CNID/") );
EC_NULL_LOG( dbpath = bformat("%s/%s/", val, name) );
- volume->v_dbpath = strdup(bdata(dbpath));
+ EC_NULL_LOG( volume->v_dbpath = strdup(bdata(dbpath)) );
bdestroy(dbpath);
- if (val = getoption(obj->iniconfig, section, "cnid scheme", preset))
+ if (val = getoption(obj->iniconfig, section, "cnid scheme", preset, NULL))
EC_NULL( volume->v_cnidscheme = strdup(val) );
else
volume->v_cnidscheme = strdup(DEFAULT_CNID_SCHEME);
- if (val = getoption(obj->iniconfig, section, "umask", preset))
+ if (val = getoption(obj->iniconfig, section, "umask", preset, NULL))
volume->v_umask = (int)strtol(val, NULL, 8);
- if (val = getoption(obj->iniconfig, section, "directory perm", preset))
+ if (val = getoption(obj->iniconfig, section, "directory perm", preset, NULL))
volume->v_dperm = (int)strtol(val, NULL, 8);
- if (val = getoption(obj->iniconfig, section, "file perm", preset))
+ if (val = getoption(obj->iniconfig, section, "file perm", preset, NULL))
volume->v_fperm = (int)strtol(val, NULL, 8);
- if (val = getoption(obj->iniconfig, section, "vol size limit", preset))
+ if (val = getoption(obj->iniconfig, section, "vol size limit", preset, NULL))
volume->v_limitsize = (uint32_t)strtoul(val, NULL, 10);
- if (val = getoption(obj->iniconfig, section, "preexec", preset))
+ if (val = getoption(obj->iniconfig, section, "preexec", preset, NULL))
EC_NULL( volume->v_preexec = volxlate(obj, NULL, MAXPATHLEN, val, pwd, path, name) );
- if (val = getoption(obj->iniconfig, section, "postexec", preset))
+ if (val = getoption(obj->iniconfig, section, "postexec", preset, NULL))
EC_NULL( volume->v_postexec = volxlate(obj, NULL, MAXPATHLEN, val, pwd, path, name) );
- if (val = getoption(obj->iniconfig, section, "root preexec", preset))
+ if (val = getoption(obj->iniconfig, section, "root preexec", preset, NULL))
EC_NULL( volume->v_root_preexec = volxlate(obj, NULL, MAXPATHLEN, val, pwd, path, name) );
- if (val = getoption(obj->iniconfig, section, "root postexec", preset))
+ if (val = getoption(obj->iniconfig, section, "root postexec", preset, NULL))
EC_NULL( volume->v_root_postexec = volxlate(obj, NULL, MAXPATHLEN, val, pwd, path, name) );
- if (val = getoption(obj->iniconfig, section, "appledouble", preset)) {
+ if (val = getoption(obj->iniconfig, section, "appledouble", preset, NULL)) {
if (strcmp(val, "v2") == 0)
volume->v_adouble = AD_VERSION2;
else if (strcmp(val, "ea") == 0)
volume->v_adouble = AD_VERSION;
}
- if (val = getoption(obj->iniconfig, section, "cnid server", preset)) {
+ if (val = getoption(obj->iniconfig, section, "cnid server", preset, NULL)) {
EC_NULL( p = strdup(val) );
volume->v_cnidserver = p;
if (q = strrchr(val, ':')) {
volume->v_cnidport = strdup(obj->options.Cnid_port);
}
- if (val = getoption(obj->iniconfig, section, "ea", preset)) {
+ if (val = getoption(obj->iniconfig, section, "ea", preset, NULL)) {
if (strcasecmp(val, "ad") == 0)
volume->v_vfs_ea = AFPVOL_EA_AD;
else if (strcasecmp(val, "sys") == 0)
volume->v_vfs_ea = AFPVOL_EA_NONE;
}
- if (val = getoption(obj->iniconfig, section, "casefold", preset)) {
+ if (val = getoption(obj->iniconfig, section, "casefold", preset, NULL)) {
if (strcasecmp(val, "tolower") == 0)
volume->v_casefold = AFPVOL_UMLOWER;
else if (strcasecmp(val, "toupper") == 0)
volume->v_casefold = AFPVOL_ULOWERMUPPER;
}
- if (val = getoption(obj->iniconfig, section, "vol options", preset)) {
- q = strdup(val);
- if (p = strtok(q, ", ")) {
- while (p) {
- if (strcasecmp(p, "ro") == 0)
- volume->v_flags |= AFPVOL_RO;
- else if (strcasecmp(p, "nohex") == 0)
- volume->v_flags |= AFPVOL_NOHEX;
- else if (strcasecmp(p, "nousedots") == 0)
- volume->v_flags &= ~AFPVOL_USEDOTS;
- else if (strcasecmp(p, "invisibledots") == 0)
- volume->v_flags |= volume->v_flags;
- else if (strcasecmp(p, "nostat") == 0)
- volume->v_flags |= AFPVOL_NOSTAT;
- else if (strcasecmp(p, "noupriv") == 0)
- volume->v_flags &= ~AFPVOL_UNIX_PRIV;
- else if (strcasecmp(p, "nodev") == 0)
- volume->v_flags |= AFPVOL_NODEV;
- else if (strcasecmp(p, "caseinsensitive") == 0)
- volume->v_flags |= AFPVOL_CASEINSEN;
- else if (strcasecmp(p, "illegalseq") == 0)
- volume->v_flags |= AFPVOL_EILSEQ;
- else if (strcasecmp(p, "tm") == 0)
- volume->v_flags |= AFPVOL_TM;
- else if (strcasecmp(p, "searchdb") == 0)
- volume->v_flags |= AFPVOL_SEARCHDB;
- else if (strcasecmp(p, "nonetids") == 0)
- volume->v_flags |= AFPVOL_NONETIDS;
- else if (strcasecmp(p, "noacls") == 0)
- volume->v_flags &= ~AFPVOL_ACLS;
- else if (strcasecmp(p, "nov2toeaconv") == 0)
- volume->v_flags |= AFPVOL_NOV2TOEACONV;
- else if (strcasecmp(p, "preexec_close") == 0)
- volume->v_preexec_close = 1;
- else if (strcasecmp(p, "root_preexec_close") == 0)
- volume->v_root_preexec_close = 1;
- p = strtok(NULL, ", ");
- }
- }
- free(q);
- }
+ if (getoption_bool(obj->iniconfig, section, "read only", preset, 0))
+ volume->v_flags |= AFPVOL_RO;
+ if (getoption_bool(obj->iniconfig, section, "invisible dots", preset, 0))
+ volume->v_flags |= AFPVOL_INV_DOTS;
+ if (!getoption_bool(obj->iniconfig, section, "stat vol", preset, 1))
+ volume->v_flags |= AFPVOL_NOSTAT;
+ if (getoption_bool(obj->iniconfig, section, "unix priv", preset, 1))
+ volume->v_flags |= AFPVOL_UNIX_PRIV;
+ if (!getoption_bool(obj->iniconfig, section, "cnid dev", preset, 1))
+ volume->v_flags |= AFPVOL_NODEV;
+ if (getoption_bool(obj->iniconfig, section, "illegal seq", preset, 0))
+ volume->v_flags |= AFPVOL_EILSEQ;
+ if (getoption_bool(obj->iniconfig, section, "time machine", preset, 0))
+ volume->v_flags |= AFPVOL_TM;
+ if (getoption_bool(obj->iniconfig, section, "search db", preset, 0))
+ volume->v_flags |= AFPVOL_SEARCHDB;
+ if (!getoption_bool(obj->iniconfig, section, "network ids", preset, 1))
+ volume->v_flags |= AFPVOL_NONETIDS;
+#ifdef HAVE_ACLS
+ if (getoption_bool(obj->iniconfig, section, "acls", preset, 1))
+ volume->v_flags |= AFPVOL_ACLS;
+#endif
+ if (!getoption_bool(obj->iniconfig, section, "convert adouble", preset, 1))
+ volume->v_flags |= AFPVOL_NOV2TOEACONV;
+
+ if (getoption_bool(obj->iniconfig, section, "preexec close", preset, 0))
+ volume->v_preexec_close = 1;
+ if (getoption_bool(obj->iniconfig, section, "root preexec close", preset, 0))
+ volume->v_root_preexec_close = 1;
/*
* Handle read-only behaviour. semantics:
* 3) rwlist exists -> ro unless user is in it.
*/
if (pwd) {
- if (accessvol(obj, getoption(obj->iniconfig, section, "rolist", preset), pwd->pw_name) == 1
- || accessvol(obj, getoption(obj->iniconfig, section, "rwlist", preset), pwd->pw_name) == 0)
+ if (accessvol(obj, getoption(obj->iniconfig, section, "rolist", preset, NULL), pwd->pw_name) == 1
+ || accessvol(obj, getoption(obj->iniconfig, section, "rwlist", preset, NULL), pwd->pw_name) == 0)
volume->v_flags |= AFPVOL_RO;
}
volume->v_ad_options |= ADVOL_INVDOTS;
/* Mac to Unix conversion flags*/
- if (!(volume->v_flags & AFPVOL_NOHEX))
- volume->v_mtou_flags |= CONV_ESCAPEHEX;
- if (!(volume->v_flags & AFPVOL_USEDOTS))
- volume->v_mtou_flags |= CONV_ESCAPEDOTS;
if ((volume->v_flags & AFPVOL_EILSEQ))
volume->v_mtou_flags |= CONV__EILSEQ;
volume->v_mtou_flags |= CONV_TOLOWER;
/* Unix to Mac conversion flags*/
- volume->v_utom_flags = CONV_IGNORE | CONV_UNESCAPEHEX;
+ volume->v_utom_flags = CONV_IGNORE;
if ((volume->v_casefold & AFPVOL_UTOMUPPER))
volume->v_utom_flags |= CONV_TOUPPER;
else if ((volume->v_casefold & AFPVOL_UTOMLOWER))
static int readvolfile(AFPObj *obj, const struct passwd *pwent)
{
EC_INIT;
+ static int regexerr = -1;
+ static regex_t reg;
char path[MAXPATHLEN + 1];
char volname[AFPVOL_U8MNAMELEN + 1];
char tmp[MAXPATHLEN + 1];
- const char *preset, *default_preset, *p;
+ const char *preset, *default_preset, *p, *basedir;
char *q, *u;
int i;
struct passwd *pw;
+ regmatch_t match[1];
LOG(log_debug, logtype_afpd, "readvolfile: BEGIN");
continue;
if (STRCMP(secname, ==, INISEC_HOMES)) {
have_uservol = 1;
- if (obj->username[0] == 0
+ if (!IS_AFP_SESSION(obj)
|| strcmp(obj->username, obj->options.guest) == 0)
/* not an AFP session, but cnid daemon, dbd or ad util, or guest login */
continue;
+ if (pwent->pw_dir == NULL || STRCMP("", ==, pwent->pw_dir))
+ /* no user home */
+ continue;
+
+ /* check if user home matches our "basedir regex" */
+ if ((basedir = iniparser_getstring(obj->iniconfig, INISEC_HOMES, "basedir regex", NULL)) == NULL)
+ continue;
+ LOG(log_debug, logtype_afpd, "readvolfile: basedir regex: '%s'", basedir);
+
+ if (regexerr != 0 && (regexerr = regcomp(®, basedir, REG_EXTENDED)) != 0) {
+ char errbuf[1024];
+ regerror(regexerr, ®, errbuf, sizeof(errbuf));
+ LOG(log_debug, logtype_default, "readvolfile: bad basedir regex: %s", errbuf);
+ }
+
+ if (regexec(®, pwent->pw_dir, 1, match, 0) == REG_NOMATCH) {
+ LOG(log_debug, logtype_default, "readvolfile: user home \"%s\" doesn't match basedir regex \"%s\"",
+ pwent->pw_dir, basedir);
+ continue;
+ }
+
strlcpy(tmp, pwent->pw_dir, MAXPATHLEN);
strlcat(tmp, "/", MAXPATHLEN);
if (p = iniparser_getstring(obj->iniconfig, INISEC_HOMES, "path", NULL))
goto EC_CLEANUP;
have_uservol = 0;
for (vol = Volumes; vol; vol = vol->v_next) {
- if (vol->v_flags & AFPVOL_UNIX_CTXT)
- continue;
vol->v_deleted = 1;
}
} else {
struct vol *getvolbypath(AFPObj *obj, const char *path)
{
EC_INIT;
+ static int regexerr = -1;
+ static regex_t reg;
struct vol *vol;
struct vol *tmp;
const struct passwd *pw;
char tmpbuf[MAXPATHLEN + 1];
const char *secname, *basedir, *p = NULL, *subpath = NULL, *subpathconfig;
char *user = NULL, *prw;
- int regexerr = -1;
- static regex_t reg;
regmatch_t match[1];
LOG(log_debug, logtype_afpd, "getvolbypath(\"%s\")", path);
if (prw != 0)
subpath = prw;
- strlcpy(obj->username, user, MAXUSERLEN);
strlcat(tmpbuf, user, MAXPATHLEN);
+ strlcat(obj->username, user, MAXUSERLEN);
strlcat(tmpbuf, "/", MAXPATHLEN);
/* (6) */
/*!
* Initialize an AFPObj and options from ini config file
*/
-int afp_config_parse(AFPObj *AFPObj)
+int afp_config_parse(AFPObj *AFPObj, char *processname)
{
EC_INIT;
dictionary *config;
char *q, *r;
char val[MAXVAL];
+ if (processname != NULL)
+ set_processname(processname);
+
AFPObj->afp_version = 11;
options->configfile = AFPObj->cmdlineconfigfile ? strdup(AFPObj->cmdlineconfigfile) : strdup(_PATH_CONFDIR "afp.conf");
options->sigconffile = strdup(_PATH_STATEDIR "afp_signature.conf");
options->logconfig = iniparser_getstrdup(config, INISEC_GLOBAL, "log level", "default:note");
options->logfile = iniparser_getstrdup(config, INISEC_GLOBAL, "log file", NULL);
- /* "server options" options wo values */
- if (q = iniparser_getstrdup(config, INISEC_GLOBAL, "server options", NULL)) {
- if (p = strtok(q, ", ")) {
- while (p) {
- if (strcasecmp(p, "nozeroconf") == 0)
- options->flags |= OPTION_NOZEROCONF;
- if (strcasecmp(p, "icon") == 0)
- options->flags |= OPTION_CUSTOMICON;
- if (strcasecmp(p, "noicon") == 0)
- options->flags &= ~OPTION_CUSTOMICON;
- if (strcasecmp(p, "advertise_ssh") == 0)
- options->flags |= OPTION_ANNOUNCESSH;
- if (strcasecmp(p, "noacl2maccess") == 0)
- options->flags &= ~OPTION_ACL2MACCESS;
- if (strcasecmp(p, "keepsessions") == 0)
- options->flags |= OPTION_KEEPSESSIONS;
- if (strcasecmp(p, "closevol") == 0)
- options->flags |= OPTION_CLOSEVOL;
- if (strcasecmp(p, "client_polling") == 0)
- options->flags &= ~OPTION_SERVERNOTIF;
- if (strcasecmp(p, "nosendfile") == 0)
- options->flags |= OPTION_NOSENDFILE;
- if (strcasecmp(p, "nosavepassword") == 0)
- options->passwdbits |= PASSWD_NOSAVE;
- if (strcasecmp(p, "savepassword") == 0)
- options->passwdbits &= ~PASSWD_NOSAVE;
- if (strcasecmp(p, "nosetpassword") == 0)
- options->passwdbits &= ~PASSWD_SET;
- if (strcasecmp(p, "setpassword") == 0)
- options->passwdbits |= PASSWD_SET;
- p = strtok(NULL, ", ");
- }
- }
- free(q);
- }
- /* figure out options w values */
+ setuplog(options->logconfig, options->logfile);
+
+ /* "server options" boolean options */
+ if (!iniparser_getboolean(config, INISEC_GLOBAL, "zeroconf", 1))
+ options->flags |= OPTION_NOZEROCONF;
+ if (iniparser_getboolean(config, INISEC_GLOBAL, "icon", 0))
+ options->flags |= OPTION_CUSTOMICON;
+ if (iniparser_getboolean(config, INISEC_GLOBAL, "advertise ssh", 0))
+ options->flags |= OPTION_ANNOUNCESSH;
+ if (iniparser_getboolean(config, INISEC_GLOBAL, "map acls", 1))
+ options->flags |= OPTION_ACL2MACCESS;
+ if (iniparser_getboolean(config, INISEC_GLOBAL, "keep sessions", 0))
+ options->flags |= OPTION_KEEPSESSIONS;
+ if (iniparser_getboolean(config, INISEC_GLOBAL, "close vol", 0))
+ options->flags |= OPTION_CLOSEVOL;
+ if (!iniparser_getboolean(config, INISEC_GLOBAL, "client polling", 1))
+ options->flags |= OPTION_SERVERNOTIF;
+ if (!iniparser_getboolean(config, INISEC_GLOBAL, "use sendfile", 1))
+ options->flags |= OPTION_NOSENDFILE;
+ if (!iniparser_getboolean(config, INISEC_GLOBAL, "save password", 1))
+ options->passwdbits |= PASSWD_NOSAVE;
+ if (iniparser_getboolean(config, INISEC_GLOBAL, "set password", 0))
+ options->passwdbits |= PASSWD_SET;
- options->loginmesg = iniparser_getstrdup(config, INISEC_GLOBAL, "loginmesg", "");
+ /* figure out options w values */
+ options->loginmesg = iniparser_getstrdup(config, INISEC_GLOBAL, "login message", NULL);
options->guest = iniparser_getstrdup(config, INISEC_GLOBAL, "guest account", "nobody");
options->passwdfile = iniparser_getstrdup(config, INISEC_GLOBAL, "passwd file",_PATH_AFPDPWFILE);
options->uampath = iniparser_getstrdup(config, INISEC_GLOBAL, "uam path", _PATH_AFPDUAMPATH);
options->uamlist = iniparser_getstrdup(config, INISEC_GLOBAL, "uam list", "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->signatureopt = iniparser_getstrdup(config, INISEC_GLOBAL, "signature", "");
options->k5service = iniparser_getstrdup(config, INISEC_GLOBAL, "k5 service", NULL);
options->k5realm = iniparser_getstrdup(config, INISEC_GLOBAL, "k5 realm", NULL);
options->listen = iniparser_getstrdup(config, INISEC_GLOBAL, "afp listen", NULL);
/* unix charset is in [G] only */
if (!(p = iniparser_getstring(config, INISEC_GLOBAL, "unix charset", NULL))) {
- options->unixcharset = CH_UNIX;
- options->unixcodepage = strdup("LOCALE");
+ options->unixcodepage = strdup("UTF8");
+ charset_names[CH_UNIX] = strdup("UTF8");
} else {
- if ((options->unixcharset = add_charset(p)) == (charset_t)-1) {
- options->unixcharset = CH_UNIX;
- options->unixcodepage = strdup("LOCALE");
- LOG(log_warning, logtype_afpd, "Setting unix charset to '%s' failed", p);
- } else {
- options->unixcodepage = strdup(p);
+ if (strcasecmp(p, "LOCALE") == 0) {
+#if defined(CODESET)
+ setlocale(LC_ALL, "");
+ p = nl_langinfo(CODESET);
+ LOG(log_debug, logtype_afpd, "Locale charset is '%s'", p);
+#else /* system doesn't have LOCALE support */
+ LOG(log_warning, logtype_afpd, "system doesn't have LOCALE support");
+ p = strdup("UTF8");
+#endif
}
+ if (strcasecmp(p, "UTF-8") == 0) {
+ p = strdup("UTF8");
+ }
+ options->unixcodepage = strdup(p);
+ charset_names[CH_UNIX] = strdup(p);
}
+ options->unixcharset = CH_UNIX;
+ LOG(log_debug, logtype_afpd, "Global unix charset is %s", options->unixcodepage);
- /* vol charset is in [G[ and [V] */
+ /* vol charset is in [G] and [V] */
if (!(p = iniparser_getstring(config, INISEC_GLOBAL, "vol charset", NULL))) {
- options->volcodepage = strdup("UTF8");
+ options->volcodepage = strdup(options->unixcodepage);
} else {
+ if (strcasecmp(p, "UTF-8") == 0) {
+ p = strdup("UTF8");
+ }
options->volcodepage = strdup(p);
}
-
+ LOG(log_debug, logtype_afpd, "Global vol charset is %s", options->volcodepage);
+
/* mac charset is in [G] and [V] */
if (!(p = iniparser_getstring(config, INISEC_GLOBAL, "mac charset", NULL))) {
- options->maccharset = CH_MAC;
options->maccodepage = strdup("MAC_ROMAN");
+ charset_names[CH_MAC] = strdup("MAC_ROMAN");
} else {
- if ((options->maccharset = add_charset(p)) == (charset_t)-1) {
- options->maccharset = CH_MAC;
- options->maccodepage = strdup("MAC_ROMAN");
- LOG(log_warning, logtype_afpd, "Setting mac charset to '%s' failed", p);
- } else {
- options->maccodepage = strdup(p);
+ if (strncasecmp(p, "MAC", 3) != 0) {
+ LOG(log_warning, logtype_afpd, "Is '%s' really mac charset? ", p);
}
+ options->maccodepage = strdup(p);
+ charset_names[CH_MAC] = strdup(p);
}
+ options->maccharset = CH_MAC;
+ LOG(log_debug, logtype_afpd, "Global mac charset is %s", options->maccodepage);
/* Check for sane values */
if (options->tickleval <= 0)
projects / netatalk.git / blobdiff