General fixes for logging, error reporting, this, that, and the other thing.

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

diff --git a/etc/afpd/unix.c b/etc/afpd/unix.c
index 83464411649c04c9d9933c3c94c80d5f64ac5506..1f9206bcda08a8b622091e8a86a107153571e3d6 100644 (file)
--- a/etc/afpd/unix.c
+++ b/etc/afpd/unix.c
@@ -51,6 +51,18 @@ int ustatfs_getvolspace( vol, bfree, btotal, bsize )
     *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;
+    } else {
+        *bfree *= *bsize;
+    }
+#endif
+
 #ifdef ultrix
     *btotal = (VolSpace) 
       ( sfs.fd_req.btot - ( sfs.fd_req.bfree - sfs.fd_req.bfreen )) * 1024;
@@ -58,6 +70,16 @@ int ustatfs_getvolspace( vol, bfree, btotal, bsize )
     *btotal = (VolSpace) 
       ( sfs.f_blocks - ( sfs.f_bfree - sfs.f_bavail )) * sfs.f_frsize;
 #endif ultrix
+
+#if FORCE_2GB
+    // see similar block above comments
+    if ( *bfree > 0x7fffffff / *bsize ) {
+        *bfree = 0x7fffffff;
+    } else {
+        *bfree *= *bsize;
+    }
+#endif
+
     return( AFP_OK );
 }
 
@@ -68,9 +90,10 @@ static __inline__ int utombits( bits )
 
     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 );
 }
@@ -91,13 +114,7 @@ void utommode( stat, ma )
 
     ma->ma_owner = utombits( mode );
 
-#ifdef ADMIN_GRP
-    if ( uuid == 0 )
-        ma->ma_user = AR_UWRITE | AR_UREAD | AR_USEARCH | AR_UOWN;
-    else
-#endif
-
-    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;
@@ -136,9 +153,10 @@ static __inline__ mode_t mtoubits( bits )
 
     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 );
 }
@@ -160,6 +178,41 @@ mode_t mtoumode( ma )
     return( mode );
 }
 
+inline int stickydirmode(name, mode)
+char * name;
+const mode_t mode;
+{
+  int uid, retval;
+
+/* Turn on the sticky bit if this is a drop box */
+   retval=0;
+#ifdef DROPKLUDGE
+   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: chmod \"%s\": %m", name );
+#endif
+           seteuid(uid);
+        }
+      }
+   else 
+#endif DROPKLUDGE
+       if ( retval=chmod( name, DIRBITS | mode ) < 0 ) 
+          syslog( LOG_ERR, "stickydirmode: chmod \"%s\": %m", name );
+   return retval;
+}
 
 int setdeskmode( mode )
     const mode_t       mode;
@@ -202,23 +255,23 @@ int setdeskmode( 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 );
@@ -228,7 +281,7 @@ int setdeskmode( mode )
     }
     /* 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 );
 }
@@ -253,19 +306,17 @@ int setdirmode( mode, noadouble )
            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) < 0)
+               return (-1);
+           } else if (stickydirmode(dirp->d_name, mode) < 0)
+               return (-1);
        }
     }
     closedir( dir );
@@ -287,34 +338,27 @@ int setdirmode( mode, noadouble )
        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 );
+       } else 
+           stickydirmode( buf, mode );
+    } /* 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) < 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) < 0 )
        return( -1 );
-    }
     return( 0 );
 }
 
@@ -360,13 +404,13 @@ int setdeskowner( uid, gid )
            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 );
@@ -404,12 +448,12 @@ int setdirowner( uid, gid, noadouble )
            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 );
            }
        }
     }
@@ -430,7 +474,7 @@ int setdirowner( uid, gid, noadouble )
        *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 );
        }
     }
@@ -444,7 +488,7 @@ int setdirowner( uid, gid, noadouble )
        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);
     }
 
@@ -453,7 +497,7 @@ setdirowner_noadouble:
        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);
     }