X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fatalk%2Fvolume.h;h=ad8be2b8421ff98a384a907b45145e3a6c0cc298;hb=3a84db87064922ad10ac10cc1d6833380e575995;hp=ca2aa87c256f1af4e71a5f7d4f9b8ae5ab10d970;hpb=6aa3f324ef50bd6a6241739da872541bdb2c5705;p=netatalk.git diff --git a/include/atalk/volume.h b/include/atalk/volume.h index ca2aa87c..ad8be2b8 100644 --- a/include/atalk/volume.h +++ b/include/atalk/volume.h @@ -13,14 +13,23 @@ #include #include #include +#include #define AFPVOL_U8MNAMELEN 255 /* AFP3 sepc */ #define AFPVOL_MACNAMELEN 27 /* AFP2 spec */ typedef uint64_t VolSpace; +/* This should belong in a file.h */ +struct extmap { + char *em_ext; + char em_creator[4]; + char em_type[4]; +}; + struct vol { struct vol *v_next; + AFPObj *v_obj; uint16_t v_vid; int v_flags; char *v_path; @@ -42,7 +51,6 @@ struct vol { char v_stamp[ADEDLEN_PRIVSYN]; VolSpace v_limitsize; /* Size limit, if any, in MiB */ mode_t v_umask; - mode_t v_perm; /* default permission value OR with requested perm*/ mode_t v_dperm; /* default directories permission value OR with requested perm*/ mode_t v_fperm; /* default files permission value OR with requested perm*/ ucs2_t *v_u8mname; /* converted to utf8-mac in ucs2 */ @@ -68,7 +76,8 @@ struct vol { /* only when opening/closing volumes or in error */ int v_casefold; - char *v_localname; /* as defined in AppleVolumes.default */ + char *v_configname; /* as defined in afpc.conf */ + char *v_localname; /* as defined in afp.conf but with vars expanded */ char *v_volcodepage; char *v_maccodepage; char *v_password; @@ -76,8 +85,10 @@ struct vol { char *v_dbpath; char *v_cnidserver; char *v_cnidport; +#if 0 int v_hide; /* new volume wait until old volume is closed */ int v_new; /* volume deleted but there's a new one with the same name */ +#endif int v_deleted; /* volume open but deleted in new config file */ char *v_root_preexec; char *v_preexec; @@ -86,35 +97,28 @@ struct vol { int v_root_preexec_close; int v_preexec_close; char *v_uuid; /* For TimeMachine zeroconf record */ -#ifdef __svr4__ - int v_qfd; -#endif /*__svr4__*/ + int v_qfd; + uint32_t v_ignattr; /* AFP attributes that shall be ignored */ }; -#define AFPVOL_OPEN (1<<0) +/* load_volumes() flags */ +typedef enum {lv_none = 0, lv_all = 1} lv_flags_t; +/* volume flags */ +#define AFPVOL_OPEN (1<<0) /* flags for AFS and quota 0xxx0 */ #define AFPVOL_GVSMASK (7<<2) -#define AFPVOL_NONE (0<<2) +#define AFPVOL_NONE (0<<2) #define AFPVOL_AFSGVS (1<<2) -#define AFPVOL_USTATFS (2<<2) -#define AFPVOL_UQUOTA (4<<2) +#define AFPVOL_USTATFS (1<<3) +#define AFPVOL_UQUOTA (1<<4) -/* - Flags that alter volume behaviour. - Keep in sync with libatalk/util/volinfo.c -*/ -#define AFPVOL_A2VOL (1 << 5) /* prodos volume */ -#define AFPVOL_CRLF (1 << 6) /* cr/lf translation */ -#define AFPVOL_NOADOUBLE (1 << 7) /* don't create .AppleDouble by default */ +#define AFPVOL_NOV2TOEACONV (1 << 5) /* no adouble:v2 to adouble:ea conversion */ +#define AFPVOL_SPOTLIGHT (1 << 6) /* Index volume for Spotlight searches */ #define AFPVOL_RO (1 << 8) /* read-only volume */ -#define AFPVOL_MSWINDOWS (1 << 9) /* deal with ms-windows yuckiness. - this is going away. */ -#define AFPVOL_NOHEX (1 << 10) /* don't do :hex translation */ -#define AFPVOL_USEDOTS (1 << 11) /* use real dots */ -#define AFPVOL_LIMITSIZE (1 << 12) /* limit size for older macs */ -#define AFPVOL_MAPASCII (1 << 13) /* map the ascii range as well */ -#define AFPVOL_NOFILEID (1 << 15) /* don't advertise createid resolveid and deleteid calls */ +#define AFPVOL_CHMOD_PRESERVE_ACL (1 << 9) /* try to preserve ACLs */ +#define AFPVOL_CHMOD_IGNORE (1 << 10) /* try to preserve ACLs */ +#define AFPVOL_FORCE_STICKY_XATTR (1 << 11) /* write metadata xattr as root on sticky dirs */ #define AFPVOL_NOSTAT (1 << 16) /* advertise the volume even if we can't stat() it * maybe because it will be mounted later in preexec */ #define AFPVOL_UNIX_PRIV (1 << 17) /* support unix privileges */ @@ -122,16 +126,15 @@ struct vol { * help if device number is notconsistent across reboot * NOTE symlink to a different device will return an ACCESS error */ -#define AFPVOL_CASEINSEN (1 << 19) /* volume is case insensitive */ #define AFPVOL_EILSEQ (1 << 20) /* encode illegal sequence 'asis' UCS2, ex "\217-", which is not a valid SHIFT-JIS char, is encoded as U\217 -*/ - -#define AFPVOL_CACHE (1 << 21) /* Use adouble v2 CNID caching. Default: yes */ #define AFPVOL_INV_DOTS (1 << 22) /* dots files are invisible */ #define AFPVOL_TM (1 << 23) /* Supports TimeMachine */ #define AFPVOL_ACLS (1 << 24) /* Volume supports ACLS */ #define AFPVOL_SEARCHDB (1 << 25) /* Use fast CNID db search instead of filesystem */ #define AFPVOL_NONETIDS (1 << 26) /* signal the client it shall do privelege mapping */ +#define AFPVOL_FOLLOWSYM (1 << 27) /* follow symlinks on the server, default is not to */ +#define AFPVOL_DELVETO (1 << 28) /* delete veto files and dirs */ /* Extended Attributes vfs indirection */ #define AFPVOL_EA_NONE 0 /* No EAs */ @@ -153,10 +156,6 @@ struct vol { #define AFPVOL_UUPPERMLOWER (AFPVOL_MTOUUPPER | AFPVOL_UTOMLOWER) #define AFPVOL_ULOWERMUPPER (AFPVOL_MTOULOWER | AFPVOL_UTOMUPPER) -#define MSWINDOWS_BADCHARS ":\t\\/<>*?|\"" - -int wincheck(const struct vol *vol, const char *path); - #define AFPVOLSIG_FLAT 0x0001 /* flat fs */ #define AFPVOLSIG_FIX 0x0002 /* fixed ids */ #define AFPVOLSIG_VAR 0x0003 /* variable ids */ @@ -189,13 +188,13 @@ int wincheck(const struct vol *vol, const char *path); #define VOLPBIT_XBTOTAL 10 #define VOLPBIT_BSIZE 11 /* block size */ -#define utf8_encoding() (afp_version >= 30) +#define utf8_encoding(obj) ((obj)->afp_version >= 30) -// TODO: remove AFPVOL_NOADOUBLE -#define vol_noadouble(vol) (((vol)->v_flags & AFPVOL_NOADOUBLE) ? 1 : 0) #define vol_nodev(vol) (((vol)->v_flags & AFPVOL_NODEV) ? 1 : 0) -#define vol_unix_priv(vol) (afp_version >= 30 && ((vol)->v_flags & AFPVOL_UNIX_PRIV)) +#define vol_unix_priv(vol) ((vol)->v_obj->afp_version >= 30 && ((vol)->v_flags & AFPVOL_UNIX_PRIV)) #define vol_inv_dots(vol) (((vol)->v_flags & AFPVOL_INV_DOTS) ? 1 : 0) - +#define vol_syml_opt(vol) (((vol)->v_flags & AFPVOL_FOLLOWSYM) ? 0 : O_NOFOLLOW) +#define vol_chmod_opt(vol) (((vol)->v_flags & AFPVOL_CHMOD_PRESERVE_ACL) ? O_NETATALK_ACL : \ + ((vol)->v_flags & AFPVOL_CHMOD_IGNORE) ? O_IGNORE : 0) #endif