X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Ffiledir.c;h=8930293c562c128f2c270cecdfba611ea98d0df5;hb=44aa32affa2c16524ca5cca5d322922a8862f935;hp=f9a84039a793e64e2d563d6a1b8e81c85fc5aa90;hpb=28806b4a383c62fc4e5d236eea835247565ed3b4;p=netatalk.git diff --git a/etc/afpd/filedir.c b/etc/afpd/filedir.c index f9a84039..8930293c 100644 --- a/etc/afpd/filedir.c +++ b/etc/afpd/filedir.c @@ -1,5 +1,5 @@ /* - * $Id: filedir.c,v 1.54 2009-09-01 13:15:13 franklahm Exp $ + * $Id: filedir.c,v 1.64 2009-10-29 13:38:15 didg Exp $ * * Copyright (c) 1990,1993 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. @@ -29,15 +29,16 @@ char *strchr (), *strrchr (); #ifdef HAVE_STRINGS_H #include #endif -#include #include #include -#include +#include +#include #include #include #include #include +#include #include "directory.h" #include "desktop.h" @@ -49,12 +50,12 @@ char *strchr (), *strrchr (); #include "unix.h" #ifdef DROPKLUDGE -int matchfile2dirperms(upath, vol, did) +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 */ @@ -65,8 +66,8 @@ 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)); @@ -123,29 +124,23 @@ 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 _U_; -char *ibuf, *rbuf; -int ibuflen _U_, *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; @@ -220,17 +215,10 @@ int ibuflen _U_, *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 _U_; -int ibuflen _U_, *rbuflen; +int afp_setfildirparams(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, size_t *rbuflen) { struct stat *st; struct vol *vol; @@ -239,10 +227,6 @@ int ibuflen _U_, *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)); @@ -297,10 +281,6 @@ int ibuflen _U_, *rbuflen; setvoltime(obj, vol ); } -#ifdef DEBUG - LOG(log_info, logtype_afpd, "end afp_setfildirparams:"); -#endif /* DEBUG */ - return( rc ); } @@ -316,7 +296,7 @@ int check_name(const struct vol *vol, char *name) if ((vol->v_flags & AFPVOL_NOHEX) && strchr(name, '/')) return AFPERR_PARAM; - if (!vol->vfs->validupath(vol, name)) { + if (!vol->vfs->vfs_validupath(vol, name)) { LOG(log_info, logtype_afpd, "check_name: illegal name: '%s'", name); return AFPERR_EXIST; } @@ -332,12 +312,7 @@ int check_name(const struct vol *vol, char *name) 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, char *oldname, char *newname, int isdir) { char *p; char *upath; @@ -444,10 +419,7 @@ int isdir; } /* -------------------------------------------- */ -int afp_rename(obj, ibuf, ibuflen, rbuf, rbuflen ) -AFPObj *obj; -char *ibuf, *rbuf _U_; -int ibuflen _U_, *rbuflen; +int afp_rename(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, size_t *rbuflen) { struct vol *vol; struct dir *sdir; @@ -458,9 +430,6 @@ int ibuflen _U_, *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; @@ -522,18 +491,11 @@ int ibuflen _U_, *rbuflen; 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 _U_; -int ibuflen _U_, *rbuflen; +int afp_delete(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, size_t *rbuflen) { struct vol *vol; struct dir *dir; @@ -542,10 +504,6 @@ int ibuflen _U_, *rbuflen; int did, rc; u_int16_t vid; -#ifdef DEBUG - LOG(log_info, logtype_afpd, "begin afp_delete:"); -#endif /* DEBUG */ - *rbuflen = 0; ibuf += 2; @@ -579,24 +537,26 @@ int ibuflen _U_, *rbuflen; } else if (of_findname(s_path)) { rc = AFPERR_BUSY; } else { - rc = deletefile(vol, upath, 1); + /* 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, 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]; @@ -638,19 +598,13 @@ char *u; /* ------------------------ * FIXME dir could be NULL */ -char *ctoupath( vol, dir, name ) -const struct vol *vol; -struct dir *dir; -char *name; +char *ctoupath(const struct vol *vol, struct dir *dir, char *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 _U_; -int ibuflen _U_, *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; @@ -666,10 +620,6 @@ int ibuflen _U_, *rbuflen; int retvalue; #endif /* DROPKLUDGE */ -#ifdef DEBUG - LOG(log_info, logtype_afpd, "begin afp_moveandrename:"); -#endif /* DEBUG */ - *rbuflen = 0; ibuf += 2; @@ -755,16 +705,12 @@ int ibuflen _U_, *rbuflen; if (!isdir && !vol_unix_priv(vol)) { int admode = ad_mode("", 0777) | vol->v_fperm; - setfilmode(upath, admode, NULL); - vol->vfs->rf_setfilmode(vol, upath, 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 */ - return( rc ); }