Yet another dropkludge fix.

[netatalk.git] / etc / afpd / unix.c

diff --git a/etc/afpd/unix.c b/etc/afpd/unix.c
index 1f9206bcda08a8b622091e8a86a107153571e3d6..707a56d0d6dba644d68c56f54bbe81b6a78df605 100644 (file)
--- a/etc/afpd/unix.c
+++ b/etc/afpd/unix.c
@@ -33,52 +33,48 @@ int ustatfs_getvolspace( vol, bfree, btotal, bsize )
     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 );
 }
@@ -133,6 +129,40 @@ void utommode( stat, ma )
 }
 
 
+/*
+ * 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;
 {
@@ -184,7 +214,7 @@ const mode_t mode;
 {
   int uid, retval;
 
-/* Turn on the sticky bit if this is a drop box */
+/* Turn on the sticky bit if this is a drop box, also turn off the setgid bit */
    retval=0;
 #ifdef DROPKLUDGE
    if (mode & S_IWOTH) 
@@ -194,15 +224,15 @@ const mode_t mode;
         uid=geteuid();
         if ( seteuid(0) < 0)
           syslog( LOG_ERR, "stickydirmode: unable to seteuid root: %m");
-        if ( retval=chmod( name, (DIRBITS | mode | S_ISVTX)) < 0)
+        if ( retval=chmod( name, ( DIRBITS | mode | S_ISVTX) ) < 0)
         {
-           syslog( LOG_ERR, "stickydirmode: chmod %s: %m", name );
+           syslog( LOG_ERR, "stickydirmode: chmod \"%s\": %m", name );
            return(AFPERR_ACCESS);
         }
         else
         {
 #ifdef DEBUG
-           syslog( LOG_INFO, "stickydirmode: chmod \"%s\": %m", name );
+           syslog( LOG_INFO, "stickydirmode: (debug) chmod \"%s\": %m", name );
 #endif
            seteuid(uid);
         }
@@ -454,6 +484,7 @@ int setdirowner( uid, gid, noadouble )
        if (( st.st_mode & S_IFMT ) == S_IFREG ) {
            if ( chown( dirp->d_name, uid, gid ) < 0 ) {
                syslog( LOG_ERR, "setdirowner: chown %s: %m", dirp->d_name );
+               /* return ( -1 ); Sometimes this is okay */
            }
        }
     }
@@ -476,6 +507,7 @@ int setdirowner( uid, gid, noadouble )
        if ( chown( buf, uid, gid ) < 0 ) {
            syslog( LOG_ERR, "setdirowner: chown %d/%d %s: %m",
                    uid, gid, buf );
+           /* return ( -1 ); Sometimes this is okay */
        }
     }
     closedir( dir );
@@ -490,6 +522,7 @@ int setdirowner( uid, gid, noadouble )
     if ( gid && gid != st.st_gid && chown( ".AppleDouble", uid, gid ) < 0 ) {
        syslog( LOG_ERR, "setdirowner: chown %d/%d .AppleDouble: %m",
                uid, gid);
+       /* return ( -1 ); Sometimes this is okay */
     }
 
 setdirowner_noadouble: