VolSpace *bfree, *btotal;
u_int32_t *bsize;
{
+ VolSpace maxVolSpace = (~(VolSpace)0);
+
#ifdef ultrix
struct fs_data sfs;
#else /*ultrix*/
struct statfs sfs;
#endif /*ultrix*/
+
if ( statfs( vol->v_path, &sfs ) < 0 ) {
- return( AFPERR_PARAM );
+ syslog(LOG_ERR, "ustatfs_getvolspace unable to stat %s", vol->v_path);
+ return( AFPERR_PARAM );
}
#ifdef ultrix
- *bfree = (VolSpace) sfs.fd_req.bfreen * 1024;
+ *bfree = (VolSpace) sfs.fd_req.bfreen;
*bsize = 1024;
#else
- *bfree = (VolSpace) sfs.f_bavail * sfs.f_frsize;
+ *bfree = (VolSpace) sfs.f_bavail;
*bsize = sfs.f_frsize;
#endif ultrix
-#if FORCE_2GB
- // if the volume is over 2GB in size, report
- // the size as 2GB.
- // this doesn't seem to work correctly for
- // 64 bit size descriptors.
- if ( *bfree > 0x7fffffff / *bsize ) {
- *bfree = 0x7fffffff;
+ if ( *bfree > maxVolSpace / *bsize ) {
+ *bfree = maxVolSpace;
} else {
*bfree *= *bsize;
}
-#endif
#ifdef ultrix
*btotal = (VolSpace)
- ( sfs.fd_req.btot - ( sfs.fd_req.bfree - sfs.fd_req.bfreen )) * 1024;
+ ( sfs.fd_req.btot - ( sfs.fd_req.bfree - sfs.fd_req.bfreen ));
#else ultrix
*btotal = (VolSpace)
- ( sfs.f_blocks - ( sfs.f_bfree - sfs.f_bavail )) * sfs.f_frsize;
+ ( sfs.f_blocks - ( sfs.f_bfree - sfs.f_bavail ));
#endif ultrix
-#if FORCE_2GB
// see similar block above comments
- if ( *bfree > 0x7fffffff / *bsize ) {
- *bfree = 0x7fffffff;
+ if ( *btotal > maxVolSpace / *bsize ) {
+ *btotal = maxVolSpace;
} else {
- *bfree *= *bsize;
+ *btotal *= *bsize;
}
-#endif
return( AFP_OK );
}
else /* if S_IWOTH and not S_IROTH */
{
uid=geteuid();
- seteuid(0);
+ if ( seteuid(0) < 0)
+ syslog( LOG_ERR, "stickydirmode: unable to seteuid root: %m");
if ( retval=chmod( name, (DIRBITS | mode | S_ISVTX)) < 0)
{
- syslog( LOG_ERR, "stickydirmode: chmod %s: %m", name );
- return(AFP_ACCESS);
+ syslog( LOG_ERR, "stickydirmode: chmod \"%s\": %m", name );
+ return(AFPERR_ACCESS);
}
else
{
- syslog( LOG_DEBUG, "stickydirmode: chmod \"%s\": %m", name );
+#ifdef DEBUG
+ syslog( LOG_INFO, "stickydirmode: (debug) chmod \"%s\": %m", name );
+#endif
seteuid(uid);
}
}
else
#endif DROPKLUDGE
if ( retval=chmod( name, DIRBITS | mode ) < 0 )
- syslog( LOG_DEBUG, "stickydirmode: chmod \"%s\": %m", name );
+ syslog( LOG_ERR, "stickydirmode: chmod \"%s\": %m", name );
return retval;
}
strcat( modbuf, subp->d_name );
/* XXX: need to preserve special modes */
if (stat(modbuf, &st) < 0) {
- syslog( LOG_DEBUG, "setdeskmode: stat %s: %m", modbuf );
+ syslog( LOG_ERR, "setdeskmode: stat %s: %m", modbuf );
continue;
}
if (S_ISDIR(st.st_mode)) {
if ( chmod( modbuf, DIRBITS | mode ) < 0 ) {
- syslog( LOG_DEBUG, "setdeskmode: chmod %s: %m", modbuf );
+ syslog( LOG_ERR, "setdeskmode: chmod %s: %m", modbuf );
}
} else if ( chmod( modbuf, mode ) < 0 ) {
- syslog( LOG_DEBUG, "setdeskmode: chmod %s: %m", modbuf );
+ syslog( LOG_ERR, "setdeskmode: chmod %s: %m", modbuf );
}
}
closedir( sub );
/* XXX: need to preserve special modes */
if ( chmod( deskp->d_name, DIRBITS | mode ) < 0 ) {
- syslog( LOG_DEBUG, "setdeskmode: chmod %s: %m", deskp->d_name );
+ syslog( LOG_ERR, "setdeskmode: chmod %s: %m", deskp->d_name );
}
}
closedir( desk );
}
/* XXX: need to preserve special modes */
if ( chmod( ".AppleDesktop", DIRBITS | mode ) < 0 ) {
- syslog( LOG_DEBUG, "setdeskmode: chmod .AppleDesktop: %m" );
+ syslog( LOG_ERR, "setdeskmode: chmod .AppleDesktop: %m" );
}
return( 0 );
}
continue;
}
if ( stat( dirp->d_name, &st ) < 0 ) {
- syslog( LOG_DEBUG, "setdirmode: stat %s: %m", dirp->d_name );
+ syslog( LOG_ERR, "setdirmode: stat %s: %m", dirp->d_name );
continue;
}
strcat( buf, dirp->d_name );
if ( stat( buf, &st ) < 0 ) {
- syslog( LOG_DEBUG, "setdirmode: stat %s: %m", buf );
+ syslog( LOG_ERR, "setdirmode: stat %s: %m", buf );
continue;
}
strcat( modbuf, subp->d_name );
/* XXX: add special any uid, ignore group bits */
if ( chown( modbuf, uid, gid ) < 0 ) {
- syslog( LOG_DEBUG, "setdeskown: chown %s: %m", modbuf );
+ syslog( LOG_ERR, "setdeskown: chown %s: %m", modbuf );
}
}
closedir( sub );
/* XXX: add special any uid, ignore group bits */
if ( chown( deskp->d_name, uid, gid ) < 0 ) {
- syslog( LOG_DEBUG, "setdeskowner: chown %s: %m", deskp->d_name );
+ syslog( LOG_ERR, "setdeskowner: chown %s: %m", deskp->d_name );
}
}
closedir( desk );
continue;
};
if ( stat( dirp->d_name, &st ) < 0 ) {
- syslog( LOG_DEBUG, "setdirowner: stat %s: %m", dirp->d_name );
+ syslog( LOG_ERR, "setdirowner: stat %s: %m", dirp->d_name );
continue;
}
if (( st.st_mode & S_IFMT ) == S_IFREG ) {
if ( chown( dirp->d_name, uid, gid ) < 0 ) {
- syslog( LOG_DEBUG, "setdirowner: chown %s: %m", dirp->d_name );
+ syslog( LOG_ERR, "setdirowner: chown %s: %m", dirp->d_name );
}
}
}
*m = '\0';
strcat( buf, dirp->d_name );
if ( chown( buf, uid, gid ) < 0 ) {
- syslog( LOG_DEBUG, "setdirowner: chown %d/%d %s: %m",
+ syslog( LOG_ERR, "setdirowner: chown %d/%d %s: %m",
uid, gid, buf );
}
}
return( -1 );
}
if ( gid && gid != st.st_gid && chown( ".AppleDouble", uid, gid ) < 0 ) {
- syslog( LOG_DEBUG, "setdirowner: chown %d/%d .AppleDouble: %m",
+ syslog( LOG_ERR, "setdirowner: chown %d/%d .AppleDouble: %m",
uid, gid);
}
return( -1 );
}
if ( gid && gid != st.st_gid && chown( ".", uid, gid ) < 0 ) {
- syslog( LOG_DEBUG, "setdirowner: chown %d/%d .: %m",
+ syslog( LOG_ERR, "setdirowner: chown %d/%d .: %m",
uid, gid);
}