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 ( *bfree > maxVolSpace / *bsize ) {
+ *bfree = maxVolSpace;
+ } else {
+ *bfree *= *bsize;
+ }
+
#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
+
+ // see similar block above comments
+ if ( *btotal > maxVolSpace / *bsize ) {
+ *btotal = maxVolSpace;
+ } else {
+ *btotal *= *bsize;
+ }
+
return( AFP_OK );
}
mbits = 0;
- mbits |= ( bits & ( S_IREAD >> 6 )) ? AR_UREAD : 0;
+ mbits |= ( bits & ( S_IREAD >> 6 )) ? (AR_UREAD | AR_USEARCH) : 0;
mbits |= ( bits & ( S_IWRITE >> 6 )) ? AR_UWRITE : 0;
- mbits |= ( bits & ( S_IEXEC >> 6) ) ? AR_USEARCH : 0;
+/* Do we really need this?
+ mbits |= ( bits & ( S_IEXEC >> 6) ) ? AR_USEARCH : 0; */
return( mbits );
}
ma->ma_owner = utombits( mode );
- if ( uuid == stat->st_uid ) {
+ if ( (uuid == stat->st_uid) || (uuid == 0)) {
ma->ma_user = ma->ma_owner | AR_UOWN;
} else if ( gmem( stat->st_gid )) {
ma->ma_user = ma->ma_group;
}
+/*
+ * Calculate the mode for a directory using Posix access() calls to
+ * estimate permission, a la mdw.
+ */
+accessmode( path, ma, dir )
+ char *path;
+ struct maccess *ma;
+ struct dir *dir;
+{
+ if ( access( path, R_OK|W_OK|X_OK ) == 0 ) {
+ ma->ma_user = AR_UREAD|AR_UWRITE|AR_USEARCH|AR_UOWN;
+ ma->ma_owner = AR_UREAD|AR_UWRITE|AR_USEARCH;
+ } else if ( access( path, R_OK|X_OK ) == 0 ) {
+ ma->ma_user = AR_UREAD|AR_USEARCH;
+ ma->ma_owner = AR_UREAD|AR_USEARCH;
+ } else {
+ ma->ma_user = ma->ma_owner = 0;
+ if ( access( path, R_OK ) == 0 ) {
+ ma->ma_user |= AR_UREAD;
+ ma->ma_owner |= AR_UREAD;
+ }
+ if ( access( path, X_OK ) == 0 ) {
+ ma->ma_user |= AR_USEARCH;
+ ma->ma_owner |= AR_USEARCH;
+ }
+ if ( access( path, W_OK ) == 0 ) {
+ ma->ma_user |= AR_UWRITE|AR_UOWN;
+ ma->ma_owner |= AR_UWRITE;
+ }
+ }
+
+ return;
+}
+
int gmem( gid )
const gid_t gid;
{
mode = 0;
- mode |= ( bits & AR_UREAD ) ? ( S_IREAD >> 6 ) : 0;
- mode |= ( bits & AR_UWRITE ) ? ( S_IWRITE >> 6 ) : 0;
- mode |= ( bits & AR_USEARCH ) ? ( S_IEXEC >> 6 ) : 0;
+ mode |= ( bits & AR_UREAD ) ? ( (S_IREAD | S_IEXEC) >> 6 ) : 0;
+ mode |= ( bits & AR_UWRITE ) ? ( (S_IWRITE | S_IEXEC) >> 6 ) : 0;
+/* I don't think there's a way to set the SEARCH bit by itself on a Mac
+ mode |= ( bits & AR_USEARCH ) ? ( S_IEXEC >> 6 ) : 0; */
return( mode );
}
return( mode );
}
+inline int stickydirmode(name, mode, dropbox)
+ char * name;
+ const mode_t mode;
+ const int dropbox;
+{
+ int uid, retval;
+
+/* 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) {
+ 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(AFPERR_ACCESS);
+ } else {
+#ifdef DEBUG
+ syslog( LOG_INFO, "stickydirmode: (debug) chmod \"%s\": %m", name );
+#endif
+ seteuid(uid);
+ } /* end getting retval */
+ } /* end if not & S_IROTH */
+ } else { /* end if S_IWOTH and not S_IROTH */
+#endif DROPKLUDGE
+ if ( retval=chmod( name, DIRBITS | mode ) < 0 ) {
+ syslog( LOG_ERR, "stickydirmode: chmod \"%s\": %m", name );
+ }
+#ifdef DROPKLUDGE
+ } /* end if not mode */
+ } /* end checking for "dropbox" */
+#endif /* DROPKLUDGE */
+ return retval;
+}
int setdeskmode( mode )
const mode_t mode;
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 );
}
-int setdirmode( mode, noadouble )
+int setdirmode( mode, noadouble, dropbox )
const mode_t mode;
const int noadouble;
+ const int dropbox;
{
char buf[ MAXPATHLEN + 1];
struct stat st;
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;
}
if (S_ISREG(st.st_mode)) {
/* XXX: need to preserve special modes */
if (S_ISDIR(st.st_mode)) {
- if ( chmod( dirp->d_name, DIRBITS | mode ) < 0 ) {
- syslog( LOG_DEBUG, "setdirmode: chmod %s: %m", dirp->d_name );
- }
- } else if ( chmod( dirp->d_name, mode ) < 0 ) {
- syslog( LOG_DEBUG, "setdirmode: chmod %s: %m", dirp->d_name );
- }
+ if (stickydirmode(dirp->d_name, DIRBITS | mode, dropbox) < 0)
+ return (-1);
+ } else if (stickydirmode(dirp->d_name, mode, dropbox) < 0)
+ return (-1);
}
}
closedir( dir );
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;
}
if (S_ISDIR(st.st_mode)) {
- if ( chmod(buf, DIRBITS | mode) < 0 ) {
- syslog( LOG_DEBUG, "setdirmode: chmod %s: %m", buf );
- }
- } else if ( chmod(buf, mode) < 0 ) {
- syslog( LOG_DEBUG, "setdirmode: chmod %s: %m", buf );
- }
- }
+ 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 ( chmod( ".AppleDouble", DIRBITS | mode ) < 0 ) {
- syslog( LOG_ERR, "setdirmode: chmod .AppleDouble: %m" );
+ if ( stickydirmode(".AppleDouble", DIRBITS | mode, dropbox) < 0 )
return( -1 );
- }
setdirmode_noadouble:
/* XXX: need to preserve special modes */
- if ( chmod( ".", DIRBITS | mode ) < 0 ) {
- syslog( LOG_ERR, "setdirmode: chmod .: %m" );
+ if ( stickydirmode(".", DIRBITS | mode, dropbox) < 0 )
return( -1 );
- }
return( 0 );
}
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 );
+ /* return ( -1 ); Sometimes this is okay */
}
}
}
if ( chown( buf, uid, gid ) < 0 ) {
syslog( LOG_DEBUG, "setdirowner: chown %d/%d %s: %m",
uid, gid, buf );
+ /* return ( -1 ); Sometimes this is okay */
}
}
closedir( dir );
if ( gid && gid != st.st_gid && chown( ".AppleDouble", uid, gid ) < 0 ) {
syslog( LOG_DEBUG, "setdirowner: chown %d/%d .AppleDouble: %m",
uid, gid);
+ /* return ( -1 ); Sometimes this is okay */
}
setdirowner_noadouble:
projects / netatalk.git / blobdiff