X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Funix.c;h=d068c0b3c2711caa45d579df36180a53fc12802a;hb=b362b6f7b22b6e4e9e74760989f389149677917b;hp=c5459c1612aa84c95ce9f586cb37d30424e58de3;hpb=9439f2b251f67b25cfedb88f76000946138a41d9;p=netatalk.git diff --git a/etc/afpd/unix.c b/etc/afpd/unix.c index c5459c16..d068c0b3 100644 --- a/etc/afpd/unix.c +++ b/etc/afpd/unix.c @@ -1,6 +1,4 @@ /* - * $Id: unix.c,v 1.35 2002-06-06 10:14:26 didg Exp $ - * * Copyright (c) 1990,1993 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. */ @@ -11,49 +9,51 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include /* STDC check */ -#if STDC_HEADERS +#ifdef STDC_HEADERS #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 */ -#ifdef HAVE_FCNTL_H -#include -#endif /* HAVE_FCNTL_H */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include "auth.h" #include "directory.h" #include "volume.h" #include "unix.h" +#include "fork.h" +#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); + VolSpace maxVolSpace = UINT64_MAX; #ifdef ultrix struct fs_data sfs; @@ -61,7 +61,6 @@ u_int32_t *bsize; 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 ); @@ -99,17 +98,16 @@ u_int32_t *bsize; return( AFP_OK ); } -static __inline__ int utombits( bits ) -mode_t bits; +static int utombits(mode_t bits) { int mbits; 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 ); } @@ -117,14 +115,11 @@ mode_t bits; /* -------------------------------- 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; +mode_t mode; mode = stat->st_mode; - ma->ma_world = utombits( mode ); mode = mode >> 3; @@ -133,52 +128,64 @@ struct maccess *ma; ma->ma_owner = utombits( mode ); - /* ma_user is a union of all permissions */ - + /* 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; } - if ( gmem( stat->st_gid )) { - ma->ma_user |= ma->ma_group; - } - ma->ma_user |= ma->ma_world; + else if ( gmem( stat->st_gid )) { + ma->ma_user = ma->ma_group; + } + 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 ? + * 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 0 - if ( ma->ma_user & AR_UWRITE ) { + if ( !stat->st_uid ) { ma->ma_user |= AR_UOWN; } -#endif } +#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. + * + * dir parameter is used by AFS */ -void accessmode( path, ma, dir ) -char *path; -struct maccess *ma; -struct dir *dir; +void accessmode(const struct vol *vol, char *path, struct maccess *ma, 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 (ostat(path, &sb, vol_syml_opt(vol)) != 0) + return; + st = &sb; + } + utommode( st, ma ); +#ifdef HAVE_ACLS + acltoownermode(vol, path, st, ma); +#endif } -int gmem( gid ) -const gid_t gid; +int gmem(const gid_t gid) { int i; @@ -190,8 +197,7 @@ const gid_t gid; return( 0 ); } -static __inline__ mode_t mtoubits( bits ) -u_char bits; +static mode_t mtoubits(u_char bits) { mode_t mode; @@ -210,8 +216,7 @@ u_char bits; 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; @@ -227,58 +232,10 @@ struct maccess *ma; return( mode ); } -int stickydirmode(name, mode, dropbox) -char * name; -const mode_t mode; -const int dropbox; -{ - int retval; -#ifdef DROPKLUDGE - int uid; -#endif /* DROPKLUDGE */ - - /* Turn on the sticky bit if this is a drop box, also turn off the setgid bit */ - retval=0; -#ifdef DROPKLUDGE - 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_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) ); - return(AFPERR_ACCESS); - } else { -#ifdef DEBUG - 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) & ~default_options.umask ) < 0) && errno != EPERM) { - LOG(log_error, logtype_afpd, "stickydirmode: chmod \"%s\": %s", - name, strerror(errno) ); - retval = -1; - } -#ifdef DROPKLUDGE - } /* end if not mode */ - } /* end checking for "dropbox" */ -#endif /* DROPKLUDGE */ - return retval; -} +#define EXEC_MODE (S_IXGRP | S_IXUSR | S_IXOTH) -int setdeskmode( mode ) -const mode_t mode; +/* Using chmod_acl() instead of ochmod is ok here */ +int setdeskmode(const mode_t mode) { char wd[ MAXPATHLEN + 1]; struct stat st; @@ -286,6 +243,10 @@ 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 ); } @@ -318,27 +279,23 @@ const mode_t mode; strcat( modbuf, subp->d_name ); /* XXX: need to preserve special modes */ if (stat(modbuf, &st) < 0) { - LOG(log_error, logtype_afpd, "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) & ~default_options.umask ) < 0 && errno != EPERM ) { - LOG(log_error, logtype_afpd, "setdeskmode: chmod %s: %s", - modbuf, strerror(errno) ); + 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 ) < 0 && errno != EPERM ) { - LOG(log_error, logtype_afpd, "setdeskmode: chmod %s: %s", - modbuf, strerror(errno) ); + } 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 ) { - LOG(log_error, logtype_afpd, "setdeskmode: chmod %s: %s", - deskp->d_name, strerror(errno) ); + 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) ); } } closedir( desk ); @@ -347,93 +304,117 @@ const mode_t mode; return -1; } /* XXX: need to preserve special modes */ - if ( chmod( ".AppleDesktop", (DIRBITS | mode) & ~default_options.umask ) < 0 && errno != EPERM ) { - LOG(log_error, logtype_afpd, "setdeskmode: chmod .AppleDesktop: %s", strerror(errno) ); + 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 ); } -int setdirmode( mode, noadouble, dropbox ) -const mode_t mode; -const int noadouble; -const int dropbox; +/* --------------------- */ +int setfilunixmode (const struct vol *vol, struct path* path, mode_t mode) +{ + if (!path->st_valid) { + of_stat(vol, path); + } + + if (path->st_errno) { + return -1; + } + + mode |= vol->v_fperm; + + if (setfilmode(vol, path->u_name, mode, &path->st) < 0) + return -1; + /* we need to set write perm if read set for resource fork */ + return vol->vfs->vfs_setfilmode(vol, path->u_name, mode, &path->st); +} + + +/* --------------------- */ +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)) { + /* extending right? dir first then .AppleDouble in rf_setdirmode */ + if ( stickydirmode(name, DIRBITS | mode, dropbox, 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 ) + return -1; + } + return 0; +} + +/* --------------------- */ +int setdirmode(const struct vol *vol, const char *name, mode_t mode) { - char buf[ MAXPATHLEN + 1]; struct stat st; - char *m; struct dirent *dirp; DIR *dir; - - if (( dir = opendir( "." )) == NULL ) { - LOG(log_error, logtype_afpd, "setdirmode: opendir .: %s", strerror(errno) ); + 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 ) + 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_afpd, "setdirmode: stat %s: %s", - dirp->d_name, strerror(errno) ); + if (ostat(dirp->d_name, &st, vol_syml_opt(vol)) < 0 ) { + 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(vol, dirp->d_name, setmode, &st) < 0) { + closedir( dir ); + 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_afpd, "setdirmode: opendir .AppleDouble: %s", strerror(errno) ); - return( -1 ); + + if (vol->vfs->vfs_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_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 ); - } /* 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, vol->v_umask) < 0 ) + return -1; + } return( 0 ); } -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; @@ -473,8 +454,7 @@ const gid_t gid; 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_afpd, "setdeskown: chown %s: %s", - modbuf, strerror(errno) ); + LOG(log_error, logtype_afpd, "setdeskown: chown %s: %s", fullpathname(modbuf), strerror(errno) ); } } closedir( sub ); @@ -490,95 +470,131 @@ const gid_t gid; return -1; } if ( chown( ".AppleDesktop", uid, gid ) < 0 && errno != EPERM ) { - LOG(log_error, logtype_afpd, "setdeskowner: chown .AppleDesktop: %s", - strerror(errno) ); + LOG(log_error, logtype_afpd, "setdeskowner: chown %s: %s", fullpathname(".AppleDouble"), strerror(errno) ); } return( 0 ); } +/* ----------------------------- */ +int setfilowner(const struct vol *vol, const uid_t uid, const gid_t gid, struct path* path) +{ + + if (!path->st_valid) { + of_stat(vol, path); + } + + if (path->st_errno) { + return -1; + } + + if (ochown( path->u_name, uid, gid, vol_syml_opt(vol)) < 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->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; + } -/* uid/gid == 0 need to be handled as special cases. they really mean + 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 ) -const uid_t uid; -const gid_t gid; -const int noadouble; +int setdirowner(const struct vol *vol, const char *name, const uid_t uid, const gid_t gid) { - 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 ) { + } + if (ostat(dirp->d_name, &st, vol_syml_opt(vol)) < 0 ) { LOG(log_error, logtype_afpd, "setdirowner: stat %s: %s", - dirp->d_name, strerror(errno) ); + 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 (ochown(dirp->d_name, uid, gid, vol_syml_opt(vol)) < 0 && errno != EPERM ) { LOG(log_debug, logtype_afpd, "setdirowner: chown %s: %s", - dirp->d_name, strerror(errno) ); + 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->vfs_setdirowner(vol, name, uid, gid) < 0) { + return -1; + } + + if (ostat(".", &st, vol_syml_opt(vol)) < 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_afpd, "setdirowner: chown %d/%d %s: %s", - uid, gid, buf, strerror(errno) ); - /* return ( -1 ); Sometimes this is okay */ - } + if ( gid && gid != st.st_gid && ochown(".", uid, gid, vol_syml_opt(vol)) < 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_afpd, "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_afpd, "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_afpd, "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( 0 ); + return ret; } +#endif +