X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Ffiledir.c;h=3e5cb2f5ee8048597a75d0552c971f7c769821f9;hb=refs%2Ftags%2Fafter-renameat;hp=57f39ccde67448b8266626449ab54c7bb17ad1b3;hpb=c0babec81dd1f72953a91b9757a5753937634c75;p=netatalk.git diff --git a/etc/afpd/filedir.c b/etc/afpd/filedir.c index 57f39ccd..3e5cb2f5 100644 --- a/etc/afpd/filedir.c +++ b/etc/afpd/filedir.c @@ -1,5 +1,5 @@ /* - * $Id: filedir.c,v 1.36 2002-10-25 11:26:49 didg Exp $ + * $Id: filedir.c,v 1.73 2010-03-12 15:16:49 franklahm Exp $ * * Copyright (c) 1990,1993 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. @@ -9,25 +9,8 @@ #include "config.h" #endif /* HAVE_CONFIG_H */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#ifdef CNID_DB -#include -#endif /* CNID_DB */ #include #include -#ifdef HAVE_FCNTL_H -#include -#endif /* HAVE_FCNTL_H */ -#include - /* STDC check */ #if STDC_HEADERS #include @@ -43,9 +26,19 @@ char *strchr (), *strrchr (); #endif /* ! HAVE_MEMCPY */ #endif /* STDC_HEADERS */ -#ifdef HAVE_UNISTD_H -#include -#endif /* HAVE_UNISTD_H */ +#ifdef HAVE_STRINGS_H +#include +#endif +#include +#include + +#include +#include +#include +#include +#include +#include +#include #include "directory.h" #include "desktop.h" @@ -56,12 +49,13 @@ char *strchr (), *strrchr (); #include "filedir.h" #include "unix.h" -int matchfile2dirperms(upath, vol, did) +#ifdef DROPKLUDGE +int matchfile2dirperms( /* Since it's kinda' big; I decided against an inline function */ -char *upath; -struct vol *vol; -int did; + char *upath, + struct vol *vol, + int did) /* The below code changes the way file ownership is determined in the name of fixing dropboxes. It has known security problem. See the netatalk FAQ for more information */ @@ -72,15 +66,15 @@ more information */ uid_t uid; int ret = AFP_OK; #ifdef DEBUG - LOG(log_info, logtype_afpd, "begin matchfile2dirperms:"); -#endif /* DEBUG */ + LOG(log_debug9, logtype_afpd, "begin matchfile2dirperms:"); +#endif if (stat(upath, &st ) < 0) { LOG(log_error, logtype_afpd, "Could not stat %s: %s", upath, strerror(errno)); return AFPERR_NOOBJ ; } - adpath = ad_path( upath, ADFLAGS_HF ); + adpath = vol->vfs->ad_path( upath, ADFLAGS_HF ); /* FIXME dirsearch doesn't move cwd to did ! */ if (( dir = dirlookup( vol, did )) == NULL ) { LOG(log_error, logtype_afpd, "matchfile2dirperms: Unable to get directory info."); @@ -100,29 +94,29 @@ more information */ if (lchown(upath, sb.st_uid, sb.st_gid) < 0) { LOG(log_error, logtype_afpd, - "matchfile2dirperms: Error changing owner/gid of %s: %s", + "matchfile2dirperms(%s): Error changing owner/gid: %s", upath, strerror(errno)); ret = AFPERR_ACCESS; } - else if (chmod(upath,(st.st_mode&~default_options.umask)| S_IRGRP| S_IROTH) < 0) + else if ((!S_ISLNK(st->st_mode)) && (chmod(upath,(st.st_mode&~default_options.umask)| S_IRGRP| S_IROTH) < 0)) { LOG(log_error, logtype_afpd, - "matchfile2dirperms: Error adding file read permissions: %s", - strerror(errno)); + "matchfile2dirperms(%s): Error adding file read permissions: %s", + upath, strerror(errno)); ret = AFPERR_ACCESS; } else if (lchown(adpath, sb.st_uid, sb.st_gid) < 0) { LOG(log_error, logtype_afpd, - "matchfile2dirperms: Error changing AppleDouble owner/gid %s: %s", + "matchfile2dirperms(%s): Error changing AppleDouble owner/gid: %s", adpath, strerror(errno)); ret = AFPERR_ACCESS; } else if (chmod(adpath, (st.st_mode&~default_options.umask)| S_IRGRP| S_IROTH) < 0) { LOG(log_error, logtype_afpd, - "matchfile2dirperms: Error adding AD file read permissions: %s", - strerror(errno)); + "matchfile2dirperms(%s): Error adding AD file read permissions: %s", + adpath, strerror(errno)); ret = AFPERR_ACCESS; } seteuid(uid); @@ -130,43 +124,40 @@ more information */ } /* end else if stat success */ #ifdef DEBUG - LOG(log_info, logtype_afpd, "end matchfile2dirperms:"); -#endif /* DEBUG */ + LOG(log_debug9, logtype_afpd, "end matchfile2dirperms:"); +#endif return ret; } +#endif - -int afp_getfildirparams(obj, ibuf, ibuflen, rbuf, rbuflen ) -AFPObj *obj; -char *ibuf, *rbuf; -int ibuflen, *rbuflen; +int afp_getfildirparams(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf, size_t *rbuflen) { struct stat *st; struct vol *vol; struct dir *dir; u_int32_t did; - int buflen, ret; + int ret; + size_t buflen; u_int16_t fbitmap, dbitmap, vid; struct path *s_path; -#ifdef DEBUG - LOG(log_info, logtype_afpd, "begin afp_getfildirparams:"); -#endif /* DEBUG */ - *rbuflen = 0; ibuf += 2; memcpy( &vid, ibuf, sizeof( vid )); ibuf += sizeof( vid ); - if (( vol = getvolbyvid( vid )) == NULL ) { - return( AFPERR_PARAM ); + if (NULL == ( vol = getvolbyvid( vid )) ) { + /* was AFPERR_PARAM but it helps OS 10.3 when a volume has been removed + * from the list. + */ + return( AFPERR_ACCESS ); } memcpy( &did, ibuf, sizeof( did )); ibuf += sizeof( did ); - if (( dir = dirlookup( vol, did )) == NULL ) { - return( AFPERR_NOOBJ ); + if (NULL == ( dir = dirlookup( vol, did )) ) { + return afp_errno; } memcpy( &fbitmap, ibuf, sizeof( fbitmap )); @@ -176,25 +167,35 @@ int ibuflen, *rbuflen; dbitmap = ntohs( dbitmap ); ibuf += sizeof( dbitmap ); - if (( s_path = cname( vol, dir, &ibuf )) == NULL) { - return( AFPERR_NOOBJ ); + if (NULL == ( s_path = cname( vol, dir, &ibuf )) ) { + return get_afp_errno(AFPERR_NOOBJ); } + LOG(log_debug, logtype_afpd, "getfildirparams(vid:%u, did:%u, name:'%s', f/d:%04x/%04x) {cwd: %s}", + ntohs(vid), ntohl(dir->d_did), s_path->u_name, fbitmap, dbitmap, getcwdpath()); + st = &s_path->st; if (!s_path->st_valid) { /* it's a dir and it should be there - * because we chdir in it in cname + * because we chdir in it in cname or + * it's curdir (maybe deleted, but then we can't know). + * So we need to try harder. */ - of_stat(s_path); + of_statdir(vol, s_path); } if ( s_path->st_errno != 0 ) { return( AFPERR_NOOBJ ); } + buflen = 0; if (S_ISDIR(st->st_mode)) { if (dbitmap) { - ret = getdirparams(vol, dbitmap, s_path, curdir, + dir = s_path->d_dir; + if (!dir) + return AFPERR_NOOBJ; + + ret = getdirparams(vol, dbitmap, s_path, dir, rbuf + 3 * sizeof( u_int16_t ), &buflen ); if (ret != AFP_OK ) return( ret ); @@ -202,8 +203,8 @@ int ibuflen, *rbuflen; /* this is a directory */ *(rbuf + 2 * sizeof( u_int16_t )) = (char) FILDIRBIT_ISDIR; } else { - if (fbitmap && ( ret = getfilparams(vol, fbitmap, s_path, curdir, - rbuf + 3 * sizeof( u_int16_t ), &buflen )) != AFP_OK ) { + if (fbitmap && AFP_OK != (ret = getfilparams(vol, fbitmap, s_path, curdir, + rbuf + 3 * sizeof( u_int16_t ), &buflen )) ) { return( ret ); } /* this is a file */ @@ -218,17 +219,10 @@ int ibuflen, *rbuflen; rbuf += sizeof( dbitmap ) + sizeof( u_char ); *rbuf = 0; -#ifdef DEBUG - LOG(log_info, logtype_afpd, "end afp_getfildirparams:"); -#endif /* DEBUG */ - return( AFP_OK ); } -int afp_setfildirparams(obj, ibuf, ibuflen, rbuf, rbuflen ) -AFPObj *obj; -char *ibuf, *rbuf; -int ibuflen, *rbuflen; +int afp_setfildirparams(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, size_t *rbuflen) { struct stat *st; struct vol *vol; @@ -237,16 +231,12 @@ int ibuflen, *rbuflen; u_int16_t vid, bitmap; int did, rc; -#ifdef DEBUG - LOG(log_info, logtype_afpd, "begin afp_setfildirparams:"); -#endif /* DEBUG */ - *rbuflen = 0; ibuf += 2; memcpy( &vid, ibuf, sizeof(vid)); ibuf += sizeof( vid ); - if (( vol = getvolbyvid( vid )) == NULL ) { + if (NULL == ( vol = getvolbyvid( vid )) ) { return( AFPERR_PARAM ); } @@ -256,16 +246,16 @@ int ibuflen, *rbuflen; memcpy( &did, ibuf, sizeof( did)); ibuf += sizeof( did); - if (( dir = dirlookup( vol, did )) == NULL ) { - return( AFPERR_NOOBJ ); + if (NULL == ( dir = dirlookup( vol, did )) ) { + return afp_errno; } memcpy( &bitmap, ibuf, sizeof( bitmap )); bitmap = ntohs( bitmap ); ibuf += sizeof( bitmap ); - if (( path = cname( vol, dir, &ibuf )) == NULL ) { - return( AFPERR_NOOBJ ); + if (NULL == ( path = cname( vol, dir, &ibuf ))) { + return get_afp_errno(AFPERR_NOOBJ); } st = &path->st; @@ -273,7 +263,7 @@ int ibuflen, *rbuflen; /* it's a dir and it should be there * because we chdir in it in cname */ - of_stat(path); + of_statdir(vol, path); } if ( path->st_errno != 0 ) { @@ -295,15 +285,11 @@ int ibuflen, *rbuflen; setvoltime(obj, vol ); } -#ifdef DEBUG - LOG(log_info, logtype_afpd, "end afp_setfildirparams:"); -#endif /* DEBUG */ - return( rc ); } /* -------------------------------------------- - Factorise some check on a pathname + Factorise some checks on a pathname */ int check_name(const struct vol *vol, char *name) { @@ -314,8 +300,10 @@ int check_name(const struct vol *vol, char *name) if ((vol->v_flags & AFPVOL_NOHEX) && strchr(name, '/')) return AFPERR_PARAM; - if (!validupath(vol, name)) + if (!vol->vfs->vfs_validupath(vol, name)) { + LOG(log_error, logtype_afpd, "check_name: illegal name: '%s'", name); return AFPERR_EXIST; + } /* check for vetoed filenames */ if (veto_file(vol->v_veto, name)) @@ -325,69 +313,97 @@ int check_name(const struct vol *vol, char *name) /* ------------------------- move and rename sdir:oldname to curdir:newname in volume vol - special care is needed for lock */ -static int moveandrename(vol, sdir, oldname, newname, isdir) -const struct vol *vol; -struct dir *sdir; -char *oldname; -char *newname; -int isdir; +static int moveandrename(const struct vol *vol, + struct dir *sdir, + int sdir_fd, + char *oldname, + char *newname, + int isdir) { char *p; char *upath; int rc; - struct stat *st; + struct stat *st, nst; int adflags; struct adouble ad; struct adouble *adp; struct ofork *opened = NULL; - struct path path; -#ifdef CNID_DB - cnid_t id; -#endif /* CNID_DB */ + struct path path; + cnid_t id; + int cwd_fd; - memset(&ad, 0, sizeof(ad)); + ad_init(&ad, vol->v_adouble, vol->v_ad_options); adp = &ad; adflags = 0; - + if (!isdir) { -#ifdef CNID_DB - p = mtoupath(vol, oldname); - id = cnid_get(vol->v_db, sdir->d_did, p, strlen(p)); -#endif /* CNID_DB */ + if ((p = mtoupath(vol, oldname, sdir->d_did, utf8_encoding())) == NULL) + return AFPERR_PARAM; /* can't convert */ + +#ifndef HAVE_RENAMEAT + /* Need full path */ + id = cnid_get(vol->v_cdb, sdir->d_did, p, strlen(p)); p = ctoupath( vol, sdir, oldname ); + if (!p) + return AFPERR_PARAM; /* pathname too long */ +#endif /* HAVE_RENAMEAT */ + path.st_valid = 0; path.u_name = p; - if ((opened = of_findname(&path))) { +#ifdef HAVE_RENAMEAT + opened = of_findnameat(sdir_fd, &path); +#else + opened = of_findname(&path); +#endif /* HAVE_RENAMEAT */ + if (opened) { /* reuse struct adouble so it won't break locks */ adp = opened->of_ad; } - } - else { -#ifdef CNID_DB + } else { id = sdir->d_did; /* we already have the CNID */ -#endif /* CNID_DB */ p = ctoupath( vol, sdir->d_parent, oldname ); + if (!p) { + return AFPERR_PARAM; + } adflags = ADFLAGS_DIR; } + + /* - * p now points to the full pathname of the source fs object. - * - * we are in the dest folder so we need to use p for ad_open - */ - - if (!ad_open(p, ADFLAGS_HF |adflags, O_RDONLY, 0666, adp)) { - u_int16_t bshort; + * p now points to either + * a) full pathname of the source fs object (if renameat is not available) + * b) the oldname (renameat is available) + * we are in the dest folder so we need to use + * a) p for ad_open + * b) fchdir sdir_fd before eg ad_open or use *at functions where appropiate + */ + + if (sdir_fd != -1) { + if ((cwd_fd = open(".", O_RDONLY)) == -1) + return AFPERR_MISC; + if (fchdir(sdir_fd) != 0) + return AFPERR_MISC; + } + if (!ad_metadata(p, adflags, adp)) { + u_int16_t bshort; ad_getattr(adp, &bshort); - ad_close( adp, ADFLAGS_HF ); + ad_close_metadata( adp); if ((bshort & htons(ATTRBIT_NORENAME))) return(AFPERR_OLOCK); } + if (sdir_fd != -1) { + if (fchdir(cwd_fd) != 0) { + LOG(log_error, logtype_afpd, "moveandrename: %s", strerror(errno) ); + return AFPERR_MISC; + } + } - upath = mtoupath(vol, newname); + if (NULL == (upath = mtoupath(vol, newname, curdir->d_did, utf8_encoding()))){ + return AFPERR_PARAM; + } path.u_name = upath; st = &path.st; if (0 != (rc = check_name(vol, upath))) { @@ -395,15 +411,18 @@ int isdir; } /* source == destination. we just silently accept this. */ - if (curdir == sdir) { + if ((!isdir && curdir == sdir) || (isdir && curdir == sdir->d_parent)) { if (strcmp(oldname, newname) == 0) return AFP_OK; - /* deal with case insensitive, case-preserving filesystems. */ - if ((stat(upath, st) == 0) && strdiacasecmp(oldname, newname)) - return AFPERR_EXIST; - - } else if (stat(upath, st ) == 0) + if (stat(upath, st) == 0 || caseenumerate(vol, &path, curdir) == 0) { + if (!stat(p, &nst) && !(nst.st_dev == st->st_dev && nst.st_ino == st->st_ino) ) { + /* not the same file */ + return AFPERR_EXIST; + } + errno = 0; + } + } else if (stat(upath, st ) == 0 || caseenumerate(vol, &path, curdir) == 0) return AFPERR_EXIST; if ( !isdir ) { @@ -412,32 +431,27 @@ int isdir; if (of_findname(&path)) { rc = AFPERR_EXIST; /* was AFPERR_BUSY; */ } else { - rc = renamefile( p, upath, newname,vol_noadouble(vol), adp ); + rc = renamefile(vol, sdir_fd, p, upath, newname, adp ); if (rc == AFP_OK) of_rename(vol, opened, sdir, oldname, curdir, newname); } } else { - rc = renamedir(p, upath, sdir, curdir, newname, vol_noadouble(vol)); + rc = renamedir(vol, sdir_fd, p, upath, sdir, curdir, newname); } - if ( rc == AFP_OK ) { -#ifdef CNID_DB + if ( rc == AFP_OK && id ) { /* renaming may have moved the file/dir across a filesystem */ if (stat(upath, st) < 0) return AFPERR_MISC; /* fix up the catalog entry */ - cnid_update(vol->v_db, id, st, curdir->d_did, upath, strlen(upath)); -#endif /* CNID_DB */ + cnid_update(vol->v_cdb, id, st, curdir->d_did, upath, strlen(upath)); } return rc; } /* -------------------------------------------- */ -int afp_rename(obj, ibuf, ibuflen, rbuf, rbuflen ) -AFPObj *obj; -char *ibuf, *rbuf; -int ibuflen, *rbuflen; +int afp_rename(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, size_t *rbuflen) { struct vol *vol; struct dir *sdir; @@ -448,16 +462,13 @@ int ibuflen, *rbuflen; u_int16_t vid; int isdir = 0; int rc; -#ifdef DEBUG - LOG(log_info, logtype_afpd, "begin afp_rename:"); -#endif /* DEBUG */ *rbuflen = 0; ibuf += 2; memcpy( &vid, ibuf, sizeof( vid )); ibuf += sizeof( vid ); - if (( vol = getvolbyvid( vid )) == NULL ) { + if (NULL == ( vol = getvolbyvid( vid )) ) { return( AFPERR_PARAM ); } @@ -466,20 +477,25 @@ int ibuflen, *rbuflen; memcpy( &did, ibuf, sizeof( did )); ibuf += sizeof( did ); - if (( sdir = dirlookup( vol, did )) == NULL ) { - return( AFPERR_NOOBJ ); + if (NULL == ( sdir = dirlookup( vol, did )) ) { + return afp_errno; } /* source pathname */ - if (( path = cname( vol, sdir, &ibuf )) == NULL ) { - return( AFPERR_NOOBJ ); + if (NULL == ( path = cname( vol, sdir, &ibuf )) ) { + return get_afp_errno(AFPERR_NOOBJ); } sdir = curdir; newname = obj->newtmp; oldname = obj->oldtmp; + isdir = path_isadir(path); if ( *path->m_name != '\0' ) { strcpy(oldname, path->m_name); /* an extra copy for of_rename */ + if (isdir) { + /* curdir parent dir, need to move sdir back */ + sdir = path->d_dir; + } } else { if ( sdir->d_parent == NULL ) { /* root directory */ @@ -487,14 +503,13 @@ int ibuflen, *rbuflen; } /* move to destination dir */ if ( movecwd( vol, sdir->d_parent ) < 0 ) { - return( AFPERR_NOOBJ ); + return afp_errno; } - isdir = 1; strcpy(oldname, sdir->d_m_name); } /* another place where we know about the path type */ - if ((plen = copy_path_name(newname, ibuf)) < 0) { + if ((plen = copy_path_name(vol, newname, ibuf)) < 0) { return( AFPERR_PARAM ); } @@ -502,24 +517,16 @@ int ibuflen, *rbuflen; return AFP_OK; /* newname == oldname same dir */ } - rc = moveandrename(vol, sdir, oldname, newname, isdir); - + rc = moveandrename(vol, sdir, -1, oldname, newname, isdir); if ( rc == AFP_OK ) { setvoltime(obj, vol ); } -#ifdef DEBUG - LOG(log_info, logtype_afpd, "end afp_rename:"); -#endif /* DEBUG */ - return( rc ); } /* ------------------------------- */ -int afp_delete(obj, ibuf, ibuflen, rbuf, rbuflen ) -AFPObj *obj; -char *ibuf, *rbuf; -int ibuflen, *rbuflen; +int afp_delete(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, size_t *rbuflen) { struct vol *vol; struct dir *dir; @@ -528,16 +535,12 @@ int ibuflen, *rbuflen; int did, rc; u_int16_t vid; -#ifdef DEBUG - LOG(log_info, logtype_afpd, "begin afp_delete:"); -#endif /* DEBUG */ - *rbuflen = 0; ibuf += 2; memcpy( &vid, ibuf, sizeof( vid )); ibuf += sizeof( vid ); - if (( vol = getvolbyvid( vid )) == NULL ) { + if (NULL == ( vol = getvolbyvid( vid )) ) { return( AFPERR_PARAM ); } @@ -546,103 +549,116 @@ int ibuflen, *rbuflen; memcpy( &did, ibuf, sizeof( did )); ibuf += sizeof( int ); - if (( dir = dirlookup( vol, did )) == NULL ) { - return( AFPERR_NOOBJ ); + if (NULL == ( dir = dirlookup( vol, did )) ) { + return afp_errno; } - if (( s_path = cname( vol, dir, &ibuf )) == NULL ) { - return( AFPERR_NOOBJ ); + if (NULL == ( s_path = cname( vol, dir, &ibuf )) ) { + return get_afp_errno(AFPERR_NOOBJ); } upath = s_path->u_name; - if ( *s_path->m_name == '\0' ) { - rc = deletecurdir( vol, obj->oldtmp, AFPOBJ_TMPSIZ); + if ( path_isadir( s_path) ) { + if (*s_path->m_name != '\0') { + rc = AFPERR_ACCESS; + } + else { + rc = deletecurdir( vol); + } } else if (of_findname(s_path)) { rc = AFPERR_BUSY; - } else if ((rc = deletefile( upath, 1)) == AFP_OK) { -#ifdef CNID_DB /* get rid of entry */ - cnid_t id = cnid_get(vol->v_db, curdir->d_did, upath, strlen(upath)); - cnid_delete(vol->v_db, id); -#endif /* CNID_DB */ + } else { + /* it's a file st_valid should always be true + * only test for ENOENT because EACCES needs + * to read meta data in deletefile + */ + if (s_path->st_valid && s_path->st_errno == ENOENT) { + rc = AFPERR_NOOBJ; + } + else { + rc = deletefile(vol, -1, upath, 1); + } } if ( rc == AFP_OK ) { curdir->offcnt--; setvoltime(obj, vol ); } -#ifdef DEBUG - LOG(log_info, logtype_afpd, "end afp_delete:"); -#endif /* DEBUG */ - return( rc ); } -char *absupath( vol, dir, u ) -const struct vol *vol; -struct dir *dir; -char *u; +/* ------------------------ */ +char *absupath(const struct vol *vol, struct dir *dir, char *u) { struct dir *d; static char path[ MAXPATHLEN + 1]; char *p; int len; + if (u == NULL) + return NULL; + p = path + sizeof( path ) - 1; *p = '\0'; len = strlen( u ); p -= len; - strncpy( p, u, len ); - for ( d = dir; d->d_parent; d = d->d_parent ) { - *--p = '/'; + memcpy( p, u, len ); + if (dir) for ( d = dir; d->d_parent; d = d->d_parent ) { u = d->d_u_name; len = strlen( u ); + if (p -len -1 < path) { + /* FIXME + rather rare so LOG error and/or client message ? + */ + return NULL; + } + *--p = '/'; p -= len; - strncpy( p, u, len ); + memcpy( p, u, len ); } - *--p = '/'; len = strlen( vol->v_path ); + if (p -len -1 < path) { + return NULL; + } + *--p = '/'; p -= len; - strncpy( p, vol->v_path, len ); + memcpy( p, vol->v_path, len ); return( p ); } -char *ctoupath( vol, dir, name ) -const struct vol *vol; -struct dir *dir; -char *name; +/* ------------------------ + * FIXME dir could be NULL +*/ +char *ctoupath(const struct vol *vol, struct dir *dir, char *name) { - return absupath(vol, dir, mtoupath(vol, name)); + return absupath(vol, dir, mtoupath(vol, name, dir->d_did, utf8_encoding())); } /* ------------------------- */ -int afp_moveandrename(obj, ibuf, ibuflen, rbuf, rbuflen ) -AFPObj *obj; -char *ibuf, *rbuf; -int ibuflen, *rbuflen; +int afp_moveandrename(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, size_t *rbuflen) { struct vol *vol; struct dir *sdir, *ddir; - int isdir = 0; + int isdir; char *oldname, *newname; struct path *path; int did; + int pdid; int plen; u_int16_t vid; int rc; #ifdef DROPKLUDGE int retvalue; #endif /* DROPKLUDGE */ + int sdir_fd = -1; -#ifdef DEBUG - LOG(log_info, logtype_afpd, "begin afp_moveandrename:"); -#endif /* DEBUG */ *rbuflen = 0; ibuf += 2; memcpy( &vid, ibuf, sizeof( vid )); ibuf += sizeof( vid ); - if (( vol = getvolbyvid( vid )) == NULL ) { + if (NULL == ( vol = getvolbyvid( vid )) ) { return( AFPERR_PARAM ); } @@ -652,76 +668,99 @@ int ibuflen, *rbuflen; /* source did followed by dest did */ memcpy( &did, ibuf, sizeof( did )); ibuf += sizeof( int ); - if (( sdir = dirlookup( vol, did )) == NULL ) { - return( AFPERR_PARAM ); + if (NULL == ( sdir = dirlookup( vol, did )) ) { + return afp_errno; /* was AFPERR_PARAM */ } memcpy( &did, ibuf, sizeof( did )); ibuf += sizeof( int ); /* source pathname */ - if (( path = cname( vol, sdir, &ibuf )) == NULL ) { - return( AFPERR_NOOBJ ); + if (NULL == ( path = cname( vol, sdir, &ibuf )) ) { + return get_afp_errno(AFPERR_NOOBJ); } sdir = curdir; newname = obj->newtmp; oldname = obj->oldtmp; + + isdir = path_isadir(path); if ( *path->m_name != '\0' ) { - /* not a directory */ + if (isdir) { + sdir = path->d_dir; + } strcpy(oldname, path->m_name); /* an extra copy for of_rename */ } else { - isdir = 1; strcpy(oldname, sdir->d_m_name); } +#ifdef HAVE_RENAMEAT + if ((sdir_fd = open(".", O_RDONLY)) == -1) + return AFPERR_MISC; +#endif + /* get the destination directory */ - if (( ddir = dirlookup( vol, did )) == NULL ) { - return( AFPERR_PARAM ); + if (NULL == ( ddir = dirlookup( vol, did )) ) { + rc = afp_errno; /* was AFPERR_PARAM */ + goto exit; } - if (( path = cname( vol, ddir, &ibuf )) == NULL ) { - return( AFPERR_NOOBJ ); + if (NULL == ( path = cname( vol, ddir, &ibuf ))) { + rc = AFPERR_NOOBJ; + goto exit; } + pdid = curdir->d_did; if ( *path->m_name != '\0' ) { - return( AFPERR_BADTYPE ); + rc = path_error(path, AFPERR_NOOBJ); + goto exit; } /* one more place where we know about path type */ - if ((plen = copy_path_name(newname, ibuf)) < 0) { - return( AFPERR_PARAM ); + if ((plen = copy_path_name(vol, newname, ibuf)) < 0) { + rc = AFPERR_PARAM; + goto exit; } if (!plen) { strcpy(newname, oldname); } - rc = moveandrename(vol, sdir, oldname, newname, isdir); + /* This does the work */ + rc = moveandrename(vol, sdir, sdir_fd, oldname, newname, isdir); if ( rc == AFP_OK ) { - char *upath = mtoupath(vol, newname); - + char *upath = mtoupath(vol, newname, pdid, utf8_encoding()); + + if (NULL == upath) { + rc = AFPERR_PARAM; + goto exit; + } curdir->offcnt++; sdir->offcnt--; #ifdef DROPKLUDGE if (vol->v_flags & AFPVOL_DROPBOX) { + /* FIXME did is not always the source id */ if ((retvalue=matchfile2dirperms (upath, vol, did)) != AFP_OK) { - return retvalue; + rc = retvalue; + goto exit; } } else #endif /* DROPKLUDGE */ - if (!isdir) { - int admode = ad_mode("", 0777); + /* if unix priv don't try to match perm with dest folder */ + if (!isdir && !vol_unix_priv(vol)) { + int admode = ad_mode("", 0777) | vol->v_fperm; - setfilmode(upath, admode, NULL); - setfilmode(ad_path( upath, ADFLAGS_HF ), ad_hf_mode(admode), NULL); + setfilmode(upath, admode, NULL, vol->v_umask); + vol->vfs->vfs_setfilmode(vol, upath, admode, NULL); } setvoltime(obj, vol ); } -#ifdef DEBUG - LOG(log_info, logtype_afpd, "end afp_moveandrename:"); -#endif /* DEBUG */ +exit: +#ifdef HAVE_RENAMEAT + if (sdir_fd != -1) + close(sdir_fd); +#endif return( rc ); } @@ -738,15 +777,13 @@ int veto_file(const char*veto_str, const char*path) if ((veto_str == NULL) || (path == NULL)) return 0; - /* - #ifdef DEBUG - LOG(log_debug, logtype_afpd, "veto_file \"%s\", \"%s\"", veto_str, path); - #endif - */ + for(i=0, j=0; veto_str[i] != '\0'; i++) { if (veto_str[i] == '/') { - if ((j>0) && (path[j] == '\0')) + if ((j>0) && (path[j] == '\0')) { + LOG(log_debug, logtype_afpd, "vetoed file:'%s'", path); return 1; + } j = 0; } else { if (veto_str[i] != path[j]) {