/*
- * $Id: unix.c,v 1.53 2009-10-02 09:32:40 franklahm Exp $
+ * $Id: unix.c,v 1.61 2010-02-10 14:05:37 franklahm Exp $
*
* Copyright (c) 1990,1993 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
#endif /* STDC_HEADERS */
#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/vfs.h>
#include <atalk/afp.h>
#include <atalk/util.h>
+#include <atalk/unix.h>
#include "auth.h"
#include "directory.h"
#include "volume.h"
#include "unix.h"
#include "fork.h"
-
-#ifdef HAVE_NFSv4_ACLS
-extern void acltoownermode(char *path, struct stat *st,uid_t uid, struct maccess *ma);
+#ifdef HAVE_ACLS
+#include "acls.h"
#endif
-
/*
* Get the free space on a partition.
*/
-int ustatfs_getvolspace( vol, bfree, btotal, bsize )
-const struct vol *vol;
-VolSpace *bfree, *btotal;
-u_int32_t *bsize;
+int ustatfs_getvolspace(const struct vol *vol, VolSpace *bfree, VolSpace *btotal, u_int32_t *bsize)
{
VolSpace maxVolSpace = (~(VolSpace)0);
return( AFP_OK );
}
-static int utombits( bits )
-mode_t bits;
+static int utombits(mode_t bits)
{
int mbits;
/* --------------------------------
cf AFP 3.0 page 63
*/
-void utommode( stat, ma )
-struct stat *stat;
-struct maccess *ma;
+void utommode(struct stat *stat, struct maccess *ma)
{
mode_t mode;
*
* dir parameter is used by AFS
*/
-void accessmode( path, ma, dir, st )
-char *path;
-struct maccess *ma;
-struct dir *dir _U_;
-struct stat *st;
-
+void accessmode(char *path, struct maccess *ma, struct dir *dir _U_, struct stat *st)
{
-struct stat sb;
+ struct stat sb;
ma->ma_user = ma->ma_owner = ma->ma_world = ma->ma_group = 0;
if (!st) {
- if (stat(path, &sb) != 0)
+ if (lstat(path, &sb) != 0)
return;
st = &sb;
}
utommode( st, ma );
-#ifdef HAVE_NFSv4_ACLS
+#ifdef HAVE_ACLS
/* 10.5 Finder looks at OS 9 mode, so we must do some mapping */
acltoownermode( path, st, uuid, ma);
#endif
}
-int gmem( gid )
-const gid_t gid;
+int gmem(const gid_t gid)
{
int i;
return( 0 );
}
-static mode_t mtoubits( bits )
-u_char bits;
+static mode_t mtoubits(u_char bits)
{
mode_t mode;
and from AFP 3.0 spec page 63
the mac mode should be save somewhere
*/
-mode_t mtoumode( ma )
-struct maccess *ma;
+mode_t mtoumode(struct maccess *ma)
{
mode_t mode;
#define EXEC_MODE (S_IXGRP | S_IXUSR | S_IXOTH)
-int setdeskmode( mode )
-const mode_t mode;
+int setdeskmode(const mode_t mode)
{
char wd[ MAXPATHLEN + 1];
struct stat st;
*m = '\0';
strcat( modbuf, subp->d_name );
/* XXX: need to preserve special modes */
- if (stat(modbuf, &st) < 0) {
+ if (lstat(modbuf, &st) < 0) {
LOG(log_error, logtype_afpd, "setdeskmode: stat %s: %s",fullpathname(modbuf), strerror(errno) );
continue;
}
}
/* --------------------- */
-int setfilunixmode (vol, path, mode)
-const struct vol *vol;
-struct path* path;
-mode_t mode;
+int setfilunixmode (const struct vol *vol, struct path* path, mode_t mode)
{
if (!path->st_valid) {
of_stat(path);
if (setfilmode( path->u_name, mode, &path->st, vol->v_umask) < 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);
+ return vol->vfs->vfs_setfilmode(vol, path->u_name, mode, &path->st);
}
/* --------------------- */
-int setdirunixmode( vol, name, mode )
-const struct vol *vol;
-const char *name;
-mode_t mode;
+int setdirunixmode(const struct vol *vol, const char *name, mode_t mode)
{
int dropbox = (vol->v_flags & AFPVOL_DROPBOX);
+
+ LOG(log_debug, logtype_afpd, "setdirunixmode('%s', mode:%04o) {v_dperm:%04o}",
+ fullpathname(name), mode, vol->v_dperm);
+
mode |= vol->v_dperm;
if (dir_rx_set(mode)) {
if ( stickydirmode(name, DIRBITS | mode, dropbox, vol->v_umask) < 0 )
return -1;
}
- if (vol->vfs->rf_setdirunixmode(vol, name, mode, NULL) < 0 && !vol_noadouble(vol)) {
+ if (vol->vfs->vfs_setdirunixmode(vol, name, mode, NULL) < 0 && !vol_noadouble(vol)) {
return -1 ;
}
if (!dir_rx_set(mode)) {
}
/* --------------------- */
-int setdirmode( vol, name, mode )
-const struct vol *vol;
-const char *name;
-mode_t mode;
+int setdirmode(const struct vol *vol, const char *name, mode_t mode)
{
struct stat st;
struct dirent *dirp;
if ( *dirp->d_name == '.' && (!osx || dirp->d_name[1] != '_')) {
continue;
}
- if ( stat( dirp->d_name, &st ) < 0 ) {
+ if ( lstat( dirp->d_name, &st ) < 0 ) {
LOG(log_error, logtype_afpd, "setdirmode: stat %s: %s",dirp->d_name, strerror(errno) );
continue;
}
}
closedir( dir );
- if (vol->vfs->rf_setdirmode(vol, name, mode, NULL) < 0 && !vol_noadouble(vol)) {
+ if (vol->vfs->vfs_setdirmode(vol, name, mode, NULL) < 0 && !vol_noadouble(vol)) {
return -1 ;
}
}
/* ----------------------------- */
-int setdeskowner( uid, gid )
-const uid_t uid;
-const gid_t gid;
+int setdeskowner(const uid_t uid, const gid_t gid)
{
char wd[ MAXPATHLEN + 1];
char modbuf[12 + 1], *m;
}
/* ----------------------------- */
-int setfilowner(vol, uid, gid, path)
-const struct vol *vol;
-const uid_t uid;
-const gid_t gid;
-struct path* path;
+int setfilowner(const struct vol *vol, const uid_t uid, const gid_t gid, struct path* path)
{
if (!path->st_valid) {
return -1;
}
- if ( chown( path->u_name, uid, gid ) < 0 && errno != EPERM ) {
+ if ( lchown( 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) {
+ if (vol->vfs->vfs_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;
* 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, name, uid, gid )
-const struct vol *vol;
-const char *name;
-const uid_t uid;
-const gid_t gid;
+int setdirowner(const struct vol *vol, const char *name, const uid_t uid, const gid_t gid)
{
struct stat st;
struct dirent *dirp;
if ( *dirp->d_name == '.' && (!osx || dirp->d_name[1] != '_')) {
continue;
}
- if ( stat( dirp->d_name, &st ) < 0 ) {
+ if ( lstat( dirp->d_name, &st ) < 0 ) {
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 ) {
+ if ( lchown( dirp->d_name, uid, gid ) < 0 && errno != EPERM ) {
LOG(log_debug, logtype_afpd, "setdirowner: chown %s: %s",
fullpathname(dirp->d_name), strerror(errno) );
/* return ( -1 ); Sometimes this is okay */
}
closedir( dir );
- if (vol->vfs->rf_setdirowner(vol, name, uid, gid) < 0) {
+ if (vol->vfs->vfs_setdirowner(vol, name, uid, gid) < 0) {
return -1;
}
- if ( stat( ".", &st ) < 0 ) {
+ if ( lstat( ".", &st ) < 0 ) {
return( -1 );
}
- if ( gid && gid != st.st_gid && chown( ".", uid, gid ) < 0 && errno != EPERM ) {
+ if ( gid && gid != st.st_gid && lchown( ".", uid, gid ) < 0 && errno != EPERM ) {
LOG(log_debug, logtype_afpd, "setdirowner: chown %d/%d %s: %s",
uid, gid, fullpathname("."), strerror(errno) );
}
return -1;
}
- if (stat(path, &sbuf) < 0) {
+ if (lstat(path, &sbuf) < 0) {
LOG(log_error, logtype_afpd, "cannot chown() file [%s] (uid = %d): %s", path, uid, strerror(errno));
return -1;
}
}
#endif
-/* 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;
-}
-