#include <arpa/inet.h>
#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>
#include <atalk/dsi.h>
#include <atalk/uuid.h>
#include <atalk/netatalk_conf.h>
-
-#define VOLOPT_ALLOW 0 /* user allow list */
-#define VOLOPT_DENY 1 /* user deny list */
-#define VOLOPT_RWLIST 2 /* user rw list */
-#define VOLOPT_ROLIST 3 /* user ro list */
-#define VOLOPT_PASSWORD 4 /* volume password */
-#define VOLOPT_CASEFOLD 5 /* character case mangling */
-#define VOLOPT_FLAGS 6 /* various flags */
-#define VOLOPT_DBPATH 7 /* path to database */
-#define VOLOPT_LIMITSIZE 8 /* Limit the size of the volume */
-/* Usable slot: 9 */
-#define VOLOPT_VETO 10 /* list of veto filespec */
-#define VOLOPT_PREEXEC 11 /* preexec command */
-#define VOLOPT_ROOTPREEXEC 12 /* root preexec command */
-#define VOLOPT_POSTEXEC 13 /* postexec command */
-#define VOLOPT_ROOTPOSTEXEC 14 /* root postexec command */
-#define VOLOPT_ENCODING 15 /* mac encoding (pre OSX)*/
-#define VOLOPT_MACCHARSET 16
-#define VOLOPT_CNIDSCHEME 17
-#define VOLOPT_ADOUBLE 18 /* adouble version */
-/* Usable slot: 19/20 */
-#define VOLOPT_UMASK 21
-#define VOLOPT_ALLOWED_HOSTS 22
-#define VOLOPT_DENIED_HOSTS 23
-#define VOLOPT_DPERM 24 /* dperm default directories perms */
-#define VOLOPT_FPERM 25 /* fperm default files perms */
-#define VOLOPT_DFLTPERM 26 /* perm */
-#define VOLOPT_EA_VFS 27 /* Extended Attributes vfs indirection */
-#define VOLOPT_CNIDSERVER 28 /* CNID Server ip address*/
-#define VOLOPT_CNIDPORT 30 /* CNID server tcp port */
-
-#define VOLOPT_MAX 31 /* <== IMPORTANT !!!!!! */
-#define VOLOPT_NUM (VOLOPT_MAX + 1)
+#include <atalk/bstrlib.h>
#define VOLPASSLEN 8
+#ifndef UUID_PRINTABLE_STRING_LENGTH
+#define UUID_PRINTABLE_STRING_LENGTH 37
+#endif
#define IS_VAR(a, b) (strncmp((a), (b), 2) == 0)
-struct vol_option {
- char *c_value;
- int i_value;
-};
-
/**************************************************************
* Locals
**************************************************************/
+static int have_uservol = 0; /* whether there's generic user home share in config ("~" or "~/path", but not "~user") */
static struct vol *Volumes = NULL;
static uint16_t lastvid = 0;
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? */
sys_removexattr(vol->v_path, eaname);
haseas = 1;
} else {
- LOG(log_warning, logtype_afpd, "volume \"%s\" does not support Extended Attributes",
+ LOG(log_warning, logtype_afpd, "volume \"%s\" does not support Extended Attributes or read-only volume root",
vol->v_localname);
haseas = 0;
}
return ret;
}
-static void volfree(struct vol_option *options, const struct vol_option *save)
-{
- int i;
-
- if (save) {
- for (i = 0; i < VOLOPT_MAX; i++) {
- if (options[i].c_value && (options[i].c_value != save[i].c_value))
- free(options[i].c_value);
- }
- } else {
- for (i = 0; i < VOLOPT_MAX; i++) {
- if (options[i].c_value)
- free(options[i].c_value);
- }
- }
-}
-
/*
* Handle variable substitutions. here's what we understand:
* $b -> basename of path
static char *volxlate(const AFPObj *obj,
char *dest,
size_t destlen,
- char *src,
+ const char *src,
const struct passwd *pwd,
- char *path,
- char *volname)
+ const char *path,
+ const char *volname)
{
char *p, *r;
const char *q;
/* now figure out what the variable is */
q = NULL;
if (IS_VAR(p, "$b")) {
- if (!obj->uid && xlatevolname)
- return NULL;
if (path) {
if ((q = strrchr(path, '/')) == NULL)
q = path;
q++;
}
} else if (IS_VAR(p, "$c")) {
- if (!obj->uid && xlatevolname)
- return NULL;
- 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")) {
- if (!obj->uid && xlatevolname)
- return NULL;
q = path;
} else if (pwd && IS_VAR(p, "$f")) {
- if (!obj->uid && xlatevolname)
- return NULL;
if ((r = strchr(pwd->pw_gecos, ',')))
*r = '\0';
q = pwd->pw_gecos;
} else if (pwd && IS_VAR(p, "$g")) {
- if (!obj->uid && xlatevolname)
- return NULL;
struct group *grp = getgrgid(pwd->pw_gid);
if (grp)
q = grp->gr_name;
} else if (IS_VAR(p, "$h")) {
q = obj->options.hostname;
} else if (IS_VAR(p, "$i")) {
- if (!obj->uid && xlatevolname)
- return NULL;
DSI *dsi = obj->dsi;
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")) {
- if (!obj->uid && xlatevolname)
- return NULL;
+ } 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;
else
q = obj->username;
} else if (IS_VAR(p, "$v")) {
- if (!obj->uid && xlatevolname)
- return NULL;
if (volname) {
q = volname;
}
return ret;
}
-/* -------------------- */
-static void setoption(struct vol_option *options, const struct vol_option *save, int opt, const char *val)
+/*!
+ * check access list
+ *
+ * this function wants something of the following form:
+ * "@group,name,name2,@group2,name3" or "@group name name2 @group2 name3"
+ * A NULL argument allows everybody to have access.
+ * We return three things:
+ * -1: no list
+ * 0: list exists, but name isn't in it
+ * 1: in list
+ */
+static int accessvol(const AFPObj *obj, const char *args, const char *name)
{
- if (options[opt].c_value && (!save || options[opt].c_value != save[opt].c_value))
- free(options[opt].c_value);
- options[opt].c_value = strdup(val);
-}
+ char buf[MAXPATHLEN + 1], *p;
+ struct group *gr;
-/* Parse iniconfig and initalize volume options */
-static void volset(const dictionary *conf, const char *vol, struct vol_option *options, const struct vol_option *save)
-{
- const char *val;
- char *p, *q;
+ if (!args)
+ return -1;
- if (val = iniparser_getstring(conf, vol, "allow", NULL))
- setoption(options, save, VOLOPT_ALLOW, val);
+ strlcpy(buf, args, sizeof(buf));
+ if ((p = strtok(buf, ", ")) == NULL) /* nothing, return okay */
+ return -1;
- if (val = iniparser_getstring(conf, vol, "deny", NULL))
- setoption(options, save, VOLOPT_DENY, val);
+ while (p) {
+ if (*p == '@') { /* it's a group */
+ if ((gr = getgrnam(p + 1)) && gmem(gr->gr_gid, obj->ngroups, obj->groups))
+ return 1;
+ } else if (strcasecmp(p, name) == 0) /* it's a user name */
+ return 1;
+ p = strtok(NULL, ", ");
+ }
- if (val = iniparser_getstring(conf, vol, "rwlist", NULL))
- setoption(options, save, VOLOPT_RWLIST, val);
+ return 0;
+}
- if (val = iniparser_getstring(conf, vol, "rolist", NULL))
- setoption(options, save, VOLOPT_ROLIST, val);
+static int hostaccessvol(const AFPObj *obj, const char *volname, const char *args)
+{
+ int mask_int;
+ char buf[MAXPATHLEN + 1], *p, *b;
+ struct sockaddr_storage client;
+ const DSI *dsi = obj->dsi;
- if (val = iniparser_getstring(conf, vol, "volcharset", NULL))
- setoption(options, save, VOLOPT_ENCODING, val);
+ if (!args || !dsi)
+ return -1;
- if (val = iniparser_getstring(conf, vol, "maccharset", NULL))
- setoption(options, save, VOLOPT_MACCHARSET, val);
+ strlcpy(buf, args, sizeof(buf));
+ if ((p = strtok_r(buf, ", ", &b)) == NULL) /* nothing, return okay */
+ return -1;
- if (val = iniparser_getstring(conf, vol, "veto", NULL))
- setoption(options, save, VOLOPT_VETO, val);
+ while (p) {
+ int ret;
+ char *ipaddr, *mask_char;
+ struct addrinfo hints, *ai;
- if (val = iniparser_getstring(conf, vol, "cnidscheme", NULL))
- setoption(options, save, VOLOPT_CNIDSCHEME, val);
+ ipaddr = strtok(p, "/");
+ mask_char = strtok(NULL,"/");
- if (val = iniparser_getstring(conf, vol, "dbpath", NULL))
- setoption(options, save, VOLOPT_DBPATH, val);
+ /* Get address from string with getaddrinfo */
+ memset(&hints, 0, sizeof hints);
+ hints.ai_family = AF_UNSPEC;
+ hints.ai_socktype = SOCK_STREAM;
+ if ((ret = getaddrinfo(ipaddr, NULL, &hints, &ai)) != 0) {
+ LOG(log_error, logtype_afpd, "hostaccessvol: getaddrinfo: %s\n", gai_strerror(ret));
+ continue;
+ }
- if (val = iniparser_getstring(conf, vol, "password", NULL))
- setoption(options, save, VOLOPT_PASSWORD, val);
+ /* netmask */
+ if (mask_char != NULL)
+ mask_int = atoi(mask_char); /* apply_ip_mask does range checking on it */
+ else {
+ if (ai->ai_family == AF_INET) /* IPv4 */
+ mask_int = 32;
+ else /* IPv6 */
+ mask_int = 128;
+ }
- if (val = iniparser_getstring(conf, vol, "root_preexec", NULL))
- setoption(options, save, VOLOPT_ROOTPREEXEC, val);
+ /* Apply mask to addresses */
+ client = dsi->client;
+ apply_ip_mask((struct sockaddr *)&client, mask_int);
+ apply_ip_mask(ai->ai_addr, mask_int);
- if (val = iniparser_getstring(conf, vol, "preexec", NULL))
- setoption(options, save, VOLOPT_PREEXEC, val);
+ if (compare_ip((struct sockaddr *)&client, ai->ai_addr) == 0) {
+ freeaddrinfo(ai);
+ return 1;
+ }
- if (val = iniparser_getstring(conf, vol, "root_postexec", NULL))
- setoption(options, save, VOLOPT_ROOTPOSTEXEC, val);
+ /* next address */
+ freeaddrinfo(ai);
+ p = strtok_r(NULL, ", ", &b);
+ }
- if (val = iniparser_getstring(conf, vol, "postexec", NULL))
- setoption(options, save, VOLOPT_POSTEXEC, val);
+ return 0;
+}
- if (val = iniparser_getstring(conf, vol, "allowed_hosts", NULL))
- setoption(options, save, VOLOPT_ALLOWED_HOSTS, val);
+/*!
+ * Get option string 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 const char *getoption(const dictionary *conf, const char *vol, const char *opt, const char *defsec, const char *defval)
+{
+ EC_INIT;
+ const char *result;
- if (val = iniparser_getstring(conf, vol, "denied_hosts", NULL))
- setoption(options, save, VOLOPT_DENIED_HOSTS, val);
+ 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;
+}
- if (val = iniparser_getstring(conf, vol, "umask", NULL))
- options[VOLOPT_UMASK].i_value = (int)strtol(val, NULL, 8);
+/*!
+ * 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 (val = iniparser_getstring(conf, vol, "dperm", NULL))
- options[VOLOPT_DPERM].i_value = (int)strtol(val, NULL, 8);
+ 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;
+}
- if (val = iniparser_getstring(conf, vol, "fperm", NULL))
- options[VOLOPT_FPERM].i_value = (int)strtol(val, NULL, 8);
+/*!
+ * Create volume struct
+ *
+ * @param obj (r) handle
+ * @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 preset (r) default preset, may be NULL
+ * @returns vol on success, NULL on error
+ */
+static struct vol *creatvol(AFPObj *obj,
+ const struct passwd *pwd,
+ const char *section,
+ const char *name,
+ const char *path,
+ const char *preset)
+{
+ EC_INIT;
+ struct vol *volume = NULL;
+ int suffixlen, vlen, tmpvlen, u8mvlen, macvlen;
+ char tmpname[AFPVOL_U8MNAMELEN+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;
- if (val = iniparser_getstring(conf, vol, "perm", NULL))
- options[VOLOPT_DFLTPERM].i_value = (int)strtol(val, NULL, 8);
+ LOG(log_debug, logtype_afpd, "createvol(volume: '%s', path: \"%s\", preset: '%s'): BEGIN",
+ name, path, preset ? preset : "-");
- if (val = iniparser_getstring(conf, vol, "volsizelimit", NULL))
- options[VOLOPT_LIMITSIZE].i_value = (uint32_t)strtoul(val, NULL, 10);
+ if ( name == NULL || *name == '\0' ) {
+ if ((name = strrchr( path, '/' )) == NULL) {
+ EC_FAIL;
+ }
- if (val = iniparser_getstring(conf, vol, "casefold", NULL)) {
- if (strcasecmp(val, "tolower") == 0)
- options[VOLOPT_CASEFOLD].i_value = AFPVOL_UMLOWER;
- else if (strcasecmp(val, "toupper") == 0)
- options[VOLOPT_CASEFOLD].i_value = AFPVOL_UMUPPER;
- else if (strcasecmp(val, "xlatelower") == 0)
- options[VOLOPT_CASEFOLD].i_value = AFPVOL_UUPPERMLOWER;
- else if (strcasecmp(val, "xlateupper") == 0)
- options[VOLOPT_CASEFOLD].i_value = AFPVOL_ULOWERMUPPER;
+ /* if you wish to share /, you need to specify a name. */
+ if (*++name == '\0')
+ EC_FAIL;
}
- if (val = iniparser_getstring(conf, vol, "adouble", NULL)) {
- if (strcasecmp(val, "v2") == 0)
- options[VOLOPT_ADOUBLE].i_value = AD_VERSION2;
- else if (strcasecmp(val, "ea") == 0)
- options[VOLOPT_ADOUBLE].i_value = AD_VERSION_EA;
+ /* Once volumes are loaded, we never change options again, we just delete em when they're removed from afp.conf */
+ 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;
+ }
}
- if (val = iniparser_getstring(conf, vol, "ea", NULL)) {
- if (strcasecmp(val, "ad") == 0)
- options[VOLOPT_EA_VFS].i_value = AFPVOL_EA_AD;
- else if (strcasecmp(val, "sys") == 0)
- options[VOLOPT_EA_VFS].i_value = AFPVOL_EA_SYS;
- else if (strcasecmp(val, "none") == 0)
- options[VOLOPT_EA_VFS].i_value = AFPVOL_EA_NONE;
+ /*
+ * Check allow/deny lists:
+ * allow -> either no list (-1), or in list (1)
+ * deny -> either no list (-1), or not in list (0)
+ */
+ if (pwd) {
+ 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, NULL), pwd->pw_name) == 0)
+ goto EC_CLEANUP;
+ 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, NULL)) == 0)
+ goto EC_CLEANUP;
}
- if (p = iniparser_getstrdup(conf, vol, "cnidserver", NULL)) {
- if (q = strrchr(val, ':')) {
- *q = 0;
- setoption(options, save, VOLOPT_CNIDPORT, q + 1);
+ EC_NULL( volume = calloc(1, sizeof(struct vol)) );
+
+ EC_NULL( volume->v_configname = strdup(section));
+
+ volume->v_vfs_ea = AFPVOL_EA_AUTO;
+ volume->v_umask = obj->options.umask;
+
+ 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, NULL))
+ EC_NULL( volume->v_veto = strdup(val) );
+
+ /* 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");
}
- setoption(options, save, VOLOPT_CNIDSERVER, p);
- LOG(log_debug, logtype_afpd, "CNID Server for volume '%s': %s:%s",
- vol, p, q ? q + 1 : "4700");
- free(p);
+ EC_NULL( volume->v_volcodepage = strdup(val) );
}
+ else
+ EC_NULL( volume->v_volcodepage = strdup(obj->options.volcodepage) );
- if (q = iniparser_getstrdup(conf, vol, "options", NULL)) {
- if (p = strtok(q, ", ")) {
- while (p) {
- if (strcasecmp(p, "ro") == 0)
- options[VOLOPT_FLAGS].i_value |= AFPVOL_RO;
- else if (strcasecmp(p, "nohex") == 0)
- options[VOLOPT_FLAGS].i_value |= AFPVOL_NOHEX;
- else if (strcasecmp(p, "nousedots") == 0)
- options[VOLOPT_FLAGS].i_value &= ~AFPVOL_USEDOTS;
- else if (strcasecmp(p, "invisibledots") == 0)
- options[VOLOPT_FLAGS].i_value |= AFPVOL_USEDOTS;
- else if (strcasecmp(p, "nostat") == 0)
- options[VOLOPT_FLAGS].i_value |= AFPVOL_NOSTAT;
- else if (strcasecmp(p, "preexec_close") == 0)
- options[VOLOPT_PREEXEC].i_value = 1;
- else if (strcasecmp(p, "root_preexec_close") == 0)
- options[VOLOPT_ROOTPREEXEC].i_value = 1;
- else if (strcasecmp(p, "noupriv") == 0)
- options[VOLOPT_FLAGS].i_value &= ~AFPVOL_UNIX_PRIV;
- else if (strcasecmp(p, "nodev") == 0)
- options[VOLOPT_FLAGS].i_value |= AFPVOL_NODEV;
- else if (strcasecmp(p, "caseinsensitive") == 0)
- options[VOLOPT_FLAGS].i_value |= AFPVOL_CASEINSEN;
- else if (strcasecmp(p, "illegalseq") == 0)
- options[VOLOPT_FLAGS].i_value |= AFPVOL_EILSEQ;
- else if (strcasecmp(p, "tm") == 0)
- options[VOLOPT_FLAGS].i_value |= AFPVOL_TM;
- else if (strcasecmp(p, "searchdb") == 0)
- options[VOLOPT_FLAGS].i_value |= AFPVOL_SEARCHDB;
- else if (strcasecmp(p, "nonetids") == 0)
- options[VOLOPT_FLAGS].i_value |= AFPVOL_NONETIDS;
- else if (strcasecmp(p, "noacls") == 0)
- options[VOLOPT_FLAGS].i_value &= ~AFPVOL_ACLS;
- else if (strcasecmp(p, "nov2toeaconv") == 0)
- options[VOLOPT_FLAGS].i_value |= AFPVOL_NOV2TOEACONV;
- p = strtok(NULL, ", ");
- }
+ /* 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);
}
- free(q);
+ EC_NULL( volume->v_maccodepage = strdup(val) );
}
-}
+ else
+ EC_NULL( volume->v_maccodepage = strdup(obj->options.maccodepage) );
-/* ------------------------------- */
-static int creatvol(const AFPObj *obj, const struct passwd *pwd,
- char *path, char *name,
- struct vol_option *options)
-{
- struct vol *volume;
- int suffixlen, vlen, tmpvlen, u8mvlen, macvlen;
- int hide = 0;
- char tmpname[AFPVOL_U8MNAMELEN+1];
- ucs2_t u8mtmpname[(AFPVOL_U8MNAMELEN+1)*2], mactmpname[(AFPVOL_MACNAMELEN+1)*2];
- char suffix[6]; /* max is #FFFF */
- uint16_t flags;
+ 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) );
+ EC_NULL_LOG( volume->v_dbpath = strdup(bdata(dbpath)) );
+ bdestroy(dbpath);
- LOG(log_debug, logtype_afpd, "createvol: Volume '%s'", name);
+ 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 ( name == NULL || *name == '\0' ) {
- if ((name = strrchr( path, '/' )) == NULL) {
- return -1; /* Obviously not a fully qualified path */
+ 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, NULL))
+ volume->v_dperm = (int)strtol(val, NULL, 8);
+
+ 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, NULL))
+ volume->v_limitsize = (uint32_t)strtoul(val, NULL, 10);
+
+ 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, NULL))
+ EC_NULL( volume->v_postexec = volxlate(obj, NULL, MAXPATHLEN, val, pwd, path, name) );
+
+ 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, NULL))
+ EC_NULL( volume->v_root_postexec = volxlate(obj, NULL, MAXPATHLEN, val, pwd, path, name) );
+
+ 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_EA;
+ } else {
+ volume->v_adouble = AD_VERSION;
+ }
+
+ if (val = getoption(obj->iniconfig, section, "cnid server", preset, NULL)) {
+ EC_NULL( p = strdup(val) );
+ volume->v_cnidserver = p;
+ if (q = strrchr(val, ':')) {
+ *q++ = 0;
+ volume->v_cnidport = strdup(q);
+ } else {
+ volume->v_cnidport = strdup("4700");
}
- /* if you wish to share /, you need to specify a name. */
- if (*++name == '\0')
- return -1;
+ } else {
+ volume->v_cnidserver = strdup(obj->options.Cnid_srv);
+ volume->v_cnidport = strdup(obj->options.Cnid_port);
+ }
+
+ 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_SYS;
+ else if (strcasecmp(val, "none") == 0)
+ volume->v_vfs_ea = AFPVOL_EA_NONE;
}
+ 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_UMUPPER;
+ else if (strcasecmp(val, "xlatelower") == 0)
+ volume->v_casefold = AFPVOL_UUPPERMLOWER;
+ else if (strcasecmp(val, "xlateupper") == 0)
+ volume->v_casefold = AFPVOL_ULOWERMUPPER;
+ }
+
+ 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:
+ * 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.
+ */
+ if (pwd) {
+ 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 ((volume->v_flags & AFPVOL_NODEV))
+ volume->v_ad_options |= ADVOL_NODEV;
+ if ((volume->v_flags & AFPVOL_UNIX_PRIV))
+ volume->v_ad_options |= ADVOL_UNIXPRIV;
+ if ((volume->v_flags & AFPVOL_INV_DOTS))
+ volume->v_ad_options |= ADVOL_INVDOTS;
+
+ /* Mac to Unix conversion flags*/
+ if ((volume->v_flags & AFPVOL_EILSEQ))
+ volume->v_mtou_flags |= CONV__EILSEQ;
+
+ if ((volume->v_casefold & AFPVOL_MTOUUPPER))
+ volume->v_mtou_flags |= CONV_TOUPPER;
+ else if ((volume->v_casefold & AFPVOL_MTOULOWER))
+ volume->v_mtou_flags |= CONV_TOLOWER;
+
+ /* Unix to Mac conversion flags*/
+ 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))
+ volume->v_utom_flags |= CONV_TOLOWER;
+ if ((volume->v_flags & AFPVOL_EILSEQ))
+ volume->v_utom_flags |= CONV__EILSEQ;
+
/* suffix for mangling use (lastvid + 1) */
/* because v_vid has not been decided yet. */
suffixlen = sprintf(suffix, "#%X", lastvid + 1 );
+
vlen = strlen( name );
/* Unicode Volume Name */
/* Secondly convert name from UTF8-MAC to UCS2 */
if ( 0 >= ( u8mvlen = convert_string(CH_UTF8_MAC, CH_UCS2, tmpname, tmpvlen, u8mtmpname, AFPVOL_U8MNAMELEN*2)) )
- return -1;
+ EC_FAIL;
LOG(log_maxdebug, logtype_afpd, "createvol: Volume '%s' -> UTF8-MAC Name: '%s'", name, tmpname);
tmpvlen,
mactmpname,
AFPVOL_U8MNAMELEN*2)) )
- return -1;
+ EC_FAIL;
LOG(log_maxdebug, logtype_afpd, "createvol: Volume '%s' -> Longname: '%s'", name, tmpname);
- /* check duplicate */
- for ( volume = Volumes; volume; volume = volume->v_next ) {
- if ((utf8_encoding(obj) && (strcasecmp_w(volume->v_u8mname, u8mtmpname) == 0))
- ||
- (!utf8_encoding(obj) && (strcasecmp_w(volume->v_macname, mactmpname) == 0))) {
- LOG (log_error, logtype_afpd,
- "Duplicate volume name, check AppleVolumes files: previous: \"%s\", new: \"%s\"",
- volume->v_localname, name);
- if (volume->v_deleted) {
- volume->v_new = hide = 1;
- }
- else {
- return -1; /* Won't be able to access it, anyway... */
- }
- }
- }
+ 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) );
- if (!( volume = (struct vol *)calloc(1, sizeof( struct vol ))) ) {
- LOG(log_error, logtype_afpd, "creatvol: malloc: %s", strerror(errno) );
- return -1;
- }
- if ( NULL == ( volume->v_localname = strdup(name))) {
- LOG(log_error, logtype_afpd, "creatvol: malloc: %s", strerror(errno) );
- free(volume);
- return -1;
- }
-
- if ( NULL == ( volume->v_u8mname = strdup_w(u8mtmpname))) {
- LOG(log_error, logtype_afpd, "creatvol: malloc: %s", strerror(errno) );
- volume_free(volume);
- free(volume);
- return -1;
- }
- if ( NULL == ( volume->v_macname = strdup_w(mactmpname))) {
- LOG(log_error, logtype_afpd, "creatvol: malloc: %s", strerror(errno) );
- volume_free(volume);
- free(volume);
- return -1;
- }
- if (!( volume->v_path = (char *)malloc( strlen( path ) + 1 )) ) {
- LOG(log_error, logtype_afpd, "creatvol: malloc: %s", strerror(errno) );
- volume_free(volume);
- free(volume);
- return -1;
- }
-
- volume->v_name = utf8_encoding(obj)?volume->v_u8mname:volume->v_macname;
- volume->v_hide = hide;
- strcpy( volume->v_path, path );
+ volume->v_name = utf8_encoding(obj) ? volume->v_u8mname : volume->v_macname;
+ strcpy(volume->v_path, path);
#ifdef __svr4__
volume->v_qfd = -1;
#endif /* __svr4__ */
+
/* os X start at 1 and use network order ie. 1 2 3 */
volume->v_vid = ++lastvid;
volume->v_vid = htons(volume->v_vid);
+
#ifdef HAVE_ACLS
if (!check_vol_acl_support(volume)) {
LOG(log_debug, logtype_afpd, "creatvol(\"%s\"): disabling ACL support", volume->v_path);
- options[VOLOPT_FLAGS].i_value &= ~AFPVOL_ACLS;
+ volume->v_flags &= ~AFPVOL_ACLS;
}
#endif
- /* handle options */
- if (options) {
- volume->v_casefold = options[VOLOPT_CASEFOLD].i_value;
- volume->v_flags |= options[VOLOPT_FLAGS].i_value;
-
- if (options[VOLOPT_EA_VFS].i_value)
- volume->v_vfs_ea = options[VOLOPT_EA_VFS].i_value;
-
- volume->v_ad_options = 0;
- if ((volume->v_flags & AFPVOL_NODEV))
- volume->v_ad_options |= ADVOL_NODEV;
- if ((volume->v_flags & AFPVOL_UNIX_PRIV))
- volume->v_ad_options |= ADVOL_UNIXPRIV;
- if ((volume->v_flags & AFPVOL_INV_DOTS))
- volume->v_ad_options |= ADVOL_INVDOTS;
-
- if (options[VOLOPT_PASSWORD].c_value)
- volume->v_password = strdup(options[VOLOPT_PASSWORD].c_value);
-
- if (options[VOLOPT_VETO].c_value)
- volume->v_veto = strdup(options[VOLOPT_VETO].c_value);
-
- if (options[VOLOPT_ENCODING].c_value)
- volume->v_volcodepage = strdup(options[VOLOPT_ENCODING].c_value);
-
- if (options[VOLOPT_MACCHARSET].c_value)
- volume->v_maccodepage = strdup(options[VOLOPT_MACCHARSET].c_value);
-
- if (options[VOLOPT_DBPATH].c_value)
- volume->v_dbpath = volxlate(obj, NULL, MAXPATHLEN, options[VOLOPT_DBPATH].c_value, pwd, path, name);
-
- if (options[VOLOPT_CNIDSCHEME].c_value)
- volume->v_cnidscheme = strdup(options[VOLOPT_CNIDSCHEME].c_value);
-
- if (options[VOLOPT_CNIDSERVER].c_value)
- volume->v_cnidserver = strdup(options[VOLOPT_CNIDSERVER].c_value);
-
- if (options[VOLOPT_CNIDPORT].c_value)
- volume->v_cnidport = strdup(options[VOLOPT_CNIDPORT].c_value);
-
- if (options[VOLOPT_UMASK].i_value)
- volume->v_umask = (mode_t)options[VOLOPT_UMASK].i_value;
-
- if (options[VOLOPT_DPERM].i_value)
- volume->v_dperm = (mode_t)options[VOLOPT_DPERM].i_value;
-
- if (options[VOLOPT_FPERM].i_value)
- volume->v_fperm = (mode_t)options[VOLOPT_FPERM].i_value;
-
- if (options[VOLOPT_DFLTPERM].i_value)
- volume->v_perm = (mode_t)options[VOLOPT_DFLTPERM].i_value;
-
- if (options[VOLOPT_ADOUBLE].i_value)
- volume->v_adouble = options[VOLOPT_ADOUBLE].i_value;
- else
- volume->v_adouble = AD_VERSION;
-
- if (options[VOLOPT_LIMITSIZE].i_value)
- volume->v_limitsize = options[VOLOPT_LIMITSIZE].i_value;
-
- /* Mac to Unix conversion flags*/
- volume->v_mtou_flags = 0;
- 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;
-
- if ((volume->v_casefold & AFPVOL_MTOUUPPER))
- volume->v_mtou_flags |= CONV_TOUPPER;
- else if ((volume->v_casefold & AFPVOL_MTOULOWER))
- volume->v_mtou_flags |= CONV_TOLOWER;
-
- /* Unix to Mac conversion flags*/
- volume->v_utom_flags = CONV_IGNORE | CONV_UNESCAPEHEX;
- if ((volume->v_casefold & AFPVOL_UTOMUPPER))
- volume->v_utom_flags |= CONV_TOUPPER;
- else if ((volume->v_casefold & AFPVOL_UTOMLOWER))
- volume->v_utom_flags |= CONV_TOLOWER;
-
- if ((volume->v_flags & AFPVOL_EILSEQ))
- volume->v_utom_flags |= CONV__EILSEQ;
-
- if (options[VOLOPT_PREEXEC].c_value)
- volume->v_preexec = volxlate(obj, NULL, MAXPATHLEN, options[VOLOPT_PREEXEC].c_value, pwd, path, name);
- volume->v_preexec_close = options[VOLOPT_PREEXEC].i_value;
-
- if (options[VOLOPT_POSTEXEC].c_value)
- volume->v_postexec = volxlate(obj, NULL, MAXPATHLEN, options[VOLOPT_POSTEXEC].c_value, pwd, path, name);
-
- if (options[VOLOPT_ROOTPREEXEC].c_value)
- volume->v_root_preexec = volxlate(obj, NULL, MAXPATHLEN, options[VOLOPT_ROOTPREEXEC].c_value, pwd, path, name);
- volume->v_root_preexec_close = options[VOLOPT_ROOTPREEXEC].i_value;
-
- if (options[VOLOPT_ROOTPOSTEXEC].c_value)
- volume->v_root_postexec = volxlate(obj, NULL, MAXPATHLEN, options[VOLOPT_ROOTPOSTEXEC].c_value, pwd, path, name);
- }
- volume->v_dperm |= volume->v_perm;
- volume->v_fperm |= volume->v_perm;
-
/* Check EA support on volume */
if (volume->v_vfs_ea == AFPVOL_EA_AUTO || volume->v_adouble == AD_VERSION_EA)
check_ea_support(volume);
initvol_vfs(volume);
/* get/store uuid from file in afpd master*/
- if ((parent_or_child == 0) && (volume->v_flags & AFPVOL_TM)) {
+ if (!(pwd) && (volume->v_flags & AFPVOL_TM)) {
char *uuid = get_vol_uuid(obj, volume->v_localname);
if (!uuid) {
LOG(log_error, logtype_afpd, "Volume '%s': couldn't get UUID",
}
}
+ /* no errors shall happen beyond this point because the cleanup would mess the volume chain up */
volume->v_next = Volumes;
Volumes = volume;
volume->v_obj = obj;
- return 0;
-}
-/* check access list. this function wants something of the following
- * form:
- * @group,name,name2,@group2,name3
- *
- * a NULL argument allows everybody to have access.
- * we return three things:
- * -1: no list
- * 0: list exists, but name isn't in it
- * 1: in list
- */
-
-#ifndef NO_REAL_USER_NAME
-/* authentication is case insensitive
- * FIXME should we do the same with group name?
- */
-#define access_strcmp strcasecmp
-
-#else
-#define access_strcmp strcmp
-
-#endif
-
-static int accessvol(const AFPObj *obj, const char *args, const char *name)
-{
- char buf[MAXPATHLEN + 1], *p;
- struct group *gr;
-
- if (!args)
- return -1;
-
- strlcpy(buf, args, sizeof(buf));
- if ((p = strtok(buf, ",")) == NULL) /* nothing, return okay */
- return -1;
-
- while (p) {
- if (*p == '@') { /* it's a group */
- if ((gr = getgrnam(p + 1)) && gmem(gr->gr_gid, obj->ngroups, obj->groups))
- return 1;
- } else if (access_strcmp(p, name) == 0) /* it's a user name */
- return 1;
- p = strtok(NULL, ",");
- }
-
- return 0;
-}
-
-static int hostaccessvol(const AFPObj *obj, int type, const char *volname, const char *args)
-{
- int mask_int;
- char buf[MAXPATHLEN + 1], *p, *b;
- struct sockaddr_storage client;
- const DSI *dsi = obj->dsi;
-
- if (!args)
- return -1;
-
- strlcpy(buf, args, sizeof(buf));
- if ((p = strtok_r(buf, ",", &b)) == NULL) /* nothing, return okay */
- return -1;
-
- while (p) {
- int ret;
- char *ipaddr, *mask_char;
- struct addrinfo hints, *ai;
-
- ipaddr = strtok(p, "/");
- mask_char = strtok(NULL,"/");
-
- /* Get address from string with getaddrinfo */
- memset(&hints, 0, sizeof hints);
- hints.ai_family = AF_UNSPEC;
- hints.ai_socktype = SOCK_STREAM;
- if ((ret = getaddrinfo(ipaddr, NULL, &hints, &ai)) != 0) {
- LOG(log_error, logtype_afpd, "hostaccessvol: getaddrinfo: %s\n", gai_strerror(ret));
- continue;
- }
-
- /* netmask */
- if (mask_char != NULL)
- mask_int = atoi(mask_char); /* apply_ip_mask does range checking on it */
- else {
- if (ai->ai_family == AF_INET) /* IPv4 */
- mask_int = 32;
- else /* IPv6 */
- mask_int = 128;
- }
-
- /* Apply mask to addresses */
- client = dsi->client;
- apply_ip_mask((struct sockaddr *)&client, mask_int);
- apply_ip_mask(ai->ai_addr, mask_int);
-
- if (compare_ip((struct sockaddr *)&client, ai->ai_addr) == 0) {
- if (type == VOLOPT_DENIED_HOSTS)
- LOG(log_info, logtype_afpd, "AFP access denied for client IP '%s' to volume '%s' by denied list",
- getip_string((struct sockaddr *)&client), volname);
- freeaddrinfo(ai);
- return 1;
+EC_CLEANUP:
+ LOG(log_debug, logtype_afpd, "createvol: END: %d", ret);
+ if (ret != 0) {
+ if (volume) {
+ volume_free(volume);
+ free(volume);
}
-
- /* next address */
- freeaddrinfo(ai);
- p = strtok_r(NULL, ",", &b);
+ return NULL;
}
-
- if (type == VOLOPT_ALLOWED_HOSTS)
- LOG(log_info, logtype_afpd, "AFP access denied for client IP '%s' to volume '%s', not in allowed list",
- getip_string((struct sockaddr *)&dsi->client), volname);
- return 0;
+ return volume;
}
/* ----------------------
*/
static int volfile_changed(struct afp_options *p)
{
- struct stat st;
+ struct stat st;
if (!stat(p->configfile, &st) && st.st_mtime > p->volfile.mtime) {
p->volfile.mtime = st.st_mtime;
{
if (STRCMP(sec, ==, INISEC_GLOBAL))
return 0;
- if (STRCMP(sec, ==, INISEC_AFP))
- return 0;
- if (STRCMP(sec, ==, INISEC_CNID))
- return 0;
return 1;
}
-/* ----------------------
+#define MAXPRESETLEN 100
+/*!
* Read volumes from iniconfig and add the volumes contained within to
* the global volume list. This gets called from the forked afpd childs.
* The master now reads this too for Zeroconf announcements.
*/
-static int readvolfile(const AFPObj *obj, const struct passwd *pwent)
+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];
- char *u;
- const char *p;
- int fd;
+ const char *preset, *default_preset, *p, *basedir;
+ char *q, *u;
int i;
- struct passwd *pw;
- struct vol_option save_options[VOLOPT_NUM];
- struct vol_option default_options[VOLOPT_NUM];
- struct vol_option options[VOLOPT_NUM];
+ struct passwd *pw;
+ regmatch_t match[1];
LOG(log_debug, logtype_afpd, "readvolfile: BEGIN");
- memset(default_options, 0, sizeof(default_options));
-
- /* Enable some default options for all volumes */
- default_options[VOLOPT_FLAGS].i_value |= AFPVOL_USEDOTS | AFPVOL_UNIX_PRIV;
-#ifdef HAVE_ACLS
- default_options[VOLOPT_FLAGS].i_value |= AFPVOL_ACLS;
-#endif
- default_options[VOLOPT_EA_VFS].i_value = AFPVOL_EA_AUTO;
- default_options[VOLOPT_UMASK].i_value = obj->options.umask;
- memcpy(save_options, default_options, sizeof(options));
-
int secnum = iniparser_getnsec(obj->iniconfig);
LOG(log_debug, logtype_afpd, "readvolfile: sections: %d", secnum);
const char *secname;
+ if ((default_preset = iniparser_getstring(obj->iniconfig, INISEC_GLOBAL, "vol preset", NULL))) {
+ LOG(log_debug, logtype_afpd, "readvolfile: default_preset: %s", default_preset);
+ }
+
for (i = 0; i < secnum; i++) {
secname = iniparser_getsecname(obj->iniconfig, i);
- if (!vol_section(secname))
- continue;
- strlcpy(volname, secname, AFPVOL_U8MNAMELEN);
- LOG(log_debug, logtype_afpd, "readvolfile: volume: %s", volname);
-
- if ((p = iniparser_getstrdup(obj->iniconfig, secname, "path", NULL)) == NULL)
- continue;
- strlcpy(path, p, MAXPATHLEN);
- strcpy(tmp, path);
-
- if (volxlate(obj, path, sizeof(path) - 1, tmp, pwent, NULL, NULL) == NULL)
+ if (!vol_section(secname))
continue;
-
- memcpy(options, default_options, sizeof(options));
- volset(obj->iniconfig, secname, options, default_options);
-
- /* check allow/deny lists (if not afpd master loading volumes for Zeroconf reg.):
- allow -> either no list (-1), or in list (1)
- deny -> either no list (-1), or not in list (0) */
-
- if (pwent) {
- if (accessvol(obj, options[VOLOPT_DENY].c_value, pwent->pw_name) == 1)
+ if (STRCMP(secname, ==, INISEC_HOMES)) {
+ have_uservol = 1;
+ 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 (accessvol(obj, options[VOLOPT_ALLOW].c_value, pwent->pw_name) == 0)
+ if (pwent->pw_dir == NULL || STRCMP("", ==, pwent->pw_dir))
+ /* no user home */
continue;
- if (hostaccessvol(obj, VOLOPT_DENIED_HOSTS, volname, options[VOLOPT_DENIED_HOSTS].c_value) == 1)
+
+ /* check if user home matches our "basedir regex" */
+ if ((basedir = iniparser_getstring(obj->iniconfig, INISEC_HOMES, "basedir regex", NULL)) == NULL)
continue;
- if (hostaccessvol(obj, VOLOPT_ALLOWED_HOSTS, volname, options[VOLOPT_ALLOWED_HOSTS].c_value) == 0)
+ 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;
- }
+ }
- /* 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. */
- if (pwent && !(options[VOLOPT_FLAGS].i_value & AFPVOL_RO)) {
- if (accessvol(obj, options[VOLOPT_ROLIST].c_value, pwent->pw_name) == 1
- || accessvol(obj, options[VOLOPT_RWLIST].c_value, pwent->pw_name) == 0)
- options[VOLOPT_FLAGS].i_value |= AFPVOL_RO;
+ strlcpy(tmp, pwent->pw_dir, MAXPATHLEN);
+ strlcat(tmp, "/", MAXPATHLEN);
+ if (p = iniparser_getstring(obj->iniconfig, INISEC_HOMES, "path", NULL))
+ strlcat(tmp, p, MAXPATHLEN);
+ } else {
+ /* Get path */
+ if ((p = iniparser_getstring(obj->iniconfig, secname, "path", NULL)) == NULL)
+ continue;
+ strlcpy(tmp, p, MAXPATHLEN);
}
- /* do variable substitution for volname */
- if (volxlate(obj, tmp, sizeof(tmp) - 1, volname, pwent, path, NULL) == NULL) {
- volfree(options, default_options);
+ if (volxlate(obj, path, sizeof(path) - 1, tmp, pwent, NULL, NULL) == NULL)
continue;
- }
-
- creatvol(obj, pwent, path, tmp, options);
- volfree(options, default_options);
- }
- volfree(save_options, NULL);
- return( 0 );
-}
-/* ------------------------------- */
-static void free_volumes(void)
-{
- struct vol *vol;
- struct vol *nvol, *ovol;
-
- for ( vol = Volumes; vol; vol = vol->v_next ) {
- if (( vol->v_flags & AFPVOL_OPEN ) ) {
- vol->v_deleted = 1;
- continue;
+ /* 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);
+ } else {
+ strlcpy(tmp, secname, AFPVOL_U8MNAMELEN);
}
- volume_free(vol);
- }
+ if (volxlate(obj, volname, sizeof(volname) - 1, tmp, pwent, path, NULL) == NULL)
+ continue;
- for ( vol = Volumes, ovol = NULL; vol; vol = nvol) {
- nvol = vol->v_next;
+ preset = iniparser_getstring(obj->iniconfig, secname, "vol preset", NULL);
- if (vol->v_localname == NULL) {
- if (Volumes == vol) {
- Volumes = nvol;
- ovol = Volumes;
- }
- else {
- ovol->v_next = nvol;
- }
- free(vol);
- }
- else {
- ovol = vol;
- }
+ creatvol(obj, pwent, secname, volname, path, preset ? preset : default_preset ? default_preset : NULL);
}
+
+EC_CLEANUP:
+ EC_EXIT;
}
/**************************************************************
struct vol *vol, *ovol, *nvol;
if (volume == Volumes) {
- Volumes = Volumes->v_next;
+ Volumes = NULL;
return;
}
for ( vol = Volumes->v_next, ovol = Volumes; vol; vol = nvol) {
}
/*!
- * Free all resources allocated in a struct vol
+ * Free all resources allocated in a struct vol, only struct dir *v_root can't be freed
*/
void volume_free(struct vol *vol)
{
+ LOG(log_debug, logtype_afpd, "volume_free('%s'): BEGIN", vol->v_localname);
+
free(vol->v_localname);
- vol->v_localname = NULL;
free(vol->v_u8mname);
- vol->v_u8mname = NULL;
free(vol->v_macname);
- vol->v_macname = NULL;
free(vol->v_path);
free(vol->v_password);
free(vol->v_veto);
free(vol->v_cnidscheme);
free(vol->v_dbpath);
free(vol->v_gvs);
- if (vol->v_uuid)
- free(vol->v_uuid);
+ free(vol->v_uuid);
+ free(vol->v_cnidserver);
+ free(vol->v_cnidport);
+ free(vol->v_root_preexec);
+ free(vol->v_postexec);
+
+ LOG(log_debug, logtype_afpd, "volume_free: END");
+}
+
+/*!
+ * Load charsets for a volume
+ */
+int load_charset(struct vol *vol)
+{
+ if ((vol->v_maccharset = add_charset(vol->v_maccodepage)) == (charset_t)-1) {
+ LOG(log_error, logtype_default, "Setting mac charset '%s' failed", vol->v_maccodepage);
+ return -1;
+ }
+
+ if ((vol->v_volcharset = add_charset(vol->v_volcodepage)) == (charset_t)-1) {
+ LOG(log_error, logtype_default, "Setting vol charset '%s' failed", vol->v_volcodepage);
+ return -1;
+ }
+
+ return 0;
}
/*!
* @param obj (r) handle
* @param delvol_fn (r) callback called for deleted volumes
*/
-int load_volumes(AFPObj *obj, void (*delvol_fn)(const struct vol *))
+int load_volumes(AFPObj *obj, void (*delvol_fn)(struct vol *))
{
EC_INIT;
int fd = -1;
if (Volumes) {
if (!volfile_changed(&obj->options))
goto EC_CLEANUP;
- /* TODO: volume reloading */
-// free_volumes();
- goto EC_CLEANUP;
+ have_uservol = 0;
+ for (vol = Volumes; vol; vol = vol->v_next) {
+ vol->v_deleted = 1;
+ }
+ } else {
+ LOG(log_debug, logtype_afpd, "load_volumes: no volumes yet");
+ EC_ZERO_LOG( lstat(obj->options.configfile, &st) );
+ obj->options.volfile.mtime = st.st_mtime;
}
/* try putting a read lock on the volume file twice, sleep 1 second if first attempt fails */
if (obj->iniconfig)
iniparser_freedict(obj->iniconfig);
- LOG(log_debug, logtype_afpd, "load_volumes: reloading: %s", obj->options.configfile);
+ LOG(log_debug, logtype_afpd, "load_volumes: loading: %s", obj->options.configfile);
obj->iniconfig = iniparser_load(obj->options.configfile);
EC_ZERO_LOG( readvolfile(obj, pwent) );
for ( vol = Volumes; vol; vol = vol->v_next ) {
- if (vol->v_deleted && !vol->v_new ) {
- delvol_fn(vol);
+ if (vol->v_deleted) {
+ LOG(log_debug, logtype_afpd, "load_volumes: deleted: %s", vol->v_localname);
+ if (delvol_fn)
+ delvol_fn(vol);
vol = Volumes;
}
}
EC_CLEANUP:
if (fd != -1)
(void)close(fd);
+
+ LOG(log_debug, logtype_afpd, "load_volumes: END");
EC_EXIT;
}
-void unload_volumes(void)
+void unload_volumes(AFPObj *obj)
{
- LOG(log_debug, logtype_afpd, "unload_volumes");
- free_volumes();
+ struct vol *vol;
+
+ LOG(log_debug, logtype_afpd, "unload_volumes: BEGIN");
+
+ for (vol = Volumes; vol; vol = vol->v_next)
+ volume_free(vol);
+ Volumes = NULL;
+ obj->options.volfile.mtime = 0;
+
+ LOG(log_debug, logtype_afpd, "unload_volumes: END");
}
struct vol *getvolumes(void)
return( vol );
}
-struct vol *getvolbypath(const char *path)
+/*!
+ * Search volume by path, creating user home vols as necessary
+ *
+ * Path may be absolute or relative. Ordinary volume structs are created when
+ * the ini config is initially parsed (load_volumes()), but user volumes are
+ * as load_volumes() only can create the user volume of the logged in user
+ * in an AFP session in afpd, but not when called from eg cnid_metad or dbd.
+ * Both cnid_metad and dbd thus need a way to lookup and create struct vols
+ * for user home by path. This is what this func does as well.
+ *
+ * (1) Search "normal" volume list
+ * (2) Check if theres a [Homes] section, load_volumes() remembers this for us
+ * (3) If there is, match "path" with "basedir regex" to get the user home parent dir
+ * (4) Built user home path by appending the basedir matched in (3) and appending the username
+ * (5) The next path element then is the username
+ * (6) Append [Homes]->path subdirectory if defined
+ * (7) Create volume
+ *
+ * @param obj (rw) handle
+ * @param path (r) path, may be relative or absolute
+ */
+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 tmpbuf[MAXPATHLEN + 1];
+ const char *secname, *basedir, *p = NULL, *subpath = NULL, *subpathconfig;
+ char *user = NULL, *prw;
+ regmatch_t match[1];
+
+ LOG(log_debug, logtype_afpd, "getvolbypath(\"%s\")", path);
+
+ if (path[0] != '/') {
+ /* relative path, build absolute path */
+ EC_NULL_LOG( getcwd(abspath, MAXPATHLEN) );
+ strlcat(abspath, "/", MAXPATHLEN);
+ strlcat(abspath, path, MAXPATHLEN);
+ path = abspath;
+ }
+
+
+ for (tmp = Volumes; tmp; tmp = tmp->v_next) { /* (1) */
+ if (strncmp(path, tmp->v_path, strlen(tmp->v_path)) == 0) {
+ vol = tmp;
+ goto EC_CLEANUP;
+ }
+ }
+
+ if (!have_uservol) /* (2) */
+ EC_FAIL_LOG("getvolbypath(\"%s\"): no volume for path", path);
+
+ int secnum = iniparser_getnsec(obj->iniconfig);
+
+ for (int i = 0; i < secnum; i++) {
+ secname = iniparser_getsecname(obj->iniconfig, i);
+ if (STRCMP(secname, ==, INISEC_HOMES))
+ break;
+ }
+
+ if (STRCMP(secname, !=, INISEC_HOMES))
+ EC_FAIL_LOG("getvolbypath(\"%s\"): no volume for path", path);
+
+ /* (3) */
+ EC_NULL_LOG( basedir = iniparser_getstring(obj->iniconfig, INISEC_HOMES, "basedir regex", NULL) );
+ LOG(log_debug, logtype_afpd, "getvolbypath: user home section: '%s', basedir: '%s'", secname, basedir);
+
+ if (regexerr != 0 && (regexerr = regcomp(®, basedir, REG_EXTENDED)) != 0) {
+ char errbuf[1024];
+ regerror(regexerr, ®, errbuf, sizeof(errbuf));
+ printf("error: %s\n", errbuf);
+ EC_FAIL_LOG("getvolbypath(\"%s\"): bad basedir regex: %s", errbuf);
+ }
+
+ if (regexec(®, path, 1, match, 0) == REG_NOMATCH)
+ EC_FAIL_LOG("getvolbypath(\"%s\"): no volume for path", path);
+
+ if (match[0].rm_eo - match[0].rm_so > MAXPATHLEN)
+ EC_FAIL_LOG("getvolbypath(\"%s\"): path too long", path);
+
+ /* (4) */
+ strncpy(tmpbuf, path + match[0].rm_so, match[0].rm_eo - match[0].rm_so);
+ tmpbuf[match[0].rm_eo - match[0].rm_so] = 0;
+
+ LOG(log_debug, logtype_afpd, "getvolbypath: basedir regex: '%s', basedir match: \"%s\"",
+ basedir, tmpbuf);
+
+ strlcat(tmpbuf, "/", MAXPATHLEN);
+
+ /* (5) */
+ p = path + strlen(basedir);
+ while (*p == '/')
+ p++;
+ EC_NULL_LOG( user = strdup(p) );
+
+ if (prw = strchr(user, '/'))
+ *prw++ = 0;
+ if (prw != 0)
+ subpath = prw;
+
+ strlcat(tmpbuf, user, MAXPATHLEN);
+ strlcat(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);
+ }
+
+
+ /* (7) */
+ if (volxlate(obj, volpath, sizeof(volpath) - 1, tmpbuf, pw, NULL, NULL) == NULL)
+ return NULL;
+
+ EC_NULL( pw = getpwnam(user) );
+
+ LOG(log_debug, logtype_afpd, "getvolbypath(\"%s\"): user: %s, homedir: %s => volpath: \"%s\"",
+ path, user, pw->pw_dir, volpath);
+
+ /* do variable substitution for volume name */
+ p = iniparser_getstring(obj->iniconfig, INISEC_HOMES, "home name", "$u's home");
+ strlcpy(tmpbuf, p, AFPVOL_U8MNAMELEN);
+ EC_NULL_LOG( volxlate(obj, volname, sizeof(volname) - 1, tmpbuf, pw, volpath, 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);
+
+EC_CLEANUP:
+ if (user)
+ free(user);
+ if (ret != 0)
+ vol = NULL;
+ return vol;
+}
+
+struct vol *getvolbyname(const char *name)
{
struct vol *vol = NULL;
struct vol *tmp;
for (tmp = Volumes; tmp; tmp = tmp->v_next) {
- if (strncmp(path, tmp->v_path, strlen(tmp->v_path)) == 0) {
+ if (strncmp(name, tmp->v_configname, strlen(tmp->v_configname)) == 0) {
vol = tmp;
break;
}
/*!
* 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_CONFDIR "afp_signature.conf");
- options->uuidconf = strdup(_PATH_CONFDIR "afp_voluuid.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;
if ((config = iniparser_load(AFPObj->options.configfile)) == NULL)
AFPObj->iniconfig = config;
/* [Global] */
- options->logconfig = iniparser_getstrdup(config, INISEC_GLOBAL, "loglevel", "default:note");
- 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 = 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, ", ");
- }
- }
- }
- /* figure out options w values */
+ options->logconfig = iniparser_getstrdup(config, INISEC_GLOBAL, "log level", "default:note");
+ options->logfile = iniparser_getstrdup(config, INISEC_GLOBAL, "log file", NULL);
+
+ 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_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, "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->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) * 60 * 2;
- options->disconnected = iniparser_getint (config, INISEC_AFP, "disconnect", 24) * 60 * 2;
-
- if ((p = iniparser_getstring(config, INISEC_AFP, "hostname", NULL))) {
+ /* 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", "");
+ 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);
+ options->ntdomain = iniparser_getstrdup(config, INISEC_GLOBAL, "nt domain", NULL);
+ options->ntseparator = iniparser_getstrdup(config, INISEC_GLOBAL, "nt separator", NULL);
+ options->mimicmodel = iniparser_getstrdup(config, INISEC_GLOBAL, "mimic model", NULL);
+ options->adminauthuser = iniparser_getstrdup(config, INISEC_GLOBAL, "admin auth user",NULL);
+ options->connections = iniparser_getint (config, INISEC_GLOBAL, "max connections",200);
+ options->passwdminlen = iniparser_getint (config, INISEC_GLOBAL, "passwd minlen", 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, "fce holdfmod", 60);
+ options->sleep = iniparser_getint (config, INISEC_GLOBAL, "sleep time", 10);
+ options->disconnected = iniparser_getint (config, INISEC_GLOBAL, "disconnect time",24);
+
+ if ((p = iniparser_getstring(config, INISEC_GLOBAL, "hostname", NULL))) {
EC_NULL_LOG( options->hostname = strdup(p) );
} else {
if (gethostname(val, sizeof(val)) < 0 ) {
options->hostname = strdup(val);
}
- if ((p = iniparser_getstring(config, INISEC_AFP, "k5keytab", NULL))) {
+ if ((p = iniparser_getstring(config, INISEC_GLOBAL, "k5 keytab", 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, "admin group", 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, "cnid server", "localhost:4700");
r = strrchr(q, ':');
if (r)
*r = 0;
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)
free(q);
}
- if (!(p = iniparser_getstring(config, INISEC_AFP, "unixcodepage", NULL))) {
- options->unixcharset = CH_UNIX;
- options->unixcodepage = strdup("LOCALE");
+ /* Charset Options */
+
+ /* unix charset is in [G] only */
+ if (!(p = iniparser_getstring(config, INISEC_GLOBAL, "unix charset", NULL))) {
+ 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 codepage 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);
}
-
- if (!(p = iniparser_getstring(config, INISEC_AFP, "maccodepage", NULL))) {
- options->maccharset = CH_MAC;
+ options->unixcharset = CH_UNIX;
+ LOG(log_debug, logtype_afpd, "Global unix charset is %s", options->unixcodepage);
+
+ /* vol charset is in [G] and [V] */
+ if (!(p = iniparser_getstring(config, INISEC_GLOBAL, "vol charset", NULL))) {
+ 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->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 Unix codepage 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)
options->tickleval = 30;
+ options->disconnected *= 3600 / options->tickleval;
+ options->sleep *= 3600 / options->tickleval;
if (options->timeout <= 0)
options->timeout = 4;
if (options->sleep <= 4)
if (options->volnamelen < 8)
options->volnamelen = 8; /* max mangled volname "???#FFFF" */
if (options->volnamelen > 255)
- options->volnamelen = 255; /* AFP3 spec */
+ options->volnamelen = 255; /* AFP3 spec */
EC_CLEANUP:
EC_EXIT;
}
-
projects / netatalk.git / blobdiff