adp = &ad;
}
- if ( ad_open( path->u_name, ADFLAGS_HF | ((isdir)?ADFLAGS_DIR:0), O_RDONLY, 0, adp) < 0 ) {
+ if ( ad_metadata( path->u_name, ((isdir)?ADFLAGS_DIR:0), adp) < 0 ) {
return NULL;
}
return adp;
/*
- * $Id: desktop.c,v 1.26.2.4.2.13 2004-05-04 15:38:24 didg Exp $
+ * $Id: desktop.c,v 1.26.2.4.2.14 2004-05-10 18:40:32 didg Exp $
*
* See COPYRIGHT.
*
} else
adp = of->of_ad;
- if ( ad_open( upath,
- ( isadir) ? ADFLAGS_HF|ADFLAGS_DIR : ADFLAGS_HF,
- O_RDONLY, 0666, adp) < 0 ) {
+ if ( ad_metadata( upath,( isadir) ? ADFLAGS_DIR : 0, adp) < 0 ) {
return( AFPERR_NOITEM );
}
/*
- * $Id: directory.c,v 1.71.2.4.2.13 2004-05-04 15:38:24 didg Exp $
+ * $Id: directory.c,v 1.71.2.4.2.14 2004-05-10 18:40:32 didg Exp $
*
* Copyright (c) 1990,1993 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
#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 */
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;
}
}
- path->dir = dir;
+ path->d_dir = dir;
if ( movecwd( vol, dir ) < 0 ) {
return( NULL );
}
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 ) {
*/
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 ) {
}
if (*path == '\0') {
ret.u_name = ".";
- ret.dir = dir;
+ ret.d_dir = dir;
}
return &ret;
} /* if (len == 0) */
(1 << DIRPBIT_FINFO)))) {
ad_init(&ad, vol->v_adouble);
- if ( !ad_open( upath, ADFLAGS_HF|ADFLAGS_DIR, O_RDONLY,
- DIRBITS | 0777, &ad)) {
+ if ( !ad_metadata( upath, ADFLAGS_DIR, &ad) ) {
isad = 1;
}
}
*data++ = ma.ma_group;
*data++ = ma.ma_owner;
break;
-
-
+
default :
if ( isad ) {
ad_close( &ad, ADFLAGS_HF );
*/
if (path_isadir(path))
return afp_errno;
- if (path->st_errno)
+ if (path->st_valid && path->st_errno)
return error;
return AFPERR_BADTYPE ;
}
}
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;
}
/*
0, /* */
};
+/* ------------------ */
+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;
struct timeval tv;
char *upath;
- int bit = 0, aint, isad = 1;
+ struct dir *dir;
+ int bit, aint, 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;
+ u_int16_t upriv_bit = 0;
+ bit = 0;
upath = path->u_name;
+ 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 ));
+ if ((ashort & htons(ATTRBIT_INVISIBLE)))
+ change_parent_mdate = 1;
+ 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 );
+ 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. <shirsch@ibm.net> */
+ case DIRPBIT_PDINFO :
+ if (afp_version < 30) {
+ buf += 6;
+ }
+ else {
+ err = AFPERR_BITMAP;
+ bitmap = 0;
+ }
+ break;
+ case DIRPBIT_UNIXPR :
+ if (vol_unix_priv(vol)) {
+ /* Skip UID and GID for now, there seems to be no way to set them from an OSX client anyway */
+ buf += sizeof( aint );
+ buf += sizeof( aint );
+
+ change_mdate = 1;
+ change_parent_mdate = 1;
+ memcpy( &upriv, buf, sizeof( upriv ));
+ buf += sizeof( upriv );
+ upriv = ntohl (upriv);
+ 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, "setdirmode", 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);
if (ad_open( upath, vol_noadouble(vol)|ADFLAGS_HF|ADFLAGS_DIR,
* 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<<DIRPBIT_ACCESS)|(1<<DIRPBIT_UID)|(1<<DIRPBIT_GID)|
+ if (!vol_noadouble(vol) && (d_bitmap &
+ ~((1<<DIRPBIT_ACCESS)|(1<<DIRPBIT_UNIXPR)|
+ (1<<DIRPBIT_UID)|(1<<DIRPBIT_GID)|
(1<<DIRPBIT_MDATE)|(1<<DIRPBIT_PDINFO)))) {
return AFPERR_ACCESS;
}
}
}
+ bit = 0;
+ bitmap = d_bitmap;
while ( bitmap != 0 ) {
while (( bitmap & 1 ) == 0 ) {
bitmap = bitmap>>1;
switch( bit ) {
case DIRPBIT_ATTR :
- change_mdate = 1;
if (isad) {
- memcpy( &ashort, buf, sizeof( ashort ));
ad_getattr(&ad, &bshort);
if ( ntohs( ashort ) & ATTRBIT_SETCLR ) {
bshort |= htons( ntohs( ashort ) & ~ATTRBIT_SETCLR );
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(%s): setdeskowner: %s",
- path->u_name, 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(vol, ntohl(aint), -1 ) < 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(%s): setdirowner: %s",
- path->u_name, 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 (dir->d_did == DIRDID_ROOT)
+ setdeskowner( -1, ntohl(group) );
#if 0 /* don't error if we can't set the desktop owner. */
- 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(%s): setdeskowner: %s", path->u_name, strerror(errno) );
- if (!isad) {
- err = AFPERR_PARAM;
+ err = set_dir_errors(path, "setdeskowner", errno);
+ if (isad && err == AFPERR_PARAM) {
+ err = AFP_OK; /* ???*/
+ }
+ else {
goto setdirparam_done;
}
- break;
- }
#endif /* 0 */
- if ( setdirowner(vol, -1, ntohl(aint) ) < 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(%s): setdirowner: %s",
- path->u_name, strerror(errno) );
- break;
- }
+ if ( setdirowner(vol, upath, -1, ntohl(group) ) < 0 ) {
+ err = set_dir_errors(path, "setdirowner", errno);
+ goto setdirparam_done;
}
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(%s): setdeskmode: %s",
- path->u_name, strerror(errno) );
- break;
- err = AFPERR_PARAM;
- goto setdirparam_done;
- }
-#endif /* 0 */
-
- if ( setdirmode( vol, mtoumode( &ma )) < 0 ) {
- switch ( errno ) {
- case EPERM :
- case EACCES :
+ 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;
- case EROFS :
- err = AFPERR_VLOCK;
- goto setdirparam_done;
- default :
- LOG(log_error, logtype_afpd, "setdirparam(%s): setdirmode: %s",
- path->u_name, 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. <shirsch@ibm.net> */
- 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;
+ if (!dir_rx_set(mpriv) && setdirmode( vol, upath, mpriv) < 0 ) {
+ err = set_dir_errors(path, "setdirmode", errno);
goto setdirparam_done;
- default :
- LOG(log_error, logtype_afpd, "setdirparam(%s): setdeskmode: %s",
- path->u_name, strerror(errno) );
- break;
- err = AFPERR_PARAM;
+ }
+ break;
+ case DIRPBIT_PDINFO :
+ if (afp_version >= 30) {
+ err = AFPERR_BITMAP;
goto setdirparam_done;
}
-#endif /* 0 */
+ break;
+ case DIRPBIT_UNIXPR :
+ if (vol_unix_priv(vol)) {
+ if (dir->d_did == DIRDID_ROOT) {
+ setdeskmode( upriv );
+ if (!dir_rx_set(upriv)) {
+ /* we can't remove read and search for owner on volume root */
+ err = AFPERR_ACCESS;
+ goto setdirparam_done;
+ }
+ }
- if ( setdirunixmode(vol, aint) < 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(%s): setdirmode: %s",
- path->u_name, strerror(errno) );
- err = AFPERR_PARAM;
+ if ( upriv_bit && setdirunixmode(vol, upath, upriv) < 0 ) {
+ err = set_dir_errors(path, "setdirmode", errno);
goto setdirparam_done;
}
+ break;
}
- break;
-
+ /* fall through */
default :
err = AFPERR_BITMAP;
goto setdirparam_done;
if (path->st_valid && !path->st_errno) {
struct stat *st = &path->st;
- if (curdir->d_parent) {
+ if (dir && dir->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);
+ 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<<DIRPBIT_MDATE;
setdirparams(vol, &Cur_Path, bitmap, (char *)&newdate);
/* should we reset curdir ?*/
fdir = curdir;
ad_init(&ad, vol->v_adouble);
- if ( ad_open( ".", ADFLAGS_HF|ADFLAGS_DIR, O_RDONLY,
- DIRBITS | 0777, &ad) == 0 ) {
+ if ( ad_metadata( ".", ADFLAGS_DIR, &ad) == 0 ) {
ad_getattr(&ad, &ashort);
ad_close( &ad, ADFLAGS_HF );
/*
- * $Id: directory.h,v 1.13.2.4.2.1 2004-03-11 02:01:59 didg Exp $
+ * $Id: directory.h,v 1.13.2.4.2.2 2004-05-10 18:40:32 didg Exp $
*
* Copyright (c) 1990,1991 Regents of The University of Michigan.
* All Rights Reserved.
int m_type; /* mac name type (long name, unicode */
char *m_name; /* mac name */
char *u_name; /* unix name */
- struct dir *dir; /* */
+ struct dir *d_dir; /* */
int st_valid; /* does st_errno and st set */
int st_errno;
struct stat st;
#ifndef ATACC
static __inline__ 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 */
/*
- * $Id: file.c,v 1.92.2.2.2.24 2004-05-04 15:38:24 didg Exp $
+ * $Id: file.c,v 1.92.2.2.2.25 2004-05-10 18:40:32 didg Exp $
*
* Copyright (c) 1990,1993 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
memcpy(data, &aint, sizeof( aint ));
data += sizeof( aint );
break;
- case FILPBIT_UNIXPR :
+ case FILPBIT_UNIXPR :
/* accessmode may change st_mode with ACLs */
accessmode( upath, &ma, dir , st);
memcpy( data, &aint, sizeof( aint ));
data += sizeof( aint );
-
*data++ = ma.ma_user;
*data++ = ma.ma_world;
*data++ = ma.ma_group;
*data++ = ma.ma_owner;
break;
-
+
default :
return( AFPERR_BITMAP );
}
adp = &ad;
}
- if ( ad_open( upath, ADFLAGS_HF, O_RDONLY, 0, adp) < 0 ) {
- adp = NULL;
+ if ( ad_metadata( upath, 0, adp) < 0 ) {
+ switch (errno) {
+ case EACCES:
+ LOG(log_error, logtype_afpd, "getfilparams(%s): %s: check resource fork permission?",
+ upath, strerror(errno));
+ return AFPERR_ACCESS;
+ case EIO:
+ LOG(log_error, logtype_afpd, "getfilparams(%s): bad resource fork", upath);
+ /* fall through */
+ case ENOENT:
+ default:
+ adp = NULL;
+ break;
+ }
}
- else {
+ if (adp) {
/* FIXME
we need to check if the file is open by another process.
it's slow so we only do it if we have to:
/*
* cf AFP3.0.pdf page 252 for change_mdate and change_parent_mdate logic
- *
+ *
*/
extern struct path Cur_Path;
int setfilparams(struct vol *vol,
- struct path *path, u_int16_t bitmap, char *buf )
+ struct path *path, u_int16_t f_bitmap, char *buf )
{
struct adouble ad, *adp;
struct ofork *of;
struct extmap *em;
- int bit = 0, isad = 1, err = AFP_OK;
+ int bit, isad = 1, err = AFP_OK;
char *upath;
u_char achar, *fdType, xyy[4];
u_int16_t ashort, bshort;
u_int32_t aint;
+ u_int32_t upriv;
+ u_int16_t upriv_bit = 0;
+
struct utimbuf ut;
int change_mdate = 0;
struct timeval tv;
uid_t f_uid;
gid_t f_gid;
-
+ u_int16_t bitmap = f_bitmap;
+ u_int32_t cdate,bdate;
+ u_char finder_buf[32];
#ifdef DEBUG
LOG(log_info, logtype_afpd, "begin setfilparams:");
return AFPERR_ACCESS;
}
- if (ad_open( upath, vol_noadouble(vol) | ADFLAGS_HF,
- O_RDWR|O_CREAT, 0666, adp) < 0) {
- /* for some things, we don't need an adouble header */
- if (bitmap & ~(1<<FILPBIT_MDATE)) {
- return vol_noadouble(vol) ? AFP_OK : AFPERR_ACCESS;
- }
- isad = 0;
- } else if ((ad_get_HF_flags( adp ) & O_CREAT) ) {
- ad_setname(adp, path->m_name);
- }
-
+ /* with unix priv maybe we have to change adouble file priv first */
+ bit = 0;
while ( bitmap != 0 ) {
while (( bitmap & 1 ) == 0 ) {
bitmap = bitmap>>1;
bit++;
}
-
switch( bit ) {
case FILPBIT_ATTR :
change_mdate = 1;
memcpy(&ashort, buf, sizeof( ashort ));
- ad_getattr(adp, &bshort);
- if ( ntohs( ashort ) & ATTRBIT_SETCLR ) {
- bshort |= htons( ntohs( ashort ) & ~ATTRBIT_SETCLR );
- } else {
- bshort &= ~ashort;
- }
if ((ashort & htons(ATTRBIT_INVISIBLE)))
change_parent_mdate = 1;
- ad_setattr(adp, bshort);
buf += sizeof( ashort );
break;
-
case FILPBIT_CDATE :
change_mdate = 1;
- memcpy(&aint, buf, sizeof(aint));
- ad_setdate(adp, AD_DATE_CREATE, aint);
- buf += sizeof( aint );
+ memcpy(&cdate, buf, sizeof(cdate));
+ buf += sizeof( cdate );
break;
-
case FILPBIT_MDATE :
memcpy(&newdate, buf, sizeof( newdate ));
buf += sizeof( newdate );
break;
-
case FILPBIT_BDATE :
change_mdate = 1;
- memcpy(&aint, buf, sizeof(aint));
- ad_setdate(adp, AD_DATE_BACKUP, aint);
- buf += sizeof( aint );
+ memcpy(&bdate, buf, sizeof( bdate));
+ buf += sizeof( bdate );
break;
-
case FILPBIT_FINFO :
change_mdate = 1;
-
- if (!memcmp( ad_entry( adp, ADEID_FINDERI ), ufinderi, 8 )
- && (
- ((em = getextmap( path->m_name )) &&
- !memcmp(buf, em->em_type, sizeof( em->em_type )) &&
- !memcmp(buf + 4, em->em_creator,sizeof( em->em_creator)))
- || ((em = getdefextmap()) &&
- !memcmp(buf, em->em_type, sizeof( em->em_type )) &&
- !memcmp(buf + 4, em->em_creator,sizeof( em->em_creator)))
- )) {
- memcpy(buf, ufinderi, 8 );
- }
-
- memcpy(ad_entry( adp, ADEID_FINDERI ), buf, 32 );
+ memcpy(finder_buf, buf, 32 );
buf += 32;
break;
-
case FILPBIT_UNIXPR :
+ if (!vol_unix_priv(vol)) {
+ /* this volume doesn't use unix priv */
+ err = AFPERR_BITMAP;
+ bitmap = 0;
+ break;
+ }
change_mdate = 1;
change_parent_mdate = 1;
buf += sizeof( aint );
setfilowner(vol, f_uid, f_gid, path);
- memcpy( &aint, buf, sizeof( aint ));
- buf += sizeof( aint );
- aint = ntohl (aint);
- setfilunixmode(vol, path, aint);
+ memcpy( &upriv, buf, sizeof( upriv ));
+ buf += sizeof( upriv );
+ upriv = ntohl (upriv);
+ if ((upriv & S_IWUSR)) {
+ setfilunixmode(vol, path, upriv);
+ }
+ else {
+ /* do it later */
+ upriv_bit = 1;
+ }
break;
- /* Client needs to set the ProDOS file info for this file.
- Use a defined string for TEXT to support crlf
- translations and convert all else into pXYY per Inside
- Appletalk. Always set the creator as "pdos". Changes
- from original by Marsha Jackson. */
case FILPBIT_PDINFO :
if (afp_version < 30) { /* else it's UTF8 name */
achar = *buf;
xyy[2] = *buf++;
fdType = xyy;
}
+ break;
+ }
+ /* fallthrough */
+ default :
+ err = AFPERR_BITMAP;
+ /* break while loop */
+ bitmap = 0;
+ break;
+ }
+
+ bitmap = bitmap>>1;
+ bit++;
+ }
+
+ /* second try with adouble open
+ */
+ if (ad_open( upath, vol_noadouble(vol) | ADFLAGS_HF,
+ O_RDWR|O_CREAT, 0666, adp) < 0) {
+ /* for some things, we don't need an adouble header */
+ if (f_bitmap & ~(1<<FILPBIT_MDATE)) {
+ return vol_noadouble(vol) ? AFP_OK : AFPERR_ACCESS;
+ }
+ isad = 0;
+ } else if ((ad_get_HF_flags( adp ) & O_CREAT) ) {
+ ad_setname(adp, path->m_name);
+ }
+
+ bit = 0;
+ bitmap = f_bitmap;
+ while ( bitmap != 0 ) {
+ while (( bitmap & 1 ) == 0 ) {
+ bitmap = bitmap>>1;
+ bit++;
+ }
+
+ switch( bit ) {
+ case FILPBIT_ATTR :
+ ad_getattr(adp, &bshort);
+ if ( ntohs( ashort ) & ATTRBIT_SETCLR ) {
+ bshort |= htons( ntohs( ashort ) & ~ATTRBIT_SETCLR );
+ } else {
+ bshort &= ~ashort;
+ }
+ ad_setattr(adp, bshort);
+ break;
+ case FILPBIT_CDATE :
+ ad_setdate(adp, AD_DATE_CREATE, cdate);
+ break;
+ case FILPBIT_MDATE :
+ break;
+ case FILPBIT_BDATE :
+ ad_setdate(adp, AD_DATE_BACKUP, bdate);
+ break;
+ case FILPBIT_FINFO :
+ if (!memcmp( ad_entry( adp, ADEID_FINDERI ), ufinderi, 8 )
+ && (
+ ((em = getextmap( path->m_name )) &&
+ !memcmp(finder_buf, em->em_type, sizeof( em->em_type )) &&
+ !memcmp(finder_buf + 4, em->em_creator,sizeof( em->em_creator)))
+ || ((em = getdefextmap()) &&
+ !memcmp(finder_buf, em->em_type, sizeof( em->em_type )) &&
+ !memcmp(finder_buf + 4, em->em_creator,sizeof( em->em_creator)))
+ )) {
+ memcpy(finder_buf, ufinderi, 8 );
+ }
+
+ memcpy(ad_entry( adp, ADEID_FINDERI ), finder_buf, 32 );
+ break;
+ case FILPBIT_UNIXPR :
+ if (upriv_bit) {
+ setfilunixmode(vol, path, upriv);
+ }
+ break;
+ case FILPBIT_PDINFO :
+ if (afp_version < 30) { /* else it's UTF8 name */
memcpy(ad_entry( adp, ADEID_FINDERI ), fdType, 4 );
memcpy(ad_entry( adp, ADEID_FINDERI ) + 4, "pdos", 4 );
break;
err = AFPERR_BITMAP;
goto setfilparam_done;
}
-
bitmap = bitmap>>1;
bit++;
}
return get_afp_errno(AFPERR_NOOBJ);
}
if ( *s_path->m_name != '\0' ) {
-#if 0
- return (path_isadir( s_path))? AFPERR_PARAM:AFPERR_BADTYPE ;
-#endif
path_error(s_path, AFPERR_PARAM);
}
int checkAttrib;
{
struct adouble ad;
+ struct adouble *adp = &ad;
int adflags, err = AFP_OK;
#ifdef DEBUG
continue;
case EACCES:
- return AFPERR_ACCESS;
+ adp = NULL; /* maybe it's a file we no rw mode for us */
+ break; /* was return AFPERR_ACCESS;*/
case EROFS:
return AFPERR_VLOCK;
default:
/*
* Does kFPDeleteInhibitBit (bit 8) set?
*/
- if (checkAttrib && (adflags & ADFLAGS_HF)) {
+ if (checkAttrib) {
u_int16_t bshort;
+
+ if (adp && (adflags & ADFLAGS_HF)) {
- ad_getattr(&ad, &bshort);
- if ((bshort & htons(ATTRBIT_NODELETE))) {
- ad_close( &ad, adflags );
- return(AFPERR_OLOCK);
+ ad_getattr(&ad, &bshort);
+ if ((bshort & htons(ATTRBIT_NODELETE))) {
+ ad_close( &ad, adflags );
+ return(AFPERR_OLOCK);
+ }
+ }
+ else if (!adp) {
+ /* was EACCESS error try to get only metadata */
+ ad_init(&ad, vol->v_adouble); /* OK */
+ if ( ad_metadata( file , 0, &ad) == 0 ) {
+ ad_getattr(&ad, &bshort);
+ ad_close( &ad, ADFLAGS_HF );
+ if ((bshort & htons(ATTRBIT_NODELETE))) {
+ return AFPERR_OLOCK;
+ }
+ }
}
}
- if ((adflags & ADFLAGS_HF) ) {
+ if (adp && (adflags & ADFLAGS_HF) ) {
/* FIXME we have a pb here because we want to know if a file is open
* there's a 'priority inversion' if you can't open the ressource fork RW
* you can delete it if it's open because you can't get a write lock.
}
}
- if (ad_tmplock( &ad, ADEID_DFORK, ADLOCK_WR, 0, 0, 0 ) < 0) {
+ if (adp && ad_tmplock( &ad, ADEID_DFORK, ADLOCK_WR, 0, 0, 0 ) < 0) {
err = AFPERR_BUSY;
}
else if (!(err = netatalk_unlink( vol->ad_path( file, ADFLAGS_HF)) ) &&
}
}
- ad_close( &ad, adflags ); /* ad_close removes locks if any */
+ if (adp)
+ ad_close( &ad, adflags ); /* ad_close removes locks if any */
#ifdef DEBUG
LOG(log_info, logtype_afpd, "end deletefile:");
/*
- * $Id: filedir.c,v 1.45.2.2.2.10 2004-05-04 15:38:25 didg Exp $
+ * $Id: filedir.c,v 1.45.2.2.2.11 2004-05-10 18:40:32 didg Exp $
*
* Copyright (c) 1990,1993 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
* it's curdir (maybe deleted, but then we can't know).
* So we need to try harder.
*/
- of_statdir(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) {
- dir = s_path->dir;
+ dir = s_path->d_dir;
if (!dir)
return AFPERR_NOOBJ;
/* 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 ) {
* 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)) {
+ if (!ad_metadata(p, adflags, adp)) {
u_int16_t bshort;
ad_getattr(adp, &bshort);
strcpy(oldname, path->m_name); /* an extra copy for of_rename */
if (isdir) {
/* curdir parent dir, need to move sdir back */
- sdir = path->dir;
+ sdir = path->d_dir;
}
}
else {
isdir = path_isadir(path);
if ( *path->m_name != '\0' ) {
if (isdir) {
- sdir = path->dir;
+ sdir = path->d_dir;
}
strcpy(oldname, path->m_name); /* an extra copy for of_rename */
} else {
/*
- * $Id: fork.h,v 1.8.6.1 2004-03-02 13:27:08 didg Exp $
+ * $Id: fork.h,v 1.8.6.2 2004-05-10 18:40:32 didg Exp $
*
* Copyright (c) 1990,1993 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
extern int of_flush __P((const struct vol *));
extern void of_pforkdesc __P((FILE *));
extern int of_stat __P((struct path *));
-extern int of_statdir __P((struct path *));
+extern int of_statdir __P((const struct vol *vol, struct path *));
/* in fork.c */
extern int flushfork __P((struct ofork *));
/*
- * $Id: ofork.c,v 1.20.6.5 2004-03-02 13:27:08 didg Exp $
+ * $Id: ofork.c,v 1.20.6.6 2004-05-10 18:40:32 didg Exp $
*
* Copyright (c) 1996 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
return ret;
}
-/* --------------------------
- * assume
-*/
-int of_statdir (struct path *path)
+/* -------------------------- */
+int of_statdir (const struct vol *vol, struct path *path)
{
static char pathname[ MAXPATHLEN + 1];
int ret;
}
path->st_errno = 0;
path->st_valid = 1;
+ /* FIXME, what about: we don't have r-x perm anymore ? */
strcpy(pathname, "../");
- strlcat(pathname, path->dir->d_u_name, MAXPATHLEN);
- if ((ret = stat(pathname, &path->st)) < 0)
- path->st_errno = errno;
- return ret;
+ strlcat(pathname, path->d_dir->d_u_name, MAXPATHLEN);
+
+ if (!(ret = stat(pathname, &path->st)))
+ return 0;
+
+ path->st_errno = errno;
+ /* hmm, can't stat curdir anymore */
+ if (errno == EACCES && curdir->d_parent ) {
+ if (movecwd(vol, curdir->d_parent))
+ return -1;
+ path->st_errno = 0;
+ if ((ret = stat(path->d_dir->d_u_name, &path->st)) < 0)
+ path->st_errno = errno;
+ }
+ return ret;
}
/* -------------------------- */
/*
- * $Id: unix.c,v 1.43.2.1.2.6 2004-05-08 22:39:26 didg Exp $
+ * $Id: unix.c,v 1.43.2.1.2.7 2004-05-10 18:40:32 didg Exp $
*
* Copyright (c) 1990,1993 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
return retval;
}
+/* ------------------------- */
+int dir_rx_set(mode_t mode)
+{
+ return (mode & (S_IXUSR | S_IRUSR)) == (S_IXUSR | S_IRUSR);
+}
+
+#define EXEC_MODE (S_IXGRP | S_IXUSR | S_IXOTH)
+
int setdeskmode( mode )
const mode_t mode;
{
struct dirent *deskp, *subp;
DIR *desk, *sub;
+ if (!dir_rx_set(mode)) {
+ /* want to remove read and search access to owner it will screw the volume */
+ return -1 ;
+ }
if ( getcwd( wd , MAXPATHLEN) == NULL ) {
return( -1 );
}
if (S_ISDIR(st.st_mode)) {
if ( chmod( modbuf, (DIRBITS | mode) & ~default_options.umask ) < 0 && errno != EPERM ) {
- LOG(log_error, logtype_afpd, "setdeskmode: chmod %s: %s",fullpathname(modbuf), strerror(errno) );
+ LOG(log_error, logtype_afpd, "setdeskmode: chmod %s: %s",fullpathname(modbuf), strerror(errno) );
}
- } else if ( chmod( modbuf, mode & ~default_options.umask ) < 0 && errno != EPERM ) {
+ } else if ( chmod( modbuf, mode & ~(default_options.umask | EXEC_MODE) ) < 0 && errno != EPERM ) {
LOG(log_error, logtype_afpd, "setdeskmode: chmod %s: %s",fullpathname(modbuf), strerror(errno) );
}
}
/* --------------------- */
-int setdirunixmode( vol, mode )
+int setdirunixmode( vol, name, mode )
const struct vol *vol;
+const char *name;
const mode_t mode;
{
+char *adouble = vol->ad_path( name, ADFLAGS_DIR );
+
int dropbox = (vol->v_flags & AFPVOL_DROPBOX);
- if (vol->v_adouble != AD_VERSION2_OSX) {
- if (stickydirmode(".AppleDouble", DIRBITS | mode, dropbox) < 0 && !vol_noadouble(vol))
- return -1 ;
+ if (dir_rx_set(mode)) {
+ /* extending right? dir first then .AppleDouble */
+ if ( stickydirmode(name, DIRBITS | mode, dropbox) < 0 )
+ return -1;
+ if (vol->v_adouble != AD_VERSION2_OSX) {
+ if (stickydirmode(ad_dir(adouble), DIRBITS | mode, dropbox) < 0 && !vol_noadouble(vol)) {
+ return -1 ;
+ }
+ }
+ }
+ if (setfilmode(adouble, ad_hf_mode(mode), NULL) < 0 && !vol_noadouble(vol)) {
+ return -1 ;
+ }
+ if (!dir_rx_set(mode)) {
+ if (vol->v_adouble != AD_VERSION2_OSX) {
+ if (stickydirmode(ad_dir(adouble), DIRBITS | mode, dropbox) < 0 && !vol_noadouble(vol)) {
+ return -1 ;
+ }
+ }
+ if ( stickydirmode(name, DIRBITS | mode, dropbox) < 0 )
+ return -1;
}
-
- if ( stickydirmode(".", DIRBITS | mode, dropbox) < 0 )
- return -1;
return 0;
}
/* --------------------- */
-int setdirmode( vol, mode )
+int setdirmode( vol, name, mode )
const struct vol *vol;
+const char *name;
const mode_t mode;
{
char buf[ MAXPATHLEN + 1];
int osx = vol->v_adouble == AD_VERSION2_OSX;
int hf_mode = ad_hf_mode(mode);
int dropbox = (vol->v_flags & AFPVOL_DROPBOX);
+ char *adouble = vol->ad_path( name, ADFLAGS_DIR );
+ char *adouble_p = ad_dir(adouble);
- if (( dir = opendir( "." )) == NULL ) {
- LOG(log_error, logtype_afpd, "setdirmode: opendir %s: %s", fullpathname("."), strerror(errno) );
+ if (dir_rx_set(mode)) {
+ /* extending right? dir first then .AppleDouble */
+ if ( stickydirmode(name, DIRBITS | mode, dropbox) < 0 )
+ return -1;
+ if (!osx) {
+ if (stickydirmode(adouble_p, DIRBITS | mode, dropbox) < 0 && !vol_noadouble(vol)) {
+ return -1 ;
+ }
+ }
+ }
+
+ if (( dir = opendir( name )) == NULL ) {
+ LOG(log_error, logtype_afpd, "setdirmode: opendir: %s", fullpathname(name), strerror(errno) );
return( -1 );
}
}
}
#if 0
- /* XXX: need to preserve special modes */
+ /* Don't change subdir perm */
else if (S_ISDIR(st.st_mode)) {
if (stickydirmode(dirp->d_name, DIRBITS | mode, dropbox) < 0)
return (-1);
/* change perm of .AppleDouble's files
*/
- if (( dir = opendir( ".AppleDouble" )) == NULL ) {
+ if (( dir = opendir( adouble_p )) == NULL ) {
if (vol_noadouble(vol))
goto setdirmode_noadouble;
LOG(log_error, logtype_afpd, "setdirmode: opendir %s: %s", fullpathname(".AppleDouble"),strerror(errno) );
return( -1 );
}
- strcpy( buf, ".AppleDouble" );
+ strcpy( buf, adouble_p);
strcat( buf, "/" );
m = strchr( buf, '\0' );
for ( dirp = readdir( dir ); dirp != NULL; dirp = readdir( dir )) {
} /* end for */
closedir( dir );
- /* XXX: use special bits to tag directory permissions */
-
- /* XXX: need to preserve special modes */
- if ( stickydirmode(".AppleDouble", DIRBITS | mode, dropbox) < 0 )
- return( -1 );
+ if (!dir_rx_set(mode)) {
+ /* XXX: need to preserve special modes */
+ if (stickydirmode(adouble_p, DIRBITS | mode, dropbox) < 0 ) {
+ return -1 ;
+ }
+ }
setdirmode_noadouble:
- /* XXX: need to preserve special modes */
- if ( stickydirmode(".", DIRBITS | mode, dropbox) < 0 )
- return( -1 );
+ if (!dir_rx_set(mode)) {
+ if ( stickydirmode(name, DIRBITS | mode, dropbox) < 0 )
+ return -1;
+ }
return( 0 );
}
* that user/group should inherit from other, but that doesn't fit
* into the unix permission scheme. we can get around this by
* co-opting some bits. */
-int setdirowner(vol, uid, gid )
+int setdirowner(vol, name, uid, gid )
const struct vol *vol;
+const char *name;
const uid_t uid;
const gid_t gid;
{
DIR *dir;
int osx = vol->v_adouble == AD_VERSION2_OSX;
int noadouble = vol_noadouble(vol);
+ char *adouble;
+ char *adouble_p;
- if (( dir = opendir( "." )) == NULL ) {
+ if (( dir = opendir( name )) == NULL ) {
return( -1 );
}
for ( dirp = readdir( dir ); dirp != NULL; dirp = readdir( dir )) {
goto setdirowner_noadouble;
}
- if (( dir = opendir( ".AppleDouble" )) == NULL ) {
+ adouble = vol->ad_path( name, ADFLAGS_DIR );
+ adouble_p = ad_dir(adouble);
+ if (( dir = opendir( adouble_p )) == NULL ) {
if (noadouble)
goto setdirowner_noadouble;
return( -1 );
}
- strcpy( buf, ".AppleDouble" );
+ strcpy( buf, adouble_p );
strcat( buf, "/" );
m = strchr( buf, '\0' );
for ( dirp = readdir( dir ); dirp != NULL; dirp = readdir( dir )) {
/*
- * $Id: unix.h,v 1.12.2.1.2.5 2004-05-08 22:39:26 didg Exp $
+ * $Id: unix.h,v 1.12.2.1.2.6 2004-05-10 18:40:33 didg Exp $
*/
#ifndef AFPD_UNIX_H
extern int gmem __P((const gid_t));
extern int setdeskmode __P((const mode_t));
-extern int setdirunixmode __P((const struct vol *, const mode_t));
-extern int setdirmode __P((const struct vol *, const mode_t));
+extern int setdirunixmode __P((const struct vol *, const char *, const mode_t));
+extern int setdirmode __P((const struct vol *, const char *, const mode_t));
extern int setdeskowner __P((const uid_t, const gid_t));
-extern int setdirowner __P((const struct vol *, const uid_t, const gid_t));
+extern int setdirowner __P((const struct vol *, const char *, const uid_t, const gid_t));
extern int setfilmode __P((char *, mode_t , struct stat *));
extern int setfilunixmode __P((const struct vol *, struct path*, const mode_t));
extern int setfilowner __P((const struct vol *, const uid_t, const gid_t, struct path*));
extern int unix_rename __P((const char *oldpath, const char *newpath));
+extern int dir_rx_set __P((mode_t mode));
extern void accessmode __P((char *, struct maccess *, struct dir *, struct stat *));
extern char *fullpathname __P((const char *));
/*
- * $Id: adouble.h,v 1.21.6.16 2004-04-21 18:45:45 bfernhomberg Exp $
+ * $Id: adouble.h,v 1.21.6.17 2004-05-10 18:40:33 didg Exp $
* Copyright (c) 1990,1991 Regents of The University of Michigan.
* All Rights Reserved.
*
extern int ad_refresh __P((struct adouble *));
extern int ad_stat __P((const char *, struct stat *));
+#define ad_metadata(name, flags, adp) ad_open(name, ADFLAGS_HF|(flags), O_RDONLY, 0666, adp)
+
/* extend header to RW if R or W (W if R for locking),
*/
#ifndef ATACC
#endif
static __inline__ mode_t ad_hf_mode (mode_t mode)
{
+#if 1
+ mode |= S_IRUSR;
+#endif
/* fnctl lock need write access */
if ((mode & S_IRUSR))
mode |= S_IWUSR;
/*
- * $Id: ad_open.c,v 1.30.6.12 2004-05-08 22:38:33 didg Exp $
+ * $Id: ad_open.c,v 1.30.6.13 2004-05-10 18:40:33 didg Exp $
*
* Copyright (c) 1999 Adrian Sun (asun@u.washington.edu)
* Copyright (c) 1990,1991 Regents of The University of Michigan.
#ifdef ATACC
mode_t ad_hf_mode (mode_t mode)
{
+ /* we always need RW mode for file owner */
+ mode |= S_IRUSR;
/* fnctl lock need write access */
if ((mode & S_IRUSR))
mode |= S_IWUSR;
projects / netatalk.git / commitdiff