Dont set owner of directory entries in setdirowner

diff --git a/etc/afpd/directory.c b/etc/afpd/directory.c
index eb71aabe26e720ae13ebb96579a514e6602db256..dfcbf44d0edac7e499e9ba0676cfb47ecfb2aa38 100644 (file)
--- a/etc/afpd/directory.c
+++ b/etc/afpd/directory.c
@@ -2085,13 +2085,17 @@ setdirparam_done:
             }
 
             if (setdirowner(vol, upath, -1, ntohl(group)) < 0) {
+                LOG(log_info, logtype_afpd, "setdirparams(\"%s\"): setdirowner: %s",
+                    fullpathname(upath), strerror(errno));
                 err = set_dir_errors(path, "setdirowner", errno);
                 goto setprivdone;
             }
 
-
-            if (setdirunixmode(vol, upath, upriv) < 0)
+            if (setdirunixmode(vol, upath, upriv) < 0) {
+                LOG(log_info, logtype_afpd, "setdirparams(\"%s\"): setdirunixmode: %s",
+                    fullpathname(upath), strerror(errno));
                 err = set_dir_errors(path, "setdirunixmode", errno);
+            }
         }
     }
 

diff --git a/etc/afpd/unix.c b/etc/afpd/unix.c
index e080208a77439e3859d09a684910b76cb462af7b..f2288546d6675ed902f71a2b919f0eb3294f9ea9 100644 (file)
--- a/etc/afpd/unix.c
+++ b/etc/afpd/unix.c
@@ -451,22 +451,13 @@ int setdeskowner(const uid_t uid, const gid_t gid)
 /* ----------------------------- */
 int setfilowner(const struct vol *vol, const uid_t uid, const gid_t gid, struct path* path)
 {
-
-    if (!path->st_valid) {
-        of_stat(path);
-    }
-
-    if (path->st_errno) {
-        return -1;
-    }
-
-    if ( lchown( path->u_name, uid, gid ) < 0 && errno != EPERM ) {
+    if (lchown(path->u_name, uid, gid) < 0 && errno != EPERM) {
         LOG(log_debug, logtype_afpd, "setfilowner: chown %d/%d %s: %s",
-            uid, gid, path->u_name, strerror(errno) );
-       return -1;
+            uid, gid, path->u_name, strerror(errno));
+        return -1;
     }
 
-    if (vol->vfs->vfs_chown(vol, path->u_name, uid, gid ) < 0 && errno != EPERM) {
+    if (vol->vfs->vfs_chown(vol, path->u_name, uid, gid) < 0 && errno != EPERM) {
         LOG(log_debug, logtype_afpd, "setfilowner: rf_chown %d/%d %s: %s",
             uid, gid, path->u_name, strerror(errno) );
         return -1;
@@ -482,91 +473,14 @@ int setfilowner(const struct vol *vol, const uid_t uid, const gid_t gid, struct
  * co-opting some bits. */
 int setdirowner(const struct vol *vol, const char *name, const uid_t uid, const gid_t gid)
 {
-    struct stat                st;
-    struct dirent      *dirp;
-    DIR                        *dir;
-
-    if (( dir = opendir( name )) == NULL ) {
-        return( -1 );
-    }
-    for ( dirp = readdir( dir ); dirp != NULL; dirp = readdir( dir )) {
-        if ( *dirp->d_name == '.') {
-            continue;
-        }
-        if ( lstat( dirp->d_name, &st ) < 0 ) {
-            LOG(log_error, logtype_afpd, "setdirowner: stat %s: %s",
-                fullpathname(dirp->d_name), strerror(errno) );
-            continue;
-        }
-        if (( st.st_mode & S_IFMT ) == S_IFREG ) {
-            if ( lchown( dirp->d_name, uid, gid ) < 0 && errno != EPERM ) {
-                LOG(log_debug, logtype_afpd, "setdirowner: chown %s: %s",
-                    fullpathname(dirp->d_name), strerror(errno) );
-                /* return ( -1 ); Sometimes this is okay */
-            }
-        }
+    if (lchown(name, uid, gid ) < 0 && errno != EPERM ) {
+        LOG(log_debug, logtype_afpd, "setdirowner: chown %d/%d %s: %s",
+            uid, gid, fullpathname(name), strerror(errno) );
     }
-    closedir( dir );
 
-    if (vol->vfs->vfs_setdirowner(vol, name, uid, gid) < 0) {
+    if (vol->vfs->vfs_setdirowner(vol, name, uid, gid) < 0)
         return -1;
-    }
-    
-    if ( lstat( ".", &st ) < 0 ) {
-        return( -1 );
-    }
-    if ( gid && gid != st.st_gid && lchown( ".", uid, gid ) < 0 && errno != EPERM ) {
-        LOG(log_debug, logtype_afpd, "setdirowner: chown %d/%d %s: %s",
-            uid, gid, fullpathname("."), strerror(errno) );
-    }
 
     return( 0 );
 }
 
-#if 0
-/* recursive chown()ing of a directory */
-static int recursive_chown(const char *path, uid_t uid, gid_t gid) {
-    struct stat sbuf;
-    DIR *odir = NULL;
-    struct dirent *entry;
-    char *name;
-    int ret = 0;
-    char newpath[PATH_MAX+1];
-    newpath[PATH_MAX] = '\0';
-    
-    if (chown(path, uid, gid) < 0) {
-        LOG(log_error, logtype_afpd, "cannot chown() file [%s] (uid = %d): %s", path, uid, strerror(errno));
-       return -1;
-    }
-
-    if (lstat(path, &sbuf) < 0) {
-       LOG(log_error, logtype_afpd, "cannot chown() file [%s] (uid = %d): %s", path, uid, strerror(errno));
-       return -1;
-    }
-       
-    if (S_ISDIR(sbuf.st_mode)) {
-       odir = opendir(path);
-       if (odir == NULL) {
-           LOG(log_error, logtype_afpd, "cannot opendir() [%s] (uid = %d): %s", path, uid, strerror(errno));
-           goto recursive_chown_end;
-       }
-       while (NULL != (entry=readdir(odir)) ) {
-           name = entry->d_name;
-           if (name[0] == '.' && name[1] == '\0')
-               continue;
-           if (name[0] == '.' && name[1] == '.' && name[2] == '\0')
-               continue;
-           sprintf(newpath, "%s/%s", path, name);
-           if (recursive_chown(newpath, uid, gid) < 0)
-               ret = -1;
-       } /* while */
-    } /* if */
-
-recursive_chown_end:
-    if (odir != NULL) {
-       closedir(odir);
-    }
-    return ret;
-}
-#endif
-

diff --git a/libatalk/vfs/vfs.c b/libatalk/vfs/vfs.c
index 270e2a25b5328ad35d64559d7a6a27ad93b4ebfa..a704b5d185adf1a38a21c843981fe1cb2ba508a2 100644 (file)
--- a/libatalk/vfs/vfs.c
+++ b/libatalk/vfs/vfs.c
@@ -233,44 +233,11 @@ static int RF_setdirmode_adouble(VFS_FUNC_ARGS_SETDIRMODE)
     return 0;
 }
 
-/* ----------------- */
-static int setdirowner_adouble_loop(struct dirent *de _U_, char *name, void *data, int flag _U_, mode_t v_umask _U_)
-{
-    struct perm   *owner  = data;
-
-    if ( chown( name, owner->uid, owner->gid ) < 0 && errno != EPERM ) {
-         LOG(log_debug, logtype_afpd, "setdirowner: chown %d/%d %s: %s",
-                owner->uid, owner->gid, fullpathname(name), strerror(errno) );
-         /* return ( -1 ); Sometimes this is okay */
-    }
-    return 0;
-}
-
 static int RF_setdirowner_adouble(VFS_FUNC_ARGS_SETDIROWNER)
 {
-    char          *adouble_p;
-    struct stat   st;
-    struct perm   owner;
-    
-    owner.uid = uid;
-    owner.gid = gid;
-
-    adouble_p = ad_dir(vol->ad_path(name, ADFLAGS_DIR ));
-
-    if (for_each_adouble("setdirowner", adouble_p, setdirowner_adouble_loop, &owner, 0, vol->v_umask)) 
-        return -1;
-
-    /*
-     * We cheat: we know that chown doesn't do anything.
-     */
-    if ( stat( ".AppleDouble", &st ) < 0) {
-        LOG(log_error, logtype_afpd, "setdirowner: stat %s: %s", fullpathname(".AppleDouble"), strerror(errno) );
-        return -1;
-    }
-    if ( gid && gid != st.st_gid && chown( ".AppleDouble", uid, gid ) < 0 && errno != EPERM ) {
+    if (lchown(".AppleDouble", uid, gid) < 0 && errno != EPERM ) {
         LOG(log_debug, logtype_afpd, "setdirowner: chown %d/%d %s: %s",
-            uid, gid,fullpathname(".AppleDouble"), strerror(errno) );
-        /* return ( -1 ); Sometimes this is okay */
+            uid, gid,fullpathname(".AppleDouble"), strerror(errno));
     }
     return 0;
 }