/*
- * $Id: unix.c,v 1.28 2002-01-04 04:45:47 sibaz Exp $
+ * $Id: unix.c,v 1.47 2005-05-25 18:19:33 didg Exp $
*
* Copyright (c) 1990,1993 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
#include <stdio.h>
#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <atalk/logger.h>
-#include <netatalk/endian.h>
-#include <dirent.h>
-#include <limits.h>
-#include <atalk/afp.h>
/* STDC check */
-#if STDC_HEADERS
+#ifdef STDC_HEADERS
#include <string.h>
#else /* STDC_HEADERS */
+
#ifndef HAVE_STRCHR
#define strchr index
#define strrchr index
#endif /* HAVE_STRCHR */
char *strchr (), *strrchr ();
+
#ifndef HAVE_MEMCPY
#define memcpy(d,s,n) bcopy ((s), (d), (n))
#define memmove(d,s,n) bcopy ((s), (d), (n))
#endif /* ! HAVE_MEMCPY */
#endif /* STDC_HEADERS */
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif /* HAVE_FCNTL_H */
+#include <errno.h>
+#include <dirent.h>
+#include <limits.h>
+#include <sys/param.h>
+#include <sys/stat.h>
+#include <atalk/logger.h>
+#include <atalk/adouble.h>
+#include <atalk/afp.h>
+#include <atalk/util.h>
+
#include "auth.h"
#include "directory.h"
#include "volume.h"
#include "unix.h"
+#include "fork.h"
/*
* Get the free space on a partition.
if ( statfs( vol->v_path, &sfs ) < 0 ) {
- LOG(log_error, logtype_default, "ustatfs_getvolspace unable to stat %s", vol->v_path);
+ LOG(log_error, logtype_afpd, "ustatfs_getvolspace unable to stat %s", vol->v_path);
return( AFPERR_PARAM );
}
mbits = 0;
- mbits |= ( bits & ( S_IREAD >> 6 )) ? (AR_UREAD | AR_USEARCH) : 0;
+ mbits |= ( bits & ( S_IREAD >> 6 )) ? AR_UREAD : 0;
mbits |= ( bits & ( S_IWRITE >> 6 )) ? AR_UWRITE : 0;
- /* Do we really need this?
- mbits |= ( bits & ( S_IEXEC >> 6) ) ? AR_USEARCH : 0; */
+ /* Do we really need this? */
+ mbits |= ( bits & ( S_IEXEC >> 6) ) ? AR_USEARCH : 0;
return( mbits );
}
+/* --------------------------------
+ cf AFP 3.0 page 63
+*/
void utommode( stat, ma )
struct stat *stat;
struct maccess *ma;
{
- mode_t mode;
+mode_t mode;
mode = stat->st_mode;
-
ma->ma_world = utombits( mode );
mode = mode >> 3;
ma->ma_owner = utombits( mode );
+ /* ma_user is a union of all permissions but we must follow
+ * unix perm
+ */
if ( (uuid == stat->st_uid) || (uuid == 0)) {
ma->ma_user = ma->ma_owner | AR_UOWN;
- } else if ( gmem( stat->st_gid )) {
+ }
+ else if ( gmem( stat->st_gid )) {
ma->ma_user = ma->ma_group;
- } else {
+ }
+ else {
ma->ma_user = ma->ma_world;
}
* There are certain things the mac won't try if you don't have
* the "owner" bit set, even tho you can do these things on unix wiht
* only write permission. What were the things?
+ *
+ * FIXME
+ * ditto seems to care if st_uid is 0 ?
+ * was ma->ma_user & AR_UWRITE
+ * but 0 as owner is a can of worms.
*/
- if ( ma->ma_user & AR_UWRITE ) {
+ if ( !stat->st_uid ) {
ma->ma_user |= AR_UOWN;
}
}
-
+#ifdef accessmode
+#undef accessmode
+#endif
/*
* Calculate the mode for a directory using a stat() call to
* estimate permission.
*
* Note: the previous method, using access(), does not work correctly
* over NFS.
+ * FIXME what about ACL?
+ *
+ * dir parameter is used by AFS
*/
-void accessmode( path, ma, dir )
+void accessmode( path, ma, dir, st )
char *path;
struct maccess *ma;
-struct dir *dir;
+struct dir *dir _U_;
+struct stat *st;
+
{
- struct stat sb;
- ma->ma_user = ma->ma_owner = 0;
- if ( stat( path, &sb ) == 0 )
- utommode( &sb, ma );
- return;
+struct stat sb;
+
+ ma->ma_user = ma->ma_owner = ma->ma_world = ma->ma_group = 0;
+ if (!st) {
+ if (stat(path, &sb) != 0)
+ return;
+ st = &sb;
+ }
+ utommode( st, ma );
}
int gmem( gid )
return( mode );
}
+/* ----------------------------------
+ from the finder's share windows (menu--> File--> sharing...)
+ and from AFP 3.0 spec page 63
+ the mac mode should be save somewhere
+*/
mode_t mtoumode( ma )
struct maccess *ma;
{
mode_t mode;
mode = 0;
- mode |= mtoubits( ma->ma_owner );
+ mode |= mtoubits( ma->ma_owner |ma->ma_world);
mode = mode << 3;
- mode |= mtoubits( ma->ma_group );
+ mode |= mtoubits( ma->ma_group |ma->ma_world);
mode = mode << 3;
mode |= mtoubits( ma->ma_world );
return( mode );
}
-inline int stickydirmode(name, mode, dropbox)
-char * name;
+/* ----------------------------- */
+char *fullpathname(const char *name)
+{
+ static char wd[ MAXPATHLEN + 1];
+
+ if ( getcwd( wd , MAXPATHLEN) ) {
+ strlcat(wd, "/", MAXPATHLEN);
+ strlcat(wd, name, MAXPATHLEN);
+ }
+ else {
+ strlcpy(wd, name, MAXPATHLEN);
+ }
+ return wd;
+}
+
+/* -----------------------------
+ a dropbox is a folder where w is set but not r eg:
+ rwx-wx-wx or rwx-wx--
+ rwx----wx (is not asked by a Mac with OS >= 8.0 ?)
+*/
+int stickydirmode(name, mode, dropbox)
+const char * name;
const mode_t mode;
const int dropbox;
{
- int retval;
-#ifdef DROPKLUDGE
- int uid;
-#endif /* DROPKLUDGE */
+ int retval = 0;
- /* Turn on the sticky bit if this is a drop box, also turn off the setgid bit */
- retval=0;
#ifdef DROPKLUDGE
+ /* Turn on the sticky bit if this is a drop box, also turn off the setgid bit */
if (dropbox) {
- if (mode & S_IWOTH) {
- if (mode & S_IROTH);
- else { /* if S_IWOTH and not S_IROTH */
- uid=geteuid();
- if ( seteuid(0) < 0) {
- LOG(log_error, logtype_default, "stickydirmode: unable to seteuid root: %m");
- }
- if ( retval=chmod( name, ( (DIRBITS | mode | S_ISVTX) & 0777 & ~default_options.umask) ) < 0) {
- LOG(log_error, logtype_default, "stickydirmode: chmod \"%s\": %m", name );
- return(AFPERR_ACCESS);
- } else {
+ int uid;
+
+ if ( ( (mode & S_IWOTH) && !(mode & S_IROTH)) ||
+ ( (mode & S_IWGRP) && !(mode & S_IRGRP)) )
+ {
+ uid=geteuid();
+ if ( seteuid(0) < 0) {
+ LOG(log_error, logtype_afpd, "stickydirmode: unable to seteuid root: %s", strerror(errno));
+ }
+ if ( (retval=chmod( name, ( (DIRBITS | mode | S_ISVTX) & ~default_options.umask) )) < 0) {
+ LOG(log_error, logtype_afpd, "stickydirmode: chmod \"%s\": %s", fullpathname(name), strerror(errno) );
+ } else {
#ifdef DEBUG
- LOG(log_info, logtype_default, "stickydirmode: (debug) chmod \"%s\": %m", name );
+ LOG(log_info, logtype_afpd, "stickydirmode: (debug) chmod \"%s\": %s", fullpathname(name), strerror(retval) );
#endif /* DEBUG */
- seteuid(uid);
- } /* end getting retval */
- } /* end if not & S_IROTH */
- } else { /* end if S_IWOTH and not S_IROTH */
-#endif /* DROPKLUDGE */
-
- /*
- * Ignore EPERM errors: We may be dealing with a directory that is
- * group writable, in which case chmod will fail.
- */
- if ( (chmod( name, (DIRBITS | mode) & 0777 & ~default_options.umask ) < 0) && errno != EPERM) {
- LOG(log_error, logtype_default, "stickydirmode: chmod \"%s\": %s",
- name, strerror(errno) );
- retval = -1;
}
-#ifdef DROPKLUDGE
- } /* end if not mode */
- } /* end checking for "dropbox" */
+ seteuid(uid);
+ return retval;
+ }
+ }
#endif /* DROPKLUDGE */
+
+ /*
+ * Ignore EPERM errors: We may be dealing with a directory that is
+ * group writable, in which case chmod will fail.
+ */
+ if ( (chmod( name, (DIRBITS | mode) & ~default_options.umask ) < 0) && errno != EPERM) {
+ LOG(log_error, logtype_afpd, "stickydirmode: chmod \"%s\": %s", fullpathname(name), strerror(errno) );
+ retval = -1;
+ }
+
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 (( desk = opendir( "." )) == NULL ) {
if ( chdir( wd ) < 0 ) {
- LOG(log_error, logtype_default, "setdeskmode: chdir %s: %s", wd, strerror(errno) );
+ LOG(log_error, logtype_afpd, "setdeskmode: chdir %s: %s", wd, strerror(errno) );
}
return( -1 );
}
strcat( modbuf, subp->d_name );
/* XXX: need to preserve special modes */
if (stat(modbuf, &st) < 0) {
- LOG(log_error, logtype_default, "setdeskmode: stat %s: %s",
- modbuf, strerror(errno) );
+ LOG(log_error, logtype_afpd, "setdeskmode: stat %s: %s",fullpathname(modbuf), strerror(errno) );
continue;
}
if (S_ISDIR(st.st_mode)) {
- if ( chmod( modbuf, (DIRBITS | mode) & 0777 & ~default_options.umask ) < 0 && errno != EPERM ) {
- LOG(log_error, logtype_default, "setdeskmode: chmod %s: %s",
- modbuf, strerror(errno) );
+ if ( chmod( modbuf, (DIRBITS | mode) & ~default_options.umask ) < 0 && errno != EPERM ) {
+ LOG(log_error, logtype_afpd, "setdeskmode: chmod %s: %s",fullpathname(modbuf), strerror(errno) );
}
- } else if ( chmod( modbuf, mode & 0777 & ~default_options.umask ) < 0 && errno != EPERM ) {
- LOG(log_error, logtype_default, "setdeskmode: chmod %s: %s",
- modbuf, strerror(errno) );
+ } 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) );
}
}
closedir( sub );
/* XXX: need to preserve special modes */
- if ( chmod( deskp->d_name, (DIRBITS | mode) & 0777 & ~default_options.umask ) < 0 && errno != EPERM ) {
- LOG(log_error, logtype_default, "setdeskmode: chmod %s: %s",
- deskp->d_name, strerror(errno) );
+ if ( chmod( deskp->d_name, (DIRBITS | mode) & ~default_options.umask ) < 0 && errno != EPERM ) {
+ LOG(log_error, logtype_afpd, "setdeskmode: chmod %s: %s",fullpathname(deskp->d_name), strerror(errno) );
}
}
closedir( desk );
if ( chdir( wd ) < 0 ) {
- LOG(log_error, logtype_default, "setdeskmode: chdir %s: %s", wd, strerror(errno) );
+ LOG(log_error, logtype_afpd, "setdeskmode: chdir %s: %s", wd, strerror(errno) );
return -1;
}
/* XXX: need to preserve special modes */
- if ( chmod( ".AppleDesktop", (DIRBITS | mode) & 0777 & ~default_options.umask ) < 0 && errno != EPERM ) {
- LOG(log_error, logtype_default, "setdeskmode: chmod .AppleDesktop: %s", strerror(errno) );
+ if ( chmod( ".AppleDesktop", (DIRBITS | mode) & ~default_options.umask ) < 0 && errno != EPERM ) {
+ LOG(log_error, logtype_afpd, "setdeskmode: chmod %s: %s", fullpathname(".AppleDesktop"),strerror(errno) );
}
return( 0 );
}
-int setdirmode( mode, noadouble, dropbox )
+/* --------------------- */
+int setfilunixmode (vol, path, mode)
+const struct vol *vol;
+struct path* path;
+mode_t mode;
+{
+ if (!path->st_valid) {
+ of_stat(path);
+ }
+
+ if (path->st_errno) {
+ return -1;
+ }
+
+ if (setfilmode( path->u_name, mode, &path->st) < 0)
+ return -1;
+ /* we need to set write perm if read set for resource fork */
+ return vol->vfs->rf_setfilmode(vol, path->u_name, mode, &path->st);
+}
+
+/* --------------------- */
+int setfilmode(name, mode, st)
+const char * name;
+mode_t mode;
+struct stat *st;
+{
+struct stat sb;
+mode_t mask = S_IRWXU | S_IRWXG | S_IRWXO; /* rwx for owner group and other, by default */
+
+ if (!st) {
+ if (stat(name, &sb) != 0)
+ return -1;
+ st = &sb;
+ }
+
+ mode |= st->st_mode & ~mask; /* keep other bits from previous mode */
+ if ( chmod( name, mode & ~default_options.umask ) < 0 && errno != EPERM ) {
+ return -1;
+ }
+ return 0;
+}
+
+/* --------------------- */
+int setdirunixmode( vol, name, mode )
+const struct vol *vol;
+const char *name;
+const mode_t mode;
+{
+
+ int dropbox = (vol->v_flags & AFPVOL_DROPBOX);
+
+ if (dir_rx_set(mode)) {
+ /* extending right? dir first then .AppleDouble in rf_setdirmode */
+ if ( stickydirmode(name, DIRBITS | mode, dropbox) < 0 )
+ return -1;
+ }
+ if (vol->vfs->rf_setdirunixmode(vol, name, mode, NULL) < 0 && !vol_noadouble(vol)) {
+ return -1 ;
+ }
+ if (!dir_rx_set(mode)) {
+ if ( stickydirmode(name, DIRBITS | mode, dropbox) < 0 )
+ return -1;
+ }
+ return 0;
+}
+
+/* --------------------- */
+int setdirmode( vol, name, mode )
+const struct vol *vol;
+const char *name;
const mode_t mode;
-const int noadouble;
-const int dropbox;
{
- char buf[ MAXPATHLEN + 1];
struct stat st;
- char *m;
struct dirent *dirp;
DIR *dir;
-
- if (( dir = opendir( "." )) == NULL ) {
- LOG(log_error, logtype_default, "setdirmode: opendir .: %s", strerror(errno) );
+ int osx = vol->v_adouble == AD_VERSION2_OSX;
+ mode_t hf_mode = ad_hf_mode(mode);
+ int dropbox = (vol->v_flags & AFPVOL_DROPBOX);
+
+ if (dir_rx_set(mode)) {
+ /* extending right? dir first */
+ if ( stickydirmode(name, DIRBITS | mode, dropbox) < 0 )
+ return -1;
+ }
+
+ if (( dir = opendir( name )) == NULL ) {
+ LOG(log_error, logtype_afpd, "setdirmode: opendir: %s", fullpathname(name), strerror(errno) );
return( -1 );
}
for ( dirp = readdir( dir ); dirp != NULL; dirp = readdir( dir )) {
- if ( *dirp->d_name == '.' ) {
+ /* FIXME */
+ if ( *dirp->d_name == '.' && (!osx || dirp->d_name[1] != '_')) {
continue;
}
if ( stat( dirp->d_name, &st ) < 0 ) {
- LOG(log_error, logtype_default, "setdirmode: stat %s: %s",
- dirp->d_name, strerror(errno) );
+ LOG(log_error, logtype_afpd, "setdirmode: stat %s: %s",dirp->d_name, strerror(errno) );
continue;
}
- if (S_ISREG(st.st_mode)) {
- /* XXX: need to preserve special modes */
- if (S_ISDIR(st.st_mode)) {
- if (stickydirmode(dirp->d_name, DIRBITS | mode, dropbox) < 0)
- return (-1);
- } else if (stickydirmode(dirp->d_name, mode, dropbox) < 0)
- return (-1);
+ if (!S_ISDIR(st.st_mode)) {
+ int setmode = (osx && *dirp->d_name == '.')?hf_mode:mode;
+
+ if (setfilmode(dirp->d_name, setmode, &st) < 0) {
+ LOG(log_error, logtype_afpd, "setdirmode: chmod %s: %s",dirp->d_name, strerror(errno) );
+ return -1;
+ }
}
}
closedir( dir );
- if (( dir = opendir( ".AppleDouble" )) == NULL ) {
- if (noadouble)
- goto setdirmode_noadouble;
- LOG(log_error, logtype_default, "setdirmode: opendir .AppleDouble: %s", strerror(errno) );
- return( -1 );
+
+ if (vol->vfs->rf_setdirmode(vol, name, mode, NULL) < 0 && !vol_noadouble(vol)) {
+ return -1 ;
}
- strcpy( buf, ".AppleDouble" );
- strcat( buf, "/" );
- m = strchr( buf, '\0' );
- for ( dirp = readdir( dir ); dirp != NULL; dirp = readdir( dir )) {
- if ( strcmp( dirp->d_name, "." ) == 0 ||
- strcmp( dirp->d_name, ".." ) == 0 ) {
- continue;
- }
- *m = '\0';
- strcat( buf, dirp->d_name );
- if ( stat( buf, &st ) < 0 ) {
- LOG(log_error, logtype_default, "setdirmode: stat %s: %s", buf, strerror(errno) );
- continue;
- }
-
- if (S_ISDIR(st.st_mode)) {
- stickydirmode( buf, DIRBITS | mode, dropbox );
- } else
- stickydirmode( buf, mode, dropbox );
- } /* 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 );
-
-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 );
}
+/* ----------------------------- */
int setdeskowner( uid, gid )
const uid_t uid;
const gid_t gid;
}
if (( desk = opendir( "." )) == NULL ) {
if ( chdir( wd ) < 0 ) {
- LOG(log_error, logtype_default, "setdeskowner: chdir %s: %s", wd, strerror(errno) );
+ LOG(log_error, logtype_afpd, "setdeskowner: chdir %s: %s", wd, strerror(errno) );
}
return( -1 );
}
strcat( modbuf, subp->d_name );
/* XXX: add special any uid, ignore group bits */
if ( chown( modbuf, uid, gid ) < 0 && errno != EPERM ) {
- LOG(log_error, logtype_default, "setdeskown: chown %s: %s",
- modbuf, strerror(errno) );
+ LOG(log_error, logtype_afpd, "setdeskown: chown %s: %s", fullpathname(modbuf), strerror(errno) );
}
}
closedir( sub );
/* XXX: add special any uid, ignore group bits */
if ( chown( deskp->d_name, uid, gid ) < 0 && errno != EPERM ) {
- LOG(log_error, logtype_default, "setdeskowner: chown %s: %s",
- deskp->d_name, strerror(errno) );
+ LOG(log_error, logtype_afpd, "setdeskowner: chown %s: %s",
+ deskp->d_name, strerror(errno) );
}
}
closedir( desk );
if ( chdir( wd ) < 0 ) {
- LOG(log_error, logtype_default, "setdeskowner: chdir %s: %s", wd, strerror(errno) );
+ LOG(log_error, logtype_afpd, "setdeskowner: chdir %s: %s", wd, strerror(errno) );
return -1;
}
if ( chown( ".AppleDesktop", uid, gid ) < 0 && errno != EPERM ) {
- LOG(log_error, logtype_default, "setdeskowner: chown .AppleDesktop: %s",
- strerror(errno) );
+ LOG(log_error, logtype_afpd, "setdeskowner: chown %s: %s", fullpathname(".AppleDouble"), strerror(errno) );
}
return( 0 );
}
+/* ----------------------------- */
+int setfilowner(vol, uid, gid, path)
+const struct vol *vol;
+const uid_t uid;
+const gid_t gid;
+struct path* path;
+{
+
+ if (!path->st_valid) {
+ of_stat(path);
+ }
-/* uid/gid == 0 need to be handled as special cases. they really mean
+ if (path->st_errno) {
+ return -1;
+ }
+
+ if ( chown( path->u_name, uid, gid ) < 0 && errno != EPERM ) {
+ LOG(log_debug, logtype_afpd, "setfilowner: chown %d/%d %s: %s",
+ uid, gid, path->u_name, strerror(errno) );
+ return -1;
+ }
+
+ if (vol->vfs->rf_chown(vol, path->u_name, uid, gid ) < 0 && errno != EPERM) {
+ LOG(log_debug, logtype_afpd, "setfilowner: rf_chown %d/%d %s: %s",
+ uid, gid, path->u_name, strerror(errno) );
+ return -1;
+ }
+
+ return 0;
+}
+
+/* ---------------------------------
+ * uid/gid == 0 need to be handled as special cases. they really mean
* 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( uid, gid, noadouble )
+int setdirowner(vol, name, uid, gid )
+const struct vol *vol;
+const char *name;
const uid_t uid;
const gid_t gid;
-const int noadouble;
{
- char buf[ MAXPATHLEN + 1];
struct stat st;
- char *m;
struct dirent *dirp;
DIR *dir;
+ int osx = vol->v_adouble == AD_VERSION2_OSX;
- if (( dir = opendir( "." )) == NULL ) {
+ if (( dir = opendir( name )) == NULL ) {
return( -1 );
}
for ( dirp = readdir( dir ); dirp != NULL; dirp = readdir( dir )) {
- if ( *dirp->d_name == '.' ) {
+ if ( *dirp->d_name == '.' && (!osx || dirp->d_name[1] != '_')) {
continue;
- };
+ }
if ( stat( dirp->d_name, &st ) < 0 ) {
- LOG(log_error, logtype_default, "setdirowner: stat %s: %s",
- dirp->d_name, strerror(errno) );
+ LOG(log_error, logtype_afpd, "setdirowner: stat %s: %s",
+ fullpathname(dirp->d_name), strerror(errno) );
continue;
}
if (( st.st_mode & S_IFMT ) == S_IFREG ) {
if ( chown( dirp->d_name, uid, gid ) < 0 && errno != EPERM ) {
- LOG(log_debug, logtype_default, "setdirowner: chown %s: %s",
- dirp->d_name, strerror(errno) );
+ LOG(log_debug, logtype_afpd, "setdirowner: chown %s: %s",
+ fullpathname(dirp->d_name), strerror(errno) );
/* return ( -1 ); Sometimes this is okay */
}
}
}
closedir( dir );
- if (( dir = opendir( ".AppleDouble" )) == NULL ) {
- if (noadouble)
- goto setdirowner_noadouble;
+
+ if (vol->vfs->rf_setdirowner(vol, name, uid, gid) < 0) {
+ return -1;
+ }
+
+ if ( stat( ".", &st ) < 0 ) {
return( -1 );
}
- strcpy( buf, ".AppleDouble" );
- strcat( buf, "/" );
- m = strchr( buf, '\0' );
- for ( dirp = readdir( dir ); dirp != NULL; dirp = readdir( dir )) {
- if ( strcmp( dirp->d_name, "." ) == 0 ||
- strcmp( dirp->d_name, ".." ) == 0 ) {
- continue;
- }
- *m = '\0';
- strcat( buf, dirp->d_name );
- if ( chown( buf, uid, gid ) < 0 && errno != EPERM ) {
- LOG(log_debug, logtype_default, "setdirowner: chown %d/%d %s: %s",
- uid, gid, buf, strerror(errno) );
- /* return ( -1 ); Sometimes this is okay */
- }
+ if ( gid && gid != st.st_gid && chown( ".", uid, gid ) < 0 && errno != EPERM ) {
+ LOG(log_debug, logtype_afpd, "setdirowner: chown %d/%d %s: %s",
+ uid, gid, fullpathname("."), strerror(errno) );
}
- closedir( dir );
- /*
- * We cheat: we know that chown doesn't do anything.
- */
- if ( stat( ".AppleDouble", &st ) < 0 ) {
- LOG(log_error, logtype_default, "setdirowner: stat .AppleDouble: %s", strerror(errno) );
- return( -1 );
- }
- if ( gid && gid != st.st_gid && chown( ".AppleDouble", uid, gid ) < 0 &&
- errno != EPERM ) {
- LOG(log_debug, logtype_default, "setdirowner: chown %d/%d .AppleDouble: %s",
- uid, gid, strerror(errno) );
- /* return ( -1 ); Sometimes this is okay */
+ return( 0 );
+}
+
+#if 0
+/* recursive chown()ing of a directory */
+static int recursive_chown(const char *path, uid_t uid, gid_t gid) {
+ struct stat sbuf;
+ DIR *odir = NULL;
+ struct dirent *entry;
+ char *name;
+ int ret = 0;
+ char newpath[PATH_MAX+1];
+ newpath[PATH_MAX] = '\0';
+
+ if (chown(path, uid, gid) < 0) {
+ LOG(log_error, logtype_afpd, "cannot chown() file [%s] (uid = %d): %s", path, uid, strerror(errno));
+ return -1;
}
-setdirowner_noadouble:
- if ( stat( ".", &st ) < 0 ) {
- return( -1 );
+ if (stat(path, &sbuf) < 0) {
+ LOG(log_error, logtype_afpd, "cannot chown() file [%s] (uid = %d): %s", path, uid, strerror(errno));
+ return -1;
}
- if ( gid && gid != st.st_gid && chown( ".", uid, gid ) < 0 &&
- errno != EPERM ) {
- LOG(log_debug, logtype_default, "setdirowner: chown %d/%d .: %s",
- uid, gid, strerror(errno) );
+
+ if (S_ISDIR(sbuf.st_mode)) {
+ odir = opendir(path);
+ if (odir == NULL) {
+ LOG(log_error, logtype_afpd, "cannot opendir() [%s] (uid = %d): %s", path, uid, strerror(errno));
+ goto recursive_chown_end;
+ }
+ while (NULL != (entry=readdir(odir)) ) {
+ name = entry->d_name;
+ if (name[0] == '.' && name[1] == '\0')
+ continue;
+ if (name[0] == '.' && name[1] == '.' && name[2] == '\0')
+ continue;
+ sprintf(newpath, "%s/%s", path, name);
+ if (recursive_chown(newpath, uid, gid) < 0)
+ ret = -1;
+ } /* while */
+ } /* if */
+
+recursive_chown_end:
+ if (odir != NULL) {
+ closedir(odir);
}
+ return ret;
+}
+#endif
- return( 0 );
+/* This is equivalent of unix rename(). */
+int unix_rename(const char *oldpath, const char *newpath)
+{
+#if 0
+ char pd_name[PATH_MAX+1];
+ int i;
+ struct stat pd_stat;
+ uid_t uid;
+#endif
+
+ if (rename(oldpath, newpath) < 0)
+ return -1;
+#if 0
+ for (i = 0; i <= PATH_MAX && newpath[i] != '\0'; i++)
+ pd_name[i] = newpath[i];
+ pd_name[i] = '\0';
+
+ while (i > 0 && pd_name[i] != '/') i--;
+ if (pd_name[i] == '/') i++;
+
+ pd_name[i++] = '.'; pd_name[i++] = '\0';
+
+ if (stat(pd_name, &pd_stat) < 0) {
+ LOG(log_error, logtype_afpd, "stat() of parent dir failed: pd_name = %s, uid = %d: %s",
+ pd_name, geteuid(), strerror(errno));
+ return 0;
+ }
+
+ /* So we have SGID bit set... */
+ if ((S_ISGID & pd_stat.st_mode) != 0) {
+ uid = geteuid();
+ if (seteuid(0) < 0)
+ LOG(log_error, logtype_afpd, "seteuid() failed: %s", strerror(errno));
+ if (recursive_chown(newpath, uid, pd_stat.st_gid) < 0)
+ LOG(log_error, logtype_afpd, "chown() of parent dir failed: newpath=%s, uid=%d: %s",
+ pd_name, geteuid(), strerror(errno));
+ seteuid(uid);
+ }
+#endif
+ return 0;
}
+