/*
- * $Id: unix.c,v 1.25 2001-12-03 05:03:38 jmarcus Exp $
+ * $Id: unix.c,v 1.41 2003-01-08 15:01:36 didg Exp $
*
* Copyright (c) 1990,1993 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
#include <sys/types.h>
#include <sys/param.h>
#include <sys/stat.h>
-#include <sys/syslog.h>
+#include <atalk/logger.h>
#include <netatalk/endian.h>
#include <dirent.h>
#include <limits.h>
+#include <atalk/adouble.h>
#include <atalk/afp.h>
/* STDC check */
if ( statfs( vol->v_path, &sfs ) < 0 ) {
- syslog(LOG_ERR, "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 );
}
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 and so what ?
*/
+#if 0
if ( ma->ma_user & AR_UWRITE ) {
ma->ma_user |= AR_UOWN;
}
+#endif
}
/*
- * Calculate the mode for a directory using Posix access() calls to
- * estimate permission, a la mdw.
+ * 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?
*/
-void accessmode( path, ma, dir )
+void accessmode( path, ma, dir, st )
char *path;
struct maccess *ma;
-struct dir *dir;
+struct dir *dir;
+struct stat *st;
+
{
- if ( access( path, R_OK|W_OK|X_OK ) == 0 ) {
- ma->ma_user = AR_UREAD|AR_UWRITE|AR_USEARCH|AR_UOWN;
- ma->ma_owner = AR_UREAD|AR_UWRITE|AR_USEARCH;
- } else if ( access( path, R_OK|X_OK ) == 0 ) {
- ma->ma_user = AR_UREAD|AR_USEARCH;
- ma->ma_owner = AR_UREAD|AR_USEARCH;
- } else {
- ma->ma_user = ma->ma_owner = 0;
- if ( access( path, R_OK ) == 0 ) {
- ma->ma_user |= AR_UREAD;
- ma->ma_owner |= AR_UREAD;
- }
- if ( access( path, X_OK ) == 0 ) {
- ma->ma_user |= AR_USEARCH;
- ma->ma_owner |= AR_USEARCH;
- }
- if ( access( path, W_OK ) == 0 ) {
- ma->ma_user |= AR_UWRITE|AR_UOWN;
- ma->ma_owner |= AR_UWRITE;
- }
+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 );
+ return;
}
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)
+/*
+ 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 ?)
+*/
+static int stickydirmode(name, mode, dropbox)
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) {
- syslog( LOG_ERR, "stickydirmode: unable to seteuid root: %m");
- }
- if ( retval=chmod( name, ( (DIRBITS | mode | S_ISVTX) & 0777 & ~default_options.umask) ) < 0) {
- syslog( LOG_ERR, "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", name, strerror(errno) );
+ } else {
#ifdef DEBUG
- syslog( LOG_INFO, "stickydirmode: (debug) chmod \"%s\": %m", name );
+ LOG(log_info, logtype_afpd, "stickydirmode: (debug) chmod \"%s\": %s", 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) {
- syslog( LOG_ERR, "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",name, strerror(errno) );
+ retval = -1;
+ }
+
return retval;
}
}
if (( desk = opendir( "." )) == NULL ) {
if ( chdir( wd ) < 0 ) {
- syslog( LOG_ERR, "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) {
- syslog( LOG_ERR, "setdeskmode: stat %s: %s",
- modbuf, strerror(errno) );
+ LOG(log_error, logtype_afpd, "setdeskmode: stat %s: %s",
+ modbuf, strerror(errno) );
continue;
}
if (S_ISDIR(st.st_mode)) {
- if ( chmod( modbuf, (DIRBITS | mode) & 0777 & ~default_options.umask ) < 0 && errno != EPERM ) {
- syslog( LOG_ERR, "setdeskmode: chmod %s: %s",
- modbuf, strerror(errno) );
- }
- } else if ( chmod( modbuf, mode & 0777 & ~default_options.umask ) < 0 && errno != EPERM ) {
- syslog( LOG_ERR, "setdeskmode: chmod %s: %s",
+ if ( chmod( modbuf, (DIRBITS | mode) & ~default_options.umask ) < 0 && errno != EPERM ) {
+ LOG(log_error, logtype_afpd, "setdeskmode: chmod %s: %s",
modbuf, strerror(errno) );
+ }
+ } else if ( chmod( modbuf, mode & ~default_options.umask ) < 0 && errno != EPERM ) {
+ LOG(log_error, logtype_afpd, "setdeskmode: chmod %s: %s",
+ 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 ) {
- syslog( LOG_ERR, "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",
+ deskp->d_name, strerror(errno) );
}
}
closedir( desk );
if ( chdir( wd ) < 0 ) {
- syslog( LOG_ERR, "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 ) {
- syslog( LOG_ERR, "setdeskmode: chmod .AppleDesktop: %s", strerror(errno) );
+ if ( chmod( ".AppleDesktop", (DIRBITS | mode) & ~default_options.umask ) < 0 && errno != EPERM ) {
+ LOG(log_error, logtype_afpd, "setdeskmode: chmod .AppleDesktop: %s", strerror(errno) );
}
return( 0 );
}
+int setfilmode(name, mode, st)
+char * name;
+mode_t mode;
+struct stat *st;
+{
+struct stat sb;
+mode_t mask = S_IRUSR |S_IWUSR | S_IRGRP | S_IWGRP |S_IROTH | S_IWOTH;
+
+ if (!st) {
+ if (stat(name, &sb) != 0)
+ return -1;
+ st = &sb;
+ }
+ mode &= mask; /* keep only rw-rw-rw in mode */
+ 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 setdirmode( mode, noadouble, dropbox )
const mode_t mode;
const int noadouble;
char *m;
struct dirent *dirp;
DIR *dir;
-
+
if (( dir = opendir( "." )) == NULL ) {
- syslog( LOG_ERR, "setdirmode: opendir .: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "setdirmode: opendir .: %s", strerror(errno) );
return( -1 );
}
continue;
}
if ( stat( dirp->d_name, &st ) < 0 ) {
- syslog( LOG_ERR, "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)) {
+ if (!S_ISDIR(st.st_mode)) {
+ if (setfilmode(dirp->d_name, mode, &st) < 0) {
+ LOG(log_error, logtype_afpd, "setdirmode: chmod %s: %s",
+ dirp->d_name, strerror(errno) );
+ return -1;
+ }
+ }
+#if 0
/* XXX: need to preserve special modes */
- if (S_ISDIR(st.st_mode)) {
+ else 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);
}
+#endif
}
closedir( dir );
+
+ /* change perm of .AppleDouble's files
+ */
if (( dir = opendir( ".AppleDouble" )) == NULL ) {
if (noadouble)
goto setdirmode_noadouble;
- syslog( LOG_ERR, "setdirmode: opendir .AppleDouble: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "setdirmode: opendir .AppleDouble: %s", strerror(errno) );
return( -1 );
}
strcpy( buf, ".AppleDouble" );
strcat( buf, dirp->d_name );
if ( stat( buf, &st ) < 0 ) {
- syslog( LOG_ERR, "setdirmode: stat %s: %s", buf, strerror(errno) );
+ LOG(log_error, logtype_afpd, "setdirmode: stat %s: %s", buf, strerror(errno) );
continue;
}
-
- if (S_ISDIR(st.st_mode)) {
- stickydirmode( buf, DIRBITS | mode, dropbox );
- } else
- stickydirmode( buf, mode, dropbox );
+ if (!S_ISDIR(st.st_mode)) {
+ if (setfilmode(buf, ad_hf_mode(mode), &st) < 0) {
+ /* FIXME what do we do then? */
+ }
+ }
} /* end for */
closedir( dir );
}
if (( desk = opendir( "." )) == NULL ) {
if ( chdir( wd ) < 0 ) {
- syslog( LOG_ERR, "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 ) {
- syslog( LOG_ERR, "setdeskown: chown %s: %s",
- modbuf, strerror(errno) );
+ LOG(log_error, logtype_afpd, "setdeskown: chown %s: %s",
+ modbuf, strerror(errno) );
}
}
closedir( sub );
/* XXX: add special any uid, ignore group bits */
if ( chown( deskp->d_name, uid, gid ) < 0 && errno != EPERM ) {
- syslog( LOG_ERR, "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 ) {
- syslog( LOG_ERR, "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 ) {
- syslog( LOG_ERR, "setdeskowner: chown .AppleDesktop: %s",
- strerror(errno) );
+ LOG(log_error, logtype_afpd, "setdeskowner: chown .AppleDesktop: %s",
+ strerror(errno) );
}
return( 0 );
}
continue;
};
if ( stat( dirp->d_name, &st ) < 0 ) {
- syslog( LOG_ERR, "setdirowner: stat %s: %s",
- dirp->d_name, strerror(errno) );
+ LOG(log_error, logtype_afpd, "setdirowner: stat %s: %s",
+ dirp->d_name, strerror(errno) );
continue;
}
if (( st.st_mode & S_IFMT ) == S_IFREG ) {
if ( chown( dirp->d_name, uid, gid ) < 0 && errno != EPERM ) {
- syslog( LOG_DEBUG, "setdirowner: chown %s: %s",
- dirp->d_name, strerror(errno) );
+ LOG(log_debug, logtype_afpd, "setdirowner: chown %s: %s",
+ dirp->d_name, strerror(errno) );
/* return ( -1 ); Sometimes this is okay */
}
}
*m = '\0';
strcat( buf, dirp->d_name );
if ( chown( buf, uid, gid ) < 0 && errno != EPERM ) {
- syslog( LOG_DEBUG, "setdirowner: chown %d/%d %s: %s",
- uid, gid, buf, strerror(errno) );
+ LOG(log_debug, logtype_afpd, "setdirowner: chown %d/%d %s: %s",
+ uid, gid, buf, strerror(errno) );
/* return ( -1 ); Sometimes this is okay */
}
}
* We cheat: we know that chown doesn't do anything.
*/
if ( stat( ".AppleDouble", &st ) < 0 ) {
- syslog( LOG_ERR, "setdirowner: stat .AppleDouble: %s", strerror(errno) );
+ LOG(log_error, logtype_afpd, "setdirowner: stat .AppleDouble: %s", strerror(errno) );
return( -1 );
}
if ( gid && gid != st.st_gid && chown( ".AppleDouble", uid, gid ) < 0 &&
errno != EPERM ) {
- syslog( LOG_DEBUG, "setdirowner: chown %d/%d .AppleDouble: %s",
- uid, gid, strerror(errno) );
+ LOG(log_debug, logtype_afpd, "setdirowner: chown %d/%d .AppleDouble: %s",
+ uid, gid, strerror(errno) );
/* return ( -1 ); Sometimes this is okay */
}
}
if ( gid && gid != st.st_gid && chown( ".", uid, gid ) < 0 &&
errno != EPERM ) {
- syslog( LOG_DEBUG, "setdirowner: chown %d/%d .: %s",
- uid, gid, strerror(errno) );
+ LOG(log_debug, logtype_afpd, "setdirowner: chown %d/%d .: %s",
+ uid, gid, strerror(errno) );
}
return( 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\n", path, uid, strerror(errno));
+ return -1;
+ }
+
+ if (stat(path, &sbuf) < 0) {
+ LOG(log_error, logtype_afpd, "cannot chown() file [%s] (uid = %d): %s\n", path, uid, strerror(errno));
+ return -1;
+ }
+
+ if (S_ISDIR(sbuf.st_mode)) {
+ odir = opendir(path);
+ if (odir == NULL) {
+ LOG(log_error, logtype_afpd, "cannot opendir() [%s] (uid = %d): %s\n", path, uid, strerror(errno));
+ goto recursive_chown_end;
+ }
+ while ((entry=readdir(odir)) != NULL) {
+ 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;
+}
+
+/* This is equivalent of unix rename(). */
+int unix_rename(const char *oldpath, const char *newpath)
+{
+ char pd_name[PATH_MAX+1];
+ int i;
+ struct stat pd_stat;
+ uid_t uid;
+
+ if (rename(oldpath, newpath) < 0)
+ return -1;
+
+ 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\n",
+ 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\n", 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\n",
+ pd_name, geteuid(), strerror(errno));
+ seteuid(uid);
+ }
+
+ return 0;
+}
+
projects / netatalk.git / blobdiff