/*
- * $Id: unix.c,v 1.29 2002-01-19 21:29:55 jmarcus Exp $
+ * $Id: unix.c,v 1.33 2002-04-14 10:53:37 srittau Exp $
*
* Copyright (c) 1990,1993 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
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 );
}
return( mode );
}
-inline int stickydirmode(name, mode, dropbox)
+int stickydirmode(name, mode, dropbox)
char * name;
const mode_t mode;
const int dropbox;
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");
+ LOG(log_error, logtype_afpd, "stickydirmode: unable to seteuid root: %s", strerror(errno));
}
- if ( retval=chmod( name, ( (DIRBITS | mode | S_ISVTX) & 0777 & ~default_options.umask) ) < 0) {
- LOG(log_error, logtype_default, "stickydirmode: chmod \"%s\": %m", name );
+ 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_default, "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 */
* 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",
+ 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;
}
}
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",
+ 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 ) {
- LOG(log_error, logtype_default, "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 & 0777 & ~default_options.umask ) < 0 && errno != EPERM ) {
- LOG(log_error, logtype_default, "setdeskmode: chmod %s: %s",
+ } 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 ) {
- LOG(log_error, logtype_default, "setdeskmode: chmod %s: %s",
+ 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 ) {
- 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 .AppleDesktop: %s", strerror(errno) );
}
return( 0 );
}
DIR *dir;
if (( dir = opendir( "." )) == NULL ) {
- LOG(log_error, logtype_default, "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 ) {
- LOG(log_error, logtype_default, "setdirmode: stat %s: %s",
+ LOG(log_error, logtype_afpd, "setdirmode: stat %s: %s",
dirp->d_name, strerror(errno) );
continue;
}
if (( dir = opendir( ".AppleDouble" )) == NULL ) {
if (noadouble)
goto setdirmode_noadouble;
- LOG(log_error, logtype_default, "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 ) {
- LOG(log_error, logtype_default, "setdirmode: stat %s: %s", buf, strerror(errno) );
+ LOG(log_error, logtype_afpd, "setdirmode: stat %s: %s", buf, strerror(errno) );
continue;
}
}
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",
+ 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 ) {
- LOG(log_error, logtype_default, "setdeskowner: chown %s: %s",
+ 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",
+ LOG(log_error, logtype_afpd, "setdeskowner: chown .AppleDesktop: %s",
strerror(errno) );
}
return( 0 );
continue;
};
if ( stat( dirp->d_name, &st ) < 0 ) {
- LOG(log_error, logtype_default, "setdirowner: stat %s: %s",
+ 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 ) {
- LOG(log_debug, logtype_default, "setdirowner: chown %s: %s",
+ 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 ) {
- LOG(log_debug, logtype_default, "setdirowner: chown %d/%d %s: %s",
+ 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 ) {
- LOG(log_error, logtype_default, "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 ) {
- LOG(log_debug, logtype_default, "setdirowner: chown %d/%d .AppleDouble: %s",
+ 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 ) {
- LOG(log_debug, logtype_default, "setdirowner: chown %d/%d .: %s",
+ LOG(log_debug, logtype_afpd, "setdirowner: chown %d/%d .: %s",
uid, gid, strerror(errno) );
}