X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=blobdiff_plain;f=etc%2Fafpd%2Fdirectory.c;h=0d5283992c736d97ade36481436bbfe3b4c720e7;hp=4b301649999007687ac9430ad0463776c73c55da;hb=85f0a9871848c178e301a804c9d9081f3fbaee33;hpb=6aa3f324ef50bd6a6241739da872541bdb2c5705 diff --git a/etc/afpd/directory.c b/etc/afpd/directory.c index 4b301649..0d528399 100644 --- a/etc/afpd/directory.c +++ b/etc/afpd/directory.c @@ -32,6 +32,7 @@ #include #include #include +#include #include "directory.h" #include "dircache.h" @@ -133,7 +134,7 @@ static int netatalk_mkdir(const struct vol *vol, const char *name) } /* ------------------- */ -static int deletedir(int dirfd, char *dir) +static int deletedir(const struct vol *vol, int dirfd, char *dir) { char path[MAXPATHLEN + 1]; DIR *dp; @@ -164,11 +165,11 @@ static int deletedir(int dirfd, char *dir) break; } strcpy(path + len, de->d_name); - if (lstatat(dirfd, path, &st)) { + if (ostatat(dirfd, path, &st, vol_syml_opt(vol))) { continue; } if (S_ISDIR(st.st_mode)) { - err = deletedir(dirfd, path); + err = deletedir(vol, dirfd, path); } else { err = netatalk_unlinkat(dirfd, path); } @@ -184,7 +185,7 @@ static int deletedir(int dirfd, char *dir) } /* do a recursive copy. */ -static int copydir(const struct vol *vol, int dirfd, char *src, char *dst) +static int copydir(struct vol *vol, struct dir *ddir, int dirfd, char *src, char *dst) { char spath[MAXPATHLEN + 1], dpath[MAXPATHLEN + 1]; DIR *dp; @@ -230,7 +231,7 @@ static int copydir(const struct vol *vol, int dirfd, char *src, char *dst) } strcpy(spath + slen, de->d_name); - if (lstatat(dirfd, spath, &st) == 0) { + if (ostatat(dirfd, spath, &st, vol_syml_opt(vol)) == 0) { if (strlen(de->d_name) > drem) { err = AFPERR_PARAM; break; @@ -238,9 +239,9 @@ static int copydir(const struct vol *vol, int dirfd, char *src, char *dst) strcpy(dpath + dlen, de->d_name); if (S_ISDIR(st.st_mode)) { - if (AFP_OK != (err = copydir(vol, dirfd, spath, dpath))) + if (AFP_OK != (err = copydir(vol, ddir, dirfd, spath, dpath))) goto copydir_done; - } else if (AFP_OK != (err = copyfile(vol, vol, dirfd, spath, dpath, NULL, NULL))) { + } else if (AFP_OK != (err = copyfile(vol, vol, ddir, dirfd, spath, dpath, NULL, NULL))) { goto copydir_done; } else { @@ -252,7 +253,7 @@ static int copydir(const struct vol *vol, int dirfd, char *src, char *dst) } /* keep the same time stamp. */ - if (lstatat(dirfd, src, &st) == 0) { + if (ostatat(dirfd, src, &st, vol_syml_opt(vol)) == 0) { ut.actime = ut.modtime = st.st_mtime; utime(dst, &ut); } @@ -300,13 +301,13 @@ static int set_dir_errors(struct path *path, const char *where, int err) * * @note If the passed ret->m_name is mangled, we'll demangle it */ -static int cname_mtouname(const struct vol *vol, const struct dir *dir, struct path *ret, int toUTF8) +static int cname_mtouname(const struct vol *vol, struct dir *dir, struct path *ret, int toUTF8) { static char temp[ MAXPATHLEN + 1]; char *t; cnid_t fileid = 0; - if (afp_version >= 30) { + if (vol->v_obj->afp_version >= 30) { if (toUTF8) { if (dir->d_did == DIRDID_ROOT_PARENT) { /* @@ -330,6 +331,12 @@ static int cname_mtouname(const struct vol *vol, const struct dir *dir, struct p /* check for OS X mangled filename :( */ t = demangle_osx(vol, ret->m_name, dir->d_did, &fileid); + + if (curdir == NULL) { + /* demangle_osx() calls dirlookup() which might have clobbered curdir */ + movecwd(vol, dir); + } + LOG(log_maxdebug, logtype_afpd, "cname_mtouname('%s',did:%u) {demangled:'%s', fileid:%u}", ret->m_name, ntohl(dir->d_did), t, ntohl(fileid)); @@ -338,7 +345,7 @@ static int cname_mtouname(const struct vol *vol, const struct dir *dir, struct p /* duplicate work but we can't reuse all convert_char we did in demangle_osx * flags weren't the same */ - if ( (t = utompath(vol, ret->u_name, fileid, utf8_encoding())) ) { + if ( (t = utompath(vol, ret->u_name, fileid, utf8_encoding(vol->v_obj))) ) { /* at last got our view of mac name */ strcpy(ret->m_name, t); } @@ -347,7 +354,7 @@ static int cname_mtouname(const struct vol *vol, const struct dir *dir, struct p /* If we haven't got it by now, get it */ if (ret->u_name == NULL) { - if ((ret->u_name = mtoupath(vol, ret->m_name, dir->d_did, utf8_encoding())) == NULL) { + if ((ret->u_name = mtoupath(vol, ret->m_name, dir->d_did, utf8_encoding(vol->v_obj))) == NULL) { afp_errno = AFPERR_PARAM; return -1; } @@ -496,12 +503,15 @@ struct dir *dirlookup_bypath(const struct vol *vol, const char *path) cfrombstr(l->entry[i]), blength(l->entry[i]))) == NULL) { - if ((cnid = cnid_add(vol->v_cdb, /* 6. */ - &st, - did, - cfrombstr(l->entry[i]), - blength(l->entry[i]), - 0)) == CNID_INVALID) + AFP_CNID_START("cnid_add"); + cnid = cnid_add(vol->v_cdb, /* 6. */ + &st, + did, + cfrombstr(l->entry[i]), + blength(l->entry[i]), + 0); + AFP_CNID_DONE(); + if (cnid == CNID_INVALID) EC_FAIL; if ((dir = dirlookup(vol, cnid)) == NULL) /* 7. */ @@ -600,13 +610,17 @@ struct dir *dirlookup(const struct vol *vol, cnid_t did) goto exit; } - utf8 = utf8_encoding(); + utf8 = utf8_encoding(vol->v_obj); maxpath = (utf8) ? MAXPATHLEN - 7 : 255; /* Get it from the database */ cnid = did; LOG(log_debug, logtype_afpd, "dirlookup(did: %u): querying CNID database", ntohl(did)); - if ((upath = cnid_resolve(vol->v_cdb, &cnid, buffer, buflen)) == NULL) { + + AFP_CNID_START("cnid_resolve"); + upath = cnid_resolve(vol->v_cdb, &cnid, buffer, buflen); + AFP_CNID_DONE(); + if (upath == NULL) { afp_errno = AFPERR_NOOBJ; err = 1; goto exit; @@ -642,7 +656,7 @@ struct dir *dirlookup(const struct vol *vol, cnid_t did) LOG(log_debug, logtype_afpd, "dirlookup(did: %u): stating \"%s\"", ntohl(did), cfrombstr(fullpath)); - if (lstat(cfrombstr(fullpath), &st) != 0) { /* 5a */ + if (ostat(cfrombstr(fullpath), &st, vol_syml_opt(vol)) != 0) { /* 5a */ switch (errno) { case ENOENT: afp_errno = AFPERR_NOOBJ; @@ -706,86 +720,6 @@ exit: #define ENUMVETO "./../Network Trash Folder/TheVolumeSettingsFolder/TheFindByContentFolder/:2eDS_Store/Contents/Desktop Folder/Trash/Benutzer/" -int caseenumerate(const struct vol *vol, struct path *path, struct dir *dir) -{ - DIR *dp; - struct dirent *de; - int ret; - static uint32_t did = 0; - static char cname[MAXPATHLEN]; - static char lname[MAXPATHLEN]; - ucs2_t u2_path[MAXPATHLEN]; - ucs2_t u2_dename[MAXPATHLEN]; - char *tmp, *savepath; - - if (!(vol->v_flags & AFPVOL_CASEINSEN)) - return -1; - - if (veto_file(ENUMVETO, path->u_name)) - return -1; - - savepath = path->u_name; - - /* very simple cache */ - if ( dir->d_did == did && strcmp(lname, path->u_name) == 0) { - path->u_name = cname; - path->d_dir = NULL; - if (of_stat( path ) == 0 ) { - return 0; - } - /* something changed, we cannot stat ... */ - did = 0; - } - - if (NULL == ( dp = opendir( "." )) ) { - LOG(log_debug, logtype_afpd, "caseenumerate: opendir failed: %s", dir->d_u_name); - return -1; - } - - - /* LOG(log_debug, logtype_afpd, "caseenumerate: for %s", path->u_name); */ - if ((size_t) -1 == convert_string(vol->v_volcharset, CH_UCS2, path->u_name, -1, u2_path, sizeof(u2_path)) ) - LOG(log_debug, logtype_afpd, "caseenumerate: conversion failed for %s", path->u_name); - - /*LOG(log_debug, logtype_afpd, "caseenumerate: dir: %s, path: %s", dir->d_u_name, path->u_name); */ - ret = -1; - for ( de = readdir( dp ); de != NULL; de = readdir( dp )) { - if (NULL == check_dirent(vol, de->d_name)) - continue; - - if ((size_t) -1 == convert_string(vol->v_volcharset, CH_UCS2, de->d_name, -1, u2_dename, sizeof(u2_dename)) ) - continue; - - if (strcasecmp_w( u2_path, u2_dename) == 0) { - tmp = path->u_name; - strlcpy(cname, de->d_name, sizeof(cname)); - path->u_name = cname; - path->d_dir = NULL; - if (of_stat( path ) == 0 ) { - LOG(log_debug, logtype_afpd, "caseenumerate: using dir: %s, path: %s", de->d_name, path->u_name); - strlcpy(lname, tmp, sizeof(lname)); - did = dir->d_did; - ret = 0; - break; - } - else - path->u_name = tmp; - } - - } - closedir(dp); - - if (ret) { - /* invalidate cache */ - cname[0] = 0; - did = 0; - path->u_name = savepath; - } - /* LOG(log_debug, logtype_afpd, "caseenumerate: path on ret: %s", path->u_name); */ - return ret; -} - - /*! * @brief Construct struct dir * @@ -822,7 +756,7 @@ struct dir *dir_new(const char *m_name, return NULL; } - if (convert_string_allocate( (utf8_encoding()) ? CH_UTF8_MAC : vol->v_maccharset, + if (convert_string_allocate( (utf8_encoding(vol->v_obj)) ? CH_UTF8_MAC : vol->v_maccharset, CH_UCS2, m_name, -1, (char **)&dir->d_m_name_ucs2) == (size_t)-1 ) { @@ -894,7 +828,7 @@ struct dir *dir_add(struct vol *vol, const struct dir *dir, struct path *path, i cnid_t id; struct adouble ad; struct adouble *adp = NULL; - bstring fullpath; + bstring fullpath = NULL; AFP_ASSERT(vol); AFP_ASSERT(dir); @@ -928,7 +862,7 @@ struct dir *dir_add(struct vol *vol, const struct dir *dir, struct path *path, i /* Get macname from unixname */ if (path->m_name == NULL) { - if ((path->m_name = utompath(vol, path->u_name, id, utf8_encoding())) == NULL) { + if ((path->m_name = utompath(vol, path->u_name, id, utf8_encoding(vol->v_obj))) == NULL) { LOG(log_error, logtype_afpd, "dir_add(\"%s\"): can't assign macname", path->u_name); err = 2; goto exit; @@ -991,7 +925,7 @@ exit: void dir_free_invalid_q(void) { struct dir *dir; - while (dir = (struct dir *)dequeue(invalid_dircache_entries)) + while ((dir = (struct dir *)dequeue(invalid_dircache_entries))) dir_free(dir); } @@ -1160,13 +1094,13 @@ struct path *cname(struct vol *vol, struct dir *dir, char **cpath) data++; len = (unsigned char) *data++; size = 2; - if (afp_version >= 30) { + if (vol->v_obj->afp_version >= 30) { ret.m_type = 3; toUTF8 = 1; } break; case 3: - if (afp_version >= 30) { + if (vol->v_obj->afp_version >= 30) { data++; memcpy(&hint, data, sizeof(hint)); hint = ntohl(hint); @@ -1238,6 +1172,14 @@ struct path *cname(struct vol *vol, struct dir *dir, char **cpath) /* the name is illegal */ LOG(log_info, logtype_afpd, "cname: illegal path: '%s'", ret.u_name); afp_errno = AFPERR_PARAM; + if (vol->v_obj->options.flags & OPTION_VETOMSG) { + bstring message = bformat("Attempt to access vetoed file or directory \"%s\" in directory \"%s\"", + ret.u_name, bdata(dir->d_u_name)); + if (setmessage(bdata(message)) == 0) + /* Client may make multiple attempts, only send the message the first time */ + kill(getpid(), SIGUSR2); + bdestroy(message); + } return NULL; } @@ -1260,7 +1202,7 @@ struct path *cname(struct vol *vol, struct dir *dir, char **cpath) * and thus call continue which should terminate the while loop because * len = 0. Ok? */ - if (of_stat(&ret) != 0) { /* 9 */ + if (of_stat(vol, &ret) != 0) { /* 9 */ /* * ret.u_name doesn't exist, might be afp_createfile|dir * that means it should have been the last part @@ -1378,7 +1320,7 @@ int movecwd(const struct vol *vol, struct dir *dir) LOG(log_debug, logtype_afpd, "movecwd(to: did: %u, \"%s\")", ntohl(dir->d_did), cfrombstr(dir->d_fullpath)); - if ((ret = lchdir(cfrombstr(dir->d_fullpath))) != 0 ) { + if ((ret = ochdir(cfrombstr(dir->d_fullpath), vol_syml_opt(vol))) != 0 ) { LOG(log_debug, logtype_afpd, "movecwd(\"%s\"): %s", cfrombstr(dir->d_fullpath), strerror(errno)); if (ret == 1) { @@ -1413,11 +1355,8 @@ int movecwd(const struct vol *vol, struct dir *dir) * If we aren't the file's owner we can't change its perms when moving it and smb * nfs,... don't even try. */ -#define AFP_CHECK_ACCESS - -int check_access(char *path, int mode) +int check_access(const AFPObj *obj, struct vol *vol, char *path, int mode) { -#ifdef AFP_CHECK_ACCESS struct maccess ma; char *p; @@ -1425,21 +1364,21 @@ int check_access(char *path, int mode) if (!p) return -1; - accessmode(current_vol, p, &ma, curdir, NULL); + accessmode(obj, vol, p, &ma, curdir, NULL); if ((mode & OPENACC_WR) && !(ma.ma_user & AR_UWRITE)) return -1; if ((mode & OPENACC_RD) && !(ma.ma_user & AR_UREAD)) return -1; -#endif + return 0; } /* --------------------- */ -int file_access(struct path *path, int mode) +int file_access(const AFPObj *obj, struct vol *vol, struct path *path, int mode) { struct maccess ma; - accessmode(current_vol, path->u_name, &ma, curdir, &path->st); + accessmode(obj, vol, path->u_name, &ma, curdir, &path->st); LOG(log_debug, logtype_afpd, "file_access(\"%s\"): mapped user mode: 0x%02x", path->u_name, ma.ma_user); @@ -1478,7 +1417,8 @@ int dirreenumerate(struct dir *dir, struct stat *st) (name, dir) with curdir:name == dir, from afp_enumerate */ -int getdirparams(const struct vol *vol, +int getdirparams(const AFPObj *obj, + const struct vol *vol, uint16_t bitmap, struct path *s_path, struct dir *dir, char *buf, size_t *buflen ) @@ -1510,7 +1450,7 @@ int getdirparams(const struct vol *vol, if ((s_path->m_name = utompath(vol, upath, dir->d_did, - utf8_encoding())) == NULL) { + utf8_encoding(obj))) == NULL) { LOG(log_error, logtype_afpd, "getdirparams(\"%s\"): can't assign macname", cfrombstr(dir->d_fullpath)); @@ -1546,6 +1486,7 @@ int getdirparams(const struct vol *vol, ashort = htons(ATTRBIT_INVISIBLE); } else ashort = 0; + ashort &= ~htons(vol->v_ignattr); memcpy( data, &ashort, sizeof( ashort )); data += sizeof( ashort ); break; @@ -1582,10 +1523,6 @@ int getdirparams(const struct vol *vol, memcpy( data, ad_entry( &ad, ADEID_FINDERI ), 32 ); } else { /* no appledouble */ memset( data, 0, 32 ); - /* set default view -- this also gets done in ad_open() */ - ashort = htons(FINDERINFO_CLOSEDVIEW); - memcpy(data + FINDERINFO_FRVIEWOFF, &ashort, sizeof(ashort)); - /* dot files are by default visible */ if (invisible_dots(vol, cfrombstr(dir->d_u_name))) { ashort = htons(FINDERINFO_INVISIBLE); @@ -1643,7 +1580,7 @@ int getdirparams(const struct vol *vol, break; case DIRPBIT_ACCESS : - accessmode(vol, upath, &ma, dir , st); + accessmode(obj, vol, upath, &ma, dir , st); *data++ = ma.ma_user; *data++ = ma.ma_world; @@ -1655,7 +1592,7 @@ int getdirparams(const struct vol *vol, Just pass back the same basic block for all directories. */ case DIRPBIT_PDINFO : - if (afp_version >= 30) { /* UTF8 name */ + if (obj->afp_version >= 30) { /* UTF8 name */ utf8 = kTextEncodingUTF8; if (dir->d_m_name) /* root of parent can have a null name */ utf_nameoff = data; @@ -1679,7 +1616,7 @@ int getdirparams(const struct vol *vol, case DIRPBIT_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 )); @@ -1808,7 +1745,7 @@ int setdirparams(struct vol *vol, struct path *path, uint16_t d_bitmap, char *bu char *upath; struct dir *dir; - int bit, isad = 1; + int bit, isad = 0; int cdate, bdate; int owner, group; uint16_t ashort, bshort, oshort; @@ -1822,7 +1759,7 @@ int setdirparams(struct vol *vol, struct path *path, uint16_t d_bitmap, char *bu mode_t mpriv = 0; bool set_upriv = false, set_maccess = false; - LOG(log_debug, logtype_afpd, "setdirparams(%s)", path->u_name); + LOG(log_debug, logtype_afpd, "setdirparams(\"%s\", bitmap: %02x)", path->u_name, bitmap); bit = 0; upath = path->u_name; @@ -1879,7 +1816,7 @@ int setdirparams(struct vol *vol, struct path *path, uint16_t d_bitmap, char *bu ProDOS information block. Skip over the data and report nothing amiss. */ case DIRPBIT_PDINFO : - if (afp_version < 30) { + if (vol->v_obj->afp_version < 30) { buf += 6; } else { @@ -1911,34 +1848,17 @@ int setdirparams(struct vol *vol, struct path *path, uint16_t d_bitmap, char *bu bitmap = bitmap>>1; bit++; } - ad_init(&ad, vol); - if (ad_open(&ad, upath, ADFLAGS_HF | ADFLAGS_DIR | ADFLAGS_CREATE | ADFLAGS_RDWR, 0777) != 0) { - /* - * Check to see what we're trying to set. If it's anything - * but ACCESS, UID, or GID, give an error. If it's any of those - * three, we don't need the ad to be open, so just continue. - * - * note: we also don't need to worry about mdate. also, be quiet - * if we're using the noadouble option. - */ - - if (!vol_noadouble(vol) && (d_bitmap & - ~((1<u_name, d_bitmap); return AFPERR_ACCESS; } - - isad = 0; - } else { - /* - * Check to see if a create was necessary. If it was, we'll want - * to set our name, etc. - */ - if ( (ad_get_MD_flags( &ad ) & O_CREAT)) { + if ((ad_get_MD_flags(&ad) & O_CREAT)) { ad_setname(&ad, cfrombstr(curdir->d_m_name)); } + isad = 1; } bit = 0; @@ -1955,6 +1875,7 @@ int setdirparams(struct vol *vol, struct path *path, uint16_t d_bitmap, char *bu ad_getattr(&ad, &bshort); oshort = bshort; if ( ntohs( ashort ) & ATTRBIT_SETCLR ) { + ashort &= ~htons(vol->v_ignattr); bshort |= htons( ntohs( ashort ) & ~ATTRBIT_SETCLR ); } else { bshort &= ~ashort; @@ -1979,9 +1900,12 @@ int setdirparams(struct vol *vol, struct path *path, uint16_t d_bitmap, char *bu case DIRPBIT_FINFO : if (isad) { /* Fixes #2802236 */ - uint16_t *fflags = (uint16_t *)(finder_buf + FINDERINFO_FRFLAGOFF); - *fflags &= htons(~FINDERINFO_ISHARED); + uint16_t fflags; + memcpy(&fflags, finder_buf + FINDERINFO_FRFLAGOFF, sizeof(uint16_t)); + fflags &= htons(~FINDERINFO_ISHARED); + memcpy(finder_buf + FINDERINFO_FRFLAGOFF, &fflags, sizeof(uint16_t)); /* #2802236 end */ + if ( dir->d_did == DIRDID_ROOT ) { /* * Alright, we admit it, this is *really* sick! @@ -2000,7 +1924,7 @@ int setdirparams(struct vol *vol, struct path *path, uint16_t d_bitmap, char *bu break; case DIRPBIT_UID : /* What kind of loser mounts as root? */ if ( (dir->d_did == DIRDID_ROOT) && - (setdeskowner( ntohl(owner), -1 ) < 0)) { + (setdeskowner(vol, ntohl(owner), -1 ) < 0)) { err = set_dir_errors(path, "setdeskowner", errno); if (isad && err == AFPERR_PARAM) { err = AFP_OK; /* ???*/ @@ -2016,7 +1940,7 @@ int setdirparams(struct vol *vol, struct path *path, uint16_t d_bitmap, char *bu break; case DIRPBIT_GID : if (dir->d_did == DIRDID_ROOT) - setdeskowner( -1, ntohl(group) ); + setdeskowner(vol, -1, ntohl(group) ); if ( setdirowner(vol, upath, -1, ntohl(group) ) < 0 ) { err = set_dir_errors(path, "setdirowner", errno); goto setdirparam_done; @@ -2025,7 +1949,7 @@ int setdirparams(struct vol *vol, struct path *path, uint16_t d_bitmap, char *bu case DIRPBIT_ACCESS : break; case DIRPBIT_PDINFO : - if (afp_version >= 30) { + if (vol->v_obj->afp_version >= 30) { err = AFPERR_BITMAP; goto setdirparam_done; } @@ -2057,10 +1981,9 @@ setdirparam_done: utime(upath, &ut); } - if ( isad ) { + if (isad) { if (path->st_valid && !path->st_errno) { struct stat *st = &path->st; - if (dir && dir->d_pdid) { ad_setid(&ad, st->st_dev, st->st_ino, dir->d_did, dir->d_pdid, vol->v_stamp); } @@ -2081,15 +2004,18 @@ setdirparam_done: if (err == AFP_OK) { if (set_maccess == true) { if (dir->d_did == DIRDID_ROOT) { - setdeskmode(mpriv); + setdeskmode(vol, mpriv); if (!dir_rx_set(mpriv)) { /* we can't remove read and search for owner on volume root */ err = AFPERR_ACCESS; goto setprivdone; } } - if (setdirmode(vol, upath, mpriv) < 0) + if (setdirunixmode(vol, upath, mpriv) < 0) { + LOG(log_info, logtype_afpd, "setdirparams(\"%s\"): setdirunixmode: %s", + fullpathname(upath), strerror(errno)); err = set_dir_errors(path, "setdirmode", errno); + } } if ((set_upriv == true) && vol_unix_priv(vol)) { if (dir->d_did == DIRDID_ROOT) { @@ -2098,18 +2024,22 @@ setdirparam_done: err = AFPERR_ACCESS; goto setprivdone; } - setdeskowner(-1, ntohl(group)); - setdeskmode(upriv); + setdeskowner(vol, -1, ntohl(group)); + setdeskmode(vol, upriv); } if (setdirowner(vol, upath, -1, ntohl(group)) < 0) { + LOG(log_info, logtype_afpd, "setdirparams(\"%s\"): setdirowner: %s", + fullpathname(upath), strerror(errno)); err = set_dir_errors(path, "setdirowner", errno); goto setprivdone; } - - if (setdirunixmode(vol, upath, upriv) < 0) + if (setdirunixmode(vol, upath, upriv) < 0) { + LOG(log_info, logtype_afpd, "setdirparams(\"%s\"): setdirunixmode: %s", + fullpathname(upath), strerror(errno)); err = set_dir_errors(path, "setdirunixmode", errno); + } } } @@ -2263,7 +2193,7 @@ int afp_createdir(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf, size_ return err; } - if (of_stat(s_path) < 0) { + if (of_stat(vol, s_path) < 0) { return AFPERR_MISC; } @@ -2279,19 +2209,16 @@ int afp_createdir(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf, size_ ad_init(&ad, vol); if (ad_open(&ad, ".", ADFLAGS_HF | ADFLAGS_DIR | ADFLAGS_CREATE | ADFLAGS_RDWR, 0777) < 0) { - if (vol_noadouble(vol)) - goto createdir_done; return( AFPERR_ACCESS ); } ad_setname(&ad, s_path->m_name); ad_setid( &ad, s_path->st.st_dev, s_path->st.st_ino, dir->d_did, did, vol->v_stamp); - fce_register_new_dir(s_path); + fce_register(FCE_DIR_CREATE, bdata(curdir->d_fullpath), NULL, fce_dir); ad_flush(&ad); ad_close(&ad, ADFLAGS_HF); -createdir_done: memcpy( rbuf, &dir->d_did, sizeof( uint32_t )); *rbuflen = sizeof( uint32_t ); setvoltime(obj, vol ); @@ -2304,7 +2231,7 @@ createdir_done: * newparent curdir * dirfd -1 means ignore dirfd (or use AT_FDCWD), otherwise src is relative to dirfd */ -int renamedir(const struct vol *vol, +int renamedir(struct vol *vol, int dirfd, char *src, char *dst, @@ -2330,11 +2257,11 @@ int renamedir(const struct vol *vol, case EXDEV: /* this needs to copy and delete. bleah. that means we have * to deal with entire directory hierarchies. */ - if ((err = copydir(vol, dirfd, src, dst)) < 0) { - deletedir(-1, dst); + if ((err = copydir(vol, newparent, dirfd, src, dst)) < 0) { + deletedir(vol, -1, dst); return err; } - if ((err = deletedir(dirfd, src)) < 0) + if ((err = deletedir(vol, dirfd, src)) < 0) return err; break; default : @@ -2378,39 +2305,17 @@ int deletecurdir(struct vol *vol) ad_getattr(&ad, &ashort); ad_close(&ad, ADFLAGS_HF); - if ((ashort & htons(ATTRBIT_NODELETE))) { + if (!(vol->v_ignattr & ATTRBIT_NODELETE) && (ashort & htons(ATTRBIT_NODELETE))) { return AFPERR_OLOCK; } } err = vol->vfs->vfs_deletecurdir(vol); if (err) { - LOG(log_error, logtype_afpd, "deletecurdir: error deleting .AppleDouble in \"%s\"", - curdir->d_fullpath); + LOG(log_error, logtype_afpd, "deletecurdir: error deleting AppleDouble files in \"%s\"", + cfrombstr(curdir->d_fullpath)); return err; } - /* now get rid of dangling symlinks */ - if ((dp = opendir("."))) { - while ((de = readdir(dp))) { - /* skip this and previous directory */ - if (!strcmp(de->d_name, ".") || !strcmp(de->d_name, "..")) - continue; - - /* bail if it's not a symlink */ - if ((lstat(de->d_name, &st) == 0) && !S_ISLNK(st.st_mode)) { - LOG(log_error, logtype_afpd, "deletecurdir(\"%s\"): not empty", - curdir->d_fullpath); - closedir(dp); - return AFPERR_DIRNEMPT; - } - - if ((err = netatalk_unlink(de->d_name))) { - closedir(dp); - return err; - } - } - } - if (movecwd(vol, pdir) < 0) { err = afp_errno; goto delete_done; @@ -2420,14 +2325,28 @@ int deletecurdir(struct vol *vol) cfrombstr(curdir->d_fullpath)); err = netatalk_rmdir_all_errors(-1, cfrombstr(fdir->d_u_name)); - if ( err == AFP_OK || err == AFPERR_NOOBJ) { - cnid_delete(vol->v_cdb, fdir->d_did); - dir_remove( vol, fdir ); - } else { + + switch (err) { + case AFP_OK: + case AFPERR_NOOBJ: + break; + case AFPERR_DIRNEMPT: + if (delete_vetoed_files(vol, bdata(fdir->d_u_name), false) != 0) + goto delete_done; + err = AFP_OK; + break; + default: LOG(log_error, logtype_afpd, "deletecurdir(\"%s\"): netatalk_rmdir_all_errors error", cfrombstr(curdir->d_fullpath)); + goto delete_done; } + AFP_CNID_START("cnid_delete"); + cnid_delete(vol->v_cdb, fdir->d_did); + AFP_CNID_DONE(); + + dir_remove( vol, fdir ); + delete_done: if (dp) { /* inode is used as key for cnid. @@ -2453,7 +2372,7 @@ int afp_mapid(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf, size_t *r *rbuflen = 0; if (sfunc >= 3 && sfunc <= 6) { - if (afp_version < 30) { + if (obj->afp_version < 30) { return( AFPERR_PARAM ); } utf8 = 1; @@ -2493,7 +2412,7 @@ int afp_mapid(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf, size_t *r case 5 : /* UUID -> username */ case 6 : /* UUID -> groupname */ - if ((afp_version < 32) || !(obj->options.flags & OPTION_UUID )) + if ((obj->afp_version < 32) || !(obj->options.flags & OPTION_UUID )) return AFPERR_PARAM; LOG(log_debug, logtype_afpd, "afp_mapid: valid UUID request"); uuidtype_t type; @@ -2556,7 +2475,7 @@ int afp_mapid(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf, size_t *r return( AFP_OK ); } -int afp_mapname(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf, size_t *rbuflen) +int afp_mapname(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf, size_t *rbuflen) { struct passwd *pw; struct group *gr; @@ -2567,11 +2486,11 @@ int afp_mapname(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf, siz ibuf++; sfunc = (unsigned char) *ibuf++; *rbuflen = 0; - LOG(log_debug, logtype_afpd, "afp_mapname: sfunc: %d, afp_version: %d", sfunc, afp_version); + LOG(log_debug, logtype_afpd, "afp_mapname: sfunc: %d", sfunc); switch ( sfunc ) { case 1 : case 2 : /* unicode */ - if (afp_version < 30) { + if (obj->afp_version < 30) { return( AFPERR_PARAM ); } memcpy(&ulen, ibuf, sizeof(ulen)); @@ -2585,7 +2504,7 @@ int afp_mapname(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf, siz break; case 5 : /* username -> UUID */ case 6 : /* groupname -> UUID */ - if ((afp_version < 32) || !(obj->options.flags & OPTION_UUID )) + if ((obj->afp_version < 32) || !(obj->options.flags & OPTION_UUID )) return AFPERR_PARAM; memcpy(&ulen, ibuf, sizeof(ulen)); len = ntohs(ulen); @@ -2713,7 +2632,7 @@ int afp_opendir(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf, si return path_error(path, AFPERR_NOOBJ); } - if ( !path->st_valid && of_stat(path ) < 0 ) { + if ( !path->st_valid && of_stat(vol, path) < 0 ) { return( AFPERR_NOOBJ ); } if ( path->st_errno ) {