X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Funix.c;h=01688c94e66c2fef5c94e6bd5dc6f6e3f14e1f3b;hb=056d3ef4c88ba09eabb1fcbf06bdd9fe6e7af4cf;hp=2822221e0d9cd145932ceb38802640ce48646447;hpb=87bec6a710bd502bd1667469cc7da6962ab40931;p=netatalk.git diff --git a/etc/afpd/unix.c b/etc/afpd/unix.c index 2822221e..01688c94 100644 --- a/etc/afpd/unix.c +++ b/etc/afpd/unix.c @@ -1,6 +1,4 @@ /* - * $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. */ @@ -11,24 +9,8 @@ #include #include - -/* STDC check */ -#ifdef STDC_HEADERS +#include #include -#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 */ - #include #include #include @@ -38,6 +20,7 @@ char *strchr (), *strrchr (); #include #include #include +#include #include "auth.h" #include "directory.h" @@ -51,9 +34,9 @@ char *strchr (), *strrchr (); /* * Get the free space on a partition. */ -int ustatfs_getvolspace(const struct vol *vol, VolSpace *bfree, VolSpace *btotal, u_int32_t *bsize) +int ustatfs_getvolspace(const struct vol *vol, VolSpace *bfree, VolSpace *btotal, uint32_t *bsize) { - VolSpace maxVolSpace = (~(VolSpace)0); + VolSpace maxVolSpace = UINT64_MAX; #ifdef ultrix struct fs_data sfs; @@ -61,7 +44,6 @@ int ustatfs_getvolspace(const struct vol *vol, VolSpace *bfree, VolSpace *btotal struct statfs sfs; #endif /*ultrix*/ - if ( statfs( vol->v_path, &sfs ) < 0 ) { LOG(log_error, logtype_afpd, "ustatfs_getvolspace unable to stat %s", vol->v_path); return( AFPERR_PARAM ); @@ -158,6 +140,7 @@ mode_t mode; } #ifdef accessmode + #undef accessmode #endif /* @@ -169,7 +152,7 @@ mode_t mode; * * dir parameter is used by AFS */ -void accessmode(char *path, struct maccess *ma, struct dir *dir _U_, struct stat *st) +void accessmode(const struct vol *vol, char *path, struct maccess *ma, struct dir *dir _U_, struct stat *st) { struct stat sb; @@ -181,8 +164,7 @@ void accessmode(char *path, struct maccess *ma, struct dir *dir _U_, struct stat } utommode( st, ma ); #ifdef HAVE_ACLS - /* 10.5 Finder looks at OS 9 mode, so we must do some mapping */ - acltoownermode( path, st, uuid, ma); + acltoownermode(vol, path, st, ma); #endif } @@ -284,17 +266,17 @@ int setdeskmode(const mode_t mode) } if (S_ISDIR(st.st_mode)) { - if ( chmod( modbuf, (DIRBITS | mode) & ~default_options.umask ) < 0 && errno != EPERM ) { + if ( chmod_acl( 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 & ~(default_options.umask | EXEC_MODE) ) < 0 && errno != EPERM ) { + } else if ( chmod_acl( 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) & ~default_options.umask ) < 0 && errno != EPERM ) { + if ( chmod_acl( 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) ); } } @@ -304,7 +286,7 @@ int setdeskmode(const mode_t mode) return -1; } /* XXX: need to preserve special modes */ - if ( chmod( ".AppleDesktop", (DIRBITS | mode) & ~default_options.umask ) < 0 && errno != EPERM ) { + if ( chmod_acl( ".AppleDesktop", (DIRBITS | mode) & ~default_options.umask ) < 0 && errno != EPERM ) { LOG(log_error, logtype_afpd, "setdeskmode: chmod %s: %s", fullpathname(".AppleDesktop"),strerror(errno) ); } return( 0 ); @@ -333,9 +315,6 @@ int setfilunixmode (const struct vol *vol, struct path* path, 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); @@ -343,14 +322,14 @@ int setdirunixmode(const struct vol *vol, const char *name, mode_t mode) if (dir_rx_set(mode)) { /* extending right? dir first then .AppleDouble in rf_setdirmode */ - if ( stickydirmode(name, DIRBITS | mode, dropbox, vol->v_umask) < 0 ) + if ( stickydirmode(name, DIRBITS | mode, 0, vol->v_umask) < 0 ) return -1; } if (vol->vfs->vfs_setdirunixmode(vol, name, mode, NULL) < 0 && !vol_noadouble(vol)) { return -1 ; } if (!dir_rx_set(mode)) { - if ( stickydirmode(name, DIRBITS | mode, dropbox, vol->v_umask) < 0 ) + if ( stickydirmode(name, DIRBITS | mode, 0, vol->v_umask) < 0 ) return -1; } return 0; @@ -363,15 +342,13 @@ int setdirmode(const struct vol *vol, const char *name, mode_t mode) struct dirent *dirp; DIR *dir; mode_t hf_mode; - int osx = vol->v_adouble == AD_VERSION2_OSX; - int dropbox = (vol->v_flags & AFPVOL_DROPBOX); mode |= vol->v_dperm; hf_mode = ad_hf_mode(mode); if (dir_rx_set(mode)) { /* extending right? dir first */ - if ( stickydirmode(name, DIRBITS | mode, dropbox, vol->v_umask) < 0 ) + if ( stickydirmode(name, DIRBITS | mode, 0, vol->v_umask) < 0 ) return -1; } @@ -382,7 +359,7 @@ int setdirmode(const struct vol *vol, const char *name, mode_t mode) for ( dirp = readdir( dir ); dirp != NULL; dirp = readdir( dir )) { /* FIXME */ - if ( *dirp->d_name == '.' && (!osx || dirp->d_name[1] != '_')) { + if (*dirp->d_name == '.') { continue; } if ( lstat( dirp->d_name, &st ) < 0 ) { @@ -394,6 +371,7 @@ int setdirmode(const struct vol *vol, const char *name, mode_t mode) int setmode = (osx && *dirp->d_name == '.')?hf_mode:mode; if (setfilmode(dirp->d_name, setmode, &st, vol->v_umask) < 0) { + closedir( dir ); LOG(log_error, logtype_afpd, "setdirmode: chmod %s: %s",dirp->d_name, strerror(errno) ); return -1; } @@ -406,7 +384,7 @@ int setdirmode(const struct vol *vol, const char *name, mode_t mode) } if (!dir_rx_set(mode)) { - if ( stickydirmode(name, DIRBITS | mode, dropbox, vol->v_umask) < 0 ) + if ( stickydirmode(name, DIRBITS | mode, 0, vol->v_umask) < 0 ) return -1; } return( 0 ); @@ -511,13 +489,12 @@ int setdirowner(const struct vol *vol, const char *name, const uid_t uid, const struct stat st; struct dirent *dirp; DIR *dir; - int osx = vol->v_adouble == AD_VERSION2_OSX; if (( dir = opendir( name )) == NULL ) { return( -1 ); } for ( dirp = readdir( dir ); dirp != NULL; dirp = readdir( dir )) { - if ( *dirp->d_name == '.' && (!osx || dirp->d_name[1] != '_')) { + if ( *dirp->d_name == '.') { continue; } if ( lstat( dirp->d_name, &st ) < 0 ) {