X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Ffiledir.c;h=0eb383e59ea4dfdce05a1c1cd756b0a62fad1eb5;hb=40362445845b8c9bc419b9e482a57f707e499072;hp=1ffda27a3988e264c4e5947bddbf3e9f9388b1ac;hpb=92a25f09e656a6606e9a1473900da654f48663ba;p=netatalk.git diff --git a/etc/afpd/filedir.c b/etc/afpd/filedir.c index 1ffda27a..0eb383e5 100644 --- a/etc/afpd/filedir.c +++ b/etc/afpd/filedir.c @@ -1,5 +1,5 @@ /* - * $Id: filedir.c,v 1.31 2002-09-07 19:18:59 didg Exp $ + * $Id: filedir.c,v 1.35 2002-10-25 11:10:48 didg Exp $ * * Copyright (c) 1990,1993 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. @@ -54,6 +54,7 @@ char *strchr (), *strrchr (); #include "file.h" #include "globals.h" #include "filedir.h" +#include "unix.h" int matchfile2dirperms(upath, vol, did) /* Since it's kinda' big; I decided against an @@ -68,7 +69,7 @@ more information */ struct stat st, sb; struct dir *dir; char *adpath; - int uid; + uid_t uid; int ret = AFP_OK; #ifdef DEBUG LOG(log_info, logtype_afpd, "begin matchfile2dirperms:"); @@ -81,15 +82,15 @@ more information */ adpath = ad_path( upath, ADFLAGS_HF ); /* FIXME dirsearch doesn't move cwd to did ! */ - if (( dir = dirsearch( vol, did )) == NULL ) { + if (( dir = dirlookup( vol, did )) == NULL ) { LOG(log_error, logtype_afpd, "matchfile2dirperms: Unable to get directory info."); ret = AFPERR_NOOBJ; } else if (stat(".", &sb) < 0) { LOG(log_error, logtype_afpd, "matchfile2dirperms: Error checking directory \"%s\": %s", - dir->d_name, strerror(errno)); - ret AFPERR_NOOBJ; + dir->d_m_name, strerror(errno)); + ret = AFPERR_NOOBJ; } else { uid=geteuid(); @@ -140,13 +141,13 @@ AFPObj *obj; char *ibuf, *rbuf; int ibuflen, *rbuflen; { - struct stat st; + struct stat *st; struct vol *vol; struct dir *dir; u_int32_t did; int buflen, ret; - char *path; u_int16_t fbitmap, dbitmap, vid; + struct path *s_path; #ifdef DEBUG LOG(log_info, logtype_afpd, "begin afp_getfildirparams:"); @@ -175,26 +176,33 @@ int ibuflen, *rbuflen; dbitmap = ntohs( dbitmap ); ibuf += sizeof( dbitmap ); - if (( path = cname( vol, dir, &ibuf )) == NULL) { + if (( s_path = cname( vol, dir, &ibuf )) == NULL) { return( AFPERR_NOOBJ ); } - if ( stat( mtoupath(vol, path ), &st ) < 0 ) { + 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 + */ + of_stat(s_path); + } + if ( s_path->st_errno != 0 ) { return( AFPERR_NOOBJ ); } buflen = 0; - if (S_ISDIR(st.st_mode)) { + if (S_ISDIR(st->st_mode)) { if (dbitmap) { - ret = getdirparams(vol, dbitmap, ".", curdir, - &st, rbuf + 3 * sizeof( u_int16_t ), &buflen ); + ret = getdirparams(vol, dbitmap, s_path, curdir, + rbuf + 3 * sizeof( u_int16_t ), &buflen ); if (ret != AFP_OK ) return( ret ); } /* this is a directory */ *(rbuf + 2 * sizeof( u_int16_t )) = (char) FILDIRBIT_ISDIR; } else { - if (fbitmap && ( ret = getfilparams(vol, fbitmap, path, curdir, &st, + if (fbitmap && ( ret = getfilparams(vol, fbitmap, s_path, curdir, rbuf + 3 * sizeof( u_int16_t ), &buflen )) != AFP_OK ) { return( ret ); } @@ -217,41 +225,15 @@ int ibuflen, *rbuflen; return( AFP_OK ); } -/* - * We can't use unix file's perm to support Apple's inherited protection modes. - * 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) -{ -#ifdef AFP_CHECK_ACCESS -struct maccess ma; -char *p; - - p = ad_dir(path); - if (!p) - return -1; - - accessmode(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 afp_setfildirparams(obj, ibuf, ibuflen, rbuf, rbuflen ) AFPObj *obj; char *ibuf, *rbuf; int ibuflen, *rbuflen; { - struct stat st; + struct stat *st; struct vol *vol; struct dir *dir; - char *path; + struct path *path; u_int16_t vid, bitmap; int did, rc; @@ -274,7 +256,7 @@ int ibuflen, *rbuflen; memcpy( &did, ibuf, sizeof( did)); ibuf += sizeof( did); - if (( dir = dirsearch( vol, did )) == NULL ) { + if (( dir = dirlookup( vol, did )) == NULL ) { return( AFPERR_NOOBJ ); } @@ -286,10 +268,17 @@ int ibuflen, *rbuflen; return( AFPERR_NOOBJ ); } - if ( stat( mtoupath(vol, path ), &st ) < 0 ) { - return( AFPERR_NOOBJ ); + st = &path->st; + if (!path->st_valid) { + /* it's a dir and it should be there + * because we chdir in it in cname + */ + of_stat(path); } + if ( path->st_errno != 0 ) { + return( AFPERR_NOOBJ ); + } /* * If ibuf is odd, make it even. */ @@ -297,7 +286,7 @@ int ibuflen, *rbuflen; ibuf++; } - if (S_ISDIR(st.st_mode)) { + if (S_ISDIR(st->st_mode)) { rc = setdirparams(vol, path, bitmap, ibuf ); } else { rc = setfilparams(vol, path, bitmap, ibuf ); @@ -349,12 +338,12 @@ int isdir; char *p; char *upath; int rc; - struct stat st; + struct stat *st; int adflags; struct adouble ad; struct adouble *adp; - struct ofork *opened; - + struct ofork *opened = NULL; + struct path path; #ifdef CNID_DB cnid_t id; #endif /* CNID_DB */ @@ -369,7 +358,9 @@ int isdir; id = cnid_get(vol->v_db, sdir->d_did, p, strlen(p)); #endif /* CNID_DB */ p = ctoupath( vol, sdir, oldname ); - if ((opened = of_findname(p, NULL))) { + path.st_valid = 0; + path.u_name = p; + if ((opened = of_findname(&path))) { /* reuse struct adouble so it won't break locks */ adp = opened->of_ad; } @@ -397,6 +388,8 @@ int isdir; } upath = mtoupath(vol, newname); + path.u_name = upath; + st = &path.st; if (0 != (rc = check_name(vol, upath))) { return rc; } @@ -407,14 +400,16 @@ int isdir; return AFP_OK; /* deal with case insensitive, case-preserving filesystems. */ - if ((stat(upath, &st) == 0) && strdiacasecmp(oldname, newname)) + if ((stat(upath, st) == 0) && strdiacasecmp(oldname, newname)) return AFPERR_EXIST; - } else if (stat(upath, &st ) == 0) + } else if (stat(upath, st ) == 0) return AFPERR_EXIST; if ( !isdir ) { - if (of_findname(upath, &st)) { + path.st_valid = 1; + path.st_errno = errno; + if (of_findname(&path)) { rc = AFPERR_EXIST; /* was AFPERR_BUSY; */ } else { rc = renamefile( p, upath, newname,vol_noadouble(vol), adp ); @@ -427,11 +422,11 @@ int isdir; if ( rc == AFP_OK ) { #ifdef CNID_DB /* renaming may have moved the file/dir across a filesystem */ - if (stat(upath, &st) < 0) + 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)); + cnid_update(vol->v_db, id, st, curdir->d_did, upath, strlen(upath)); #endif /* CNID_DB */ } @@ -446,9 +441,10 @@ int ibuflen, *rbuflen; { struct vol *vol; struct dir *sdir; - char *path, *oldname, *newname; + char *oldname, *newname; + struct path *path; u_int32_t did; - int plen; + int plen; u_int16_t vid; int isdir = 0; int rc; @@ -470,7 +466,7 @@ int ibuflen, *rbuflen; memcpy( &did, ibuf, sizeof( did )); ibuf += sizeof( did ); - if (( sdir = dirsearch( vol, did )) == NULL ) { + if (( sdir = dirlookup( vol, did )) == NULL ) { return( AFPERR_NOOBJ ); } @@ -482,8 +478,8 @@ int ibuflen, *rbuflen; sdir = curdir; newname = obj->newtmp; oldname = obj->oldtmp; - if ( *path != '\0' ) { - strcpy(oldname, path); /* an extra copy for of_rename */ + if ( *path->m_name != '\0' ) { + strcpy(oldname, path->m_name); /* an extra copy for of_rename */ } else { if ( sdir->d_parent == NULL ) { /* root directory */ @@ -494,22 +490,15 @@ int ibuflen, *rbuflen; return( AFPERR_NOOBJ ); } isdir = 1; - strcpy(oldname, sdir->d_name); + strcpy(oldname, sdir->d_m_name); } /* another place where we know about the path type */ - if ( *ibuf++ != 2 ) { + if ((plen = copy_path_name(newname, ibuf)) < 0) { return( AFPERR_PARAM ); } - if (( plen = (unsigned char)*ibuf++ ) != 0 ) { - strncpy( newname, ibuf, plen ); - newname[ plen ] = '\0'; - if (strlen(newname) != plen) { - return( AFPERR_PARAM ); - } - } - else { + if (!plen) { return AFP_OK; /* newname == oldname same dir */ } @@ -534,7 +523,8 @@ int ibuflen, *rbuflen; { struct vol *vol; struct dir *dir; - char *path, *upath; + struct path *s_path; + char *upath; int did, rc; u_int16_t vid; @@ -556,18 +546,18 @@ int ibuflen, *rbuflen; memcpy( &did, ibuf, sizeof( did )); ibuf += sizeof( int ); - if (( dir = dirsearch( vol, did )) == NULL ) { + if (( dir = dirlookup( vol, did )) == NULL ) { return( AFPERR_NOOBJ ); } - if (( path = cname( vol, dir, &ibuf )) == NULL ) { + if (( s_path = cname( vol, dir, &ibuf )) == NULL ) { return( AFPERR_NOOBJ ); } - upath = mtoupath(vol, path ); - if ( *path == '\0' ) { + upath = s_path->u_name; + if ( *s_path->m_name == '\0' ) { rc = deletecurdir( vol, obj->oldtmp, AFPOBJ_TMPSIZ); - } else if (of_findname(upath, NULL)) { + } else if (of_findname(s_path)) { rc = AFPERR_BUSY; } else if ((rc = deletefile( upath, 1)) == AFP_OK) { #ifdef CNID_DB /* get rid of entry */ @@ -576,6 +566,7 @@ int ibuflen, *rbuflen; #endif /* CNID_DB */ } if ( rc == AFP_OK ) { + curdir->offcnt--; setvoltime(obj, vol ); } @@ -585,26 +576,24 @@ int ibuflen, *rbuflen; return( rc ); } - -char *ctoupath( vol, dir, name ) +char *absupath( vol, dir, u ) const struct vol *vol; struct dir *dir; -char *name; +char *u; { struct dir *d; static char path[ MAXPATHLEN + 1]; - char *p, *u; + char *p; int len; p = path + sizeof( path ) - 1; *p = '\0'; - u = mtoupath(vol, name ); len = strlen( u ); p -= len; strncpy( p, u, len ); for ( d = dir; d->d_parent; d = d->d_parent ) { *--p = '/'; - u = mtoupath(vol, d->d_name ); + u = d->d_u_name; len = strlen( u ); p -= len; strncpy( p, u, len ); @@ -617,6 +606,14 @@ char *name; return( p ); } +char *ctoupath( vol, dir, name ) +const struct vol *vol; +struct dir *dir; +char *name; +{ + return absupath(vol, dir, mtoupath(vol, name)); +} + /* ------------------------- */ int afp_moveandrename(obj, ibuf, ibuflen, rbuf, rbuflen ) AFPObj *obj; @@ -626,10 +623,10 @@ int ibuflen, *rbuflen; struct vol *vol; struct dir *sdir, *ddir; int isdir = 0; - char *oldname, *newname; - char *path; + char *oldname, *newname; + struct path *path; int did; - int plen; + int plen; u_int16_t vid; int rc; #ifdef DROPKLUDGE @@ -655,7 +652,7 @@ int ibuflen, *rbuflen; /* source did followed by dest did */ memcpy( &did, ibuf, sizeof( did )); ibuf += sizeof( int ); - if (( sdir = dirsearch( vol, did )) == NULL ) { + if (( sdir = dirlookup( vol, did )) == NULL ) { return( AFPERR_PARAM ); } @@ -670,48 +667,44 @@ int ibuflen, *rbuflen; sdir = curdir; newname = obj->newtmp; oldname = obj->oldtmp; - if ( *path != '\0' ) { + if ( *path->m_name != '\0' ) { /* not a directory */ - strcpy(oldname, path); /* an extra copy for of_rename */ + strcpy(oldname, path->m_name); /* an extra copy for of_rename */ } else { isdir = 1; - strcpy(oldname, sdir->d_name); + strcpy(oldname, sdir->d_m_name); } /* get the destination directory */ - if (( ddir = dirsearch( vol, did )) == NULL ) { + if (( ddir = dirlookup( vol, did )) == NULL ) { return( AFPERR_PARAM ); } if (( path = cname( vol, ddir, &ibuf )) == NULL ) { return( AFPERR_NOOBJ ); } - if ( *path != '\0' ) { + if ( *path->m_name != '\0' ) { return( AFPERR_BADTYPE ); } /* one more place where we know about path type */ - if ( *ibuf++ != 2 ) { + if ((plen = copy_path_name(newname, ibuf)) < 0) { return( AFPERR_PARAM ); } - if (( plen = (unsigned char)*ibuf++ ) != 0 ) { - strncpy( newname, ibuf, plen ); - newname[ plen ] = '\0'; - if (strlen(newname) != plen) { - return( AFPERR_PARAM ); - } - } - else { + if (!plen) { strcpy(newname, oldname); } - + rc = moveandrename(vol, sdir, oldname, newname, isdir); if ( rc == AFP_OK ) { + curdir->offcnt++; + sdir->offcnt--; + char *upath = mtoupath(vol, newname); #ifdef DROPKLUDGE if (vol->v_flags & AFPVOL_DROPBOX) { - if (retvalue=matchfile2dirperms (upath, vol, did) != AFP_OK) { + if ((retvalue=matchfile2dirperms (upath, vol, did)) != AFP_OK) { return retvalue; } }