X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Fdirectory.c;h=0a5f0893fe71f5934556f2fb94188d99e066a502;hb=5447b10e1ea30a83c7af9790b557fea7337be400;hp=536a2bdaf4f52b1214db8701f7a11fe1533cae4d;hpb=1e37df8ad1fe3b4196a6dbcf971c628baed88f3c;p=netatalk.git diff --git a/etc/afpd/directory.c b/etc/afpd/directory.c index 536a2bda..0a5f0893 100644 --- a/etc/afpd/directory.c +++ b/etc/afpd/directory.c @@ -1,5 +1,5 @@ /* - * $Id: directory.c,v 1.71.2.4.2.8 2004-02-09 23:49:31 bfernhomberg Exp $ + * $Id: directory.c,v 1.71.2.4.2.15.2.14 2009-09-07 11:35:04 franklahm Exp $ * * Copyright (c) 1990,1993 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. @@ -32,19 +32,14 @@ char *strchr (), *strrchr (); #include #include #include -#ifdef HAVE_FCNTL_H -#include -#endif /* HAVE_FCNTL_H */ + #include #include -#include -#include -#include #include #include #include -#include #include + #include #include #include @@ -126,7 +121,7 @@ u_int32_t did; #ifdef ATACC int path_isadir(struct path *o_path) { - return o_path->dir != NULL; + return o_path->d_dir != NULL; #if 0 return o_path->m_name == '\0' || /* we are in a it */ !o_path->st_valid || /* in cache but we can't chdir in it */ @@ -397,9 +392,7 @@ struct dir *dir; /* remove the node from the tree. this is just like insertion, but * different. actually, it has to worry about a bunch of things that * insertion doesn't care about. */ -static void dir_remove( vol, dir ) -struct vol *vol; -struct dir *dir; +static void dir_remove( const struct vol *vol _U_, struct dir *dir) { #ifdef REMOVE_NODES struct ofork *of, *last; @@ -570,12 +563,21 @@ struct path *path; if ( path->u_name == NULL) { path->u_name = mtoupath(vol, path->m_name, dir->d_did, (path->m_type==3) ); } - path->dir = NULL; + path->d_dir = NULL; if ( path->u_name == NULL) { afp_errno = AFPERR_PARAM; return NULL; } + + if (check_name(vol, path->u_name)) { + /* the name is illegal */ + LOG(log_info, logtype_afpd, "extenddir: illegal path: '%s'", path->u_name); + path->u_name = NULL; + afp_errno = AFPERR_PARAM; + return NULL; + } + if (of_stat( path ) != 0 ) { return( NULL ); } @@ -603,7 +605,7 @@ struct path *path; } } - path->dir = dir; + path->d_dir = dir; if ( movecwd( vol, dir ) < 0 ) { return( NULL ); } @@ -735,7 +737,7 @@ static int deletedir(char *dir) } /* do a recursive copy. */ -static int copydir(char *src, char *dst, int noadouble) +static int copydir(const struct vol *vol, char *src, char *dst) { char spath[MAXPATHLEN + 1], dpath[MAXPATHLEN + 1]; DIR *dp; @@ -744,7 +746,6 @@ static int copydir(char *src, char *dst, int noadouble) struct utimbuf ut; size_t slen, dlen; size_t srem, drem; - int err; /* doesn't exist or the path is too long. */ @@ -790,9 +791,9 @@ static int copydir(char *src, char *dst, int noadouble) strcpy(dpath + dlen, de->d_name); if (S_ISDIR(st.st_mode)) { - if (AFP_OK != (err = copydir(spath, dpath, noadouble))) + if (AFP_OK != (err = copydir(vol, spath, dpath))) goto copydir_done; - } else if (AFP_OK != (err = copyfile(spath, dpath, NULL, noadouble))) { + } else if (AFP_OK != (err = copyfile(vol, vol, spath, dpath, NULL, NULL))) { goto copydir_done; } else { @@ -985,6 +986,7 @@ char **cpath; u_int16_t len16; int size = 0; char sep; + int toUTF8 = 0; data = *cpath; afp_errno = AFPERR_NOOBJ; @@ -994,6 +996,10 @@ char **cpath; len = (unsigned char) *data++; size = 2; sep = 0; + if (afp_version >= 30) { + ret.m_type = 3; + toUTF8 = 1; + } break; case 3: if (afp_version >= 30) { @@ -1019,7 +1025,7 @@ char **cpath; ret.m_name = path; ret.st_errno = 0; ret.st_valid = 0; - ret.dir = NULL; + ret.d_dir = NULL; for ( ;; ) { if ( len == 0 ) { if (movecwd( vol, dir ) < 0 ) { @@ -1034,9 +1040,13 @@ char **cpath; if ( movecwd( vol, dir->d_parent ) < 0 ) { return NULL; } + /* FIXME should we set, don't need to call stat() after: + ret.st_valid = 1; + ret.st_errno = EACCES; + */ ret.m_name = dir->d_m_name; ret.u_name = dir->d_u_name; - ret.dir = dir; + ret.d_dir = dir; return &ret; } else if (afp_errno == AFPERR_NOOBJ) { if ( movecwd( vol, dir->d_parent ) < 0 ) { @@ -1053,6 +1063,11 @@ char **cpath; ret.u_name = path +tp; } + /* FIXME should we set : + ret.st_valid = 1; + ret.st_errno = ENOENT; + */ + dir_invalidate(vol, dir); return &ret; } @@ -1061,7 +1076,7 @@ char **cpath; } if (*path == '\0') { ret.u_name = "."; - ret.dir = dir; + ret.d_dir = dir; } return &ret; } /* if (len == 0) */ @@ -1101,9 +1116,20 @@ char **cpath; if ( p != path ) { /* we got something */ ret.u_name = NULL; if (afp_version >= 30) { - /* check for OS X mangled filename :( */ char *t; cnid_t fileid; + + if (toUTF8) { + static char temp[ MAXPATHLEN + 1]; + + /* not an UTF8 name */ + if (mtoUTF8(vol, path, strlen(path), temp, MAXPATHLEN) == (size_t)-1) { + afp_errno = AFPERR_PARAM; + return( NULL ); + } + strcpy(path, temp); + } + /* check for OS X mangled filename :( */ t = demangle_osx(vol, path, dir->d_did, &fileid); if (t != path) { @@ -1203,7 +1229,7 @@ struct dir *dir; } *--p = '/'; p -= n; - strncpy( p, u, n ); + memcpy( p, u, n ); } if ( d != curdir ) { n = strlen( vol->v_path ); @@ -1213,7 +1239,7 @@ struct dir *dir; } *--p = '/'; p -= n; - strncpy( p, vol->v_path, n ); + memcpy( p, vol->v_path, n ); } if ( chdir( p ) < 0 ) { switch (errno) { @@ -1271,6 +1297,12 @@ struct maccess ma; } +/* --------------------- */ +static int invisible_dots(const struct vol *vol, const char *name) +{ + return vol_inv_dots(vol) && *name == '.' && strcmp(name, ".") && strcmp(name, ".."); +} + /* ------------------------------ (".", curdir) (name, dir) with curdir:name == dir, from afp_enumerate @@ -1299,9 +1331,8 @@ int getdirparams(const struct vol *vol, (1 << DIRPBIT_BDATE) | (1 << DIRPBIT_FINFO)))) { - ad_init(&ad, vol->v_adouble); - if ( !ad_open( upath, ADFLAGS_HF|ADFLAGS_DIR, O_RDONLY, - DIRBITS | 0777, &ad)) { + ad_init(&ad, vol->v_adouble, vol->v_ad_options); + if ( !ad_metadata( upath, ADFLAGS_DIR, &ad) ) { isad = 1; } } @@ -1325,8 +1356,7 @@ int getdirparams(const struct vol *vol, case DIRPBIT_ATTR : if ( isad ) { ad_getattr(&ad, &ashort); - } else if (*dir->d_u_name == '.' && strcmp(dir->d_u_name, ".") - && strcmp(dir->d_u_name, "..")) { + } else if (invisible_dots(vol, dir->d_u_name)) { ashort = htons(ATTRBIT_INVISIBLE); } else ashort = 0; @@ -1369,12 +1399,10 @@ int getdirparams(const struct vol *vol, ashort = htons(FINDERINFO_CLOSEDVIEW); memcpy(data + FINDERINFO_FRVIEWOFF, &ashort, sizeof(ashort)); - /* dot files are by default invisible */ - if (*dir->d_u_name == '.' && strcmp(dir->d_u_name , ".") && - strcmp(dir->d_u_name , "..")) { + /* dot files are by default visible */ + if (invisible_dots(vol, dir->d_u_name)) { ashort = htons(FINDERINFO_INVISIBLE); - memcpy(data + FINDERINFO_FRFLAGOFF, - &ashort, sizeof(ashort)); + memcpy(data + FINDERINFO_FRFLAGOFF, &ashort, sizeof(ashort)); } } data += 32; @@ -1481,8 +1509,7 @@ int getdirparams(const struct vol *vol, *data++ = ma.ma_group; *data++ = ma.ma_owner; break; - - + default : if ( isad ) { ad_close( &ad, ADFLAGS_HF ); @@ -1518,16 +1545,16 @@ int path_error(struct path *path, int error) */ if (path_isadir(path)) return afp_errno; - if (path->st_errno) + if (path->st_valid && path->st_errno) return error; return AFPERR_BADTYPE ; } /* ----------------------------- */ int afp_setdirparams(obj, ibuf, ibuflen, rbuf, rbuflen ) -AFPObj *obj; -char *ibuf, *rbuf; -int ibuflen, *rbuflen; +AFPObj *obj; +char *ibuf, *rbuf _U_; +int ibuflen _U_, *rbuflen; { struct vol *vol; struct dir *dir; @@ -1564,7 +1591,10 @@ int ibuflen, *rbuflen; } if ( *path->m_name != '\0' ) { - return path_error(path, AFPERR_NOOBJ); + rc = path_error(path, AFPERR_NOOBJ); + /* maybe we are trying to set perms back */ + if (rc != AFPERR_ACCESS) + return rc; } /* @@ -1590,12 +1620,28 @@ struct path Cur_Path = { 0, "", /* mac name */ ".", /* unix name */ + NULL, 0, /* stat is not set */ - 0, /* */ + 0 /* errno */ }; +/* ------------------ */ +static int set_dir_errors(struct path *path, const char *where, int err) +{ + switch ( err ) { + case EPERM : + case EACCES : + return AFPERR_ACCESS; + case EROFS : + return AFPERR_VLOCK; + } + LOG(log_error, logtype_afpd, "setdirparam(%s): %s: %s", fullpathname(path->u_name), where, strerror(err) ); + return AFPERR_PARAM; +} + +/* ------------------ */ int setdirparams(const struct vol *vol, - struct path *path, u_int16_t bitmap, char *buf ) + struct path *path, u_int16_t d_bitmap, char *buf ) { struct maccess ma; struct adouble ad; @@ -1603,15 +1649,126 @@ int setdirparams(const struct vol *vol, struct timeval tv; char *upath; - int bit = 0, aint, isad = 1; + struct dir *dir; + int bit, isad = 1; + int cdate, bdate; + int owner, group; u_int16_t ashort, bshort; int err = AFP_OK; int change_mdate = 0; int change_parent_mdate = 0; int newdate = 0; + u_int16_t bitmap = d_bitmap; + u_char finder_buf[32]; + u_int32_t upriv; + mode_t mpriv = 0; + u_int16_t upriv_bit = 0; + bit = 0; upath = path->u_name; - ad_init(&ad, vol->v_adouble); + dir = path->d_dir; + while ( bitmap != 0 ) { + while (( bitmap & 1 ) == 0 ) { + bitmap = bitmap>>1; + bit++; + } + + switch( bit ) { + case DIRPBIT_ATTR : + change_mdate = 1; + memcpy( &ashort, buf, sizeof( ashort )); + buf += sizeof( ashort ); + break; + case DIRPBIT_CDATE : + change_mdate = 1; + memcpy(&cdate, buf, sizeof(cdate)); + buf += sizeof( cdate ); + break; + case DIRPBIT_MDATE : + memcpy(&newdate, buf, sizeof(newdate)); + buf += sizeof( newdate ); + break; + case DIRPBIT_BDATE : + change_mdate = 1; + memcpy(&bdate, buf, sizeof(bdate)); + buf += sizeof( bdate ); + break; + case DIRPBIT_FINFO : + change_mdate = 1; + memcpy( finder_buf, buf, 32 ); + buf += 32; + break; + case DIRPBIT_UID : /* What kind of loser mounts as root? */ + change_parent_mdate = 1; + memcpy( &owner, buf, sizeof(owner)); + buf += sizeof( owner ); + break; + case DIRPBIT_GID : + change_parent_mdate = 1; + memcpy( &group, buf, sizeof( group )); + buf += sizeof( group ); + break; + case DIRPBIT_ACCESS : + change_mdate = 1; + change_parent_mdate = 1; + ma.ma_user = *buf++; + ma.ma_world = *buf++; + ma.ma_group = *buf++; + ma.ma_owner = *buf++; + mpriv = mtoumode( &ma ) | vol->v_dperm; + if (dir_rx_set(mpriv) && setdirmode( vol, upath, mpriv) < 0 ) { + err = set_dir_errors(path, "setdirmode", errno); + bitmap = 0; + } + 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 : + if (afp_version < 30) { + buf += 6; + } + else { + err = AFPERR_BITMAP; + bitmap = 0; + } + break; + case DIRPBIT_UNIXPR : + if (vol_unix_priv(vol)) { + memcpy( &owner, buf, sizeof(owner)); /* FIXME need to change owner too? */ + buf += sizeof( owner ); + memcpy( &group, buf, sizeof( group )); + buf += sizeof( group ); + + change_mdate = 1; + change_parent_mdate = 1; + memcpy( &upriv, buf, sizeof( upriv )); + buf += sizeof( upriv ); + upriv = ntohl (upriv) | vol->v_dperm; + if (dir_rx_set(upriv)) { + /* maybe we are trying to set perms back */ + if ( setdirunixmode(vol, upath, upriv) < 0 ) { + bitmap = 0; + err = set_dir_errors(path, "setdirunixmode", errno); + } + } + else { + /* do it later */ + upriv_bit = 1; + } + break; + } + /* fall through */ + default : + err = AFPERR_BITMAP; + bitmap = 0; + break; + } + + bitmap = bitmap>>1; + bit++; + } + ad_init(&ad, vol->v_adouble, vol->v_ad_options); if (ad_open( upath, vol_noadouble(vol)|ADFLAGS_HF|ADFLAGS_DIR, O_RDWR|O_CREAT, 0666, &ad) < 0) { @@ -1623,8 +1780,9 @@ int setdirparams(const struct vol *vol, * note: we also don't need to worry about mdate. also, be quiet * if we're using the noadouble option. */ - if (!vol_noadouble(vol) && (bitmap & - ~((1<d_m_name )); - memcpy( ad_entry( &ad, ADEID_NAME ), curdir->d_m_name, - ad_getentrylen( &ad, ADEID_NAME )); + if ( (ad_get_HF_flags( &ad ) & O_CREAT)) { + ad_setname(&ad, curdir->d_m_name); } } + bit = 0; + bitmap = d_bitmap; while ( bitmap != 0 ) { while (( bitmap & 1 ) == 0 ) { bitmap = bitmap>>1; @@ -1650,262 +1808,120 @@ 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); + if ((bshort & htons(ATTRBIT_INVISIBLE)) != + (ashort & htons(ATTRBIT_INVISIBLE) & htons(ATTRBIT_SETCLR)) ) + change_parent_mdate = 1; if ( ntohs( ashort ) & ATTRBIT_SETCLR ) { bshort |= htons( ntohs( ashort ) & ~ATTRBIT_SETCLR ); } else { 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); + ad_setdate(&ad, AD_DATE_CREATE, cdate); } - buf += sizeof( aint ); break; - case DIRPBIT_MDATE : - 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); + ad_setdate(&ad, AD_DATE_BACKUP, bdate); } - buf += sizeof( aint ); 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 - * with the root of a volume, are the directory's - * location information. This eliminates that annoying - * behavior one sees when mounting above another mount - * point. - */ if (isad) { - if ( curdir->d_did == DIRDID_ROOT ) { - memcpy( ad_entry( &ad, ADEID_FINDERI ), buf, 10 ); - memcpy( ad_entry( &ad, ADEID_FINDERI ) + 14, buf + 14, 18 ); + if ( dir->d_did == DIRDID_ROOT ) { + /* + * Alright, we admit it, this is *really* sick! + * The 4 bytes that we don't copy, when we're dealing + * with the root of a volume, are the directory's + * location information. This eliminates that annoying + * behavior one sees when mounting above another mount + * point. + */ + memcpy( ad_entry( &ad, ADEID_FINDERI ), finder_buf, 10 ); + memcpy( ad_entry( &ad, ADEID_FINDERI ) + 14, finder_buf + 14, 18 ); } else { - memcpy( ad_entry( &ad, ADEID_FINDERI ), buf, 32 ); + memcpy( ad_entry( &ad, ADEID_FINDERI ), finder_buf, 32 ); } } - buf += 32; 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) && - (setdeskowner( ntohl(aint), -1 ) < 0)) { - switch ( errno ) { - case EPERM : - case EACCES : - err = AFPERR_ACCESS; - goto setdirparam_done; - break; - case EROFS : - err = AFPERR_VLOCK; - goto setdirparam_done; - break; - default : - LOG(log_error, logtype_afpd, "setdirparam: setdeskowner: %s", - strerror(errno) ); - if (!isad) { - err = AFPERR_PARAM; - goto setdirparam_done; - } - break; + if ( (dir->d_did == DIRDID_ROOT) && + (setdeskowner( ntohl(owner), -1 ) < 0)) { + err = set_dir_errors(path, "setdeskowner", errno); + if (isad && err == AFPERR_PARAM) { + err = AFP_OK; /* ???*/ } - } - if ( setdirowner( ntohl(aint), -1, vol_noadouble(vol) ) < 0 ) { - switch ( errno ) { - case EPERM : - case EACCES : - err = AFPERR_ACCESS; - goto setdirparam_done; - break; - case EROFS : - err = AFPERR_VLOCK; + else { goto setdirparam_done; - break; - default : - LOG(log_error, logtype_afpd, "setdirparam: setdirowner: %s", - strerror(errno) ); - break; } } + if ( setdirowner(vol, upath, ntohl(owner), -1 ) < 0 ) { + err = set_dir_errors(path, "setdirowner", errno); + goto setdirparam_done; + } break; case DIRPBIT_GID : - change_parent_mdate = 1; - memcpy( &aint, buf, sizeof( aint )); - buf += sizeof( aint ); - if (curdir->d_did == DIRDID_ROOT) - setdeskowner( -1, ntohl(aint) ); - -#if 0 /* don't error if we can't set the desktop owner. */ - switch ( errno ) { - case EPERM : - case EACCES : - err = AFPERR_ACCESS; + if (dir->d_did == DIRDID_ROOT) + setdeskowner( -1, ntohl(group) ); + if ( setdirowner(vol, upath, -1, ntohl(group) ) < 0 ) { + err = set_dir_errors(path, "setdirowner", errno); goto setdirparam_done; - break; - case EROFS : - err = AFPERR_VLOCK; - goto setdirparam_done; - break; - default : - LOG(log_error, logtype_afpd, "setdirparam: setdeskowner: %m" ); - if (!isad) { - err = AFPERR_PARAM; - goto setdirparam_done; - } - break; } -#endif /* 0 */ - - if ( setdirowner( -1, ntohl(aint), vol_noadouble(vol) ) < 0 ) { - switch ( errno ) { - case EPERM : - case EACCES : + break; + case DIRPBIT_ACCESS : + if (dir->d_did == DIRDID_ROOT) { + setdeskmode(mpriv); + if (!dir_rx_set(mpriv)) { + /* we can't remove read and search for owner on volume root */ err = AFPERR_ACCESS; goto setdirparam_done; - break; - case EROFS : - err = AFPERR_VLOCK; - goto setdirparam_done; - break; - default : - 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++; - ma.ma_owner = *buf++; - if (curdir->d_did == DIRDID_ROOT) - setdeskmode(mtoumode( &ma )); -#if 0 /* don't error if we can't set the desktop mode */ - 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: setdeskmode: %s", - strerror(errno) ); - break; - err = AFPERR_PARAM; + if (!dir_rx_set(mpriv) && setdirmode( vol, upath, mpriv) < 0 ) { + err = set_dir_errors(path, "setdirmode", errno); goto setdirparam_done; } -#endif /* 0 */ - - 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 : - LOG(log_error, logtype_afpd, "setdirparam: setdirmode: %s", - strerror(errno) ); - err = AFPERR_PARAM; - goto setdirparam_done; - } - } 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 : - if (afp_version < 30) { - buf += 6; - break; - } - - case DIRPBIT_UNIXPR : - /* Skip UID and GID for now, there seems to be now way to set them from an OSX client anyway */ - buf += sizeof( aint ); - buf += sizeof( aint ); - - change_mdate = 1; - change_parent_mdate = 1; - memcpy( &aint, buf, sizeof( aint )); - buf += sizeof( aint ); - aint = ntohl (aint); - if (curdir->d_did == DIRDID_ROOT) - setdeskmode( aint ); -#if 0 /* don't error if we can't set the desktop mode */ - 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: setdeskmode: %s", - strerror(errno) ); - break; - err = AFPERR_PARAM; + if (afp_version >= 30) { + err = AFPERR_BITMAP; goto setdirparam_done; } -#endif /* 0 */ - - if ( setdirunixmode( aint, 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; + break; + case DIRPBIT_UNIXPR : + if (vol_unix_priv(vol)) { + if (dir->d_did == DIRDID_ROOT) { + if (!dir_rx_set(upriv)) { + /* we can't remove read and search for owner on volume root */ + err = AFPERR_ACCESS; + goto setdirparam_done; + } + setdeskowner( -1, ntohl(group) ); + setdeskmode( upriv ); + } + if ( setdirowner(vol, upath, -1, ntohl(group) ) < 0 ) { + err = set_dir_errors(path, "setdirowner", errno); goto setdirparam_done; - default : - LOG(log_error, logtype_afpd, "setdirparam: setdirmode: %s", - strerror(errno) ); - err = AFPERR_PARAM; + } + + if ( upriv_bit && setdirunixmode(vol, upath, upriv) < 0 ) { + err = set_dir_errors(path, "setdirunixmode", errno); goto setdirparam_done; } } + else { + err = AFPERR_BITMAP; + goto setdirparam_done; + } break; - default : err = AFPERR_BITMAP; goto setdirparam_done; @@ -1931,20 +1947,19 @@ setdirparam_done: if (path->st_valid && !path->st_errno) { struct stat *st = &path->st; - if (curdir->d_parent) { - ad_setid(&ad,(vol->v_flags & AFPVOL_NODEV)?0:st->st_dev, - st->st_ino, curdir->d_did, curdir->d_parent->d_did, vol->v_stamp); + if (dir && dir->d_parent) { + ad_setid(&ad, st->st_dev, st->st_ino, dir->d_did, dir->d_parent->d_did, vol->v_stamp); } } - ad_flush( &ad, ADFLAGS_HF ); ad_close( &ad, ADFLAGS_HF ); } - if (change_parent_mdate && curdir->d_did != DIRDID_ROOT + if (change_parent_mdate && dir->d_did != DIRDID_ROOT && gettimeofday(&tv, NULL) == 0) { - if (!movecwd(vol, curdir->d_parent)) { + if (!movecwd(vol, dir->d_parent)) { newdate = AD_DATE_FROM_UNIX(tv.tv_sec); + /* be careful with bitmap because now dir is null */ bitmap = 1<d_u_name); + + dfd = dirfd( dp ); + if ( fsync ( dfd ) < 0 ) + LOG(log_error, logtype_afpd, "afp_syncdir(%s): %s", + dir->d_u_name, strerror(errno) ); + closedir(dp); /* closes dfd too */ +#endif + + if ( -1 == (dfd = open(vol->ad_path(".", ADFLAGS_DIR), O_RDWR))) { + switch( errno ) { + case ENOENT: + return( AFPERR_NOOBJ ); + case EACCES: + return( AFPERR_ACCESS ); + default: + return( AFPERR_PARAM ); + } + } + + LOG(log_debug, logtype_afpd, "afp_syncdir: ad-file: '%s'", + vol->ad_path(".", ADFLAGS_DIR) ); + + if ( fsync(dfd) < 0 ) + LOG(log_error, logtype_afpd, "afp_syncdir(%s): %s", + vol->ad_path(dir->d_u_name, ADFLAGS_DIR), strerror(errno) ); + close(dfd); + } + + return ( AFP_OK ); +} + int afp_createdir(obj, ibuf, ibuflen, rbuf, rbuflen ) -AFPObj *obj; +AFPObj *obj; char *ibuf, *rbuf; -int ibuflen, *rbuflen; +int ibuflen _U_, *rbuflen; { struct adouble ad; struct vol *vol; @@ -1998,9 +2106,6 @@ int ibuflen, *rbuflen; return AFPERR_EXIST; upath = s_path->u_name; - if (0 != (err = check_name(vol, upath))) { - return err; - } if (AFP_OK != (err = netatalk_mkdir( upath))) { return err; @@ -2018,20 +2123,15 @@ int ibuflen, *rbuflen; return( AFPERR_PARAM ); } - ad_init(&ad, vol->v_adouble); + ad_init(&ad, vol->v_adouble, vol->v_ad_options); if (ad_open( ".", vol_noadouble(vol)|ADFLAGS_HF|ADFLAGS_DIR, O_RDWR|O_CREAT, 0666, &ad ) < 0) { if (vol_noadouble(vol)) goto createdir_done; return( AFPERR_ACCESS ); } - - 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_setid( &ad, (vol->v_flags & AFPVOL_NODEV)?0:s_path->st.st_dev, - s_path->st.st_ino, dir->d_did, did, vol->v_stamp); + 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); ad_flush( &ad, ADFLAGS_HF ); ad_close( &ad, ADFLAGS_HF ); @@ -2049,10 +2149,10 @@ createdir_done: * newparent curdir * */ -int renamedir(src, dst, dir, newparent, newname, noadouble) +int renamedir(vol, src, dst, dir, newparent, newname) +const struct vol *vol; char *src, *dst, *newname; struct dir *dir, *newparent; -const int noadouble; { struct adouble ad; struct dir *parent; @@ -2074,7 +2174,7 @@ const int noadouble; case EXDEV: /* this needs to copy and delete. bleah. that means we have * to deal with entire directory hierarchies. */ - if ((err = copydir(src, dst, noadouble)) < 0) { + if ((err = copydir(vol, src, dst)) < 0) { deletedir(dst); return err; } @@ -2086,19 +2186,25 @@ const int noadouble; } } - ad_init(&ad, 0); /* FIXME */ + if (vol->v_adouble == AD_VERSION2_OSX) { + /* We simply move the corresponding ad file as well */ + char tempbuf[258]="._"; + rename(vol->ad_path(src,0),strcat(tempbuf,dst)); + } len = strlen( newname ); /* rename() succeeded so we need to update our tree even if we can't open * .Parent */ - if ( !ad_open( dst, ADFLAGS_HF|ADFLAGS_DIR, O_RDWR, 0, &ad)) { - ad_setentrylen( &ad, ADEID_NAME, len ); - memcpy( ad_entry( &ad, ADEID_NAME ), newname, len ); + + ad_init(&ad, vol->v_adouble, vol->v_ad_options); + + if (!ad_open( dst, ADFLAGS_HF|ADFLAGS_DIR, O_RDWR, 0, &ad)) { + ad_setname(&ad, newname); ad_flush( &ad, ADFLAGS_HF ); ad_close( &ad, ADFLAGS_HF ); } - + if (dir->d_m_name == dir->d_u_name) dir->d_u_name = NULL; @@ -2139,10 +2245,9 @@ const int noadouble; #define DOT_APPLEDOUBLE_LEN 13 /* delete an empty directory */ -int deletecurdir( vol, path, pathlen ) +int deletecurdir( vol, path ) const struct vol *vol; char *path; -int pathlen; { struct dirent *de; struct stat st; @@ -2158,9 +2263,8 @@ int pathlen; fdir = curdir; - ad_init(&ad, vol->v_adouble); - if ( ad_open( ".", ADFLAGS_HF|ADFLAGS_DIR, O_RDONLY, - DIRBITS | 0777, &ad) == 0 ) { + ad_init(&ad, vol->v_adouble, vol->v_ad_options); + if ( ad_metadata( ".", ADFLAGS_DIR, &ad) == 0 ) { ad_getattr(&ad, &ashort); ad_close( &ad, ADFLAGS_HF ); @@ -2169,33 +2273,41 @@ int pathlen; } } - /* delete stray .AppleDouble files. this happens to get .Parent files - as well. */ - if ((dp = opendir(".AppleDouble"))) { - strcpy(path, ".AppleDouble/"); - while ((de = readdir(dp))) { - /* skip this and previous directory */ - if (!strcmp(de->d_name, ".") || !strcmp(de->d_name, "..")) - continue; - - /* bail if the file exists in the current directory. - * note: this will not fail with dangling symlinks */ - if (stat(de->d_name, &st) == 0) { - closedir(dp); - return AFPERR_DIRNEMPT; - } + if (vol->v_adouble == AD_VERSION2_OSX) { + + if ((err = netatalk_unlink(vol->ad_path(".",0) )) ) { + return err; + } + } + else { + /* delete stray .AppleDouble files. this happens to get .Parent files + as well. */ + if ((dp = opendir(".AppleDouble"))) { + strcpy(path, ".AppleDouble/"); + while ((de = readdir(dp))) { + /* skip this and previous directory */ + if (!strcmp(de->d_name, ".") || !strcmp(de->d_name, "..")) + continue; + + /* bail if the file exists in the current directory. + * note: this will not fail with dangling symlinks */ + if (stat(de->d_name, &st) == 0) { + closedir(dp); + return AFPERR_DIRNEMPT; + } - strcpy(path + DOT_APPLEDOUBLE_LEN, de->d_name); - if ((err = netatalk_unlink(path))) { - closedir(dp); - return err; + strcpy(path + DOT_APPLEDOUBLE_LEN, de->d_name); + if ((err = netatalk_unlink(path))) { + closedir(dp); + return err; + } } + closedir(dp); } - closedir(dp); - } - if ( (err = netatalk_rmdir( ".AppleDouble" )) ) { - return err; + if ( (err = netatalk_rmdir( ".AppleDouble" )) ) { + return err; + } } /* now get rid of dangling symlinks */ @@ -2241,9 +2353,9 @@ delete_done: } int afp_mapid(obj, ibuf, ibuflen, rbuf, rbuflen ) -AFPObj *obj; +AFPObj *obj; char *ibuf, *rbuf; -int ibuflen, *rbuflen; +int ibuflen _U_, *rbuflen; { struct passwd *pw; struct group *gr; @@ -2272,7 +2384,7 @@ int ibuflen, *rbuflen; if (( pw = getpwuid( id )) == NULL ) { return( AFPERR_NOITEM ); } - len = convert_string_allocate( obj->options.unixcharset, ((sfunc == 1)?obj->options.maccharset:CH_UTF8_MAC), + len = convert_string_allocate( obj->options.unixcharset, ((!utf8)?obj->options.maccharset:CH_UTF8_MAC), pw->pw_name, strlen(pw->pw_name), &name); break; @@ -2281,7 +2393,7 @@ int ibuflen, *rbuflen; if (NULL == ( gr = (struct group *)getgrgid( id ))) { return( AFPERR_NOITEM ); } - len = convert_string_allocate( obj->options.unixcharset, (sfunc == 1)?obj->options.maccharset:CH_UTF8_MAC, + len = convert_string_allocate( obj->options.unixcharset, (!utf8)?obj->options.maccharset:CH_UTF8_MAC, gr->gr_name, strlen(gr->gr_name), &name); break; @@ -2314,9 +2426,9 @@ int ibuflen, *rbuflen; } int afp_mapname(obj, ibuf, ibuflen, rbuf, rbuflen ) -AFPObj *obj; +AFPObj *obj _U_; char *ibuf, *rbuf; -int ibuflen, *rbuflen; +int ibuflen _U_, *rbuflen; { struct passwd *pw; struct group *gr; @@ -2378,9 +2490,9 @@ int ibuflen, *rbuflen; variable DID support */ int afp_closedir(obj, ibuf, ibuflen, rbuf, rbuflen ) -AFPObj *obj; -char *ibuf, *rbuf; -int ibuflen, *rbuflen; +AFPObj *obj _U_; +char *ibuf _U_, *rbuf _U_; +int ibuflen _U_, *rbuflen; { #if 0 struct vol *vol; @@ -2417,9 +2529,9 @@ int ibuflen, *rbuflen; * there's a pb again with case but move it to cname */ int afp_opendir(obj, ibuf, ibuflen, rbuf, rbuflen ) -AFPObj *obj; +AFPObj *obj _U_; char *ibuf, *rbuf; -int ibuflen, *rbuflen; +int ibuflen _U_, *rbuflen; { struct vol *vol; struct dir *parentdir;