X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Ffile.c;h=c24d296b2f1049c76c6407267d6410847e7564cb;hb=9ebba6f4ae4965d0d63e4015fa5345fcd5eef9e0;hp=b34f810bd8240637b01e3cc32cf6bb169439e0b3;hpb=3f7f813f828d41fd4b7aa8e1eec3c605e41bb293;p=netatalk.git diff --git a/etc/afpd/file.c b/etc/afpd/file.c index b34f810b..c24d296b 100644 --- a/etc/afpd/file.c +++ b/etc/afpd/file.c @@ -24,6 +24,7 @@ #include #include #include +#include #include "directory.h" #include "dircache.h" @@ -76,22 +77,17 @@ static int default_type(void *finder) /* FIXME path : unix or mac name ? (for now it's unix name ) */ void *get_finderinfo(const struct vol *vol, const char *upath, struct adouble *adp, void *data, int islink) { - struct extmap *em; void *ad_finder = NULL; int chk_ext = 0; - + if (adp) ad_finder = ad_entry(adp, ADEID_FINDERI); if (ad_finder) { memcpy(data, ad_finder, ADEDLEN_FINDERI); - /* default type ? */ - if (default_type(ad_finder)) - chk_ext = 1; } else { memcpy(data, ufinderi, ADEDLEN_FINDERI); - chk_ext = 1; if (vol_inv_dots(vol) && *upath == '.') { /* make it invisible */ uint16_t ashort; @@ -107,14 +103,8 @@ void *get_finderinfo(const struct vol *vol, const char *upath, struct adouble *a memcpy((char *)data + FINDERINFO_FRFLAGOFF, &linkflag, 2); memcpy((char *)data + FINDERINFO_FRTYPEOFF,"slnk",4); memcpy((char *)data + FINDERINFO_FRCREATOFF,"rhap",4); - chk_ext = 0; } - /** Only enter if no appledouble information and no finder information found. */ - if (chk_ext && (em = getextmap( upath ))) { - memcpy(data, em->em_type, sizeof( em->em_type )); - memcpy((char *)data + 4, em->em_creator, sizeof(em->em_creator)); - } return data; } @@ -129,7 +119,7 @@ char *set_name(const struct vol *vol, char *data, cnid_t pid, char *name, cnid_t if (!utf8) { /* want mac name */ - if (utf8_encoding()) { + if (utf8_encoding(vol->v_obj)) { /* but name is an utf8 mac name */ char *u, *m; @@ -249,8 +239,7 @@ restart: vol->v_path); vol->v_cdb = cnid_open(vol->v_path, vol->v_umask, "tdb", flags, NULL, NULL); if (vol->v_cdb) { - /* deactivate cnid caching/storing in AppleDouble files and set ro mode*/ - vol->v_flags &= ~AFPVOL_CACHE; + /* set ro mode*/ vol->v_flags |= AFPVOL_RO; #ifdef SERVERTEXT /* kill ourself with SIGUSR2 aka msg pending */ @@ -286,10 +275,11 @@ exit: } /* -------------------------- */ -int getmetadata(struct vol *vol, - uint16_t bitmap, - struct path *path, struct dir *dir, - char *buf, size_t *buflen, struct adouble *adp) +int getmetadata(const AFPObj *obj, + struct vol *vol, + uint16_t bitmap, + struct path *path, struct dir *dir, + char *buf, size_t *buflen, struct adouble *adp) { char *data, *l_nameoff = NULL, *upath; char *utf_nameoff = NULL; @@ -309,7 +299,7 @@ int getmetadata(struct vol *vol, data = buf; if ( ((bitmap & ( (1 << FILPBIT_FINFO)|(1 << FILPBIT_LNAME)|(1 <m_name) - || (bitmap & ( (1 << FILPBIT_LNAME) ) && utf8_encoding()) /* FIXME should be m_name utf8 filename */ + || (bitmap & ( (1 << FILPBIT_LNAME) ) && utf8_encoding(obj)) /* FIXME should be m_name utf8 filename */ || (bitmap & (1 << FILPBIT_FNUM))) { if (!path->id) { bstring fullpath; @@ -326,7 +316,7 @@ int getmetadata(struct vol *vol, /* Get macname from unixname first */ if (path->m_name == NULL) { - if ((path->m_name = utompath(vol, upath, id, utf8_encoding())) == NULL) { + if ((path->m_name = utompath(vol, upath, id, utf8_encoding(obj))) == NULL) { LOG(log_error, logtype_afpd, "getmetadata: utompath error"); return AFPERR_MISC; } @@ -358,7 +348,7 @@ int getmetadata(struct vol *vol, return afp_errno; if (!path->m_name) { - path->m_name = utompath(vol, upath, id, utf8_encoding()); + path->m_name = utompath(vol, upath, id, utf8_encoding(vol->v_obj)); } } while ( bitmap != 0 ) { @@ -477,7 +467,7 @@ int getmetadata(struct vol *vol, to "pXYZ" when we created it. See IA, Ver 2. */ case FILPBIT_PDINFO : - if (afp_version >= 30) { /* UTF8 name */ + if (obj->afp_version >= 30) { /* UTF8 name */ utf8 = kTextEncodingUTF8; utf_nameoff = data; data += sizeof( uint16_t ); @@ -548,7 +538,7 @@ int getmetadata(struct vol *vol, break; case FILPBIT_UNIXPR : /* accessmode may change st_mode with ACLs */ - accessmode(vol, upath, &ma, dir , st); + accessmode(obj, vol, upath, &ma, dir , st); aint = htonl(st->st_uid); memcpy( data, &aint, sizeof( aint )); @@ -601,7 +591,8 @@ int getmetadata(struct vol *vol, } /* ----------------------- */ -int getfilparams(struct vol *vol, +int getfilparams(const AFPObj *obj, + struct vol *vol, uint16_t bitmap, struct path *path, struct dir *dir, char *buf, size_t *buflen ) @@ -609,6 +600,7 @@ int getfilparams(struct vol *vol, struct adouble ad, *adp; int opened = 0; int rc; + int flags; LOG(log_debug, logtype_afpd, "getfilparams(\"%s\")", path->u_name); @@ -617,7 +609,7 @@ int getfilparams(struct vol *vol, if (opened) { char *upath; - int flags = (bitmap & (1 << FILPBIT_ATTR)) ? ADFLAGS_CHECK_OF : 0; + flags = (bitmap & (1 << FILPBIT_ATTR)) ? ADFLAGS_CHECK_OF : 0; adp = of_ad(vol, path, &ad); upath = path->u_name; @@ -638,8 +630,8 @@ int getfilparams(struct vol *vol, } } } - rc = getmetadata(vol, bitmap, path, dir, buf, buflen, adp); - ad_close(adp, ADFLAGS_HF); + rc = getmetadata(obj, vol, bitmap, path, dir, buf, buflen, adp); + ad_close(adp, ADFLAGS_HF | flags); return( rc ); } @@ -677,12 +669,11 @@ int afp_createfile(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, if (NULL == ( s_path = cname( vol, dir, &ibuf )) ) return get_afp_errno(AFPERR_PARAM); - if ( *s_path->m_name == '\0' ) return( AFPERR_BADTYPE ); upath = s_path->u_name; - ad_init(&ad, vol->v_adouble, vol->v_ad_options); + ad_init(&ad, vol); /* if upath is deleted we already in trouble anyway */ if ((of = of_findname(s_path))) { @@ -717,11 +708,6 @@ int afp_createfile(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, } } if ( ad_meta_fileno( &ad ) == -1 ) { /* Hard META / HF */ - /* on noadouble volumes, just creating the data fork is ok */ - if (vol_noadouble(vol)) { - ad_close( &ad, ADFLAGS_DF ); - goto createfile_done; - } /* FIXME with hard create on an existing file, we already * corrupted the data file. */ @@ -801,7 +787,7 @@ int afp_setfilparams(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_ ibuf++; } - if (AFP_OK == ( rc = setfilparams(vol, s_path, bitmap, ibuf )) ) { + if (AFP_OK == ( rc = setfilparams(obj, vol, s_path, bitmap, ibuf )) ) { setvoltime(obj, vol ); } @@ -814,7 +800,7 @@ int afp_setfilparams(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_ */ extern struct path Cur_Path; -int setfilparams(struct vol *vol, +int setfilparams(const AFPObj *obj, struct vol *vol, struct path *path, uint16_t f_bitmap, char *buf ) { struct adouble ad, *adp; @@ -826,9 +812,7 @@ int setfilparams(struct vol *vol, uint32_t aint; uint32_t upriv; uint16_t upriv_bit = 0; - - struct utimbuf ut; - + struct utimbuf ut; int change_mdate = 0; int change_parent_mdate = 0; int newdate = 0; @@ -838,6 +822,7 @@ int setfilparams(struct vol *vol, uint16_t bitmap = f_bitmap; uint32_t cdate,bdate; u_char finder_buf[32]; + int symlinked = 0; #ifdef DEBUG LOG(log_debug9, logtype_afpd, "begin setfilparams:"); @@ -846,7 +831,7 @@ int setfilparams(struct vol *vol, adp = of_ad(vol, path, &ad); upath = path->u_name; - if (!vol_unix_priv(vol) && check_access(upath, OPENACC_WR ) < 0) { + if (!vol_unix_priv(vol) && check_access(obj, vol, upath, OPENACC_WR ) < 0) { return AFPERR_ACCESS; } @@ -880,16 +865,15 @@ int setfilparams(struct vol *vol, case FILPBIT_FINFO : change_mdate = 1; memcpy(finder_buf, buf, 32 ); - if (memcmp(buf,"slnkrhap",8)==0 && !S_ISLNK(path->st.st_mode)){ - // SLFINFO + if (memcmp(buf, "slnkrhap", 8) == 0 && !S_ISLNK(path->st.st_mode)) { int fp; ssize_t len; int erc=1; char buf[PATH_MAX+1]; - if ((fp=open(path->u_name,O_RDONLY))>=0){ - if ((len=read(fp,buf,PATH_MAX+1))){ - if (unlink(path->u_name)==0){ - buf[len]=0; + if ((fp = open(path->u_name, O_RDONLY)) >= 0) { + if ((len = read(fp, buf, PATH_MAX+1))) { + if (unlink(path->u_name) == 0) { + buf[len] = 0; erc = symlink(buf, path->u_name); if (!erc) of_stat(path); @@ -897,10 +881,11 @@ int setfilparams(struct vol *vol, } close(fp); } - if (erc!=0){ + if (erc != 0) { err=AFPERR_BITMAP; goto setfilparam_done; } + symlinked = 1; } buf += 32; break; @@ -934,7 +919,7 @@ int setfilparams(struct vol *vol, } break; case FILPBIT_PDINFO : - if (afp_version < 30) { /* else it's UTF8 name */ + if (obj->afp_version < 30) { /* else it's UTF8 name */ achar = *buf; buf += 2; /* Keep special case to support crlf translations */ @@ -971,7 +956,7 @@ int setfilparams(struct vol *vol, * - change of modification date * - UNIX privs (Bug-ID #2863424) */ - if (!vol_noadouble(vol) && (f_bitmap & ~(1<m_name )) && - !memcmp(finder_buf, em->em_type, sizeof( em->em_type )) && - !memcmp(finder_buf + 4, em->em_creator,sizeof( em->em_creator))) - || ((em = getdefextmap()) && - !memcmp(finder_buf, em->em_type, sizeof( em->em_type )) && - !memcmp(finder_buf + 4, em->em_creator,sizeof( em->em_creator))) - )) { - memcpy(finder_buf, ufinderi, 8 ); - } memcpy(ad_entry( adp, ADEID_FINDERI ), finder_buf, 32 ); break; case FILPBIT_UNIXPR : @@ -1030,7 +1004,7 @@ int setfilparams(struct vol *vol, } break; case FILPBIT_PDINFO : - if (afp_version < 30) { /* else it's UTF8 name */ + if (obj->afp_version < 30) { /* else it's UTF8 name */ memcpy(ad_entry( adp, ADEID_FINDERI ), fdType, 4 ); memcpy(ad_entry( adp, ADEID_FINDERI ) + 4, "pdos", 4 ); break; @@ -1174,14 +1148,14 @@ size_t plen = 0; uint16_t len16; uint32_t hint; - if ( type != 2 && !(afp_version >= 30 && type == 3) ) { + if ( type != 2 && !(vol->v_obj->afp_version >= 30 && type == 3) ) { return -1; } ibuf++; switch (type) { case 2: if (( plen = (unsigned char)*ibuf++ ) != 0 ) { - if (afp_version >= 30) { + if (vol->v_obj->afp_version >= 30) { /* convert it to UTF8 */ if ((plen = mtoUTF8(vol, ibuf, plen, newname, AFPOBJ_TMPSIZ)) == (size_t)-1) @@ -1272,7 +1246,7 @@ int afp_copyfile(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, si adp = of_ad(s_vol, s_path, &ad); - if (ad_open(adp, s_path->u_name, ADFLAGS_DF | ADFLAGS_HF | ADFLAGS_NOHF | ADFLAGS_RDONLY) < 0) { + if (ad_open(adp, s_path->u_name, ADFLAGS_DF | ADFLAGS_HF | ADFLAGS_NOHF | ADFLAGS_RDONLY | ADFLAGS_SETSHRMD) < 0) { return AFPERR_DENYCONF; } denyreadset = (ad_testlock(adp, ADEID_DFORK, AD_FILELOCK_DENY_RD) != 0 || @@ -1325,7 +1299,7 @@ int afp_copyfile(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, si /* newname is always only a filename so curdir *is* its * parent folder */ - if (NULL == (upath = mtoupath(d_vol, newname, curdir->d_did, utf8_encoding()))) { + if (NULL == (upath = mtoupath(d_vol, newname, curdir->d_did, utf8_encoding(d_vol->v_obj)))) { retvalue =AFPERR_PARAM; goto copy_exit; } @@ -1339,108 +1313,10 @@ int afp_copyfile(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, si setvoltime(obj, d_vol ); copy_exit: - ad_close( adp, ADFLAGS_DF |ADFLAGS_HF ); + ad_close( adp, ADFLAGS_DF |ADFLAGS_HF | ADFLAGS_SETSHRMD); return( retvalue ); } -/* ----------------------- */ -static int copy_all(const int dfd, const void *buf, - size_t buflen) -{ - ssize_t cc; - -#ifdef DEBUG - LOG(log_debug9, logtype_afpd, "begin copy_all:"); -#endif /* DEBUG */ - - while (buflen > 0) { - if ((cc = write(dfd, buf, buflen)) < 0) { - switch (errno) { - case EINTR: - continue; - default: - return -1; - } - } - buflen -= cc; - } - -#ifdef DEBUG - LOG(log_debug9, logtype_afpd, "end copy_all:"); -#endif /* DEBUG */ - - return 0; -} - -/* -------------------------- - * copy only the fork data stream -*/ -static int copy_fork(int eid, struct adouble *add, struct adouble *ads) -{ - ssize_t cc; - int err = 0; - char filebuf[8192]; - int sfd, dfd; - - if (eid == ADEID_DFORK) { - sfd = ad_data_fileno(ads); - dfd = ad_data_fileno(add); - } - else { - sfd = ad_reso_fileno(ads); - dfd = ad_reso_fileno(add); - } - - if ((off_t)-1 == lseek(sfd, ad_getentryoff(ads, eid), SEEK_SET)) - return -1; - - if ((off_t)-1 == lseek(dfd, ad_getentryoff(add, eid), SEEK_SET)) - return -1; - -#if 0 /* ifdef SENDFILE_FLAVOR_LINUX */ - /* doesn't work With 2.6 FIXME, only check for EBADFD ? */ - off_t offset = 0; - size_t size; - struct stat st; - #define BUF 128*1024*1024 - - if (fstat(sfd, &st) == 0) { - - while (1) { - if ( offset >= st.st_size) { - return 0; - } - size = (st.st_size -offset > BUF)?BUF:st.st_size -offset; - if ((cc = sys_sendfile(dfd, sfd, &offset, size)) < 0) { - switch (errno) { - case ENOSYS: - case EINVAL: /* there's no guarantee that all fs support sendfile */ - goto no_sendfile; - default: - return -1; - } - } - } - } - no_sendfile: - lseek(sfd, offset, SEEK_SET); -#endif - - while (1) { - if ((cc = read(sfd, filebuf, sizeof(filebuf))) < 0) { - if (errno == EINTR) - continue; - err = -1; - break; - } - - if (!cc || ((err = copy_all(dfd, filebuf, cc)) < 0)) { - break; - } - } - return err; -} - /* ---------------------------------- * if newname is NULL (from directory.c) we don't want to copy the resource fork. * because we are doing it elsewhere. @@ -1465,24 +1341,20 @@ int copyfile(const struct vol *s_vol, sfd, src, dst, newname); if (adp == NULL) { - ad_init(&ads, s_vol->v_adouble, s_vol->v_ad_options); + ad_init(&ads, s_vol); adp = &ads; } - adflags = ADFLAGS_DF; - if (newname) { - adflags |= ADFLAGS_HF; - } + adflags = ADFLAGS_DF | ADFLAGS_RF | ADFLAGS_NORF; - if (ad_openat(adp, sfd, src, adflags | ADFLAGS_NOHF | ADFLAGS_RDONLY) < 0) { + if (ad_openat(adp, sfd, src, adflags | ADFLAGS_RDONLY) < 0) { ret_err = errno; goto done; } - if (ad_meta_fileno(adp) == -1 && ad_reso_fileno(adp) == -1) { /* META / HF */ + if (!AD_RSRC_OPEN(adp)) /* no resource fork, don't create one for dst file */ - adflags &= ~ADFLAGS_HF; - } + adflags &= ~ADFLAGS_RF; stat_result = fstat(ad_data_fileno(adp), &st); /* saving stat exit code, thus saving us on one more stat later on */ @@ -1491,8 +1363,8 @@ int copyfile(const struct vol *s_vol, st.st_mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH; } - ad_init(&add, d_vol->v_adouble, d_vol->v_ad_options); - if (ad_open(&add, dst, adflags | ADFLAGS_RDWR | ADFLAGS_CREATE | ADFLAGS_EXCL, st.st_mode) < 0) { + ad_init(&add, d_vol); + if (ad_open(&add, dst, adflags | ADFLAGS_RDWR | ADFLAGS_CREATE | ADFLAGS_EXCL, st.st_mode | S_IRUSR | S_IWUSR) < 0) { ret_err = errno; ad_close( adp, adflags ); if (EEXIST != ret_err) { @@ -1501,21 +1373,16 @@ int copyfile(const struct vol *s_vol, } return AFPERR_EXIST; } - - /* - * XXX if the source and the dest don't use the same resource type it's broken - */ - if (ad_reso_fileno(adp) == -1 || 0 == (err = copy_fork(ADEID_RFORK, &add, adp))){ - /* copy the data fork */ - if ((err = copy_fork(ADEID_DFORK, &add, adp)) == 0) { - if (ad_meta_fileno(adp) != -1) - err = d_vol->vfs->vfs_copyfile(d_vol, sfd, src, dst); - } - } - if (err < 0) { + if ((err = copy_fork(ADEID_DFORK, &add, adp)) != 0) + LOG(log_error, logtype_afpd, "copyfile('%s'): %s", src, strerror(errno)); + + if (err == 0) + if ((err = d_vol->vfs->vfs_copyfile(d_vol, sfd, src, dst)) != 0) + LOG(log_error, logtype_afpd, "copyfile('%s'): %s", src, strerror(errno)); + + if (err < 0) ret_err = errno; - } if (!ret_err && newname && (adflags & ADFLAGS_HF)) { /* set the new name in the resource fork */ @@ -1601,7 +1468,7 @@ int deletefile(const struct vol *vol, int dirfd, char *file, int checkAttrib) LOG(log_debug, logtype_afpd, "deletefile('%s')", file); - ad_init(&ad, vol->v_adouble, vol->v_ad_options); + ad_init(&ad, vol); if (checkAttrib) { /* was EACCESS error try to get only metadata */ /* we never want to create a resource fork here, we are going to delete it @@ -1610,7 +1477,7 @@ int deletefile(const struct vol *vol, int dirfd, char *file, int checkAttrib) */ if ( ad_metadataat(dirfd, file, ADFLAGS_CHECK_OF, &ad) == 0 ) { if ((err = check_attrib(&ad))) { - ad_close(&ad, ADFLAGS_HF); + ad_close(&ad, ADFLAGS_HF | ADFLAGS_CHECK_OF); return err; } meta = 1; @@ -1619,7 +1486,7 @@ int deletefile(const struct vol *vol, int dirfd, char *file, int checkAttrib) /* try to open both forks at once */ adflags = ADFLAGS_DF; - if (ad_openat(&ad, dirfd, file, adflags | ADFLAGS_HF | ADFLAGS_NOHF | ADFLAGS_RDONLY) < 0 ) { + if (ad_openat(&ad, dirfd, file, adflags | ADFLAGS_RF | ADFLAGS_NORF | ADFLAGS_RDONLY) < 0 ) { switch (errno) { case ENOENT: err = AFPERR_NOOBJ; @@ -1638,8 +1505,8 @@ int deletefile(const struct vol *vol, int dirfd, char *file, int checkAttrib) adp = &ad; } - if ( adp && ad_reso_fileno( adp ) != -1 ) { /* there's a resource fork */ - adflags |= ADFLAGS_HF; + if ( adp && AD_RSRC_OPEN(adp) != -1 ) { /* there's a resource fork */ + adflags |= ADFLAGS_RF; /* FIXME we have a pb here because we want to know if a file is open * there's a 'priority inversion' if you can't open the ressource fork RW * you can delete it if it's open because you can't get a write lock. @@ -1656,6 +1523,7 @@ int deletefile(const struct vol *vol, int dirfd, char *file, int checkAttrib) } if (adp && ad_tmplock( &ad, ADEID_DFORK, ADLOCK_WR, 0, 0, 0 ) < 0) { + LOG(log_error, logtype_afpd, "deletefile('%s'): ad_tmplock error: %s", file, strerror(errno)); err = AFPERR_BUSY; } else if (!(err = vol->vfs->vfs_deletefile(vol, dirfd, file)) && !(err = netatalk_unlinkat(dirfd, file )) ) { cnid_t id; @@ -1666,7 +1534,7 @@ int deletefile(const struct vol *vol, int dirfd, char *file, int checkAttrib) end: if (meta) - ad_close(&ad, ADFLAGS_HF); + ad_close(&ad, ADFLAGS_HF | ADFLAGS_CHECK_OF); if (adp) ad_close( &ad, adflags ); /* ad_close removes locks if any */ @@ -1808,7 +1676,7 @@ reenumerate_id(struct vol *vol, char *name, struct dir *dir) /* ------------------------------ resolve a file id */ -int afp_resolveid(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf, size_t *rbuflen) +int afp_resolveid(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf, size_t *rbuflen) { struct vol *vol; struct dir *dir; @@ -1894,17 +1762,17 @@ retry: /* directories are bad */ if (S_ISDIR(path.st.st_mode)) { /* OS9 and OSX don't return the same error code */ - return (afp_version >=30)?AFPERR_NOID:AFPERR_BADTYPE; + return (obj->afp_version >=30)?AFPERR_NOID:AFPERR_BADTYPE; } memcpy(&bitmap, ibuf, sizeof(bitmap)); bitmap = ntohs( bitmap ); - if (NULL == (path.m_name = utompath(vol, upath, cnid, utf8_encoding()))) { + if (NULL == (path.m_name = utompath(vol, upath, cnid, utf8_encoding(obj)))) { return AFPERR_NOID; } path.id = cnid; - if (AFP_OK != (err = getfilparams(vol, bitmap, &path , curdir, - rbuf + sizeof(bitmap), &buflen))) { + if (AFP_OK != (err = getfilparams(obj, vol, bitmap, &path , curdir, + rbuf + sizeof(bitmap), &buflen))) { return err; } *rbuflen = buflen + sizeof(bitmap); @@ -1997,7 +1865,7 @@ delete: } /* ------------------------------ */ -static struct adouble *find_adouble(struct path *path, struct ofork **of, struct adouble *adp) +static struct adouble *find_adouble(const AFPObj *obj, struct vol *vol, struct path *path, struct ofork **of, struct adouble *adp) { int ret; @@ -2019,7 +1887,7 @@ static struct adouble *find_adouble(struct path *path, struct ofork **of, struct /* we use file_access both for legacy Mac perm and * for unix privilege, rename will take care of folder perms */ - if (file_access(path, OPENACC_WR ) < 0) { + if (file_access(obj, vol, path, OPENACC_WR ) < 0) { afp_errno = AFPERR_ACCESS; return NULL; } @@ -2114,8 +1982,8 @@ int afp_exchangefiles(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U return AFPERR_PARAM ; } - ad_init(&ads, vol->v_adouble, vol->v_ad_options); - if (!(adsp = find_adouble( path, &s_of, &ads))) { + ad_init(&ads, vol); + if (!(adsp = find_adouble(obj, vol, path, &s_of, &ads))) { return afp_errno; } @@ -2147,8 +2015,8 @@ int afp_exchangefiles(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U goto err_exchangefile; } - ad_init(&add, vol->v_adouble, vol->v_ad_options); - if (!(addp = find_adouble( path, &d_of, &add))) { + ad_init(&add, vol); + if (!(addp = find_adouble(obj, vol, path, &d_of, &add))) { err = afp_errno; goto err_exchangefile; }