unix.c:

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

diff --git a/etc/afpd/unix.c b/etc/afpd/unix.c
index dbdb6ada828bd76fad2d1b4a5c8ce2c10790c893..c5459c1612aa84c95ce9f586cb37d30424e58de3 100644 (file)
--- a/etc/afpd/unix.c
+++ b/etc/afpd/unix.c
@@ -1,5 +1,5 @@
 /*
- * $Id: unix.c,v 1.27 2002-01-03 17:49:38 sibaz Exp $
+ * $Id: unix.c,v 1.35 2002-06-06 10:14:26 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -16,7 +16,7 @@
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/stat.h>
-#include <syslog.h>
+#include <atalk/logger.h>
 #include <netatalk/endian.h>
 #include <dirent.h>
 #include <limits.h>
@@ -63,7 +63,7 @@ u_int32_t   *bsize;
 
 
     if ( statfs( vol->v_path, &sfs ) < 0 ) {
-        syslog(LOG_ERR, "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 );
     }
 
@@ -114,6 +114,9 @@ mode_t      bits;
     return( mbits );
 }
 
+/* --------------------------------
+    cf AFP 3.0 page 63
+*/
 void utommode( stat, ma )
 struct stat            *stat;
 struct maccess *ma;
@@ -130,22 +133,28 @@ struct maccess    *ma;
 
     ma->ma_owner = utombits( mode );
 
+    /* ma_user is a union of all permissions */
+
     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;
-    } else {
-        ma->ma_user = ma->ma_world;
     }
+    if ( gmem( stat->st_gid )) {
+        ma->ma_user |= ma->ma_group;
+    } 
+    ma->ma_user |= ma->ma_world;
 
     /*
      * There are certain things the mac won't try if you don't have
      * the "owner" bit set, even tho you can do these things on unix wiht
      * only write permission.  What were the things?
+     * 
+     * FIXME and so what ?
      */
+#if 0
     if ( ma->ma_user & AR_UWRITE ) {
         ma->ma_user |= AR_UOWN;
     }
+#endif    
 }
 
 
@@ -196,16 +205,21 @@ u_char    bits;
     return( mode );
 }
 
+/* ----------------------------------
+   from the finder's share windows (menu--> File--> sharing...)
+   and from AFP 3.0 spec page 63 
+   the mac mode should be save somewhere 
+*/
 mode_t mtoumode( ma )
 struct maccess *ma;
 {
     mode_t             mode;
 
     mode = 0;
-    mode |= mtoubits( ma->ma_owner );
+    mode |= mtoubits( ma->ma_owner |ma->ma_world);
     mode = mode << 3;
 
-    mode |= mtoubits( ma->ma_group );
+    mode |= mtoubits( ma->ma_group |ma->ma_world);
     mode = mode << 3;
 
     mode |= mtoubits( ma->ma_world );
@@ -213,7 +227,7 @@ struct maccess      *ma;
     return( mode );
 }
 
-inline int stickydirmode(name, mode, dropbox)
+int stickydirmode(name, mode, dropbox)
 char * name;
 const mode_t mode;
 const int dropbox;
@@ -232,14 +246,14 @@ const int dropbox;
             else { /* if S_IWOTH and not S_IROTH */
                 uid=geteuid();
                 if ( seteuid(0) < 0) {
-                    syslog( LOG_ERR, "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) {
-                    syslog( LOG_ERR, "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
-                    syslog( LOG_INFO, "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 */
@@ -251,9 +265,9 @@ const int dropbox;
             *  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)  {
-                syslog( LOG_ERR, "stickydirmode: chmod \"%s\": %s",
-                        name, strerror(errno) );
+            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;
             }
 #ifdef DROPKLUDGE
@@ -280,7 +294,7 @@ const mode_t        mode;
     }
     if (( desk = opendir( "." )) == NULL ) {
         if ( chdir( wd ) < 0 ) {
-            syslog( LOG_ERR, "setdeskmode: chdir %s: %s", wd, strerror(errno) );
+            LOG(log_error, logtype_afpd, "setdeskmode: chdir %s: %s", wd, strerror(errno) );
         }
         return( -1 );
     }
@@ -304,37 +318,37 @@ const mode_t      mode;
             strcat( modbuf, subp->d_name );
             /* XXX: need to preserve special modes */
             if (stat(modbuf, &st) < 0) {
-                syslog( LOG_ERR, "setdeskmode: stat %s: %s",
-                        modbuf, strerror(errno) );
+                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 ) {
-                    syslog( LOG_ERR, "setdeskmode: chmod %s: %s",
-                            modbuf, strerror(errno) );
-                }
-            } else if ( chmod( modbuf,  mode & 0777 & ~default_options.umask ) < 0 && errno != EPERM ) {
-                syslog( LOG_ERR, "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 & ~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 ) {
-            syslog( LOG_ERR, "setdeskmode: chmod %s: %s",
-                    deskp->d_name, strerror(errno) );
+        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 ) {
-        syslog( LOG_ERR, "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 ) {
-        syslog( LOG_ERR, "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 );
 }
@@ -351,7 +365,7 @@ const int dropbox;
     DIR                        *dir;
 
     if (( dir = opendir( "." )) == NULL ) {
-        syslog( LOG_ERR, "setdirmode: opendir .: %s", strerror(errno) );
+        LOG(log_error, logtype_afpd, "setdirmode: opendir .: %s", strerror(errno) );
         return( -1 );
     }
 
@@ -360,8 +374,8 @@ const int dropbox;
             continue;
         }
         if ( stat( dirp->d_name, &st ) < 0 ) {
-            syslog( LOG_ERR, "setdirmode: stat %s: %s",
-                    dirp->d_name, strerror(errno) );
+            LOG(log_error, logtype_afpd, "setdirmode: stat %s: %s",
+                dirp->d_name, strerror(errno) );
             continue;
         }
 
@@ -378,7 +392,7 @@ const int dropbox;
     if (( dir = opendir( ".AppleDouble" )) == NULL ) {
         if (noadouble)
             goto setdirmode_noadouble;
-        syslog( LOG_ERR, "setdirmode: opendir .AppleDouble: %s", strerror(errno) );
+        LOG(log_error, logtype_afpd, "setdirmode: opendir .AppleDouble: %s", strerror(errno) );
         return( -1 );
     }
     strcpy( buf, ".AppleDouble" );
@@ -393,7 +407,7 @@ const int dropbox;
         strcat( buf, dirp->d_name );
 
         if ( stat( buf, &st ) < 0 ) {
-            syslog( LOG_ERR, "setdirmode: stat %s: %s", buf, strerror(errno) );
+            LOG(log_error, logtype_afpd, "setdirmode: stat %s: %s", buf, strerror(errno) );
             continue;
         }
 
@@ -434,7 +448,7 @@ const gid_t gid;
     }
     if (( desk = opendir( "." )) == NULL ) {
         if ( chdir( wd ) < 0 ) {
-            syslog( LOG_ERR, "setdeskowner: chdir %s: %s", wd, strerror(errno) );
+            LOG(log_error, logtype_afpd, "setdeskowner: chdir %s: %s", wd, strerror(errno) );
         }
         return( -1 );
     }
@@ -459,25 +473,25 @@ const gid_t       gid;
             strcat( modbuf, subp->d_name );
             /* XXX: add special any uid, ignore group bits */
             if ( chown( modbuf, uid, gid ) < 0 && errno != EPERM ) {
-                syslog( LOG_ERR, "setdeskown: chown %s: %s",
-                        modbuf, strerror(errno) );
+                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 ) {
-            syslog( LOG_ERR, "setdeskowner: chown %s: %s",
-                    deskp->d_name, strerror(errno) );
+            LOG(log_error, logtype_afpd, "setdeskowner: chown %s: %s",
+                deskp->d_name, strerror(errno) );
         }
     }
     closedir( desk );
     if ( chdir( wd ) < 0 ) {
-        syslog( LOG_ERR, "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 ) {
-        syslog( LOG_ERR, "setdeskowner: chown .AppleDesktop: %s",
-                strerror(errno) );
+        LOG(log_error, logtype_afpd, "setdeskowner: chown .AppleDesktop: %s",
+            strerror(errno) );
     }
     return( 0 );
 }
@@ -506,14 +520,14 @@ const int   noadouble;
             continue;
         };
         if ( stat( dirp->d_name, &st ) < 0 ) {
-            syslog( LOG_ERR, "setdirowner: stat %s: %s",
-                    dirp->d_name, strerror(errno) );
+            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 ) {
-                syslog( LOG_DEBUG, "setdirowner: chown %s: %s",
-                        dirp->d_name, strerror(errno) );
+                LOG(log_debug, logtype_afpd, "setdirowner: chown %s: %s",
+                    dirp->d_name, strerror(errno) );
                 /* return ( -1 ); Sometimes this is okay */
             }
         }
@@ -535,8 +549,8 @@ const int   noadouble;
         *m = '\0';
         strcat( buf, dirp->d_name );
         if ( chown( buf, uid, gid ) < 0 && errno != EPERM ) {
-            syslog( LOG_DEBUG, "setdirowner: chown %d/%d %s: %s",
-                    uid, gid, buf, strerror(errno) );
+            LOG(log_debug, logtype_afpd, "setdirowner: chown %d/%d %s: %s",
+                uid, gid, buf, strerror(errno) );
             /* return ( -1 ); Sometimes this is okay */
         }
     }
@@ -546,13 +560,13 @@ const int   noadouble;
      * We cheat: we know that chown doesn't do anything.
      */
     if ( stat( ".AppleDouble", &st ) < 0 ) {
-        syslog( LOG_ERR, "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 ) {
-        syslog( LOG_DEBUG, "setdirowner: chown %d/%d .AppleDouble: %s",
-                uid, gid, strerror(errno) );
+        LOG(log_debug, logtype_afpd, "setdirowner: chown %d/%d .AppleDouble: %s",
+            uid, gid, strerror(errno) );
         /* return ( -1 ); Sometimes this is okay */
     }
 
@@ -562,8 +576,8 @@ setdirowner_noadouble:
     }
     if ( gid && gid != st.st_gid && chown( ".", uid, gid ) < 0 &&
             errno != EPERM ) {
-        syslog( LOG_DEBUG, "setdirowner: chown %d/%d .: %s",
-                uid, gid, strerror(errno) );
+        LOG(log_debug, logtype_afpd, "setdirowner: chown %d/%d .: %s",
+            uid, gid, strerror(errno) );
     }
 
     return( 0 );