X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libatalk%2Futil%2Fnetatalk_conf.c;h=2e861a06aba2b94304dbe351fc400775c4da6a6e;hb=a7f754026326a7a5187a969f1de9ce615b49fec1;hp=0c70abe2dc7c780f75ea3e4cf1aa02c0ba4615f6;hpb=61bb657eda58f3e3f7e77bcd8df3a0e94a28f1a9;p=netatalk.git diff --git a/libatalk/util/netatalk_conf.c b/libatalk/util/netatalk_conf.c index 0c70abe2..2e861a06 100644 --- a/libatalk/util/netatalk_conf.c +++ b/libatalk/util/netatalk_conf.c @@ -31,6 +31,12 @@ #include #include #include +#if HAVE_LOCALE_H +#include +#endif +#if HAVE_LANGINFO_H +#include +#endif #include #include @@ -138,7 +144,7 @@ static char *get_vol_uuid(const AFPObj *obj, const char *volname) 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? */ @@ -164,26 +170,28 @@ static char *get_vol_uuid(const AFPObj *obj, const char *volname) As we can't check (requires write access) on ro-volumes, we switch ea:auto volumes that are options:ro to ea:none. */ +#define EABUFSZ 4 static int do_check_ea_support(const struct vol *vol) { int haseas; - char eaname[] = {"org.netatalk.supports-eas.XXXXXX"}; + const char *eaname = "org.netatalk.has-Extended-Attributes"; const char *eacontent = "yes"; + char buf[EABUFSZ]; - if ((vol->v_flags & AFPVOL_RO) == AFPVOL_RO) { - LOG(log_note, logtype_afpd, "read-only volume '%s', can't test for EA support, assuming yes", vol->v_localname); + if (sys_lgetxattr(vol->v_path, eaname, buf, EABUFSZ) != -1) return 1; - } - mktemp(eaname); + if (vol->v_flags & AFPVOL_RO) { + LOG(log_debug, logtype_afpd, "read-only volume '%s', can't test for EA support, assuming yes", vol->v_localname); + return 1; + } become_root(); - if ((sys_setxattr(vol->v_path, eaname, eacontent, 4, 0)) == 0) { - sys_removexattr(vol->v_path, eaname); + if ((sys_setxattr(vol->v_path, eaname, eacontent, strlen(eacontent) + 1, 0)) == 0) { haseas = 1; } else { - LOG(log_warning, logtype_afpd, "volume \"%s\" does not support Extended Attributes or read-only volume root", + LOG(log_warning, logtype_afpd, "volume \"%s\" does not support Extended Attributes or read-only volume", vol->v_localname); haseas = 0; } @@ -196,25 +204,14 @@ static int do_check_ea_support(const struct vol *vol) static void check_ea_support(struct vol *vol) { int haseas; - char eaname[] = {"org.netatalk.supports-eas.XXXXXX"}; - const char *eacontent = "yes"; haseas = do_check_ea_support(vol); if (vol->v_vfs_ea == AFPVOL_EA_AUTO) { - if ((vol->v_flags & AFPVOL_RO) == AFPVOL_RO) { - LOG(log_info, logtype_afpd, "read-only volume '%s', can't test for EA support, disabling EAs", vol->v_localname); - vol->v_vfs_ea = AFPVOL_EA_NONE; - return; - } - - if (haseas) { + if (haseas) vol->v_vfs_ea = AFPVOL_EA_SYS; - } else { - LOG(log_warning, logtype_afpd, "volume \"%s\" does not support Extended Attributes, using ea:ad instead", - vol->v_localname); - vol->v_vfs_ea = AFPVOL_EA_AD; - } + else + vol->v_vfs_ea = AFPVOL_EA_NONE; } if (vol->v_adouble == AD_VERSION_EA) { @@ -333,12 +330,14 @@ static char *volxlate(const AFPObj *obj, 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")) { @@ -356,7 +355,7 @@ static char *volxlate(const AFPObj *obj, 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; @@ -499,19 +498,47 @@ static int hostaccessvol(const AFPObj *obj, const char *volname, const char *arg * @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; } @@ -522,7 +549,7 @@ EC_CLEANUP: * @param pwd (r) struct passwd of logged in user, may be NULL in master afpd * @param section (r) volume name wo variables expanded (exactly as in iniconfig) * @param name (r) volume name - * @param path (r) volume path + * @param path_in (r) volume path * @param preset (r) default preset, may be NULL * @returns vol on success, NULL on error */ @@ -530,39 +557,66 @@ static struct vol *creatvol(AFPObj *obj, const struct passwd *pwd, const char *section, const char *name, - const char *path, + const char *path_in, const char *preset) { EC_INIT; struct vol *volume = NULL; - int suffixlen, vlen, tmpvlen, u8mvlen, macvlen; - char tmpname[AFPVOL_U8MNAMELEN+1]; + size_t current_pathlen, another_pathlen; + int i, suffixlen, vlen, tmpvlen, u8mvlen, macvlen; + char *tmpname; + char path[MAXPATHLEN + 1]; ucs2_t u8mtmpname[(AFPVOL_U8MNAMELEN+1)*2], mactmpname[(AFPVOL_MACNAMELEN+1)*2]; char suffix[6]; /* max is #FFFF */ uint16_t flags; const char *val; char *p, *q; + strlcpy(path, path_in, MAXPATHLEN); + LOG(log_debug, logtype_afpd, "createvol(volume: '%s', path: \"%s\", preset: '%s'): BEGIN", name, path, preset ? preset : "-"); if ( name == NULL || *name == '\0' ) { - if ((name = strrchr( path, '/' )) == NULL) { + if ((name = strrchr( path, '/' )) == NULL) EC_FAIL; - } - /* if you wish to share /, you need to specify a name. */ if (*++name == '\0') EC_FAIL; } /* Once volumes are loaded, we never change options again, we just delete em when they're removed from afp.conf */ + + /* + * Check for duplicated or nested volumes, eg: + * /Volumes/name /Volumes/name [duplicate], and + * /Volumes/name /Volumes/name/dir [nested], but beware of simple strncmp test: + * /Volumes/name /Volumes/name1 [strncmp match if n=strlen("Volumes/name") -> false positive] + */ + current_pathlen = strlen(path); for (struct vol *vol = Volumes; vol; vol = vol->v_next) { - if (STRCMP(path, ==, vol->v_path)) { - LOG(log_debug, logtype_afpd, "createvol('%s'): already loaded", name); - vol->v_deleted = 0; - volume = vol; - goto EC_CLEANUP; + another_pathlen = strlen(vol->v_path); + if (strncmp(path, vol->v_path, MIN(current_pathlen, another_pathlen)) == 0) { + if (current_pathlen == another_pathlen) { + LOG(log_error, logtype_afpd, "volume \"%s\" paths is duplicated: \"%s\"", name, path); + vol->v_deleted = 0; + volume = vol; + goto EC_CLEANUP; + } else { + const char *shorter_path, *longer_path; + int shorter_len; + if (another_pathlen > current_pathlen) { + shorter_len = current_pathlen; + shorter_path = path; + longer_path = vol->v_path; + } else { + shorter_len = another_pathlen; + shorter_path = vol->v_path; + longer_path = path; + } + if (longer_path[shorter_len] == '/') + LOG(log_info, logtype_afpd, "volume \"%s\" paths are nested: \"%s\" and \"%s\"", name, path, vol->v_path); + } } } @@ -572,82 +626,90 @@ static struct vol *creatvol(AFPObj *obj, * 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 [V] strictly. */ - /* However, this can be set in both of [G] and [V] for intuitiveness */ - if (val = getoption(obj->iniconfig, section, "vol charset", preset)) + /* vol charset is in [G] and [V] */ + 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 both of [G] and [V] */ - if (val = getoption(obj->iniconfig, section, "mac charset", preset)) + /* mac charset is in [G] and [V] */ + 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) ); + + vlen = strlen(name); + tmpname = strdup(name); + for(i = 0; i < vlen; i++) + if(tmpname[i] == '/') tmpname[i] = ':'; 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( dbpath = bformat("%s/%s/", val, tmpname) ); + 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) @@ -656,7 +718,7 @@ static struct vol *creatvol(AFPObj *obj, 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, ':')) { @@ -671,7 +733,7 @@ static struct vol *creatvol(AFPObj *obj, 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) @@ -680,7 +742,7 @@ static struct vol *creatvol(AFPObj *obj, 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) @@ -691,59 +753,50 @@ static struct vol *creatvol(AFPObj *obj, 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 appledouble", 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: * 1) neither the rolist nor the rwlist exist -> rw * 2) rolist exists -> ro if user is in it. * 3) rwlist exists -> ro unless user is in it. + * 4) cnid scheme = last -> ro forcibly. */ 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; } + if (0 == strcmp(volume->v_cnidscheme, "last")) + volume->v_flags |= AFPVOL_RO; if ((volume->v_flags & AFPVOL_NODEV)) volume->v_ad_options |= ADVOL_NODEV; @@ -753,10 +806,6 @@ static struct vol *creatvol(AFPObj *obj, 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; @@ -766,7 +815,7 @@ static struct vol *creatvol(AFPObj *obj, 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)) @@ -778,12 +827,9 @@ static struct vol *creatvol(AFPObj *obj, /* because v_vid has not been decided yet. */ suffixlen = sprintf(suffix, "#%X", lastvid + 1 ); - - vlen = strlen( name ); - /* Unicode Volume Name */ /* Firstly convert name from unixcharset to UTF8-MAC */ - flags = CONV_IGNORE; + flags = CONV_IGNORE | CONV_ALLOW_SLASH; tmpvlen = convert_charset(obj->options.unixcharset, CH_UTF8_MAC, 0, name, vlen, tmpname, AFPVOL_U8MNAMELEN, &flags); if (tmpvlen <= 0) { strcpy(tmpname, "???"); @@ -793,7 +839,7 @@ static struct vol *creatvol(AFPObj *obj, /* Do we have to mangle ? */ if ( (flags & CONV_REQMANGLE) || (tmpvlen > obj->options.volnamelen)) { if (tmpvlen + suffixlen > obj->options.volnamelen) { - flags = CONV_FORCE; + flags = CONV_FORCE | CONV_ALLOW_SLASH; tmpvlen = convert_charset(obj->options.unixcharset, CH_UTF8_MAC, 0, name, vlen, tmpname, obj->options.volnamelen - suffixlen, &flags); tmpname[tmpvlen >= 0 ? tmpvlen : 0] = 0; } @@ -809,7 +855,7 @@ static struct vol *creatvol(AFPObj *obj, /* Maccharset Volume Name */ /* Firsty convert name from unixcharset to maccharset */ - flags = CONV_IGNORE; + flags = CONV_IGNORE | CONV_ALLOW_SLASH; tmpvlen = convert_charset(obj->options.unixcharset, obj->options.maccharset, 0, name, vlen, tmpname, AFPVOL_U8MNAMELEN, &flags); if (tmpvlen <= 0) { strcpy(tmpname, "???"); @@ -819,7 +865,7 @@ static struct vol *creatvol(AFPObj *obj, /* Do we have to mangle ? */ if ( (flags & CONV_REQMANGLE) || (tmpvlen > AFPVOL_MACNAMELEN)) { if (tmpvlen + suffixlen > AFPVOL_MACNAMELEN) { - flags = CONV_FORCE; + flags = CONV_FORCE | CONV_ALLOW_SLASH; tmpvlen = convert_charset(obj->options.unixcharset, obj->options.maccharset, 0, @@ -848,10 +894,9 @@ static struct vol *creatvol(AFPObj *obj, EC_NULL( volume->v_localname = strdup(name) ); EC_NULL( volume->v_u8mname = strdup_w(u8mtmpname) ); EC_NULL( volume->v_macname = strdup_w(mactmpname) ); - EC_NULL( volume->v_path = malloc(strlen(path) + 1) ); - + EC_NULL( volume->v_path = strdup(path) ); + volume->v_name = utf8_encoding(obj) ? volume->v_u8mname : volume->v_macname; - strcpy(volume->v_path, path); #ifdef __svr4__ volume->v_qfd = -1; @@ -932,13 +977,16 @@ static int vol_section(const char *sec) static int readvolfile(AFPObj *obj, const struct passwd *pwent) { EC_INIT; - char path[MAXPATHLEN + 1]; + static int regexerr = -1; + static regex_t reg; + char *realvolpath; char volname[AFPVOL_U8MNAMELEN + 1]; - char tmp[MAXPATHLEN + 1]; - const char *preset, *default_preset, *p; + char path[MAXPATHLEN + 1], tmp[MAXPATHLEN + 1]; + 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"); @@ -957,14 +1005,41 @@ static int readvolfile(AFPObj *obj, const struct passwd *pwent) 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; - strlcpy(tmp, pwent->pw_dir, MAXPATHLEN); - strlcat(tmp, "/", MAXPATHLEN); - if (p = iniparser_getstring(obj->iniconfig, INISEC_HOMES, "path", NULL)) + if (pwent->pw_dir == NULL || STRCMP("", ==, pwent->pw_dir)) + /* no user home */ + continue; + + if ((realpath(pwent->pw_dir, tmp)) == NULL) + continue; + + /* check if user home matches our "basedir regex" */ + if ((basedir = iniparser_getstring(obj->iniconfig, INISEC_HOMES, "basedir regex", NULL)) == NULL) { + LOG(log_error, logtype_afpd, "\"basedir regex =\" must be defined in [Homes] section"); + 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); + continue; + } + + if (regexec(®, tmp, 1, match, 0) == REG_NOMATCH) { + LOG(log_error, logtype_default, "readvolfile: user home \"%s\" doesn't match basedir regex \"%s\"", + tmp, basedir); + continue; + } + + if (p = iniparser_getstring(obj->iniconfig, INISEC_HOMES, "path", NULL)) { + strlcat(tmp, "/", MAXPATHLEN); strlcat(tmp, p, MAXPATHLEN); + } } else { /* Get path */ if ((p = iniparser_getstring(obj->iniconfig, secname, "path", NULL)) == NULL) @@ -977,10 +1052,16 @@ static int readvolfile(AFPObj *obj, const struct passwd *pwent) /* do variable substitution for volume name */ if (STRCMP(secname, ==, INISEC_HOMES)) { - if (p = iniparser_getstring(obj->iniconfig, INISEC_HOMES, "home name", "$u's home")) - strlcpy(tmp, p, MAXPATHLEN); - else - strlcpy(tmp, p, MAXPATHLEN); + p = iniparser_getstring(obj->iniconfig, INISEC_HOMES, "home name", "$u's home"); + if (strstr(p, "$u") == NULL) { + LOG(log_warning, logtype_afpd, "home name must contain $u."); + p = "$u's home"; + } + if (strchr(p, ':') != NULL) { + LOG(log_warning, logtype_afpd, "home name must not contain \":\"."); + p = "$u's home"; + } + strlcpy(tmp, p, MAXPATHLEN); } else { strlcpy(tmp, secname, AFPVOL_U8MNAMELEN); } @@ -989,13 +1070,170 @@ static int readvolfile(AFPObj *obj, const struct passwd *pwent) preset = iniparser_getstring(obj->iniconfig, secname, "vol preset", NULL); - creatvol(obj, pwent, secname, volname, path, preset ? preset : default_preset ? default_preset : NULL); + if ((realvolpath = realpath_safe(path)) == NULL) + continue; + + creatvol(obj, pwent, secname, volname, realvolpath, preset ? preset : default_preset ? default_preset : NULL); + free(realvolpath); + } + +EC_CLEANUP: + EC_EXIT; +} + +static struct extmap *Extmap = NULL, *Defextmap = NULL; +static int Extmap_cnt; + +static int setextmap(char *ext, char *type, char *creator) +{ + EC_INIT; + struct extmap *em; + int cnt; + + if (Extmap == NULL) { + EC_NULL_LOG( Extmap = calloc(1, sizeof( struct extmap )) ); + } + + ext++; + + for (em = Extmap, cnt = 0; em->em_ext; em++, cnt++) + if ((strdiacasecmp(em->em_ext, ext)) == 0) + goto EC_CLEANUP; + + EC_NULL_LOG( Extmap = realloc(Extmap, sizeof(struct extmap) * (cnt + 2)) ); + (Extmap + cnt + 1)->em_ext = NULL; + em = Extmap + cnt; + + EC_NULL( em->em_ext = strdup(ext) ); + + if ( *type == '\0' ) { + memcpy(em->em_type, "\0\0\0\0", sizeof( em->em_type )); + } else { + memcpy(em->em_type, type, sizeof( em->em_type )); + } + if ( *creator == '\0' ) { + memcpy(em->em_creator, "\0\0\0\0", sizeof( em->em_creator )); + } else { + memcpy(em->em_creator, creator, sizeof( em->em_creator )); } EC_CLEANUP: EC_EXIT; } +/* -------------------------- */ +static int extmap_cmp(const void *map1, const void *map2) +{ + const struct extmap *em1 = map1; + const struct extmap *em2 = map2; + return strdiacasecmp(em1->em_ext, em2->em_ext); +} + +static void sortextmap( void) +{ + struct extmap *em; + + Extmap_cnt = 0; + if ((em = Extmap) == NULL) { + return; + } + while (em->em_ext) { + em++; + Extmap_cnt++; + } + if (Extmap_cnt) { + qsort(Extmap, Extmap_cnt, sizeof(struct extmap), extmap_cmp); + if (*Extmap->em_ext == 0) { + /* the first line is really "." the default entry, + * we remove the leading '.' in setextmap + */ + Defextmap = Extmap; + } + } +} + +static void free_extmap( void) +{ + struct extmap *em; + + if (Extmap) { + for ( em = Extmap; em->em_ext; em++) { + free (em->em_ext); + } + free(Extmap); + Extmap = NULL; + Defextmap = Extmap; + Extmap_cnt = 0; + } +} + +static int ext_cmp_key(const void *key, const void *obj) +{ + const char *p = key; + const struct extmap *em = obj; + return strdiacasecmp(p, em->em_ext); +} + +struct extmap *getextmap(const char *path) +{ + char *p; + struct extmap *em; + + if (!Extmap_cnt || NULL == ( p = strrchr( path, '.' )) ) { + return( Defextmap ); + } + p++; + if (!*p) { + return( Defextmap ); + } + em = bsearch(p, Extmap, Extmap_cnt, sizeof(struct extmap), ext_cmp_key); + if (em) { + return( em ); + } else { + return( Defextmap ); + } +} + +struct extmap *getdefextmap(void) +{ + return( Defextmap ); +} + +static int readextmap(const char *file) +{ + EC_INIT; + FILE *fp; + char ext[256]; + char buf[256]; + char type[5], creator[5]; + + LOG(log_debug, logtype_afpd, "readextmap: loading \"%s\"", file); + + EC_NULL_LOGSTR( fp = fopen(file, "r"), "Couldn't open extension maping file %s", file); + + while (fgets(buf, sizeof(buf), fp) != NULL) { + initline(strlen(buf), buf); + parseline(sizeof(ext) - 1, ext); + + switch (ext[0]) { + case '.' : + parseline(sizeof(type) - 1, type); + parseline(sizeof(creator) - 1, creator); + setextmap(ext, type, creator); + LOG(log_debug, logtype_afpd, "readextmap: mapping: '%s' -> %s/%s", ext, type, creator); + break; + } + } + + sortextmap(); + EC_ZERO( fclose(fp) ); + + LOG(log_debug, logtype_afpd, "readextmap: done", file); + +EC_CLEANUP: + EC_EXIT; +} + /************************************************************** * API functions **************************************************************/ @@ -1077,7 +1315,7 @@ int load_charset(struct vol *vol) * @param obj (r) handle * @param delvol_fn (r) callback called for deleted volumes */ -int load_volumes(AFPObj *obj, void (*delvol_fn)(struct vol *)) +int load_volumes(AFPObj *obj, void (*delvol_fn)(const AFPObj *obj, struct vol *)) { EC_INIT; int fd = -1; @@ -1093,8 +1331,6 @@ int load_volumes(AFPObj *obj, void (*delvol_fn)(struct vol *)) 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 { @@ -1135,7 +1371,7 @@ int load_volumes(AFPObj *obj, void (*delvol_fn)(struct vol *)) if (vol->v_deleted) { LOG(log_debug, logtype_afpd, "load_volumes: deleted: %s", vol->v_localname); if (delvol_fn) - delvol_fn(vol); + delvol_fn(obj, vol); vol = Volumes; } } @@ -1207,17 +1443,17 @@ struct vol *getvolbyvid(const uint16_t vid ) 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 volname[AFPVOL_U8MNAMELEN + 1]; char abspath[MAXPATHLEN + 1]; - char volpath[MAXPATHLEN + 1]; + char volpath[MAXPATHLEN + 1], *realvolpath = NULL; 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); @@ -1289,15 +1525,17 @@ struct vol *getvolbypath(AFPObj *obj, const char *path) if (prw != 0) subpath = prw; - strlcpy(obj->username, user, MAXUSERLEN); strlcat(tmpbuf, user, MAXPATHLEN); + strlcpy(obj->username, user, MAXUSERLEN); strlcat(tmpbuf, "/", MAXPATHLEN); /* (6) */ if (subpathconfig = iniparser_getstring(obj->iniconfig, INISEC_HOMES, "path", NULL)) { + /* if (!subpath || strncmp(subpathconfig, subpath, strlen(subpathconfig)) != 0) { EC_FAIL; } + */ strlcat(tmpbuf, subpathconfig, MAXPATHLEN); strlcat(tmpbuf, "/", MAXPATHLEN); } @@ -1305,27 +1543,32 @@ struct vol *getvolbypath(AFPObj *obj, const char *path) /* (7) */ if (volxlate(obj, volpath, sizeof(volpath) - 1, tmpbuf, pw, NULL, NULL) == NULL) - return NULL; + EC_FAIL; + EC_NULL( realvolpath = realpath_safe(volpath) ); EC_NULL( pw = getpwnam(user) ); - LOG(log_debug, logtype_afpd, "getvolbypath(\"%s\"): user: %s, homedir: %s => volpath: \"%s\"", - path, user, pw->pw_dir, volpath); + LOG(log_debug, logtype_afpd, "getvolbypath(\"%s\"): user: %s, homedir: %s => realvolpath: \"%s\"", + path, user, pw->pw_dir, realvolpath); /* do variable substitution for volume name */ p = iniparser_getstring(obj->iniconfig, INISEC_HOMES, "home name", "$u's home"); + if (strstr(p, "$u") == NULL) + p = "$u's home"; strlcpy(tmpbuf, p, AFPVOL_U8MNAMELEN); - EC_NULL_LOG( volxlate(obj, volname, sizeof(volname) - 1, tmpbuf, pw, volpath, NULL) ); + EC_NULL_LOG( volxlate(obj, volname, sizeof(volname) - 1, tmpbuf, pw, realvolpath, NULL) ); const char *preset, *default_preset; default_preset = iniparser_getstring(obj->iniconfig, INISEC_GLOBAL, "vol preset", NULL); preset = iniparser_getstring(obj->iniconfig, INISEC_HOMES, "vol preset", NULL); - vol = creatvol(obj, pw, INISEC_HOMES, volname, volpath, preset ? preset : default_preset ? default_preset : NULL); + vol = creatvol(obj, pw, INISEC_HOMES, volname, realvolpath, preset ? preset : default_preset ? default_preset : NULL); EC_CLEANUP: if (user) free(user); + if (realvolpath) + free(realvolpath); if (ret != 0) vol = NULL; return vol; @@ -1349,7 +1592,7 @@ struct vol *getvolbyname(const char *name) /*! * 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; @@ -1359,11 +1602,14 @@ int afp_config_parse(AFPObj *AFPObj) 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->uuidconf = strdup(_PATH_STATEDIR "afp_voluuid.conf"); - options->flags = OPTION_ACL2MACCESS | OPTION_UUID | OPTION_SERVERNOTIF | AFPObj->cmdlineflags; + options->flags = OPTION_UUID | AFPObj->cmdlineflags; if ((config = iniparser_load(AFPObj->options.configfile)) == NULL) return -1; @@ -1373,48 +1619,41 @@ int afp_config_parse(AFPObj *AFPObj) 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")) - options->flags |= OPTION_NOZEROCONF; - if (strcasecmp(p, "icon")) - options->flags |= OPTION_CUSTOMICON; - if (strcasecmp(p, "noicon")) - options->flags &= ~OPTION_CUSTOMICON; - if (strcasecmp(p, "advertise_ssh")) - options->flags |= OPTION_ANNOUNCESSH; - if (strcasecmp(p, "noacl2maccess")) - options->flags &= ~OPTION_ACL2MACCESS; - if (strcasecmp(p, "keepsessions")) - options->flags |= OPTION_KEEPSESSIONS; - if (strcasecmp(p, "closevol")) - options->flags |= OPTION_CLOSEVOL; - if (strcasecmp(p, "client_polling")) - options->flags &= ~OPTION_SERVERNOTIF; - if (strcasecmp(p, "nosavepassword")) - options->passwdbits |= PASSWD_NOSAVE; - if (strcasecmp(p, "savepassword")) - options->passwdbits &= ~PASSWD_NOSAVE; - if (strcasecmp(p, "nosetpassword")) - options->passwdbits &= ~PASSWD_SET; - if (strcasecmp(p, "setpassword")) - 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, "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", 0)) + options->flags |= OPTION_SERVERNOTIF; + if (!iniparser_getboolean(config, INISEC_GLOBAL, "use sendfile", 1)) + options->flags |= OPTION_NOSENDFILE; + if (iniparser_getboolean(config, INISEC_GLOBAL, "solaris share reservations", 1)) + options->flags |= OPTION_SHARE_RESERV; + if (iniparser_getboolean(config, INISEC_GLOBAL, "afp read locks", 0)) + options->flags |= OPTION_AFP_READ_LOCK; + 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->extmapfile = iniparser_getstrdup(config, INISEC_GLOBAL, "extmap file", _PATH_CONFDIR "afp_extmap.conf"); + 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); @@ -1494,39 +1733,54 @@ int afp_config_parse(AFPObj *AFPObj) /* 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"); + set_charset_name(CH_UNIX, "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); + set_charset_name(CH_UNIX, p); } + options->unixcharset = CH_UNIX; + LOG(log_debug, logtype_afpd, "Global unix charset is %s", options->unixcodepage); - /* vol charset is in [V] strictly. */ - /* However, this can be set in both of [G] and [V] for intuitiveness */ + /* 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); } - - /* mac charset is in both of [G] and [V] */ + 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"); + set_charset_name(CH_MAC, "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); + set_charset_name(CH_MAC, p); } + options->maccharset = CH_MAC; + LOG(log_debug, logtype_afpd, "Global mac charset is %s", options->maccodepage); + + EC_ZERO_LOG( readextmap(options->extmapfile) ); /* Check for sane values */ if (options->tickleval <= 0)