X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Fdirectory.c;h=c03c47ba5113ee95f4fc63b736f38d41613bee7e;hb=40362445845b8c9bc419b9e482a57f707e499072;hp=9842001b37165e062534217079d7c87d05cc0c99;hpb=bf32151c3926916635223c5ac349eda819fee320;p=netatalk.git diff --git a/etc/afpd/directory.c b/etc/afpd/directory.c index 9842001b..c03c47ba 100644 --- a/etc/afpd/directory.c +++ b/etc/afpd/directory.c @@ -1,5 +1,5 @@ /* - * $Id: directory.c,v 1.22 2001-12-29 08:22:23 jmarcus Exp $ + * $Id: directory.c,v 1.49 2002-10-25 11:10:46 didg Exp $ * * Copyright (c) 1990,1993 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. @@ -12,7 +12,7 @@ #include "config.h" #endif /* HAVE_CONFIG_H */ -#include +#include #include #include #include @@ -59,17 +59,15 @@ char *strchr (), *strrchr (); #include "globals.h" #include "unix.h" -#ifdef FORCE_UIDGID -#include "uid.h" -#endif /* FORCE_UIDGID */ - struct dir *curdir; #define SENTINEL (&sentinel) static struct dir sentinel = { SENTINEL, SENTINEL, NULL, DIRTREE_COLOR_BLACK, - NULL, NULL, NULL, NULL, NULL, 0, 0, NULL }; -static struct dir rootpar = { SENTINEL, SENTINEL, NULL, 0, - NULL, NULL, NULL, NULL, NULL, 0, 0, NULL }; + NULL, NULL, NULL, NULL, NULL, 0, 0, + 0, 0, NULL, NULL}; +static struct dir rootpar = { SENTINEL, SENTINEL, NULL, 0, + NULL, NULL, NULL, NULL, NULL, 0, 0, + 0, 0, NULL, NULL}; /* (from IM: Toolbox Essentials) * dirFinderInfo (DInfo) fields: @@ -114,13 +112,76 @@ u_int32_t did; dir = vol->v_root; while ( dir != SENTINEL ) { if (dir->d_did == did) - return dir->d_name ? dir : NULL; + return dir->d_m_name ? dir : NULL; dir = (dir->d_did > did) ? dir->d_left : dir->d_right; } return NULL; } +/* ----------------------------------------- + * if did is not in the cache resolve it with cnid + * + */ +struct dir * + dirlookup( vol, did ) + const struct vol *vol; +u_int32_t did; +{ +#ifdef CNID_DB + struct dir *ret; + char *upath; + u_int32_t id; + static char path[MAXPATHLEN + 1]; + int len; + int pathlen; + char *ptr; + static char buffer[12 + MAXPATHLEN + 1]; + int buflen = 12 + MAXPATHLEN + 1; + char *mpath; + + ret = dirsearch(vol, did); + if (ret != NULL) + return ret; + + id = did; + if ((upath = cnid_resolve(vol->v_db, &id, buffer, buflen)) == NULL) { + return NULL; + } + ptr = path + MAXPATHLEN; + mpath = utompath(vol, upath); + len = strlen(mpath); + pathlen = len; /* no 0 in the last part */ + len++; + strcpy(ptr - len, mpath); + ptr -= len; + while (1) { + ret = dirsearch(vol,id); + if (ret != NULL) { + break; + } + if ((upath = cnid_resolve(vol->v_db, &id, buffer, buflen)) == NULL) + return NULL; + mpath = utompath(vol, upath); + len = strlen(mpath) + 1; + pathlen += len; + if (pathlen > 255) + return NULL; + strcpy(ptr - len, mpath); + ptr -= len; + } + /* fill the cache */ + ptr--; + *ptr = (unsigned char)pathlen; + ptr--; + *ptr = 2; + /* cname is not efficient */ + if (cname( vol, ret, &ptr ) == NULL ) + return NULL; +#endif + return dirsearch(vol, did); +} +/* --------------------------- */ /* rotate the tree to the left */ static void dir_leftrotate(vol, dir) struct vol *vol; @@ -272,8 +333,12 @@ struct dir *dir; /* i'm not sure if it really helps to delete stuff. */ #ifndef REMOVE_NODES - free(dir->d_name); - dir->d_name = NULL; + if (dir->d_u_name != dir->d_m_name) { + free(dir->d_u_name); + } + free(dir->d_m_name); + dir->d_m_name = NULL; + dir->d_u_name = NULL; #else /* ! REMOVE_NODES */ /* go searching for a node with at most one child */ @@ -347,17 +412,46 @@ struct dir *dir; } /* set the node's d_name */ - node->d_name = save.d_name; + node->d_m_name = save.d_m_name; + node->d_u_name = save.d_u_name; } if (node->d_color == DIRTREE_COLOR_BLACK) dir_rmrecolor(vol, leaf); - free(node->d_name); + + if (node->d_u_name != node->d_m_name) { + free(node->d_u_name); + } + free(node->d_m_name); free(node); #endif /* ! REMOVE_NODES */ } +/* --------------------------------------- + * remove the node and its childs from the tree + * + * FIXME what about opened forks with refs to it? + * it's an afp specs violation because you can't delete + * an opened forks. Now afpd doesn't care about forks opened by other + * process. It's fixable within afpd if fnctl_lock, doable with smb and + * next to impossible for nfs and local filesystem access. + */ + +static void dir_invalidate( vol, dir ) +const struct vol *vol; +struct dir *dir; +{ + if (curdir == dir) { + /* v_root can't be deleted */ + if (movecwd(vol, vol->v_root) < 0) + printf("Yuup cant change dir to v_root\n"); + } + /* FIXME */ + dirchildremove(dir->d_parent, dir); + dir_remove( vol, dir ); +} +/* ------------------------------------ */ static struct dir *dir_insert(vol, dir) const struct vol *vol; struct dir *dir; @@ -390,26 +484,24 @@ struct dir *dir; * attempt to extend the current dir. tree to include path * as a side-effect, movecwd to that point and return the new dir */ - static struct dir * extenddir( vol, dir, path ) - struct vol *vol; +struct vol *vol; struct dir *dir; -char *path; +struct path *path; { char *p; - struct stat st; - p = mtoupath(vol, path ); - if ( stat( p, &st ) != 0 ) { + path->u_name = p = mtoupath(vol, path->m_name ); + if ( of_stat( path ) != 0 ) { return( NULL ); } - if (!S_ISDIR(st.st_mode)) { + + if (!S_ISDIR(path->st.st_mode)) { return( NULL ); } - if (( dir = adddir( vol, dir, path, strlen( path ), p, strlen(p), - &st)) == NULL ) { + if (( dir = adddir( vol, dir, path)) == NULL ) { return( NULL ); } @@ -426,7 +518,8 @@ static int deletedir(char *dir) DIR *dp; struct dirent *de; struct stat st; - int len, err; + size_t len; + int err; if ((len = strlen(dir)) > sizeof(path)) return AFPERR_PARAM; @@ -456,11 +549,11 @@ static int deletedir(char *dir) continue; /* somebody went and deleted it behind our backs. */ case EROFS: err = AFPERR_VLOCK; - break; + break; case EPERM: case EACCES : err = AFPERR_ACCESS; - break; + break; default : err = AFPERR_PARAM; } @@ -499,7 +592,8 @@ static int copydir(char *src, char *dst, int noadouble) struct dirent *de; struct stat st; struct utimbuf ut; - int slen, dlen, err; + size_t slen, dlen; + int err; /* doesn't exist or the path is too long. */ if (((slen = strlen(src)) > sizeof(spath) - 2) || @@ -648,13 +742,18 @@ struct dir *dir; } if (dir != SENTINEL) { - free( dir->d_name ); + if (dir->d_u_name != dir->d_m_name) { + free(dir->d_u_name); + } + free(dir->d_m_name); free( dir ); } } - -struct dir *dirnew(const int len) +/* -------------------------------------------- + * most of the time mac name and unix name are the same +*/ +struct dir *dirnew(const char *m_name, const char *u_name) { struct dir *dir; @@ -662,7 +761,16 @@ struct dir *dirnew(const int len) if (!dir) return NULL; - if ((dir->d_name = (char *) malloc(sizeof(char)*len)) == NULL) { + if ((dir->d_m_name = strdup(m_name)) == NULL) { + free(dir); + return NULL; + } + + if (m_name == u_name) { + dir->d_u_name = dir->d_m_name; + } + else if ((dir->d_u_name = strdup(u_name)) == NULL) { + free(dir->d_m_name); free(dir); return NULL; } @@ -672,44 +780,124 @@ struct dir *dirnew(const int len) return dir; } - -/* XXX: this needs to be changed to handle path types */ -char * +/* -------------------------------------------------- */ +/* XXX: this needs to be changed to handle path types + return + if it's a filename: + in extenddir: + compute unix name + stat the file + return mac name + if it's a dirname: + not in the cache + in extenddir + compute unix name + stat the dir + in the cache + + u_name can be + XXXX u_name can be an alias on m_name if the m_name is + a valid unix name. + +*/ +struct path * cname( vol, dir, cpath ) const struct vol *vol; struct dir *dir; char **cpath; { - struct dir *cdir; - static char path[ MAXPATHLEN + 1]; + struct dir *cdir; + static char path[ MAXPATHLEN + 1]; + static struct path ret; + char *data, *p; + char *u; int extend = 0; int len; - + int olen = 0; + u_int32_t hint; + u_int16_t len16; + int size = 0; + char sep; + data = *cpath; - if ( *data++ != 2 ) { /* path type */ + switch (*data) { /* path type */ + case 2: + data++; + len = (unsigned char) *data++; + size = 2; + sep = 0; + break; + case 3: + if (afp_version >= 30) { + data++; + memcpy(&hint, data, sizeof(hint)); + hint = ntohl(hint); + data += sizeof(hint); + + memcpy(&len16, data, sizeof(len16)); + len = ntohs(len16); + data += 2; + size = 7; + sep = '/'; + break; + } + /* else it's an error */ + default: return( NULL ); + } - len = (unsigned char) *data++; - *cpath += len + 2; + *cpath += len + size; *path = '\0'; - + u = NULL; + ret.m_name = path; + ret.st_errno = 0; + ret.st_valid = 0; for ( ;; ) { if ( len == 0 ) { if ( !extend && movecwd( vol, dir ) < 0 ) { - return( NULL ); + /* it's tricky: + movecwd failed so dir is not there anymore. + FIXME Is it true with other errors? + if path == '\0' ==> the cpath parameter is that dir, + and maybe we are trying to recreate it! So we can't + fail here. + + */ + if ( dir->d_did == DIRDID_ROOT_PARENT) + return NULL; + cdir = dir->d_parent; + dir_invalidate(vol, dir); + if (*path != '\0' || u == NULL) { + /* FIXME: if path != '\0' then extend != 0 ? + * u == NUL ==> cpath is something like: + * toto\0\0\0 + */ + return NULL; + } + if (movecwd(vol, cdir) < 0) { + printf("can't change to parent\n"); + return NULL; /* give up the whole tree is out of synch*/ + } + /* restore the previous token */ + strncpy(path, u, olen); + path[olen] = '\0'; } - return( path ); + if (!ret.st_valid || *path == '\0') { + ret.u_name = "."; + } + return &ret; } - if ( *data == '\0' ) { + if (!*data || *data == sep ) { data++; len--; } + u = NULL; - while ( *data == '\0' && len > 0 ) { + while ( *data && *data == sep && len > 0 ) { if ( dir->d_parent == NULL ) { - return( NULL ); + return NULL; } dir = dir->d_parent; data++; @@ -718,7 +906,11 @@ char **cpath; /* would this be faster with strlen + strncpy? */ p = path; - while ( *data != '\0' && len > 0 ) { + if (len > 0) { + u = data; + olen = len; + } + while ( *data && *data != sep && len > 0 ) { *p++ = *data++; len--; } @@ -729,27 +921,13 @@ char **cpath; if (len == 1) len--; -#ifdef notdef - /* - * Dung Nguyen - * - * AFPD cannot handle paths with "::" if the "::" notation is - * not at the beginning of the path. The following path will not - * be interpreted correctly: - * - * :a:b:::c: (directory c at the same level as directory a) */ - if ( len > 0 ) { - data++; - len--; - } -#endif /* notdef */ *p = '\0'; if ( p != path ) { /* we got something */ if ( !extend ) { cdir = dir->d_child; while (cdir) { - if ( strcasecmp( cdir->d_name, path ) == 0 ) { + if ( strcasecmp( cdir->d_m_name, path ) == 0 ) { break; } cdir = (cdir == dir->d_child->d_prev) ? NULL : @@ -757,23 +935,32 @@ char **cpath; } if ( cdir == NULL ) { ++extend; + /* if dir == curdir it always succeed, + even if curdir is deleted. + it's not a pb because it will fail in extenddir + */ if ( movecwd( vol, dir ) < 0 ) { - return( NULL ); + /* dir is not valid anymore + we delete dir from the cache and abort. + */ + if ( dir->d_did != DIRDID_ROOT_PARENT) + dir_invalidate(vol, dir); + return NULL; } - cdir = extenddir( vol, dir, path ); + cdir = extenddir( vol, dir, &ret ); } } else { - cdir = extenddir( vol, dir, path ); + cdir = extenddir( vol, dir, &ret ); } if ( cdir == NULL ) { if ( len > 0 ) { - return( NULL ); + return NULL; } } else { - dir = cdir; + dir = cdir; *path = '\0'; } } @@ -804,7 +991,7 @@ struct dir *dir; *p = '.'; for ( d = dir; d->d_parent != NULL && d != curdir; d = d->d_parent ) { *--p = '/'; - u = mtoupath(vol, d->d_name ); + u = d->d_u_name; n = strlen( u ); p -= n; strncpy( p, u, n ); @@ -822,34 +1009,63 @@ struct dir *dir; return( 0 ); } +/* + * 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; +} + +/* ------------------------------ + (".", curdir) + (name, dir) with curdir:name == dir, from afp_enumerate +*/ + int getdirparams(const struct vol *vol, - u_int16_t bitmap, - char *upath, struct dir *dir, struct stat *st, + u_int16_t bitmap, struct path *s_path, + struct dir *dir, char *buf, int *buflen ) { struct maccess ma; struct adouble ad; - char *data, *nameoff = NULL; - DIR *dp; - struct dirent *de; - int bit = 0, isad = 1; + char *data, *l_nameoff = NULL, *utf_nameoff = NULL; + int bit = 0, isad = 0; u_int32_t aint; u_int16_t ashort; -#ifdef FORCE_UIDGID - uidgidset *uidgid; - memset(&uidgid, 0, sizeof(uidgid)); -#endif /* FORCE_UIDGID */ - - memset(&ad, 0, sizeof(ad)); - -#ifdef FORCE_UIDGID - save_uidgid ( &uidgid ); - set_uidgid ( vol ); -#endif /* FORCE_UIDGID */ - - if ( ad_open( upath, ADFLAGS_HF|ADFLAGS_DIR, O_RDONLY, - DIRBITS | 0777, &ad) < 0 ) { - isad = 0; + int ret; + u_int32_t utf8 = 0; + struct stat *st = &s_path->st; + char *upath = s_path->u_name; + + if ((bitmap & ((1 << DIRPBIT_ATTR) | + (1 << DIRPBIT_CDATE) | + (1 << DIRPBIT_MDATE) | + (1 << DIRPBIT_BDATE) | + (1 << DIRPBIT_FINFO)))) { + memset(&ad, 0, sizeof(ad)); + if ( !ad_open( upath, ADFLAGS_HF|ADFLAGS_DIR, O_RDONLY, + DIRBITS | 0777, &ad)) { + isad = 1; + } } data = buf; @@ -868,6 +1084,7 @@ int getdirparams(const struct vol *vol, ashort = htons(ATTRBIT_INVISIBLE); } else ashort = 0; + ashort |= htons(ATTRBIT_SHARED); memcpy( data, &ashort, sizeof( ashort )); data += sizeof( ashort ); break; @@ -925,8 +1142,8 @@ int getdirparams(const struct vol *vol, break; case DIRPBIT_LNAME : - if (dir->d_name) /* root of parent can have a null name */ - nameoff = data; + if (dir->d_m_name) /* root of parent can have a null name */ + l_nameoff = data; else memset(data, 0, sizeof(u_int16_t)); data += sizeof( u_int16_t ); @@ -945,25 +1162,13 @@ int getdirparams(const struct vol *vol, case DIRPBIT_OFFCNT : ashort = 0; /* this needs to handle current directory access rights */ - if ((dp = opendir( upath ))) { - while (( de = readdir( dp )) != NULL ) { - if (!strcmp(de->d_name, "..") || !strcmp(de->d_name, ".")) - continue; - - if (!validupath(vol, de->d_name)) - continue; - - /* check for vetoed filenames */ - if (veto_file(vol->v_veto, de->d_name)) - continue; - - /* now check against too long a filename */ - if (strlen(utompath(vol, de->d_name)) > MACFILELEN) - continue; - - ashort++; - } - closedir( dp ); + if (st->st_ctime == dir->ctime) { + ashort = dir->offcnt; + } + else if ((ret = for_each_dirent(vol, upath, NULL,NULL)) >= 0) { + ashort = ret; + dir->offcnt = ashort; + dir->ctime = st->st_ctime; } ashort = htons( ashort ); memcpy( data, &ashort, sizeof( ashort )); @@ -983,15 +1188,8 @@ int getdirparams(const struct vol *vol, break; case DIRPBIT_ACCESS : - utommode( st, &ma ); -#ifndef SENDFILE_FLAVOR_LINUX /* ignore this section if it's linux */ -#ifdef HAVE_ACCESS - accessmode( upath, &ma, dir ); -#endif /* HAVE_ACCESS */ -#endif /* SENDFILE_FLAVOR_LINUX */ -#ifdef AFS /* If only AFS defined, access() works only for AFS filesystems */ - afsmode( upath, &ma, dir ); -#endif /* AFS */ + accessmode( upath, &ma, dir , st); + *data++ = ma.ma_user; *data++ = ma.ma_world; *data++ = ma.ma_group; @@ -1001,38 +1199,47 @@ int getdirparams(const struct vol *vol, /* Client has requested the ProDOS information block. Just pass back the same basic block for all directories. */ - case DIRPBIT_PDINFO : /* ProDOS Info Block */ - *data++ = 0x0f; - *data++ = 0; - ashort = htons( 0x0200 ); - memcpy( data, &ashort, sizeof( ashort )); - data += sizeof( ashort ); - memset( data, 0, sizeof( ashort )); - data += sizeof( ashort ); + case DIRPBIT_PDINFO : + if (afp_version >= 30) { /* UTF8 name */ + utf8 = kTextEncodingUTF8; + if (dir->d_m_name) /* root of parent can have a null name */ + utf_nameoff = data; + else + memset(data, 0, sizeof(u_int16_t)); + data += sizeof( u_int16_t ); + aint = 0; + memcpy(data, &aint, sizeof( aint )); + data += sizeof( aint ); + } + else { /* ProDOS Info Block */ + *data++ = 0x0f; + *data++ = 0; + ashort = htons( 0x0200 ); + memcpy( data, &ashort, sizeof( ashort )); + data += sizeof( ashort ); + memset( data, 0, sizeof( ashort )); + data += sizeof( ashort ); + } break; default : if ( isad ) { ad_close( &ad, ADFLAGS_HF ); } -#ifdef FORCE_UIDGID - restore_uidgid ( &uidgid ); -#endif /* FORCE_UIDGID */ return( AFPERR_BITMAP ); } bitmap = bitmap>>1; bit++; } - if ( nameoff ) { + if ( l_nameoff ) { ashort = htons( data - buf ); - memcpy( nameoff, &ashort, sizeof( ashort )); - - if ((aint = strlen( dir->d_name )) > MACFILELEN) - aint = MACFILELEN; - - *data++ = aint; - memcpy( data, dir->d_name, aint ); - data += aint; + memcpy( l_nameoff, &ashort, sizeof( ashort )); + data = set_name(data, dir->d_m_name, 0); + } + if ( utf_nameoff ) { + ashort = htons( data - buf ); + memcpy( utf_nameoff, &ashort, sizeof( ashort )); + data = set_name(data, dir->d_m_name, utf8); } if ( isad ) { ad_close( &ad, ADFLAGS_HF ); @@ -1041,6 +1248,7 @@ int getdirparams(const struct vol *vol, return( AFP_OK ); } +/* ----------------------------- */ int afp_setdirparams(obj, ibuf, ibuflen, rbuf, rbuflen ) AFPObj *obj; char *ibuf, *rbuf; @@ -1048,7 +1256,7 @@ int ibuflen, *rbuflen; { struct vol *vol; struct dir *dir; - char *path; + struct path *path; u_int16_t vid, bitmap; u_int32_t did; int rc; @@ -1068,7 +1276,7 @@ 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 ); } @@ -1080,6 +1288,10 @@ int ibuflen, *rbuflen; return( AFPERR_NOOBJ ); } + if ( *path->m_name != '\0' ) { + return( AFPERR_BADTYPE ); /* not a directory */ + } + /* * If ibuf is odd, make it even. */ @@ -1093,27 +1305,38 @@ int ibuflen, *rbuflen; return( rc ); } -int setdirparams(const struct vol *vol, - char *path, u_int16_t bitmap, char *buf ) +/* + * cf AFP3.0.pdf page 244 for change_mdate and change_parent_mdate logic + * + * assume path == '\0' eg. it's a directory in canonical form +*/ + +struct path Cur_Path = { + "", /* mac name */ + ".", /* unix name */ + 0, /* stat is not set */ + 0, /* */ +}; + +int setdirparams(const struct vol *vol, + struct path *path, u_int16_t bitmap, char *buf ) { struct maccess ma; struct adouble ad; struct utimbuf ut; + struct timeval tv; + char *upath; int bit = 0, aint, isad = 1; u_int16_t ashort, bshort; int err = AFP_OK; -#ifdef FORCE_UIDGID - uidgidset *uidgid; - - memset(&uidgid, 0, sizeof(uidgid)); -#endif /* FORCE_UIDGID */ + int change_mdate = 0; + int change_parent_mdate = 0; + int newdate = 0; - upath = mtoupath(vol, path); + upath = path->u_name; memset(&ad, 0, sizeof(ad)); -#ifdef FORCE_UIDGID - save_uidgid ( &uidgid ); -#endif /* FORCE_UIDGID */ + if (ad_open( upath, vol_noadouble(vol)|ADFLAGS_HF|ADFLAGS_DIR, O_RDWR|O_CREAT, 0666, &ad) < 0) { /* @@ -1127,9 +1350,6 @@ int setdirparams(const struct vol *vol, if (!vol_noadouble(vol) && (bitmap & ~((1<d_name )); - memcpy( ad_entry( &ad, ADEID_NAME ), curdir->d_name, + ad_setentrylen( &ad, ADEID_NAME, strlen( curdir->d_m_name )); + memcpy( ad_entry( &ad, ADEID_NAME ), curdir->d_m_name, ad_getentrylen( &ad, ADEID_NAME )); } } @@ -1154,6 +1374,7 @@ int setdirparams(const struct vol *vol, switch( bit ) { case DIRPBIT_ATTR : + change_mdate = 1; if (isad) { memcpy( &ashort, buf, sizeof( ashort )); ad_getattr(&ad, &bshort); @@ -1163,11 +1384,14 @@ int setdirparams(const struct vol *vol, bshort &= ~ashort; } ad_setattr(&ad, bshort); + if ((ashort & htons(ATTRBIT_INVISIBLE))) + change_parent_mdate = 1; } buf += sizeof( ashort ); break; case DIRPBIT_CDATE : + change_mdate = 1; if (isad) { memcpy(&aint, buf, sizeof(aint)); ad_setdate(&ad, AD_DATE_CREATE, aint); @@ -1176,15 +1400,12 @@ int setdirparams(const struct vol *vol, break; case DIRPBIT_MDATE : - memcpy(&aint, buf, sizeof(aint)); - if (isad) - ad_setdate(&ad, AD_DATE_MODIFY, aint); - ut.actime = ut.modtime = AD_DATE_TO_UNIX(aint); - utime(upath, &ut); - buf += sizeof( aint ); + memcpy(&newdate, buf, sizeof(newdate)); + buf += sizeof( newdate ); break; case DIRPBIT_BDATE : + change_mdate = 1; if (isad) { memcpy(&aint, buf, sizeof(aint)); ad_setdate(&ad, AD_DATE_BACKUP, aint); @@ -1193,6 +1414,7 @@ int setdirparams(const struct vol *vol, break; case DIRPBIT_FINFO : + change_mdate = 1; /* * Alright, we admit it, this is *really* sick! * The 4 bytes that we don't copy, when we're dealing @@ -1213,6 +1435,7 @@ int setdirparams(const struct vol *vol, break; case DIRPBIT_UID : /* What kind of loser mounts as root? */ + change_parent_mdate = 1; memcpy( &aint, buf, sizeof(aint)); buf += sizeof( aint ); if ( (curdir->d_did == DIRDID_ROOT) && @@ -1228,8 +1451,8 @@ int setdirparams(const struct vol *vol, goto setdirparam_done; break; default : - syslog( LOG_ERR, "setdirparam: setdeskowner: %s", - strerror(errno) ); + LOG(log_error, logtype_afpd, "setdirparam: setdeskowner: %s", + strerror(errno) ); if (!isad) { err = AFPERR_PARAM; goto setdirparam_done; @@ -1249,13 +1472,14 @@ int setdirparams(const struct vol *vol, goto setdirparam_done; break; default : - syslog( LOG_ERR, "setdirparam: setdirowner: %s", - strerror(errno) ); + LOG(log_error, logtype_afpd, "setdirparam: setdirowner: %s", + strerror(errno) ); break; } } break; case DIRPBIT_GID : + change_parent_mdate = 1; memcpy( &aint, buf, sizeof( aint )); buf += sizeof( aint ); if (curdir->d_did == DIRDID_ROOT) @@ -1273,7 +1497,7 @@ int setdirparams(const struct vol *vol, goto setdirparam_done; break; default : - syslog( LOG_ERR, "setdirparam: setdeskowner: %m" ); + LOG(log_error, logtype_afpd, "setdirparam: setdeskowner: %m" ); if (!isad) { err = AFPERR_PARAM; goto setdirparam_done; @@ -1294,14 +1518,16 @@ int setdirparams(const struct vol *vol, goto setdirparam_done; break; default : - syslog( LOG_ERR, "setdirparam: setdirowner: %s", - strerror(errno) ); + LOG(log_error, logtype_afpd, "setdirparam: setdirowner: %s", + strerror(errno) ); break; } } break; case DIRPBIT_ACCESS : + change_mdate = 1; + change_parent_mdate = 1; ma.ma_user = *buf++; ma.ma_world = *buf++; ma.ma_group = *buf++; @@ -1319,62 +1545,78 @@ int setdirparams(const struct vol *vol, err = AFPERR_VLOCK; goto setdirparam_done; default : - syslog( LOG_ERR, "setdirparam: setdeskmode: %s", - strerror(errno) ); + LOG(log_error, logtype_afpd, "setdirparam: setdeskmode: %s", + strerror(errno) ); break; err = AFPERR_PARAM; goto setdirparam_done; } - } #endif /* 0 */ - if ( setdirmode( mtoumode( &ma ), vol_noadouble(vol), + if ( setdirmode( mtoumode( &ma ), vol_noadouble(vol), (vol->v_flags & AFPVOL_DROPBOX)) < 0 ) { - switch ( errno ) { - case EPERM : - case EACCES : - err = AFPERR_ACCESS; - goto setdirparam_done; - case EROFS : - err = AFPERR_VLOCK; - goto setdirparam_done; - default : - syslog( LOG_ERR, "setdirparam: setdirmode: %s", + switch ( errno ) { + case EPERM : + case EACCES : + err = AFPERR_ACCESS; + goto setdirparam_done; + case EROFS : + err = AFPERR_VLOCK; + goto setdirparam_done; + default : + LOG(log_error, logtype_afpd, "setdirparam: setdirmode: %s", strerror(errno) ); - err = AFPERR_PARAM; - goto setdirparam_done; + err = AFPERR_PARAM; + goto setdirparam_done; + } } - } - break; + break; /* Ignore what the client thinks we should do to the ProDOS information block. Skip over the data and report nothing amiss. */ - case DIRPBIT_PDINFO : - buf += 6; - break; + case DIRPBIT_PDINFO : + if (afp_version < 30) { + buf += 6; + break; + } + default : + err = AFPERR_BITMAP; + goto setdirparam_done; + break; + } - default : - err = AFPERR_BITMAP; - goto setdirparam_done; - break; + bitmap = bitmap>>1; + bit++; } - bitmap = bitmap>>1; - bit++; -} +setdirparam_done: + if (change_mdate && newdate == 0 && gettimeofday(&tv, NULL) == 0) { + newdate = AD_DATE_FROM_UNIX(tv.tv_sec); + } + if (newdate) { + if (isad) + ad_setdate(&ad, AD_DATE_MODIFY, newdate); + ut.actime = ut.modtime = AD_DATE_TO_UNIX(newdate); + utime(upath, &ut); + } + if ( isad ) { + ad_flush( &ad, ADFLAGS_HF ); + ad_close( &ad, ADFLAGS_HF ); + } -setdirparam_done: -if ( isad ) { - ad_flush( &ad, ADFLAGS_HF ); - ad_close( &ad, ADFLAGS_HF ); -} + if (change_parent_mdate && curdir->d_did != DIRDID_ROOT + && gettimeofday(&tv, NULL) == 0) { + if (!movecwd(vol, curdir->d_parent)) { + newdate = AD_DATE_FROM_UNIX(tv.tv_sec); + bitmap = 1<v_flags & AFPVOL_MSWINDOWS) && - strpbrk(path, MSWINDOWS_BADCHARS)) - return AFPERR_PARAM; - - upath = mtoupath(vol, path); - - if ((vol->v_flags & AFPVOL_NOHEX) && strchr(upath, '/')) - return AFPERR_PARAM; - - if (!validupath(vol, upath)) - return AFPERR_EXIST; - - /* check for vetoed filenames */ - if (veto_file(vol->v_veto, upath)) + /* FIXME check done elswhere? cname was able to move curdir to it! */ + if (*s_path->m_name == '\0') return AFPERR_EXIST; -#ifdef FORCE_UIDGID - save_uidgid ( &uidgid ); - set_uidgid ( vol ); -#endif /* FORCE_UIDGID */ + upath = s_path->u_name; + { + int ret; + if (0 != (ret = check_name(vol, upath))) { + return ret; + } + } if ( ad_mkdir( upath, DIRBITS | 0777 ) < 0 ) { -#ifdef FORCE_UIDGID - restore_uidgid ( &uidgid ); -#endif /* FORCE_UIDGID */ switch ( errno ) { case ENOENT : return( AFPERR_NOOBJ ); @@ -1467,41 +1690,28 @@ int ibuflen, *rbuflen; } } - if (stat(upath, &st) < 0) { -#ifdef FORCE_UIDGID - restore_uidgid ( &uidgid ); -#endif /* FORCE_UIDGID */ + if (of_stat(s_path) < 0) { return AFPERR_MISC; } - - if ((dir = adddir( vol, curdir, path, strlen( path ), upath, - strlen(upath), &st)) == NULL) { -#ifdef FORCE_UIDGID - restore_uidgid ( &uidgid ); -#endif /* FORCE_UIDGID */ + curdir->offcnt++; + if ((dir = adddir( vol, curdir, s_path)) == NULL) { return AFPERR_MISC; } if ( movecwd( vol, dir ) < 0 ) { -#ifdef FORCE_UIDGID - restore_uidgid ( &uidgid ); -#endif /* FORCE_UIDGID */ return( AFPERR_PARAM ); } memset(&ad, 0, sizeof(ad)); - if (ad_open( "", vol_noadouble(vol)|ADFLAGS_HF|ADFLAGS_DIR, + if (ad_open( ".", vol_noadouble(vol)|ADFLAGS_HF|ADFLAGS_DIR, O_RDWR|O_CREAT, 0666, &ad ) < 0) { if (vol_noadouble(vol)) goto createdir_done; -#ifdef FORCE_UIDGID - restore_uidgid ( &uidgid ); -#endif /* FORCE_UIDGID */ return( AFPERR_ACCESS ); } - ad_setentrylen( &ad, ADEID_NAME, strlen( path )); - memcpy( ad_entry( &ad, ADEID_NAME ), path, + ad_setentrylen( &ad, ADEID_NAME, strlen( s_path->m_name )); + memcpy( ad_entry( &ad, ADEID_NAME ), s_path->m_name, ad_getentrylen( &ad, ADEID_NAME )); ad_flush( &ad, ADFLAGS_HF ); ad_close( &ad, ADFLAGS_HF ); @@ -1510,13 +1720,15 @@ createdir_done: memcpy( rbuf, &dir->d_did, sizeof( u_int32_t )); *rbuflen = sizeof( u_int32_t ); setvoltime(obj, vol ); -#ifdef FORCE_UIDGID - restore_uidgid ( &uidgid ); -#endif /* FORCE_UIDGID */ return( AFP_OK ); } - +/* + * dst new unix filename (not a pathname) + * newname new mac name + * newparent curdir + * +*/ int renamedir(src, dst, dir, newparent, newname, noadouble) char *src, *dst, *newname; struct dir *dir, *newparent; @@ -1526,7 +1738,7 @@ const int noadouble; struct dir *parent; char *buf; int len, err; - + /* existence check moved to afp_moveandrename */ if ( rename( src, dst ) < 0 ) { switch ( errno ) { @@ -1576,12 +1788,29 @@ const int noadouble; ad_close( &ad, ADFLAGS_HF ); renamedir_done: - if ((buf = (char *) realloc( dir->d_name, len + 1 )) == NULL ) { - syslog( LOG_ERR, "renamedir: realloc: %s", strerror(errno) ); + if (dir->d_m_name == dir->d_u_name) + dir->d_u_name = NULL; + + if ((buf = (char *) realloc( dir->d_m_name, len + 1 )) == NULL ) { + LOG(log_error, logtype_afpd, "renamedir: realloc mac name: %s", strerror(errno) ); + /* FIXME : fatal ? */ return AFPERR_MISC; } - dir->d_name = buf; - strcpy( dir->d_name, newname ); + dir->d_m_name = buf; + strcpy( dir->d_m_name, newname ); + + if (newname == dst) { + free(dir->d_u_name); + dir->d_u_name = dir->d_m_name; + } + else { + if ((buf = (char *) realloc( dir->d_u_name, strlen(dst) + 1 )) == NULL ) { + LOG(log_error, logtype_afpd, "renamedir: realloc unix name: %s", strerror(errno) ); + return AFPERR_MISC; + } + dir->d_u_name = buf; + strcpy( dir->d_u_name, dst ); + } if (( parent = dir->d_parent ) == NULL ) { return( AFP_OK ); @@ -1608,11 +1837,8 @@ int pathlen; struct stat st; struct dir *fdir; DIR *dp; -#ifdef FORCE_UIDGID - uidgidset *uidgid; - - memset(&uidgid, 0, sizeof(uidgid)); -#endif /* FORCE_UIDGID */ + struct adouble ad; + u_int16_t ashort; if ( curdir->d_parent == NULL ) { return( AFPERR_ACCESS ); @@ -1624,10 +1850,16 @@ int pathlen; fdir = curdir; -#ifdef FORCE_UIDGID - save_uidgid ( &uidgid ); - set_uidgid ( vol ); -#endif /* FORCE_UIDGID */ + memset(&ad, 0, sizeof(ad)); + if ( ad_open( ".", ADFLAGS_HF|ADFLAGS_DIR, O_RDONLY, + DIRBITS | 0777, &ad) == 0 ) { + + ad_getattr(&ad, &ashort); + ad_close( &ad, ADFLAGS_HF ); + if ((ashort & htons(ATTRBIT_NODELETE))) { + return AFPERR_OLOCK; + } + } /* delete stray .AppleDouble files. this happens to get .Parent files as well. */ @@ -1642,9 +1874,6 @@ int pathlen; * note: this will not fail with dangling symlinks */ if (stat(de->d_name, &st) == 0) { closedir(dp); -#ifdef FORCE_UIDGID - restore_uidgid ( &uidgid ); -#endif /* FORCE_UIDGID */ return AFPERR_DIRNEMPT; } @@ -1654,21 +1883,12 @@ int pathlen; switch (errno) { case EPERM: case EACCES : -#ifdef FORCE_UIDGID - restore_uidgid ( &uidgid ); -#endif /* FORCE_UIDGID */ return( AFPERR_ACCESS ); case EROFS: -#ifdef FORCE_UIDGID - restore_uidgid ( &uidgid ); -#endif /* FORCE_UIDGID */ return AFPERR_VLOCK; case ENOENT : continue; default : -#ifdef FORCE_UIDGID - restore_uidgid ( &uidgid ); -#endif /* FORCE_UIDGID */ return( AFPERR_PARAM ); } } @@ -1681,25 +1901,13 @@ int pathlen; case ENOENT : break; case ENOTEMPTY : -#ifdef FORCE_UIDGID - restore_uidgid ( &uidgid ); -#endif /* FORCE_UIDGID */ return( AFPERR_DIRNEMPT ); case EROFS: -#ifdef FORCE_UIDGID - restore_uidgid ( &uidgid ); -#endif /* FORCE_UIDGID */ return AFPERR_VLOCK; case EPERM: case EACCES : -#ifdef FORCE_UIDGID - restore_uidgid ( &uidgid ); -#endif /* FORCE_UIDGID */ return( AFPERR_ACCESS ); default : -#ifdef FORCE_UIDGID - restore_uidgid ( &uidgid ); -#endif /* FORCE_UIDGID */ return( AFPERR_PARAM ); } } @@ -1713,9 +1921,6 @@ int pathlen; /* bail if it's not a symlink */ if ((lstat(de->d_name, &st) == 0) && !S_ISLNK(st.st_mode)) { -#ifdef FORCE_UIDGID - restore_uidgid ( &uidgid ); -#endif /* FORCE_UIDGID */ return AFPERR_DIRNEMPT; } @@ -1723,21 +1928,12 @@ int pathlen; switch (errno) { case EPERM: case EACCES : -#ifdef FORCE_UIDGID - restore_uidgid ( &uidgid ); -#endif /* FORCE_UIDGID */ return( AFPERR_ACCESS ); case EROFS: -#ifdef FORCE_UIDGID - restore_uidgid ( &uidgid ); -#endif /* FORCE_UIDGID */ return AFPERR_VLOCK; case ENOENT : continue; default : -#ifdef FORCE_UIDGID - restore_uidgid ( &uidgid ); -#endif /* FORCE_UIDGID */ return( AFPERR_PARAM ); } } @@ -1746,39 +1942,21 @@ int pathlen; } if ( movecwd( vol, curdir->d_parent ) < 0 ) { -#ifdef FORCE_UIDGID - restore_uidgid ( &uidgid ); -#endif /* FORCE_UIDGID */ return( AFPERR_NOOBJ ); } - if ( rmdir(mtoupath(vol, fdir->d_name)) < 0 ) { + if ( rmdir(fdir->d_u_name) < 0 ) { switch ( errno ) { case ENOENT : -#ifdef FORCE_UIDGID - restore_uidgid ( &uidgid ); -#endif /* FORCE_UIDGID */ return( AFPERR_NOOBJ ); case ENOTEMPTY : -#ifdef FORCE_UIDGID - restore_uidgid ( &uidgid ); -#endif /* FORCE_UIDGID */ return( AFPERR_DIRNEMPT ); case EPERM: case EACCES : -#ifdef FORCE_UIDGID - restore_uidgid ( &uidgid ); -#endif /* FORCE_UIDGID */ return( AFPERR_ACCESS ); case EROFS: -#ifdef FORCE_UIDGID - restore_uidgid ( &uidgid ); -#endif /* FORCE_UIDGID */ return AFPERR_VLOCK; default : -#ifdef FORCE_UIDGID - restore_uidgid ( &uidgid ); -#endif /* FORCE_UIDGID */ return( AFPERR_PARAM ); } } @@ -1789,9 +1967,6 @@ int pathlen; #endif /* CNID_DB */ dir_remove( vol, fdir ); -#ifdef FORCE_UIDGID - restore_uidgid ( &uidgid ); -#endif /* FORCE_UIDGID */ return( AFP_OK ); } @@ -1805,48 +1980,66 @@ int ibuflen, *rbuflen; char *name; u_int32_t id; int len, sfunc; - + int utf8 = 0; + ibuf++; sfunc = (unsigned char) *ibuf++; memcpy( &id, ibuf, sizeof( id )); id = ntohl(id); + *rbuflen = 0; if ( id != 0 ) { switch ( sfunc ) { case 1 : + case 3 :/* unicode */ if (( pw = getpwuid( id )) == NULL ) { - *rbuflen = 0; return( AFPERR_NOITEM ); } name = pw->pw_name; break; case 2 : + case 4 : /* unicode */ if (( gr = (struct group *)getgrgid( id )) == NULL ) { - *rbuflen = 0; return( AFPERR_NOITEM ); } name = gr->gr_name; break; default : - *rbuflen = 0; return( AFPERR_PARAM ); } - + switch ( sfunc ) { + case 3: + case 4: + if (afp_version < 30) { + return( AFPERR_PARAM ); + } + utf8 = 1; + /* map to unicode */ + break; + } len = strlen( name ); } else { len = 0; name = NULL; } - - *rbuf++ = len; + if (utf8) { + u_int16_t tp = htons(len); + memcpy(rbuf, &tp, sizeof(tp)); + rbuf += sizeof(tp); + *rbuflen += 2; + } + else { + *rbuf++ = len; + *rbuflen += 1; + } if ( len > 0 ) { memcpy( rbuf, name, len ); } - *rbuflen = len + 1; + *rbuflen += len; return( AFP_OK ); } @@ -1857,16 +2050,33 @@ int ibuflen, *rbuflen; { struct passwd *pw; struct group *gr; - int len, sfunc; - u_int32_t id; + int len, sfunc; + u_int32_t id; + u_int16_t ulen; ibuf++; sfunc = (unsigned char) *ibuf++; - len = (unsigned char) *ibuf++; + switch ( sfunc ) { + case 1 : + case 2 : /* unicode */ + memcpy(&ulen, ibuf, sizeof(ulen)); + len = ntohs(ulen); + ibuf += 2; + break; + case 3 : + case 4 : + len = (unsigned char) *ibuf++; + break; + default : + *rbuflen = 0; + return( AFPERR_PARAM ); + } + ibuf[ len ] = '\0'; if ( len != 0 ) { switch ( sfunc ) { + case 1 : /* unicode */ case 3 : if (( pw = (struct passwd *)getpwnam( ibuf )) == NULL ) { *rbuflen = 0; @@ -1875,6 +2085,7 @@ int ibuflen, *rbuflen; id = pw->pw_uid; break; + case 2 : /* unicode */ case 4 : if (( gr = (struct group *)getgrnam( ibuf )) == NULL ) { *rbuflen = 0; @@ -1882,9 +2093,6 @@ int ibuflen, *rbuflen; } id = gr->gr_gid; break; - default : - *rbuflen = 0; - return( AFPERR_PARAM ); } } else { id = 0; @@ -1895,7 +2103,9 @@ int ibuflen, *rbuflen; return( AFP_OK ); } -/* variable DID support */ +/* ------------------------------------ + variable DID support +*/ int afp_closedir(obj, ibuf, ibuflen, rbuf, rbuflen ) AFPObj *obj; char *ibuf, *rbuf; @@ -1922,7 +2132,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_PARAM ); } @@ -1932,23 +2142,19 @@ int ibuflen, *rbuflen; return AFP_OK; } -/* did creation gets done automatically */ +/* did creation gets done automatically + * there's a pb again with case but move it to cname +*/ int afp_opendir(obj, ibuf, ibuflen, rbuf, rbuflen ) AFPObj *obj; char *ibuf, *rbuf; int ibuflen, *rbuflen; { struct vol *vol; - struct dir *dir, *parentdir; - struct stat st; - char *path, *upath; + struct dir *parentdir; + struct path *path; u_int32_t did; u_int16_t vid; -#ifdef FORCE_UIDGID - uidgidset *uidgid; - - memset(&uidgid, 0, sizeof(uidgid)); -#endif /* FORCE_UIDGID */ *rbuflen = 0; ibuf += 2; @@ -1963,7 +2169,7 @@ int ibuflen, *rbuflen; memcpy(&did, ibuf, sizeof(did)); ibuf += sizeof(did); - if (( parentdir = dirsearch( vol, did )) == NULL ) { + if (( parentdir = dirlookup( vol, did )) == NULL ) { return( AFPERR_NOOBJ ); } @@ -1976,40 +2182,18 @@ int ibuflen, *rbuflen; } } - /* see if we already have the directory. */ - upath = mtoupath(vol, path); - if ( stat( upath, &st ) < 0 ) { - return( AFPERR_NOOBJ ); + if ( *path->m_name != '\0' ) { + return( AFPERR_BADTYPE ); /* not a directory */ } - dir = parentdir->d_child; - while (dir) { - if (strdiacasecmp(dir->d_name, path) == 0) { - memcpy(rbuf, &dir->d_did, sizeof(dir->d_did)); - *rbuflen = sizeof(dir->d_did); - return AFP_OK; - } - dir = (dir == parentdir->d_child->d_prev) ? NULL : dir->d_next; + if ( !path->st_valid && of_stat(path ) < 0 ) { + return( AFPERR_NOOBJ ); } - -#ifdef FORCE_UIDGID - save_uidgid ( &uidgid ); - set_uidgid ( vol ); -#endif /* FORCE_UIDGID */ - - /* we don't already have a did. add one in. */ - if ((dir = adddir(vol, parentdir, path, strlen(path), - upath, strlen(upath), &st)) == NULL) { -#ifdef FORCE_UIDGID - restore_uidgid ( &uidgid ); -#endif /* FORCE_UIDGID */ - return AFPERR_MISC; + if ( path->st_errno ) { + return( AFPERR_NOOBJ ); } - memcpy(rbuf, &dir->d_did, sizeof(dir->d_did)); - *rbuflen = sizeof(dir->d_did); -#ifdef FORCE_UIDGID - restore_uidgid ( &uidgid ); -#endif /* FORCE_UIDGID */ + memcpy(rbuf, &curdir->d_did, sizeof(curdir->d_did)); + *rbuflen = sizeof(curdir->d_did); return AFP_OK; }