/*
- * $Id: volume.c,v 1.57 2003-09-03 21:25:38 samnoble Exp $
+ * $Id: volume.c,v 1.123 2010-04-04 15:04:45 franklahm Exp $
*
* Copyright (c) 1990,1993 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
#include "config.h"
#endif /* HAVE_CONFIG_H */
-#include <sys/time.h>
-#include <atalk/logger.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netatalk/endian.h>
-#include <atalk/asp.h>
-#include <atalk/dsi.h>
-#include <atalk/adouble.h>
-#include <atalk/afp.h>
-#include <atalk/util.h>
-#ifdef CNID_DB
-#include <atalk/cnid.h>
-#endif /* CNID_DB*/
-#include <dirent.h>
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif /* HAVE_FCNTL_H */
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
-
+#include <pwd.h>
+#include <grp.h>
+#include <utime.h>
+#include <errno.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
/* STDC check */
#if STDC_HEADERS
#include <string.h>
#define memmove(d,s,n) bcopy ((s), (d), (n))
#endif /* ! HAVE_MEMCPY */
#endif /* STDC_HEADERS */
+#include <sys/param.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <atalk/asp.h>
+#include <atalk/dsi.h>
+#include <atalk/adouble.h>
+#include <atalk/afp.h>
+#include <atalk/util.h>
+#include <atalk/volinfo.h>
+#include <atalk/logger.h>
+#include <atalk/vfs.h>
+#include <atalk/ea.h>
+#ifdef CNID_DB
+#include <atalk/cnid.h>
+#endif /* CNID_DB*/
-#include <pwd.h>
-#include <grp.h>
-#include <utime.h>
-#include <errno.h>
-
+#include "globals.h"
#include "directory.h"
#include "file.h"
#include "volume.h"
-#include "globals.h"
#include "unix.h"
+#include "mangle.h"
+#include "fork.h"
+#include "hash.h"
+
+extern int afprun(int root, char *cmd, int *outfd);
#ifndef MIN
#define MIN(a, b) ((a) < (b) ? (a) : (b))
#endif /* BYTE_ORDER == BIG_ENDIAN */
#endif /* ! NO_LARGE_VOL_SUPPORT */
-static struct vol *volumes = NULL;
-static int lastvid = 0;
-#ifndef CNID_DB
-static char *Trash = "\02\024Network Trash Folder";
-#endif /* CNID_DB */
-static struct extmap *extmap = NULL, *defextmap = NULL;
-static int extmap_cnt;
+static struct vol *Volumes = NULL;
+static u_int16_t lastvid = 0;
+static char *Trash = "\02\024Network Trash Folder";
+
+static struct extmap *Extmap = NULL, *Defextmap = NULL;
+static int Extmap_cnt;
+static void free_extmap(void);
#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_CODEPAGE 4 /* codepage */
-#define VOLOPT_PASSWORD 5 /* volume password */
-#define VOLOPT_CASEFOLD 6 /* character case mangling */
-#define VOLOPT_FLAGS 7 /* various flags */
-#define VOLOPT_DBPATH 8 /* path to database */
-#define VOLOPT_MAPCHARS 9 /* does mtou and utom mappings. syntax:
-m and u can be double-byte hex
-strings if necessary.
-m=u -> map both ways
- m>u -> map m to u
- m<u -> map u to m
- !u -> make u illegal always
- ~u -> make u illegal only as the first
- part of a double-byte character.
- */
-#define VOLOPT_VETO 10 /* list of veto filespec */
+#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 */
+/* Usable slots: 8 and 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 */
#ifdef FORCE_UIDGID
#warning UIDGID
#include "uid.h"
-#define VOLOPT_FORCEUID 11 /* force uid for username x */
-#define VOLOPT_FORCEGID 12 /* force gid for group x */
-#define VOLOPT_UMASK 13
-#define VOLOPT_MAX 13
-#else /* normally, there are only 9 possible options */
-#define VOLOPT_UMASK 11
-#define VOLOPT_MAX 11
+#define VOLOPT_FORCEUID 19 /* force uid for username x */
+#define VOLOPT_FORCEGID 20 /* force gid for group x */
#endif /* FORCE_UIDGID */
-#define VOLOPT_NUM (VOLOPT_MAX + 1)
+#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)
#define VOLPASSLEN 8
#define VOLOPT_DEFAULT ":DEFAULT:"
#define VOLOPT_DEFAULT_LEN 9
- struct vol_option {
- char *c_value;
- int i_value;
- };
-static __inline__ void volfree(struct vol_option *options,
- const struct vol_option *save)
+struct vol_option {
+ char *c_value;
+ int i_value;
+};
+
+typedef struct _special_folder {
+ const char *name;
+ int precreate;
+ mode_t mode;
+ int hide;
+} _special_folder;
+
+static const _special_folder special_folders[] = {
+ {"Network Trash Folder", 1, 0777, 1},
+ {"Temporary Items", 1, 0777, 1},
+ {".AppleDesktop", 1, 0777, 0},
+#if 0
+ {"TheFindByContentFolder", 0, 0, 1},
+ {"TheVolumeSettingsFolder", 0, 0, 1},
+#endif
+ {NULL, 0, 0, 0}};
+
+/* Forward declarations */
+static void handle_special_folders (const struct vol *);
+static void deletevol(struct vol *vol);
+static void volume_free(struct vol *vol);
+static void check_ea_sys_support(struct vol *vol);
+
+static void volfree(struct vol_option *options, const struct vol_option *save)
{
int i;
/* handle variable substitutions. here's what we understand:
+ * $b -> basename of path
* $c -> client ip/appletalk address
+ * $d -> volume pathname on server
* $f -> full name (whatever's in the gecos field)
* $g -> group
- * $h -> hostname
+ * $h -> hostname
+ * $i -> client ip/appletalk address without port
* $s -> server name (hostname if it doesn't exist)
* $u -> username (guest is usually nobody)
- * $v -> volume name (ADEID_NAME or basename)
+ * $v -> volume name or basename if null
* $z -> zone (may not exist)
* $$ -> $
+ *
+ *
*/
#define is_var(a, b) (strncmp((a), (b), 2) == 0)
-static void volxlate(AFPObj *obj, char *dest, int destlen,
- char *src, struct passwd *pwd, char *path)
+
+static char *volxlate(AFPObj *obj, char *dest, size_t destlen,
+ char *src, struct passwd *pwd, char *path, char *volname)
{
- char *p, *q;
+ char *p, *r;
+ const char *q;
int len;
+ char *ret;
- strncpy(dest, src, destlen);
+ if (!src) {
+ return NULL;
+ }
+ if (!dest) {
+ dest = calloc(destlen +1, 1);
+ }
+ ret = dest;
+ if (!ret) {
+ return NULL;
+ }
+ strlcpy(dest, src, destlen +1);
if ((p = strchr(src, '$')) == NULL) /* nothing to do */
- return;
+ return ret;
/* first part of the path. just forward to the next variable. */
- len = MIN(p - src, destlen);
+ len = MIN((size_t)(p - src), destlen);
if (len > 0) {
destlen -= len;
dest += len;
while (p && destlen > 0) {
/* now figure out what the variable is */
q = NULL;
- if (is_var(p, "$c")) {
+ if (is_var(p, "$b")) {
+ if (path) {
+ if ((q = strrchr(path, '/')) == NULL)
+ q = path;
+ else if (*(q + 1) != '\0')
+ q++;
+ }
+ } else if (is_var(p, "$c")) {
if (obj->proto == AFPPROTO_ASP) {
ASP asp = obj->handle;
} else if (obj->proto == AFPPROTO_DSI) {
DSI *dsi = obj->handle;
-
- len = sprintf(dest, "%s:%u", inet_ntoa(dsi->client.sin_addr),
- ntohs(dsi->client.sin_port));
+ 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 (is_var(p, "$f")) {
- if ((q = strchr(pwd->pw_gecos, ',')))
- *q = '\0';
+ if ((r = strchr(pwd->pw_gecos, ',')))
+ *r = '\0';
q = pwd->pw_gecos;
} else if (is_var(p, "$g")) {
struct group *grp = getgrgid(pwd->pw_gid);
q = grp->gr_name;
} else if (is_var(p, "$h")) {
q = obj->options.hostname;
+ } else if (is_var(p, "$i")) {
+ if (obj->proto == AFPPROTO_ASP) {
+ ASP asp = obj->handle;
+
+ len = sprintf(dest, "%u", ntohs(asp->asp_sat.sat_addr.s_net));
+ dest += len;
+ destlen -= len;
+
+ } else if (obj->proto == AFPPROTO_DSI) {
+ DSI *dsi = obj->handle;
+ q = getip_string((struct sockaddr *)&dsi->client);
+ }
} else if (is_var(p, "$s")) {
if (obj->Obj)
q = obj->Obj;
} else
q = obj->options.hostname;
} else if (is_var(p, "$u")) {
- q = obj->username;
+ 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 (path) {
- struct adouble ad;
-
- memset(&ad, 0, sizeof(ad));
- if (ad_open(path, ADFLAGS_HF, O_RDONLY, 0, &ad) < 0)
- goto no_volname;
-
- if ((len = MIN(ad_getentrylen(&ad, ADEID_NAME), destlen)) > 0) {
- memcpy(dest, ad_entry(&ad, ADEID_NAME), len);
- ad_close(&ad, ADFLAGS_HF);
- dest += len;
- destlen -= len;
- } else {
- ad_close(&ad, ADFLAGS_HF);
-no_volname: /* simple basename */
- if ((q = strrchr(path, '/')) == NULL)
- q = path;
- else if (*(q + 1) != '\0')
- q++;
- }
+ if (volname) {
+ q = volname;
+ }
+ else if (path) {
+ if ((q = strrchr(path, '/')) == NULL)
+ q = path;
+ else if (*(q + 1) != '\0')
+ q++;
}
} else if (is_var(p, "$z")) {
q = obj->Zone;
/* stuff up to next $ */
src = p + 2;
p = strchr(src, '$');
- len = p ? MIN(p - src, destlen) : destlen;
+ len = p ? MIN((size_t)(p - src), destlen) : destlen;
if (len > 0) {
strncpy(dest, src, len);
dest += len;
destlen -= len;
}
}
+ return ret;
}
/* to make sure that val is valid, make sure to select an opt that
includes val */
-#define optionok(buf,opt,val) (strstr((buf),(opt)) && ((val)[1] != '\0'))
-
-static __inline__ char *get_codepage_path(const char *path, const char *name)
+static int optionok(const char *buf, const char *opt, const char *val)
{
- char *page;
- int len;
-
- if (path) {
- page = (char *) malloc((len = strlen(path)) + strlen(name) + 2);
- if (page) {
- strcpy(page, path);
- if (path[len - 1] != '/') /* add a / */
- strcat(page, "/");
- strcat(page, name);
- }
- } else {
- page = strdup(name);
- }
+ if (!strstr(buf,opt))
+ return 0;
+ if (!val[1])
+ return 0;
+ return 1;
+}
- /* debug: show which codepage directory we are using */
- LOG(log_debug, logtype_afpd, "using codepage directory: %s", page);
- return page;
+/* -------------------- */
+static void setoption(struct vol_option *options, struct vol_option *save, int opt, const char *val)
+{
+ 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 + 1);
}
-/* handle all the options. tmp can't be NULL. */
-static void volset(struct vol_option *options, char *volname, int vlen,
- const char *nlspath, const char *tmp, AFPObj *obj,
- struct passwd *pwd)
+/* ------------------------------------------
+ handle all the options. tmp can't be NULL. */
+static void volset(struct vol_option *options, struct vol_option *save,
+ char *volname, int vlen,
+ const char *tmp)
{
char *val;
- LOG(log_debug, logtype_afpd, "Parsing volset %s", tmp);
-
val = strchr(tmp, ':');
if (!val) {
/* we'll assume it's a volume name. */
strncpy(volname, tmp, vlen);
-
- } else if (optionok(tmp, "allow:", val)) {
- if (options[VOLOPT_ALLOW].c_value)
- free(options[VOLOPT_ALLOW].c_value);
- options[VOLOPT_ALLOW].c_value = strdup(val + 1);
+ volname[vlen] = 0;
+ return;
+ }
+#if 0
+ LOG(log_debug, logtype_afpd, "Parsing volset %s", val);
+#endif
+ if (optionok(tmp, "allow:", val)) {
+ setoption(options, save, VOLOPT_ALLOW, val);
} else if (optionok(tmp, "deny:", val)) {
- if (options[VOLOPT_DENY].c_value)
- free(options[VOLOPT_DENY].c_value);
- options[VOLOPT_DENY].c_value = strdup(val + 1);
+ setoption(options, save, VOLOPT_DENY, val);
} else if (optionok(tmp, "rwlist:", val)) {
- if (options[VOLOPT_RWLIST].c_value)
- free(options[VOLOPT_RWLIST].c_value);
- options[VOLOPT_RWLIST].c_value = strdup(val + 1);
+ setoption(options, save, VOLOPT_RWLIST, val);
} else if (optionok(tmp, "rolist:", val)) {
- if (options[VOLOPT_ROLIST].c_value)
- free(options[VOLOPT_ROLIST].c_value);
- options[VOLOPT_ROLIST].c_value = strdup(val + 1);
+ setoption(options, save, VOLOPT_ROLIST, val);
} else if (optionok(tmp, "codepage:", val)) {
- if (options[VOLOPT_CODEPAGE].c_value)
- free(options[VOLOPT_CODEPAGE].c_value);
- options[VOLOPT_CODEPAGE].c_value = get_codepage_path(nlspath, val + 1);
-
+ LOG (log_error, logtype_afpd, "The old codepage system has been removed. Please make sure to read the documentation !!!!");
+ /* Make sure we don't screw anything */
+ exit (EXITERR_CONF);
+ } else if (optionok(tmp, "volcharset:", val)) {
+ setoption(options, save, VOLOPT_ENCODING, val);
+ } else if (optionok(tmp, "maccharset:", val)) {
+ setoption(options, save, VOLOPT_MACCHARSET, val);
} else if (optionok(tmp, "veto:", val)) {
- if (options[VOLOPT_VETO].c_value)
- free(options[VOLOPT_VETO].c_value);
- options[VOLOPT_VETO].c_value = strdup(val + 1);
-
+ setoption(options, save, VOLOPT_VETO, val);
+ } else if (optionok(tmp, "cnidscheme:", val)) {
+ setoption(options, save, VOLOPT_CNIDSCHEME, val);
} else if (optionok(tmp, "casefold:", val)) {
if (strcasecmp(val + 1, "tolower") == 0)
options[VOLOPT_CASEFOLD].i_value = AFPVOL_UMLOWER;
options[VOLOPT_CASEFOLD].i_value = AFPVOL_UUPPERMLOWER;
else if (strcasecmp(val + 1, "xlateupper") == 0)
options[VOLOPT_CASEFOLD].i_value = AFPVOL_ULOWERMUPPER;
-
+ } else if (optionok(tmp, "adouble:", val)) {
+ if (strcasecmp(val + 1, "v1") == 0)
+ options[VOLOPT_ADOUBLE].i_value = AD_VERSION1;
+#if AD_VERSION == AD_VERSION2
+ else if (strcasecmp(val + 1, "v2") == 0)
+ options[VOLOPT_ADOUBLE].i_value = AD_VERSION2;
+ else if (strcasecmp(val + 1, "osx") == 0)
+ options[VOLOPT_ADOUBLE].i_value = AD_VERSION2_OSX;
+ else if (strcasecmp(val + 1, "sfm") == 0)
+ options[VOLOPT_ADOUBLE].i_value = AD_VERSION1_SFM;
+#endif
} else if (optionok(tmp, "options:", val)) {
char *p;
if (strcasecmp(p, "prodos") == 0)
options[VOLOPT_FLAGS].i_value |= AFPVOL_A2VOL;
else if (strcasecmp(p, "mswindows") == 0) {
- options[VOLOPT_FLAGS].i_value |= (AFPVOL_MSWINDOWS | AFPVOL_USEDOTS);
- if (!options[VOLOPT_CODEPAGE].c_value)
- options[VOLOPT_CODEPAGE].c_value =
- get_codepage_path(nlspath, MSWINDOWS_CODEPAGE);
-
+ options[VOLOPT_FLAGS].i_value |= AFPVOL_MSWINDOWS | AFPVOL_USEDOTS;
} else if (strcasecmp(p, "crlf") == 0)
options[VOLOPT_FLAGS].i_value |= AFPVOL_CRLF;
else if (strcasecmp(p, "noadouble") == 0)
options[VOLOPT_FLAGS].i_value |= AFPVOL_NOHEX;
else if (strcasecmp(p, "usedots") == 0)
options[VOLOPT_FLAGS].i_value |= AFPVOL_USEDOTS;
+ else if (strcasecmp(p, "invisibledots") == 0)
+ options[VOLOPT_FLAGS].i_value |= AFPVOL_USEDOTS | AFPVOL_INV_DOTS;
else if (strcasecmp(p, "limitsize") == 0)
options[VOLOPT_FLAGS].i_value |= AFPVOL_LIMITSIZE;
/* support for either "dropbox" or "dropkludge" */
options[VOLOPT_FLAGS].i_value |= AFPVOL_DROPBOX;
else if (strcasecmp(p, "nofileid") == 0)
options[VOLOPT_FLAGS].i_value |= AFPVOL_NOFILEID;
- else if (strcasecmp(p, "utf8") == 0)
- options[VOLOPT_FLAGS].i_value |= AFPVOL_UTF8;
+ 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, "upriv") == 0)
options[VOLOPT_FLAGS].i_value |= AFPVOL_UNIX_PRIV;
+ else if (strcasecmp(p, "acls") == 0)
+ options[VOLOPT_FLAGS].i_value |= AFPVOL_ACLS;
+ 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, "nocnidcache") == 0)
+ options[VOLOPT_FLAGS].i_value &= ~AFPVOL_CACHE;
+ else if (strcasecmp(p, "tm") == 0)
+ options[VOLOPT_FLAGS].i_value |= AFPVOL_TM;
p = strtok(NULL, ",");
}
-#ifdef CNID_DB
+ } else if (optionok(tmp, "cnidserver:", val)) {
+ setoption(options, save, VOLOPT_CNIDSERVER, val);
+
+ char *p = strrchr(val + 1, ':');
+ if (p) {
+ *p = 0;
+ setoption(options, save, VOLOPT_CNIDPORT, p);
+ }
+
+ LOG(log_debug, logtype_afpd, "CNID Server for volume '%s': %s:%s",
+ volname, val + 1, p ? p + 1 : Cnid_port);
+
} else if (optionok(tmp, "dbpath:", val)) {
- char t[MAXPATHLEN + 1];
- if (options[VOLOPT_DBPATH].c_value)
- free(options[VOLOPT_DBPATH].c_value);
+ setoption(options, save, VOLOPT_DBPATH, val);
- volxlate(obj, t, MAXPATHLEN, val, pwd, NULL);
- options[VOLOPT_DBPATH].c_value = strdup(t + 1);
-#endif /* CNID_DB */
} else if (optionok(tmp, "umask:", val)) {
- options[VOLOPT_UMASK].i_value = (int)strtol(val, (char **)NULL, 8);
- } else if (optionok(tmp, "mapchars:",val)) {
- if (options[VOLOPT_MAPCHARS].c_value)
- free(options[VOLOPT_MAPCHARS].c_value);
- options[VOLOPT_MAPCHARS].c_value = strdup(val + 1);
-
+ options[VOLOPT_UMASK].i_value = (int)strtol(val +1, NULL, 8);
+ } else if (optionok(tmp, "dperm:", val)) {
+ options[VOLOPT_DPERM].i_value = (int)strtol(val+1, NULL, 8);
+ } else if (optionok(tmp, "fperm:", val)) {
+ options[VOLOPT_FPERM].i_value = (int)strtol(val+1, NULL, 8);
+ } else if (optionok(tmp, "perm:", val)) {
+ options[VOLOPT_DFLTPERM].i_value = (int)strtol(val+1, NULL, 8);
} else if (optionok(tmp, "password:", val)) {
- if (options[VOLOPT_PASSWORD].c_value)
- free(options[VOLOPT_PASSWORD].c_value);
- options[VOLOPT_PASSWORD].c_value = strdup(val + 1);
+ setoption(options, save, VOLOPT_PASSWORD, val);
#ifdef FORCE_UIDGID
/* this code allows forced uid/gid per volume settings */
} else if (optionok(tmp, "forceuid:", val)) {
- if (options[VOLOPT_FORCEUID].c_value)
- free(options[VOLOPT_FORCEUID].c_value);
- options[VOLOPT_FORCEUID].c_value = strdup(val + 1);
+ setoption(options, save, VOLOPT_FORCEUID, val);
} else if (optionok(tmp, "forcegid:", val)) {
- if (options[VOLOPT_FORCEGID].c_value)
- free(options[VOLOPT_FORCEGID].c_value);
- options[VOLOPT_FORCEGID].c_value = strdup(val + 1);
+ setoption(options, save, VOLOPT_FORCEGID, val);
#endif /* FORCE_UIDGID */
+ } else if (optionok(tmp, "root_preexec:", val)) {
+ setoption(options, save, VOLOPT_ROOTPREEXEC, val);
+
+ } else if (optionok(tmp, "preexec:", val)) {
+ setoption(options, save, VOLOPT_PREEXEC, val);
+
+ } else if (optionok(tmp, "root_postexec:", val)) {
+ setoption(options, save, VOLOPT_ROOTPOSTEXEC, val);
+
+ } else if (optionok(tmp, "postexec:", val)) {
+ setoption(options, save, VOLOPT_POSTEXEC, val);
+
+ } else if (optionok(tmp, "allowed_hosts:", val)) {
+ setoption(options, save, VOLOPT_ALLOWED_HOSTS, val);
+
+ } else if (optionok(tmp, "denied_hosts:", val)) {
+ setoption(options, save, VOLOPT_DENIED_HOSTS, val);
+
+ } else if (optionok(tmp, "ea:", val)) {
+ if (strcasecmp(val + 1, "ad") == 0)
+ options[VOLOPT_EA_VFS].i_value = AFPVOL_EA_AD;
+ else if (strcasecmp(val + 1, "sys") == 0)
+ options[VOLOPT_EA_VFS].i_value = AFPVOL_EA_SYS;
+ else if (strcasecmp(val + 1, "none") == 0)
+ options[VOLOPT_EA_VFS].i_value = AFPVOL_EA_NONE;
} else {
/* ignore unknown options */
}
}
-static int creatvol(const char *path, char *name, struct vol_option *options)
+/* ----------------- */
+static void showvol(const ucs2_t *name)
{
- struct vol *volume;
- int vlen;
+ struct vol *volume;
+ for ( volume = Volumes; volume; volume = volume->v_next ) {
+ if (volume->v_hide && !strcasecmp_w( volume->v_name, name ) ) {
+ volume->v_hide = 0;
+ return;
+ }
+ }
+}
+
+/* ------------------------------- */
+static int creatvol(AFPObj *obj, struct passwd *pwd,
+ char *path, char *name,
+ struct vol_option *options,
+ const int user /* user defined volume */
+ )
+{
+ 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 */
+ u_int16_t flags;
if ( name == NULL || *name == '\0' ) {
if ((name = strrchr( path, '/' )) == NULL) {
- return -1; /* Obviously not a fully qualified path */
+ return -1; /* Obviously not a fully qualified path */
}
/* if you wish to share /, you need to specify a name. */
return -1;
}
- for ( volume = volumes; volume; volume = volume->v_next ) {
- if ( strcasecmp( volume->v_name, name ) == 0 ) {
- return -1; /* Won't be able to access it, anyway... */
+ /* suffix for mangling use (lastvid + 1) */
+ /* because v_vid has not been decided yet. */
+ suffixlen = sprintf(suffix, "%c%X", MANGLE_CHAR, lastvid + 1 );
+
+ vlen = strlen( name );
+
+ /* Unicode Volume Name */
+ /* Firstly convert name from unixcharset to UTF8-MAC */
+ flags = CONV_IGNORE;
+ tmpvlen = convert_charset(obj->options.unixcharset, CH_UTF8_MAC, 0, name, vlen, tmpname, AFPVOL_U8MNAMELEN, &flags);
+ if (tmpvlen <= 0) {
+ strcpy(tmpname, "???");
+ tmpvlen = 3;
+ }
+
+ /* Do we have to mangle ? */
+ if ( (flags & CONV_REQMANGLE) || (tmpvlen > obj->options.volnamelen)) {
+ if (tmpvlen + suffixlen > obj->options.volnamelen) {
+ flags = CONV_FORCE;
+ tmpvlen = convert_charset(obj->options.unixcharset, CH_UTF8_MAC, 0, name, vlen, tmpname, obj->options.volnamelen - suffixlen, &flags);
+ tmpname[tmpvlen >= 0 ? tmpvlen : 0] = 0;
+ }
+ strcat(tmpname, suffix);
+ tmpvlen = strlen(tmpname);
+ }
+
+ /* 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;
+
+ LOG(log_debug, logtype_afpd, "createvol: Volume '%s' -> UTF8-MAC Name: '%s'", name, tmpname);
+
+ /* Maccharset Volume Name */
+ /* Firsty convert name from unixcharset to maccharset */
+ flags = CONV_IGNORE;
+ tmpvlen = convert_charset(obj->options.unixcharset, obj->options.maccharset, 0, name, vlen, tmpname, AFPVOL_U8MNAMELEN, &flags);
+ if (tmpvlen <= 0) {
+ strcpy(tmpname, "???");
+ tmpvlen = 3;
+ }
+
+ /* Do we have to mangle ? */
+ if ( (flags & CONV_REQMANGLE) || (tmpvlen > AFPVOL_MACNAMELEN)) {
+ if (tmpvlen + suffixlen > AFPVOL_MACNAMELEN) {
+ flags = CONV_FORCE;
+ tmpvlen = convert_charset(obj->options.unixcharset, obj->options.maccharset, 0, name, vlen, tmpname, AFPVOL_MACNAMELEN - suffixlen, &flags);
+ tmpname[tmpvlen >= 0 ? tmpvlen : 0] = 0;
}
+ strcat(tmpname, suffix);
+ tmpvlen = strlen(tmpname);
}
- vlen = strlen( name );
- if ( vlen > AFPVOL_NAMELEN ) {
- vlen = AFPVOL_NAMELEN;
- name[AFPVOL_NAMELEN] = '\0';
+ /* Secondly convert name from maccharset to UCS2 */
+ if ( 0 >= ( macvlen = convert_string(obj->options.maccharset, CH_UCS2, tmpname, tmpvlen, mactmpname, AFPVOL_U8MNAMELEN*2)) )
+ return -1;
+
+ LOG(log_debug, logtype_afpd, "createvol: Volume '%s' -> Longname: '%s'", name, tmpname);
+
+ /* check duplicate */
+ for ( volume = Volumes; volume; volume = volume->v_next ) {
+ if (( strcasecmp_w( volume->v_u8mname, u8mtmpname ) == 0 ) || ( strcasecmp_w( volume->v_macname, mactmpname ) == 0 )){
+ if (volume->v_deleted) {
+ volume->v_new = hide = 1;
+ }
+ else {
+ return -1; /* Won't be able to access it, anyway... */
+ }
+ }
}
- if (( volume =
- (struct vol *)calloc(1, sizeof( struct vol ))) == NULL ) {
+ if (!( volume = (struct vol *)calloc(1, sizeof( struct vol ))) ) {
LOG(log_error, logtype_afpd, "creatvol: malloc: %s", strerror(errno) );
return -1;
}
- if (( volume->v_name =
- (char *)malloc( vlen + 1 )) == NULL ) {
+ if ( NULL == ( volume->v_localname = strdup(name))) {
LOG(log_error, logtype_afpd, "creatvol: malloc: %s", strerror(errno) );
free(volume);
return -1;
}
- if (( volume->v_path =
- (char *)malloc( strlen( path ) + 1 )) == NULL ) {
+
+ 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) );
- free(volume->v_name);
+ volume_free(volume);
free(volume);
return -1;
}
- strcpy( volume->v_name, name);
+ volume->v_name = utf8_encoding()?volume->v_u8mname:volume->v_macname;
+ volume->v_hide = hide;
strcpy( volume->v_path, path );
#ifdef __svr4__
volume->v_qfd = -1;
#endif /* __svr4__ */
- volume->v_vid = lastvid++;
- volume->v_lastdid = 17;
+ /* os X start at 1 and use network order ie. 1 2 3 */
+ volume->v_vid = ++lastvid;
+ volume->v_vid = htons(volume->v_vid);
/* handle options */
if (options) {
/* shift in some flags */
volume->v_flags = options[VOLOPT_FLAGS].i_value;
- /* read in the code pages */
- if (options[VOLOPT_CODEPAGE].c_value)
- codepage_read(volume, options[VOLOPT_CODEPAGE].c_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_CACHE))
+ volume->v_ad_options |= ADVOL_CACHE;
+ 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 ((volume->v_flags & AFPVOL_NOADOUBLE))
+ volume->v_ad_options |= ADVOL_NOADOUBLE;
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);
-#ifdef CNID_DB
+ 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 = strdup(options[VOLOPT_DBPATH].c_value);
-#endif /* CNID_DB */
+ volume->v_dbpath = volxlate(obj, NULL, MAXPATHLEN, options[VOLOPT_DBPATH].c_value, pwd, path, name);
- if (options[VOLOPT_UMASK].i_value)
- volume->v_umask = (mode_t)options[VOLOPT_UMASK].i_value;
+ if (options[VOLOPT_CNIDSCHEME].c_value)
+ volume->v_cnidscheme = strdup(options[VOLOPT_CNIDSCHEME].c_value);
-#ifdef FORCE_UIDGID
+ 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;
+
+ /* 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;
+
+#ifdef FORCE_UIDGID
if (options[VOLOPT_FORCEUID].c_value) {
volume->v_forceuid = strdup(options[VOLOPT_FORCEUID].c_value);
} else {
} else {
volume->v_forcegid = NULL; /* set as null so as to return 0 later on */
}
+#endif
+ if (!user) {
+ 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;
-#endif /* FORCE_UIDGID */
+ 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)
+ check_ea_sys_support(volume);
+ initvol_vfs(volume);
- volume->v_next = volumes;
- volumes = volume;
+ volume->v_next = Volumes;
+ Volumes = volume;
return 0;
}
-static char *myfgets( buf, size, fp )
-char *buf;
-int size;
-FILE *fp;
+/* ---------------- */
+static char *myfgets( char *buf, int size, FILE *fp)
{
- char *p;
- int c;
+ char *p;
+ int c;
p = buf;
- while ((EOF != ( c = getc( fp )) ) && ( size > 0 )) {
+ while ((EOF != ( c = getc( fp )) ) && ( size > 1 )) {
if ( c == '\n' || c == '\r' ) {
+ if (p != buf && *(p -1) == '\\') {
+ p--;
+ size++;
+ continue;
+ }
*p++ = '\n';
break;
} else {
* 0: list exists, but name isn't in it
* 1: in list
*/
-static int accessvol(args, name)
-const char *args;
-const char *name;
+
+#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 char *args, const char *name)
{
char buf[MAXPATHLEN + 1], *p;
struct group *gr;
if (!args)
return -1;
- strncpy(buf, args, sizeof(buf));
+ strlcpy(buf, args, sizeof(buf));
if ((p = strtok(buf, ",")) == NULL) /* nothing, return okay */
return -1;
if (*p == '@') { /* it's a group */
if ((gr = getgrnam(p + 1)) && gmem(gr->gr_gid))
return 1;
- } else if (strcmp(p, name) == 0) /* it's a user name */
+ } else if (access_strcmp(p, name) == 0) /* it's a user name */
return 1;
p = strtok(NULL, ",");
}
return 0;
}
-static void setextmap( ext, type, creator, user)
-char *ext, *type, *creator;
-int user;
+static int hostaccessvol(int type, const char *volname, const char *args, const AFPObj *obj)
+{
+ int mask_int;
+ char buf[MAXPATHLEN + 1], *p, *b;
+ DSI *dsi = obj->handle;
+ struct sockaddr_storage client;
+
+ if (!args)
+ return -1;
+
+ strlcpy(buf, args, sizeof(buf));
+ if ((p = strtok_r(buf, ",", &b)) == NULL) /* nothing, return okay */
+ return -1;
+
+ if (obj->proto != AFPPROTO_DSI)
+ 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;
+ }
+
+ /* next address */
+ freeaddrinfo(ai);
+ p = strtok_r(NULL, ",", &b);
+ }
+
+ 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;
+}
+
+static void setextmap(char *ext, char *type, char *creator, int user)
{
- struct extmap *em;
+ struct extmap *em;
int cnt;
- if (extmap == NULL) {
- if (( extmap = calloc(1, sizeof( struct extmap ))) == NULL ) {
+ if (Extmap == NULL) {
+ if (( Extmap = calloc(1, sizeof( struct extmap ))) == NULL ) {
LOG(log_error, logtype_afpd, "setextmap: calloc: %s", strerror(errno) );
return;
}
}
ext++;
- for ( em = extmap, cnt = 0; em->em_ext; em++, cnt++) {
+ for ( em = Extmap, cnt = 0; em->em_ext; em++, cnt++) {
if ( (strdiacasecmp( em->em_ext, ext )) == 0 ) {
break;
}
}
if ( em->em_ext == NULL ) {
- if (!(extmap = realloc( extmap, sizeof( struct extmap ) * (cnt +2))) ) {
+ if (!(Extmap = realloc( Extmap, sizeof( struct extmap ) * (cnt +2))) ) {
LOG(log_error, logtype_afpd, "setextmap: realloc: %s", strerror(errno) );
return;
}
- (extmap +cnt +1)->em_ext = NULL;
- em = extmap +cnt;
+ (Extmap +cnt +1)->em_ext = NULL;
+ em = Extmap +cnt;
} else if ( !user ) {
return;
}
if (em->em_ext)
- free(em->em_ext);
+ free(em->em_ext);
if (!(em->em_ext = strdup( ext))) {
LOG(log_error, logtype_afpd, "setextmap: strdup: %s", strerror(errno) );
}
if ( *type == '\0' ) {
- memcpy(em->em_type, "????", sizeof( em->em_type ));
+ 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, "UNIX", sizeof( em->em_creator ));
+ memcpy(em->em_creator, "\0\0\0\0", sizeof( em->em_creator ));
} else {
memcpy(em->em_creator, creator, sizeof( em->em_creator ));
}
static void sortextmap( void)
{
- struct extmap *em;
+ struct extmap *em;
- extmap_cnt = 0;
- if ((em = extmap) == NULL) {
+ Extmap_cnt = 0;
+ if ((em = Extmap) == NULL) {
return;
}
while (em->em_ext) {
em++;
- extmap_cnt++;
+ Extmap_cnt++;
}
- if (extmap_cnt) {
- qsort(extmap, extmap_cnt, sizeof(struct extmap), extmap_cmp);
- defextmap = extmap;
+ 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 volfile_changed(struct afp_volume_name *p)
+{
+ struct stat st;
+ char *name;
+
+ if (p->full_name)
+ name = p->full_name;
+ else
+ name = p->name;
+
+ if (!stat( name, &st) && st.st_mtime > p->mtime) {
+ p->mtime = st.st_mtime;
+ return 1;
+ }
+ return 0;
+}
+
+/* ----------------------
* Read a volume configuration file and add the volumes contained within to
* the global volume list. If p2 is non-NULL, the file that is opened is
* p1/p2
*
* Lines that begin with # and blank lines are ignored.
* Volume lines are of the form:
- * <unix path> [<volume name>] [allow:<user>,<@group>,...] \
+ * <unix path> [<volume name>] [allow:<user>,<@group>,...] \
* [codepage:<file>] [casefold:<num>]
- * <extension> TYPE [CREATOR]
+ * <extension> TYPE [CREATOR]
*/
-static int readvolfile(obj, p1, p2, user, pwent)
-AFPObj *obj;
-char *p1, *p2;
-int user;
-struct passwd *pwent;
+static int readvolfile(AFPObj *obj, struct afp_volume_name *p1, char *p2, int user, struct passwd *pwent)
{
- FILE *fp;
- char path[ MAXPATHLEN + 1], tmp[ MAXPATHLEN + 1],
- volname[ AFPVOL_NAMELEN + 1 ], buf[ BUFSIZ ],
- type[ 5 ], creator[ 5 ];
- char *u, *p;
- struct passwd *pw;
- struct vol_option options[VOLOPT_NUM], save_options[VOLOPT_NUM];
+ FILE *fp;
+ char path[MAXPATHLEN + 1];
+ char tmp[MAXPATHLEN + 1];
+ char volname[AFPVOL_U8MNAMELEN + 1];
+ char buf[BUFSIZ];
+ char type[5], creator[5];
+ char *u, *p;
+ struct passwd *pw;
+ struct vol_option save_options[VOLOPT_NUM];
+ struct vol_option options[VOLOPT_NUM];
int i;
+ struct stat st;
+ int fd;
- if (!p1)
+ if (!p1->name)
return -1;
-
- strcpy( path, p1 );
+ p1->mtime = 0;
+ strcpy( path, p1->name );
if ( p2 != NULL ) {
strcat( path, "/" );
strcat( path, p2 );
+ if (p1->full_name) {
+ free(p1->full_name);
+ }
+ p1->full_name = strdup(path);
}
if (NULL == ( fp = fopen( path, "r" )) ) {
return( -1 );
}
+ fd = fileno(fp);
+ if (fd != -1 && !fstat( fd, &st) ) {
+ p1->mtime = st.st_mtime;
+ }
memset(save_options, 0, sizeof(save_options));
+
+ /* Enable some default options for all volumes */
+ save_options[VOLOPT_FLAGS].i_value |= AFPVOL_CACHE;
+ save_options[VOLOPT_EA_VFS].i_value = AFPVOL_EA_AUTO;
+
while ( myfgets( buf, sizeof( buf ), fp ) != NULL ) {
initline( strlen( buf ), buf );
parseline( sizeof( path ) - 1, path );
if (parseline( sizeof( path ) - VOLOPT_DEFAULT_LEN - 1,
path + VOLOPT_DEFAULT_LEN) < 0)
break;
- volset(save_options, tmp, sizeof(tmp) - 1,
- obj->options.nlspath, path + VOLOPT_DEFAULT_LEN,
- obj, pwent);
+ volset(save_options, NULL, tmp, sizeof(tmp) - 1,
+ path + VOLOPT_DEFAULT_LEN);
}
}
break;
strcat( tmp, "/" );
strcat( tmp, p );
}
- /* Tag a user's home directory with their umask. Note, this will
- * be overwritten if the user actually specifies a umask: option
- * for a '~' volume. */
- save_options[VOLOPT_UMASK].i_value = obj->options.save_mask;
+ /* Tag a user's home directory with their umask. Note, this will
+ * be overwritten if the user actually specifies a umask: option
+ * for a '~' volume. */
+ save_options[VOLOPT_UMASK].i_value = obj->options.save_mask;
/* fall through */
case '/' :
strcpy(tmp, path);
if (!pwent)
pwent = getpwnam(obj->username);
- volxlate(obj, path, sizeof(path) - 1, tmp, pwent, NULL);
+ volxlate(obj, path, sizeof(path) - 1, tmp, pwent, NULL, NULL);
/* this is sort of braindead. basically, i want to be
- * able to specify things in any order, but i don't want to
- * re-write everything.
+ * able to specify things in any order, but i don't want to
+ * re-write everything.
*
- * currently we have 11 options:
+ * currently we have options:
* volname
* codepage:x
* casefold:x
* deny:x,y,@z
* rwlist:x,y,@z
* rolist:x,y,@z
- * options:prodos,crlf,noadouble,ro
+ * options:prodos,crlf,noadouble,ro...
* dbpath:x
* password:x
+ * preexec:x
+ *
* namemask:x,y,!z (not implemented yet)
*/
memcpy(options, save_options, sizeof(options));
*volname = '\0';
- /* read in up to 11 possible options */
+ /* read in up to VOLOP_NUM possible options */
for (i = 0; i < VOLOPT_NUM; i++) {
if (parseline( sizeof( tmp ) - 1, tmp ) < 0)
break;
- volset(options, volname, sizeof(volname) - 1,
- obj->options.nlspath, tmp, obj, pwent);
+ volset(options, save_options, volname, sizeof(volname) - 1, tmp);
}
/* check allow/deny lists:
allow -> either no list (-1), or in list (1)
deny -> either no list (-1), or not in list (0) */
if (accessvol(options[VOLOPT_ALLOW].c_value, obj->username) &&
- (accessvol(options[VOLOPT_DENY].c_value, obj->username) < 1)) {
+ (accessvol(options[VOLOPT_DENY].c_value, obj->username) < 1) &&
+ hostaccessvol(VOLOPT_ALLOWED_HOSTS, volname, options[VOLOPT_ALLOWED_HOSTS].c_value, obj) &&
+ (hostaccessvol(VOLOPT_DENIED_HOSTS, volname, options[VOLOPT_DENIED_HOSTS].c_value, obj) < 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 (((options[VOLOPT_FLAGS].i_value & AFPVOL_RO) == 0) &&
- ((accessvol(options[VOLOPT_ROLIST].c_value,
- obj->username) == 1) ||
- !accessvol(options[VOLOPT_RWLIST].c_value,
- obj->username)))
+ ((accessvol(options[VOLOPT_ROLIST].c_value,
+ obj->username) == 1) ||
+ !accessvol(options[VOLOPT_RWLIST].c_value,
+ obj->username)))
options[VOLOPT_FLAGS].i_value |= AFPVOL_RO;
- /* do variable substitution */
- volxlate(obj, tmp, sizeof(tmp) - 1, volname, pwent, path);
- creatvol(path, tmp, options);
+ /* do variable substitution for volname */
+ volxlate(obj, tmp, sizeof(tmp) - 1, volname, pwent, path, NULL);
+ creatvol(obj, pwent, path, tmp, options, p2 != NULL);
}
volfree(options, save_options);
break;
if ( fclose( fp ) != 0 ) {
LOG(log_error, logtype_afpd, "readvolfile: fclose: %s", strerror(errno) );
}
+ p1->loaded = 1;
return( 0 );
}
+/* ------------------------------- */
+static void volume_free(struct vol *vol)
+{
+ 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_volcodepage);
+ free(vol->v_maccodepage);
+ free(vol->v_cnidscheme);
+ free(vol->v_dbpath);
+ free(vol->v_gvs);
+#ifdef FORCE_UIDGID
+ free(vol->v_forceuid);
+ free(vol->v_forcegid);
+#endif /* FORCE_UIDGID */
+}
-static void load_volumes(AFPObj *obj)
+/* ------------------------------- */
+static void free_volumes(void )
{
- struct passwd *pwent = getpwnam(obj->username);
+ struct vol *vol;
+ struct vol *nvol, *ovol;
- if ( (obj->options.flags & OPTION_USERVOLFIRST) == 0 ) {
- readvolfile(obj, obj->options.systemvol, NULL, 0, pwent);
+ for ( vol = Volumes; vol; vol = vol->v_next ) {
+ if (( vol->v_flags & AFPVOL_OPEN ) ) {
+ vol->v_deleted = 1;
+ continue;
+ }
+ volume_free(vol);
}
- if ((*obj->username == '\0') || (obj->options.flags & OPTION_NOUSERVOL)) {
- readvolfile(obj, obj->options.defaultvol, NULL, 1, pwent);
- } else if (pwent) {
- /*
- * Read user's AppleVolumes or .AppleVolumes file
- * If neither are readable, read the default volumes file. if
- * that doesn't work, create a user share.
- */
- if ( readvolfile(obj, pwent->pw_dir, "AppleVolumes", 1, pwent) < 0 &&
- readvolfile(obj, pwent->pw_dir, ".AppleVolumes", 1, pwent) < 0 &&
- readvolfile(obj, pwent->pw_dir, "applevolumes", 1, pwent) < 0 &&
- readvolfile(obj, pwent->pw_dir, ".applevolumes", 1, pwent) < 0 &&
- obj->options.defaultvol != NULL ) {
- if (readvolfile(obj, obj->options.defaultvol, NULL, 1, pwent) < 0)
- creatvol(pwent->pw_dir, NULL, NULL);
+ for ( vol = Volumes, ovol = NULL; vol; vol = nvol) {
+ nvol = vol->v_next;
+
+ if (vol->v_localname == NULL) {
+ if (Volumes == vol) {
+ Volumes = nvol;
+ ovol = Volumes;
+ }
+ else {
+ ovol->v_next = nvol;
+ }
+ free(vol);
+ }
+ else {
+ ovol = vol;
}
}
- if ( obj->options.flags & OPTION_USERVOLFIRST ) {
- readvolfile(obj, obj->options.systemvol, NULL, 0, pwent );
+}
+
+/* ------------------------------- */
+static void volume_unlink(struct vol *volume)
+{
+ struct vol *vol, *ovol, *nvol;
+
+ if (volume == Volumes) {
+ Volumes = Volumes->v_next;
+ return;
+ }
+ for ( vol = Volumes->v_next, ovol = Volumes; vol; vol = nvol) {
+ nvol = vol->v_next;
+
+ if (vol == volume) {
+ ovol->v_next = nvol;
+ break;
+ }
+ else {
+ ovol = vol;
+ }
}
}
-static int getvolspace( vol, bfree, btotal, xbfree, xbtotal, bsize )
-struct vol *vol;
-u_int32_t *bfree, *btotal, *bsize;
-VolSpace *xbfree, *xbtotal;
+static int getvolspace(struct vol *vol,
+ u_int32_t *bfree, u_int32_t *btotal,
+ VolSpace *xbfree, VolSpace *xbtotal, u_int32_t *bsize)
{
- int spaceflag, rc;
+ int spaceflag, rc;
u_int32_t maxsize;
#ifndef NO_QUOTA_SUPPORT
- VolSpace qfree, qtotal;
-#endif /* ! NO_QUOTA_SUPPORT */
+ VolSpace qfree, qtotal;
+#endif
spaceflag = AFPVOL_GVSMASK & vol->v_flags;
/* report up to 2GB if afp version is < 2.2 (4GB if not) */
maxsize = (vol->v_flags & AFPVOL_A2VOL) ? 0x01fffe00 :
- (((afp_version < 22) || (vol->v_flags & AFPVOL_LIMITSIZE))
- ? 0x7fffffffL : 0xffffffffL);
+ (((afp_version < 22) || (vol->v_flags & AFPVOL_LIMITSIZE))
+ ? 0x7fffffffL : 0xffffffffL);
#ifdef AFS
if ( spaceflag == AFPVOL_NONE || spaceflag == AFPVOL_AFSGVS ) {
goto getvolspace_done;
}
}
-#endif /* AFS */
+#endif
if (( rc = ustatfs_getvolspace( vol, xbfree, xbtotal,
bsize)) != AFP_OK ) {
return( rc );
}
-#define min(a,b) ((a)<(b)?(a):(b))
+#define min(a,b) ((a)<(b)?(a):(b))
#ifndef NO_QUOTA_SUPPORT
if ( spaceflag == AFPVOL_NONE || spaceflag == AFPVOL_UQUOTA ) {
if ( uquota_getvolspace( vol, &qfree, &qtotal, *bsize ) == AFP_OK ) {
goto getvolspace_done;
}
}
-#endif /* ! NO_QUOTA_SUPPORT */
+#endif
vol->v_flags = ( ~AFPVOL_GVSMASK & vol->v_flags ) | AFPVOL_USTATFS;
getvolspace_done:
return( AFP_OK );
}
-static int getvolparams( bitmap, vol, st, buf, buflen )
-u_int16_t bitmap;
-struct vol *vol;
-struct stat *st;
-char *buf;
-int *buflen;
+/* -----------------------
+ * set volume creation date
+ * avoid duplicate, well at least it tries
+ */
+static void vol_setdate(u_int16_t id, struct adouble *adp, time_t date)
+{
+ struct vol *volume;
+ struct vol *vol = Volumes;
+
+ for ( volume = Volumes; volume; volume = volume->v_next ) {
+ if (volume->v_vid == id) {
+ vol = volume;
+ }
+ else if ((time_t)(AD_DATE_FROM_UNIX(date)) == volume->v_ctime) {
+ date = date+1;
+ volume = Volumes; /* restart */
+ }
+ }
+ vol->v_ctime = AD_DATE_FROM_UNIX(date);
+ ad_setdate(adp, AD_DATE_CREATE | AD_DATE_UNIX, date);
+}
+
+/* ----------------------- */
+static int getvolparams( u_int16_t bitmap, struct vol *vol, struct stat *st, char *buf, size_t *buflen)
{
- struct adouble ad;
- int bit = 0, isad = 1;
- u_int32_t aint;
- u_short ashort;
- u_int32_t bfree, btotal, bsize;
+ struct adouble ad;
+ int bit = 0, isad = 1;
+ u_int32_t aint;
+ u_short ashort;
+ u_int32_t bfree, btotal, bsize;
VolSpace xbfree, xbtotal; /* extended bytes */
- char *data, *nameoff = NULL;
+ char *data, *nameoff = NULL;
char *slash;
+ LOG(log_debug, logtype_afpd, "getvolparams: Volume '%s'", vol->v_localname);
+
/* courtesy of jallison@whistle.com:
* For MacOS8.x support we need to create the
* .Parent file here if it doesn't exist. */
- memset(&ad, 0, sizeof(ad));
- if ( ad_open( vol->v_path, vol_noadouble(vol) |
- ADFLAGS_HF|ADFLAGS_DIR, O_RDWR | O_CREAT,
- 0666, &ad) < 0 ) {
+ ad_init(&ad, vol->v_adouble, vol->v_ad_options);
+ if ( ad_open_metadata( vol->v_path, ADFLAGS_DIR, O_CREAT, &ad) < 0 ) {
isad = 0;
+ vol->v_ctime = AD_DATE_FROM_UNIX(st->st_mtime);
- } else if (ad_get_HF_flags( &ad ) & O_CREAT) {
+ } else if (ad_get_MD_flags( &ad ) & O_CREAT) {
slash = strrchr( vol->v_path, '/' );
if(slash)
slash++;
else
slash = vol->v_path;
-
- ad_setentrylen( &ad, ADEID_NAME, strlen( slash ));
- memcpy(ad_entry( &ad, ADEID_NAME ), slash,
- ad_getentrylen( &ad, ADEID_NAME ));
- ad_setdate(&ad, AD_DATE_CREATE | AD_DATE_UNIX, st->st_mtime);
- ad_flush(&ad, ADFLAGS_HF);
+ if (ad_getentryoff(&ad, ADEID_NAME)) {
+ ad_setentrylen( &ad, ADEID_NAME, strlen( slash ));
+ memcpy(ad_entry( &ad, ADEID_NAME ), slash,
+ ad_getentrylen( &ad, ADEID_NAME ));
+ }
+ vol_setdate(vol->v_vid, &ad, st->st_mtime);
+ ad_flush(&ad);
+ }
+ else {
+ if (ad_getdate(&ad, AD_DATE_CREATE, &aint) < 0)
+ vol->v_ctime = AD_DATE_FROM_UNIX(st->st_mtime);
+ else
+ vol->v_ctime = aint;
}
if (( bitmap & ( (1<<VOLPBIT_BFREE)|(1<<VOLPBIT_BTOTAL) |
(1<<VOLPBIT_XBFREE)|(1<<VOLPBIT_XBTOTAL) |
(1<<VOLPBIT_BSIZE)) ) != 0 ) {
if ( getvolspace( vol, &bfree, &btotal, &xbfree, &xbtotal,
- &bsize) < 0 ) {
+ &bsize) != AFP_OK ) {
if ( isad ) {
ad_close( &ad, ADFLAGS_HF );
}
switch ( bit ) {
case VOLPBIT_ATTR :
ashort = 0;
-#ifdef CNID_DB
- if (0 == (vol->v_flags & AFPVOL_NOFILEID) && vol->v_db != NULL) {
- ashort = VOLPBIT_ATTR_FILEID;
- }
-#endif /* CNID_DB */
/* check for read-only.
* NOTE: we don't actually set the read-only flag unless
* it's passed in that way as it's possible to mount
* a read-write filesystem under a read-only one. */
if ((vol->v_flags & AFPVOL_RO) ||
- ((utime(vol->v_path, NULL) < 0) && (errno == EROFS))) {
+ ((utime(vol->v_path, NULL) < 0) && (errno == EROFS))) {
ashort |= VOLPBIT_ATTR_RO;
}
- ashort |= VOLPBIT_ATTR_CATSEARCH;
- if (afp_version >= 30) {
- ashort |= VOLPBIT_ATTR_UTF8;
- if (vol->v_flags & AFPVOL_UNIX_PRIV)
- ashort |= VOLPBIT_ATTR_UNIXPRIV;
+ /* prior 2.1 only VOLPBIT_ATTR_RO is defined */
+ if (afp_version > 20) {
+ if (0 == (vol->v_flags & AFPVOL_NOFILEID) && vol->v_cdb != NULL &&
+ (vol->v_cdb->flags & CNID_FLAG_PERSISTENT)) {
+ ashort |= VOLPBIT_ATTR_FILEID;
+ }
+ ashort |= VOLPBIT_ATTR_CATSEARCH;
+
+ if (afp_version >= 30) {
+ ashort |= VOLPBIT_ATTR_UTF8;
+ if (vol->v_flags & AFPVOL_UNIX_PRIV)
+ ashort |= VOLPBIT_ATTR_UNIXPRIV;
+ if (vol->v_flags & AFPVOL_TM)
+ ashort |= VOLPBIT_ATTR_TM;
+
+ if (afp_version >= 32) {
+ if (vol->v_vfs_ea)
+ ashort |= VOLPBIT_ATTR_EXT_ATTRS;
+ if (vol->v_flags & AFPVOL_ACLS)
+ ashort |= VOLPBIT_ATTR_ACLS;
+ }
+ }
}
ashort = htons(ashort);
memcpy(data, &ashort, sizeof( ashort ));
break;
case VOLPBIT_CDATE :
- if (!isad || (ad_getdate(&ad, AD_DATE_CREATE, &aint) < 0))
- aint = AD_DATE_FROM_UNIX(st->st_mtime);
+ aint = vol->v_ctime;
memcpy(data, &aint, sizeof( aint ));
data += sizeof( aint );
break;
case VOLPBIT_MDATE :
- if ( st->st_mtime > vol->v_time ) {
- vol->v_time = st->st_mtime;
- aint = AD_DATE_FROM_UNIX(st->st_mtime);
- } else {
- aint = AD_DATE_FROM_UNIX(vol->v_time);
+ if ( st->st_mtime > vol->v_mtime ) {
+ vol->v_mtime = st->st_mtime;
}
+ aint = AD_DATE_FROM_UNIX(vol->v_mtime);
memcpy(data, &aint, sizeof( aint ));
data += sizeof( aint );
break;
if ( nameoff ) {
ashort = htons( data - buf );
memcpy(nameoff, &ashort, sizeof( ashort ));
- aint = strlen( vol->v_name );
+ /* name is always in mac charset */
+ aint = ucs2_to_charset( vol->v_maccharset, vol->v_macname, data+1, AFPVOL_MACNAMELEN + 1);
+ if ( aint <= 0 ) {
+ *buflen = 0;
+ return AFPERR_MISC;
+ }
+
*data++ = aint;
- memcpy(data, vol->v_name, aint );
data += aint;
}
if ( isad ) {
- ad_close( &ad, ADFLAGS_HF );
+ ad_close_metadata( &ad);
}
*buflen = data - buf;
return( AFP_OK );
}
+/* ------------------------- */
+static int stat_vol(u_int16_t bitmap, struct vol *vol, char *rbuf, size_t *rbuflen)
+{
+ struct stat st;
+ int ret;
+ size_t buflen;
+
+ if ( stat( vol->v_path, &st ) < 0 ) {
+ *rbuflen = 0;
+ return( AFPERR_PARAM );
+ }
+ /* save the volume device number */
+ vol->v_dev = st.st_dev;
+
+ buflen = *rbuflen - sizeof( bitmap );
+ if (( ret = getvolparams( bitmap, vol, &st,
+ rbuf + sizeof( bitmap ), &buflen )) != AFP_OK ) {
+ *rbuflen = 0;
+ return( ret );
+ }
+ *rbuflen = buflen + sizeof( bitmap );
+ bitmap = htons( bitmap );
+ memcpy(rbuf, &bitmap, sizeof( bitmap ));
+ return( AFP_OK );
+}
-int afp_getsrvrparms(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj *obj;
-char *ibuf, *rbuf;
-int ibuflen, *rbuflen;
+/* ------------------------------- */
+void load_volumes(AFPObj *obj)
{
- struct timeval tv;
- struct stat st;
- struct vol *volume;
- char *data;
- int vcnt, len;
+ struct passwd *pwent;
+
+ if (Volumes) {
+ int changed = 0;
+
+ /* check files date */
+ if (obj->options.defaultvol.loaded) {
+ changed = volfile_changed(&obj->options.defaultvol);
+ }
+ if (obj->options.systemvol.loaded) {
+ changed |= volfile_changed(&obj->options.systemvol);
+ }
+ if (obj->options.uservol.loaded) {
+ changed |= volfile_changed(&obj->options.uservol);
+ }
+ if (!changed)
+ return;
+ free_extmap();
+ free_volumes();
+ }
- if (!volumes)
- load_volumes(obj);
+ pwent = getpwnam(obj->username);
+ if ( (obj->options.flags & OPTION_USERVOLFIRST) == 0 ) {
+ readvolfile(obj, &obj->options.systemvol, NULL, 0, pwent);
+ }
+
+ if ((*obj->username == '\0') || (obj->options.flags & OPTION_NOUSERVOL)) {
+ readvolfile(obj, &obj->options.defaultvol, NULL, 1, pwent);
+ } else if (pwent) {
+ /*
+ * Read user's AppleVolumes or .AppleVolumes file
+ * If neither are readable, read the default volumes file. if
+ * that doesn't work, create a user share.
+ */
+ if (obj->options.uservol.name) {
+ free(obj->options.uservol.name);
+ }
+ obj->options.uservol.name = strdup(pwent->pw_dir);
+ if ( readvolfile(obj, &obj->options.uservol, "AppleVolumes", 1, pwent) < 0 &&
+ readvolfile(obj, &obj->options.uservol, ".AppleVolumes", 1, pwent) < 0 &&
+ readvolfile(obj, &obj->options.uservol, "applevolumes", 1, pwent) < 0 &&
+ readvolfile(obj, &obj->options.uservol, ".applevolumes", 1, pwent) < 0 &&
+ obj->options.defaultvol.name != NULL ) {
+ if (readvolfile(obj, &obj->options.defaultvol, NULL, 1, pwent) < 0)
+ creatvol(obj, pwent, pwent->pw_dir, NULL, NULL, 1);
+ }
+ }
+ if ( obj->options.flags & OPTION_USERVOLFIRST ) {
+ readvolfile(obj, &obj->options.systemvol, NULL, 0, pwent );
+ }
+
+ if ( obj->options.closevol ) {
+ struct vol *vol;
+
+ for ( vol = Volumes; vol; vol = vol->v_next ) {
+ if (vol->v_deleted && !vol->v_new ) {
+ of_closevol(vol);
+ deletevol(vol);
+ vol = Volumes;
+ }
+ }
+ }
+}
+
+/* ------------------------------- */
+int afp_getsrvrparms(AFPObj *obj, char *ibuf _U_, size_t ibuflen _U_, char *rbuf, size_t *rbuflen)
+{
+ struct timeval tv;
+ struct stat st;
+ struct vol *volume;
+ char *data;
+ char *namebuf;
+ int vcnt;
+ size_t len;
+
+ load_volumes(obj);
data = rbuf + 5;
- for ( vcnt = 0, volume = volumes; volume; volume = volume->v_next ) {
- if ( stat( volume->v_path, &st ) < 0 ) {
- LOG(log_info, logtype_afpd, "afp_getsrvrparms: stat %s: %s",
- volume->v_path, strerror(errno) );
- continue; /* can't access directory */
+ for ( vcnt = 0, volume = Volumes; volume; volume = volume->v_next ) {
+ if (!(volume->v_flags & AFPVOL_NOSTAT)) {
+ struct maccess ma;
+
+ if ( stat( volume->v_path, &st ) < 0 ) {
+ LOG(log_info, logtype_afpd, "afp_getsrvrparms(%s): stat: %s",
+ volume->v_path, strerror(errno) );
+ continue; /* can't access directory */
+ }
+ if (!S_ISDIR(st.st_mode)) {
+ continue; /* not a dir */
+ }
+ accessmode(volume->v_path, &ma, NULL, &st);
+ if ((ma.ma_user & (AR_UREAD | AR_USEARCH)) != (AR_UREAD | AR_USEARCH)) {
+ continue; /* no r-x access */
+ }
}
- if (!S_ISDIR(st.st_mode)) {
- continue; /* not a dir */
+ if (volume->v_hide) {
+ continue; /* config file changed but the volume was mounted */
}
+ if (utf8_encoding()) {
+ len = ucs2_to_charset_allocate(CH_UTF8_MAC, &namebuf, volume->v_u8mname);
+ } else {
+ len = ucs2_to_charset_allocate(obj->options.maccharset, &namebuf, volume->v_macname);
+ }
+
+ if (len == (size_t)-1)
+ continue;
+
/* set password bit if there's a volume password */
*data = (volume->v_password) ? AFPSRVR_PASSWD : 0;
off.. <shirsch@ibm.net> */
*data |= (volume->v_flags & AFPVOL_A2VOL) ? AFPSRVR_CONFIGINFO : 0;
*data++ |= 0; /* UNIX PRIVS BIT ..., OSX doesn't seem to use it, so we don't either */
- len = strlen( volume->v_name );
*data++ = len;
- memcpy(data, volume->v_name, len );
+ memcpy(data, namebuf, len );
data += len;
+ free(namebuf);
vcnt++;
}
*rbuflen = data - rbuf;
data = rbuf;
- if ( gettimeofday( &tv, 0 ) < 0 ) {
- LOG(log_error, logtype_afpd, "afp_getsrvrparms: gettimeofday: %s", strerror(errno) );
+ if ( gettimeofday( &tv, NULL ) < 0 ) {
+ LOG(log_error, logtype_afpd, "afp_getsrvrparms(%s): gettimeofday: %s", volume->v_path, strerror(errno) );
*rbuflen = 0;
return AFPERR_PARAM;
}
return( AFP_OK );
}
-int afp_openvol(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj *obj;
-char *ibuf, *rbuf;
-int ibuflen, *rbuflen;
+/* ------------------------- */
+static int volume_codepage(AFPObj *obj, struct vol *volume)
{
- struct stat st;
- char *volname;
-#ifndef CNID_DB
+ struct charset_functions *charset;
+ /* Codepages */
+
+ if (!volume->v_volcodepage)
+ volume->v_volcodepage = strdup("UTF8");
+
+ if ( (charset_t) -1 == ( volume->v_volcharset = add_charset(volume->v_volcodepage)) ) {
+ LOG (log_error, logtype_afpd, "Setting codepage %s as volume codepage failed", volume->v_volcodepage);
+ return -1;
+ }
+
+ if ( NULL == (charset = find_charset_functions(volume->v_volcodepage)) || charset->flags & CHARSET_ICONV ) {
+ LOG (log_warning, logtype_afpd, "WARNING: volume encoding %s is *not* supported by netatalk, expect problems !!!!", volume->v_volcodepage);
+ }
+
+ if (!volume->v_maccodepage)
+ volume->v_maccodepage = strdup(obj->options.maccodepage);
+
+ if ( (charset_t) -1 == ( volume->v_maccharset = add_charset(volume->v_maccodepage)) ) {
+ LOG (log_error, logtype_afpd, "Setting codepage %s as mac codepage failed", volume->v_maccodepage);
+ return -1;
+ }
+
+ if ( NULL == ( charset = find_charset_functions(volume->v_maccodepage)) || ! (charset->flags & CHARSET_CLIENT) ) {
+ LOG (log_error, logtype_afpd, "Fatal error: mac charset %s not supported", volume->v_maccodepage);
+ return -1;
+ }
+ volume->v_kTextEncoding = htonl(charset->kTextEncoding);
+ return 0;
+}
+
+/* ------------------------- */
+static int volume_openDB(struct vol *volume)
+{
+ int flags = 0;
+
+ if ((volume->v_flags & AFPVOL_NODEV)) {
+ flags |= CNID_FLAG_NODEV;
+ }
+
+ if (volume->v_cnidscheme == NULL) {
+ volume->v_cnidscheme = strdup(DEFAULT_CNID_SCHEME);
+ LOG(log_info, logtype_afpd, "Volume %s use CNID scheme %s.", volume->v_path, volume->v_cnidscheme);
+ }
+
+ LOG(log_info, logtype_afpd, "%s:%s", volume->v_cnidserver, volume->v_cnidport);
+
+ volume->v_cdb = cnid_open(volume->v_dbpath ? volume->v_dbpath : volume->v_path,
+ volume->v_umask,
+ volume->v_cnidscheme,
+ flags,
+ volume->v_cnidserver ? volume->v_cnidserver : Cnid_srv,
+ volume->v_cnidport ? volume->v_cnidport : Cnid_port);
+
+ if (!volume->v_cdb) {
+ flags |= CNID_FLAG_MEMORY;
+ LOG(log_error, logtype_afpd, "Reopen volume %s using in memory temporary CNID DB.", volume->v_path);
+ volume->v_cdb = cnid_open (volume->v_path, volume->v_umask, "tdb", flags, NULL, NULL);
+#ifdef SERVERTEXT
+ /* kill ourself with SIGUSR2 aka msg pending */
+ if (volume->v_cdb) {
+ setmessage("Something wrong with the volume's DB ... FIXME with a better msg");
+ kill(getpid(), SIGUSR2);
+ /* XXX desactivate cachecnid ? */
+ }
+#endif
+ }
+
+ return (!volume->v_cdb)?-1:0;
+}
+
+/*
+ Check if the underlying filesystem supports EAs for ea:sys volumes.
+ If not, switch to ea:ad.
+ As we can't check (requires write access) on ro-volumes, we switch ea:auto
+ volumes that are options:ro to ea:none.
+*/
+static void check_ea_sys_support(struct vol *vol)
+{
+ uid_t process_uid = 0;
+ char eaname[] = {"org.netatalk.supports-eas.XXXXXX"};
+ const char *eacontent = "yes";
+
+ if (vol->v_vfs_ea == AFPVOL_EA_AUTO) {
+
+ if ((vol->v_flags & AFPVOL_RO) == AFPVOL_RO) {
+ LOG(log_info, logtype_logger, "read-only volume '%s', can't test for EA support, disabling EAs", vol->v_localname);
+ vol->v_vfs_ea = AFPVOL_EA_NONE;
+ return;
+ }
+
+ mktemp(eaname);
+
+ process_uid = geteuid();
+ if (process_uid)
+ if (seteuid(0) == -1) {
+ LOG(log_error, logtype_logger, "check_ea_sys_support: can't seteuid(0): %s", strerror(errno));
+ exit(EXITERR_SYS);
+ }
+
+ if ((sys_setxattr(vol->v_path, eaname, eacontent, 4, 0)) == 0) {
+ sys_removexattr(vol->v_path, eaname);
+ 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;
+ }
+
+ if (process_uid) {
+ if (seteuid(process_uid) == -1) {
+ LOG(log_error, logtype_logger, "can't seteuid back %s", strerror(errno));
+ exit(EXITERR_SYS);
+ }
+ }
+ }
+}
+
+/* -------------------------
+ * we are the user here
+ */
+int afp_openvol(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf, size_t *rbuflen)
+{
+ struct stat st;
+ char *volname;
char *p;
-#else
- int opened = 0;
-#endif /* CNID_DB */
- struct vol *volume;
- struct dir *dir;
- int len, ret, buflen;
- u_int16_t bitmap;
+
+ struct vol *volume;
+ struct dir *dir;
+ int len, ret;
+ size_t namelen;
+ u_int16_t bitmap;
+ char path[ MAXPATHLEN + 1];
+ char *vol_uname;
+ char *vol_mname;
+ char *volname_tmp;
ibuf += 2;
memcpy(&bitmap, ibuf, sizeof( bitmap ));
bitmap = ntohs( bitmap );
ibuf += sizeof( bitmap );
+
+ *rbuflen = 0;
if (( bitmap & (1<<VOLPBIT_VID)) == 0 ) {
- ret = AFPERR_BITMAP;
- goto openvol_err;
+ return AFPERR_BITMAP;
}
len = (unsigned char)*ibuf++;
volname = obj->oldtmp;
- memcpy(volname, ibuf, len );
- *(volname + len) = '\0';
+
+ if ((volname_tmp = strchr(volname,'+')) != NULL)
+ volname = volname_tmp+1;
+
+ if (utf8_encoding()) {
+ namelen = convert_string(CH_UTF8_MAC, CH_UCS2, ibuf, len, volname, sizeof(obj->oldtmp));
+ } else {
+ namelen = convert_string(obj->options.maccharset, CH_UCS2, ibuf, len, volname, sizeof(obj->oldtmp));
+ }
+
+ if ( namelen <= 0) {
+ return AFPERR_PARAM;
+ }
+
ibuf += len;
if ((len + 1) & 1) /* pad to an even boundary */
ibuf++;
- if (!volumes)
- load_volumes(obj);
+ load_volumes(obj);
- for ( volume = volumes; volume; volume = volume->v_next ) {
- if ( strcasecmp( volname, volume->v_name ) == 0 ) {
+ for ( volume = Volumes; volume; volume = volume->v_next ) {
+ if ( strcasecmp_w( (ucs2_t*) volname, volume->v_name ) == 0 ) {
break;
}
}
if ( volume == NULL ) {
- ret = AFPERR_PARAM;
- goto openvol_err;
+ return AFPERR_PARAM;
}
/* check for a volume password */
- if (volume->v_password &&
- strncmp(ibuf, volume->v_password, VOLPASSLEN)) {
- ret = AFPERR_ACCESS;
- goto openvol_err;
- }
- /* FIXME
- */
- if (afp_version >= 30) {
- volume->max_filename = 255;
- }
- else {
- volume->max_filename = MACFILELEN;
+ if (volume->v_password && strncmp(ibuf, volume->v_password, VOLPASSLEN)) {
+ return AFPERR_ACCESS;
}
- if (( volume->v_flags & AFPVOL_OPEN ) == 0 ) {
- /* FIXME unix name != mac name */
- if ((dir = dirnew(volume->v_name, volume->v_name) ) == NULL) {
- LOG(log_error, logtype_afpd, "afp_openvol: malloc: %s", strerror(errno) );
- ret = AFPERR_MISC;
- goto openvol_err;
- }
- dir->d_did = DIRDID_ROOT;
- dir->d_color = DIRTREE_COLOR_BLACK; /* root node is black */
- volume->v_dir = volume->v_root = dir;
- volume->v_flags |= AFPVOL_OPEN;
-#ifdef CNID_DB
- volume->v_db = NULL;
- opened = 1;
+
+ if (( volume->v_flags & AFPVOL_OPEN ) ) {
+ /* the volume is already open */
+#ifdef FORCE_UIDGID
+ set_uidgid ( volume );
#endif
+ return stat_vol(bitmap, volume, rbuf, rbuflen);
}
- else {
- /* FIXME */
- }
+
+ if (volume->v_root_preexec) {
+ if ((ret = afprun(1, volume->v_root_preexec, NULL)) && volume->v_root_preexec_close) {
+ LOG(log_error, logtype_afpd, "afp_openvol(%s): root preexec : %d", volume->v_path, ret );
+ return AFPERR_MISC;
+ }
+ }
+
#ifdef FORCE_UIDGID
set_uidgid ( volume );
-#endif /* FORCE_UIDGID */
+#endif
+
+ if (volume->v_preexec) {
+ if ((ret = afprun(0, volume->v_preexec, NULL)) && volume->v_preexec_close) {
+ LOG(log_error, logtype_afpd, "afp_openvol(%s): preexec : %d", volume->v_path, ret );
+ return AFPERR_MISC;
+ }
+ }
if ( stat( volume->v_path, &st ) < 0 ) {
- ret = AFPERR_PARAM;
- goto openvol_err;
+ return AFPERR_PARAM;
}
if ( chdir( volume->v_path ) < 0 ) {
- ret = AFPERR_PARAM;
+ return AFPERR_PARAM;
+ }
+
+ if ( NULL == getcwd(path, MAXPATHLEN)) {
+ /* shouldn't be fatal but it will fail later */
+ LOG(log_error, logtype_afpd, "afp_openvol(%s): volume pathlen too long", volume->v_path);
+ return AFPERR_MISC;
+ }
+
+ /* Normalize volume path */
+#ifdef REALPATH_TAKES_NULL
+ if ((volume->v_path = realpath(path, NULL)) == NULL)
+ return AFPERR_MISC;
+#else
+ if ((volume->v_path = malloc(MAXPATHLEN+1)) == NULL)
+ return AFPERR_MISC;
+ if (realpath(path, volume->v_path) == NULL) {
+ free(volume->v_path);
+ return AFPERR_MISC;
+ }
+ /* Safe some memory */
+ char *tmp;
+ if ((tmp = strdup(volume->v_path)) == NULL) {
+ free(volume->v_path);
+ return AFPERR_MISC;
+ }
+ free(volume->v_path);
+ volume->v_path = tmp;
+#endif
+
+ if (volume_codepage(obj, volume) < 0) {
+ ret = AFPERR_MISC;
goto openvol_err;
}
- curdir = volume->v_dir;
-#ifdef CNID_DB
- if (opened) {
- if (volume->v_dbpath)
- volume->v_db = cnid_open (volume->v_dbpath, volume->v_umask);
- if (volume->v_db == NULL)
- volume->v_db = cnid_open (volume->v_path, volume->v_umask);
- if (volume->v_db == NULL) {
- /* config option?
- * - mount the volume readonly
- * - return an error
- * - read/write with other scheme
- */
- }
+ /* initialize volume variables
+ * FIXME file size
+ */
+ if (utf8_encoding()) {
+ volume->max_filename = 255;
+ }
+ else {
+ volume->max_filename = MACFILELEN;
}
-#endif /* CNID_DB */
- buflen = *rbuflen - sizeof( bitmap );
- if (( ret = getvolparams( bitmap, volume, &st,
- rbuf + sizeof(bitmap), &buflen )) != AFP_OK ) {
+ volume->v_dir = volume->v_root = NULL;
+ volume->v_hash = NULL;
+
+ volume->v_flags |= AFPVOL_OPEN;
+ volume->v_cdb = NULL;
+
+ if (utf8_encoding()) {
+ len = convert_string_allocate(CH_UCS2, CH_UTF8_MAC, volume->v_u8mname, namelen, &vol_mname);
+ } else {
+ len = convert_string_allocate(CH_UCS2, obj->options.maccharset, volume->v_macname, namelen, &vol_mname);
+ }
+ if ( !vol_mname || len <= 0) {
+ ret = AFPERR_MISC;
goto openvol_err;
}
-#ifdef AFP3x
- volume->v_utf8toucs2 = (iconv_t)(-1);
- volume->v_ucs2toutf8 = (iconv_t)(-1);
- volume->v_mactoutf8 = (iconv_t)(-1);
- volume->v_ucs2tomac = (iconv_t)(-1);
-
- if (vol_utf8(volume)) {
- if ((iconv_t)(-1) == (volume->v_utf8toucs2 = iconv_open("UCS-2LE", "UTF-8"))) {
- LOG(log_error, logtype_afpd, "openvol: no UTF8 to UCS-2LE");
- goto openvol_err;
- }
- if ((iconv_t)(-1) == (volume->v_ucs2toutf8 = iconv_open("UTF-8", "UCS-2LE"))) {
- LOG(log_error, logtype_afpd, "openvol: no UCS-2LE to UTF-8");
- goto openvol_err_iconv;
+
+ if ((vol_uname = strrchr(path, '/')) == NULL)
+ vol_uname = path;
+ else if (*(vol_uname + 1) != '\0')
+ vol_uname++;
+
+ if ((dir = dirnew(vol_mname, vol_uname) ) == NULL) {
+ free(vol_mname);
+ LOG(log_error, logtype_afpd, "afp_openvol(%s): malloc: %s", volume->v_path, strerror(errno) );
+ ret = AFPERR_MISC;
+ goto openvol_err;
+ }
+ free(vol_mname);
+
+ dir->d_did = DIRDID_ROOT;
+ dir->d_color = DIRTREE_COLOR_BLACK; /* root node is black */
+ dir->d_m_name_ucs2 = strdup_w(volume->v_name);
+ volume->v_dir = volume->v_root = dir;
+ volume->v_curdir = NULL;
+ volume->v_hash = dirhash();
+
+ curdir = volume->v_dir;
+ if (volume_openDB(volume) < 0) {
+ LOG(log_error, logtype_afpd, "Fatal error: cannot open CNID or invalid CNID backend for %s: %s",
+ volume->v_path, volume->v_cnidscheme);
+ ret = AFPERR_MISC;
+ goto openvol_err;
+ }
+
+ ret = stat_vol(bitmap, volume, rbuf, rbuflen);
+ if (ret == AFP_OK) {
+
+ if (!(volume->v_flags & AFPVOL_RO)) {
+ handle_special_folders( volume );
+ savevolinfo(volume,
+ volume->v_cnidserver ? volume->v_cnidserver : Cnid_srv,
+ volume->v_cnidport ? volume->v_cnidport : Cnid_port);
}
- if ((iconv_t)(-1) == (volume->v_mactoutf8 = iconv_open("UTF-8", "MAC"))) {
- LOG(log_error, logtype_afpd, "openvol: no MAC to UTF-8");
- goto openvol_err_iconv;
+
+ /*
+ * If you mount a volume twice, the second time the trash appears on
+ * the desk-top. That's because the Mac remembers the DID for the
+ * trash (even for volumes in different zones, on different servers).
+ * Just so this works better, we prime the DID cache with the trash,
+ * fixing the trash at DID 17.
+ * FIXME (RL): should it be done inside a CNID backend ? (always returning Trash DID when asked) ?
+ */
+ if ((volume->v_cdb->flags & CNID_FLAG_PERSISTENT)) {
+
+ /* FIXME find db time stamp */
+ if (cnid_getstamp(volume->v_cdb, volume->v_stamp, sizeof(volume->v_stamp)) < 0) {
+ LOG (log_error, logtype_afpd,
+ "afp_openvol(%s): Fatal error: Unable to get stamp value from CNID backend",
+ volume->v_path);
+ ret = AFPERR_MISC;
+ goto openvol_err;
+ }
}
- if ((iconv_t)(-1) == (volume->v_ucs2tomac = iconv_open("MAC", "UCS-2LE"))) {
- LOG(log_error, logtype_afpd, "openvol: no UCS-2LE to MAC");
- goto openvol_err_iconv;
+ else {
+ p = Trash;
+ cname( volume, volume->v_dir, &p );
}
+ return( AFP_OK );
}
-#endif
- *rbuflen = buflen + sizeof( bitmap );
- bitmap = htons( bitmap );
- memcpy(rbuf, &bitmap, sizeof( bitmap ));
-
-#ifndef CNID_DB
- /*
- * If you mount a volume twice, the second time the trash appears on
- * the desk-top. That's because the Mac remembers the DID for the
- * trash (even for volumes in different zones, on different servers).
- * Just so this works better, we prime the DID cache with the trash,
- * fixing the trash at DID 17.
- */
- p = Trash;
- cname( volume, volume->v_dir, &p );
-#endif /* CNID_DB */
- return( AFP_OK );
-#ifdef AFP3x
-openvol_err_iconv:
- if (volume->v_utf8toucs2 != (iconv_t)(-1))
- iconv_close(volume->v_utf8toucs2);
- if (volume->v_ucs2toutf8 != (iconv_t)(-1))
- iconv_close(volume->v_ucs2toutf8);
- if (volume->v_mactoutf8 != (iconv_t)(-1))
- iconv_close(volume->v_mactoutf8);
- if (volume->v_ucs2tomac != (iconv_t)(-1))
- iconv_close(volume->v_ucs2tomac);
-#endif
openvol_err:
-#ifdef CNID_DB
- if (opened && volume->v_db != NULL) {
- cnid_close(volume->v_db);
- volume->v_db = NULL;
+ if (volume->v_dir) {
+ hash_free( volume->v_hash);
+ dirfree( volume->v_dir );
+ volume->v_dir = volume->v_root = NULL;
+ }
+
+ volume->v_flags &= ~AFPVOL_OPEN;
+ if (volume->v_cdb != NULL) {
+ cnid_close(volume->v_cdb);
+ volume->v_cdb = NULL;
}
-#endif
*rbuflen = 0;
return ret;
}
-int afp_closevol(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj *obj;
-char *ibuf, *rbuf;
-int ibuflen, *rbuflen;
+/* ------------------------- */
+static void closevol(struct vol *vol)
{
- struct vol *vol, *ovol;
- u_int16_t vid;
+ if (!vol)
+ return;
- *rbuflen = 0;
- ibuf += 2;
- memcpy(&vid, ibuf, sizeof( vid ));
- if (NULL == ( vol = getvolbyvid( vid )) ) {
- return( AFPERR_PARAM );
+ hash_free( vol->v_hash);
+ dirfree( vol->v_root );
+ vol->v_dir = NULL;
+ if (vol->v_cdb != NULL) {
+ cnid_close(vol->v_cdb);
+ vol->v_cdb = NULL;
+ }
+
+ if (vol->v_postexec) {
+ afprun(0, vol->v_postexec, NULL);
+ }
+ if (vol->v_root_postexec) {
+ afprun(1, vol->v_root_postexec, NULL);
+ }
+}
+
+/* ------------------------- */
+void close_all_vol(void)
+{
+ struct vol *ovol;
+ curdir = NULL;
+ for ( ovol = Volumes; ovol; ovol = ovol->v_next ) {
+ if ( (ovol->v_flags & AFPVOL_OPEN) ) {
+ ovol->v_flags &= ~AFPVOL_OPEN;
+ closevol(ovol);
+ }
}
+}
+
+/* ------------------------- */
+static void deletevol(struct vol *vol)
+{
+ struct vol *ovol;
vol->v_flags &= ~AFPVOL_OPEN;
- for ( ovol = volumes; ovol; ovol = ovol->v_next ) {
- if ( ovol->v_flags & AFPVOL_OPEN ) {
+ for ( ovol = Volumes; ovol; ovol = ovol->v_next ) {
+ if ( (ovol->v_flags & AFPVOL_OPEN) ) {
break;
}
}
curdir = ovol->v_dir;
}
}
- dirfree( vol->v_root );
- vol->v_dir = NULL;
-#ifdef CNID_DB
- cnid_close(vol->v_db);
- vol->v_db = NULL;
-#endif /* CNID_DB */
+
+ closevol(vol);
+ if (vol->v_deleted) {
+ showvol(vol->v_name);
+ volume_free(vol);
+ volume_unlink(vol);
+ free(vol);
+ }
+}
+
+/* ------------------------- */
+int afp_closevol(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, size_t *rbuflen)
+{
+ struct vol *vol;
+ u_int16_t vid;
+
+ *rbuflen = 0;
+ ibuf += 2;
+ memcpy(&vid, ibuf, sizeof( vid ));
+ if (NULL == ( vol = getvolbyvid( vid )) ) {
+ return( AFPERR_PARAM );
+ }
+
+ deletevol(vol);
+
return( AFP_OK );
}
+/* ------------------------- */
struct vol *getvolbyvid(const u_int16_t vid )
{
- struct vol *vol;
+ struct vol *vol;
- for ( vol = volumes; vol; vol = vol->v_next ) {
+ for ( vol = Volumes; vol; vol = vol->v_next ) {
if ( vid == vol->v_vid ) {
break;
}
}
struct extmap *getextmap(const char *path)
{
- char *p;
+ char *p;
struct extmap *em;
- if (NULL == ( p = strrchr( path, '.' )) ) {
- return( defextmap );
+ if (!Extmap_cnt || NULL == ( p = strrchr( path, '.' )) ) {
+ return( Defextmap );
}
p++;
- if (!*p || !extmap_cnt) {
- return( defextmap );
+ if (!*p) {
+ return( Defextmap );
}
- em = bsearch(p, extmap, extmap_cnt, sizeof(struct extmap), ext_cmp_key);
+ em = bsearch(p, Extmap, Extmap_cnt, sizeof(struct extmap), ext_cmp_key);
if (em) {
return( em );
} else {
- return( defextmap );
+ return( Defextmap );
}
}
+/* ------------------------- */
struct extmap *getdefextmap(void)
{
- return( defextmap );
+ return( Defextmap );
}
-/*
+/* --------------------------
poll if a volume is changed by other processes.
+ return
+ 0 no attention msg sent
+ 1 attention msg sent
+ -1 error (socket closed)
+
+ Note: if attention return -1 no packet has been
+ sent because the buffer is full, we don't care
+ either there's no reader or there's a lot of
+ traffic and another pollvoltime will follow
*/
-int pollvoltime(obj)
-AFPObj *obj;
+int pollvoltime(AFPObj *obj)
+
{
- struct vol *vol;
+ struct vol *vol;
struct timeval tv;
struct stat st;
-
- if (!(afp_version > 21 && obj->options.server_notif))
- return 0;
- if ( gettimeofday( &tv, 0 ) < 0 )
- return 0;
+ if (!(afp_version > 21 && obj->options.server_notif))
+ return 0;
+
+ if ( gettimeofday( &tv, NULL ) < 0 )
+ return 0;
- for ( vol = volumes; vol; vol = vol->v_next ) {
- if ( (vol->v_flags & AFPVOL_OPEN) && vol->v_time + 30 < tv.tv_sec) {
- if ( !stat( vol->v_path, &st ) && vol->v_time != st.st_mtime ) {
- vol->v_time = st.st_mtime;
+ for ( vol = Volumes; vol; vol = vol->v_next ) {
+ if ( (vol->v_flags & AFPVOL_OPEN) && vol->v_mtime + 30 < tv.tv_sec) {
+ if ( !stat( vol->v_path, &st ) && vol->v_mtime != st.st_mtime ) {
+ vol->v_mtime = st.st_mtime;
if (!obj->attention(obj->handle, AFPATTN_NOTIFY | AFPATTN_VOLCHANGED))
return -1;
return 1;
return 0;
}
-void setvoltime(obj, vol )
-AFPObj *obj;
-struct vol *vol;
+/* ------------------------- */
+void setvoltime(AFPObj *obj, struct vol *vol)
{
- struct timeval tv;
+ struct timeval tv;
- /* just looking at vol->v_time is broken seriously since updates
+ /* just looking at vol->v_mtime is broken seriously since updates
* from other users afpd processes never are seen.
* This is not the most elegant solution (a shared memory between
* the afpd processes would come closer)
* [RS] */
- if ( gettimeofday( &tv, 0 ) < 0 ) {
- LOG(log_error, logtype_afpd, "setvoltime: gettimeofday: %s", strerror(errno) );
+ if ( gettimeofday( &tv, NULL ) < 0 ) {
+ LOG(log_error, logtype_afpd, "setvoltime(%s): gettimeofday: %s", vol->v_path, strerror(errno) );
return;
}
if( utime( vol->v_path, NULL ) < 0 ) {
}
/* a little granularity */
- if (vol->v_time < tv.tv_sec) {
- vol->v_time = tv.tv_sec;
- if (afp_version > 21 && obj->options.server_notif) {
+ if (vol->v_mtime < tv.tv_sec) {
+ vol->v_mtime = tv.tv_sec;
+ /* or finder doesn't update free space
+ * AFP 3.2 and above clients seem to be ok without so many notification
+ */
+ if (afp_version < 32 && obj->options.server_notif) {
obj->attention(obj->handle, AFPATTN_NOTIFY | AFPATTN_VOLCHANGED);
}
}
}
-int afp_getvolparams(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj *obj;
-char *ibuf, *rbuf;
-int ibuflen, *rbuflen;
+/* ------------------------- */
+int afp_getvolparams(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_,char *rbuf, size_t *rbuflen)
{
- struct stat st;
- struct vol *vol;
- int buflen, ret;
- u_int16_t vid, bitmap;
+ struct vol *vol;
+ u_int16_t vid, bitmap;
ibuf += 2;
memcpy(&vid, ibuf, sizeof( vid ));
return( AFPERR_PARAM );
}
- if ( stat( vol->v_path, &st ) < 0 ) {
- *rbuflen = 0;
- return( AFPERR_PARAM );
- }
-
- buflen = *rbuflen - sizeof( bitmap );
- if (( ret = getvolparams( bitmap, vol, &st,
- rbuf + sizeof( bitmap ), &buflen )) != AFP_OK ) {
- *rbuflen = 0;
- return( ret );
- }
- *rbuflen = buflen + sizeof( bitmap );
- bitmap = htons( bitmap );
- memcpy(rbuf, &bitmap, sizeof( bitmap ));
- return( AFP_OK );
+ return stat_vol(bitmap, vol, rbuf, rbuflen);
}
-int afp_setvolparams(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj *obj;
-char *ibuf, *rbuf;
-int ibuflen, *rbuflen;
+/* ------------------------- */
+int afp_setvolparams(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, size_t *rbuflen)
{
struct adouble ad;
- struct vol *vol;
- u_int16_t vid, bitmap;
+ struct vol *vol;
+ u_int16_t vid, bitmap;
u_int32_t aint;
ibuf += 2;
return( AFPERR_PARAM );
}
- if (vol->v_flags & AFPVOL_RO)
+ if ((vol->v_flags & AFPVOL_RO))
return AFPERR_VLOCK;
/* we can only set the backup date. */
if (bitmap != (1 << VOLPBIT_BDATE))
return AFPERR_BITMAP;
- memset(&ad, 0, sizeof(ad));
+ ad_init(&ad, vol->v_adouble, vol->v_ad_options);
if ( ad_open( vol->v_path, ADFLAGS_HF|ADFLAGS_DIR, O_RDWR,
0666, &ad) < 0 ) {
if (errno == EROFS)
memcpy(&aint, ibuf, sizeof(aint));
ad_setdate(&ad, AD_DATE_BACKUP, aint);
- ad_flush(&ad, ADFLAGS_HF);
+ ad_flush(&ad);
ad_close(&ad, ADFLAGS_HF);
return( AFP_OK );
}
-
+/* ------------------------- */
int wincheck(const struct vol *vol, const char *path)
{
int len;
}
-void close_vols ()
+/*
+ * precreate a folder
+ * this is only intended for folders in the volume root
+ * It will *not* work if the folder name contains extended characters
+ */
+static int create_special_folder (const struct vol *vol, const struct _special_folder *folder)
{
-#ifdef CNID_DB
- struct vol *vol;
+ char *p,*q,*r;
+ struct adouble ad;
+ u_int16_t attr;
+ struct stat st;
+ int ret;
+
- for ( vol = volumes; vol; vol = vol->v_next ) {
- if ( (vol->v_flags & AFPVOL_OPEN ) == 0 )
- continue;
- if ( vol->v_db )
- cnid_close(vol->v_db);
- vol->v_db = NULL;
+ p = (char *) malloc ( strlen(vol->v_path)+strlen(folder->name)+2);
+ if ( p == NULL) {
+ LOG(log_error, logtype_afpd,"malloc failed");
+ exit (EXITERR_SYS);
+ }
+
+ q=strdup(folder->name);
+ if ( q == NULL) {
+ LOG(log_error, logtype_afpd,"malloc failed");
+ exit (EXITERR_SYS);
+ }
+
+ strcpy(p, vol->v_path);
+ strcat(p, "/");
+
+ r=q;
+ while (*r) {
+ if ((vol->v_casefold & AFPVOL_MTOUUPPER))
+ *r=toupper(*r);
+ else if ((vol->v_casefold & AFPVOL_MTOULOWER))
+ *r=tolower(*r);
+ r++;
+ }
+ strcat(p, q);
+
+ if ( (ret = stat( p, &st )) < 0 ) {
+ if (folder->precreate) {
+ if (ad_mkdir(p, folder->mode)) {
+ LOG(log_debug, logtype_afpd,"Creating '%s' failed in %s: %s", p, vol->v_path, strerror(errno));
+ free(p);
+ free(q);
+ return -1;
+ }
+ ret = 0;
+ }
+ }
+
+ if ( !ret && folder->hide) {
+ /* Hide it */
+ ad_init(&ad, vol->v_adouble, vol->v_ad_options);
+ if (ad_open_metadata( p, ADFLAGS_DIR, O_CREAT, &ad) < 0) {
+ free (p);
+ free(q);
+ return (-1);
+ }
+
+ ad_setname(&ad, folder->name);
+
+ ad_getattr(&ad, &attr);
+ attr |= htons( ntohs( attr ) | ATTRBIT_INVISIBLE );
+ ad_setattr(&ad, attr);
+
+ /* do the same with the finder info */
+ if (ad_entry(&ad, ADEID_FINDERI)) {
+ memcpy(&attr, ad_entry(&ad, ADEID_FINDERI) + FINDERINFO_FRFLAGOFF, sizeof(attr));
+ attr |= htons(FINDERINFO_INVISIBLE);
+ memcpy(ad_entry(&ad, ADEID_FINDERI) + FINDERINFO_FRFLAGOFF,&attr, sizeof(attr));
+ }
+
+ ad_flush( &ad );
+ ad_close_metadata( &ad);
+ }
+ free(p);
+ free(q);
+ return 0;
+}
+
+static void handle_special_folders (const struct vol * vol)
+{
+ const _special_folder *p = &special_folders[0];
+
+ if ((vol->v_flags & AFPVOL_RO))
+ return;
+
+ for (; p->name != NULL; p++) {
+ create_special_folder (vol, p);
}
-#endif
}
projects / netatalk.git / blobdiff