X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Funix.c;h=d5bde724b9190ccb062122299ee879b2491575ec;hb=42c8cb19e0091eee8cc3cfa2c97205d7a412fb1b;hp=48ece6058f38aca072992575cf34d97f13b7a0cd;hpb=815d557e167e76015934397dffbfa869180dcdbc;p=netatalk.git

diff --git a/etc/afpd/unix.c b/etc/afpd/unix.c
index 48ece605..d5bde724 100644
--- a/etc/afpd/unix.c
+++ b/etc/afpd/unix.c
@@ -1,5 +1,5 @@
 /*
- * $Id: unix.c,v 1.54 2009-10-13 22:55:37 didg Exp $
+ * $Id: unix.c,v 1.60 2010-01-20 13:22:13 franklahm Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -30,15 +30,14 @@ char *strchr (), *strrchr ();
 #endif /* STDC_HEADERS */
 
 #include <errno.h>
-#include <dirent.h>
 #include <limits.h>
 #include <sys/param.h>
-#include <sys/stat.h>
 #include <atalk/logger.h>
 #include <atalk/adouble.h>
 #include <atalk/vfs.h>
 #include <atalk/afp.h>
 #include <atalk/util.h>
+#include <atalk/unix.h>
 
 #include "auth.h"
 #include "directory.h"
@@ -330,7 +329,7 @@ int setfilunixmode (const struct vol *vol, struct path* path, mode_t mode)
     if (setfilmode( path->u_name, mode, &path->st, vol->v_umask) < 0)
         return -1;
     /* we need to set write perm if read set for resource fork */
-    return vol->vfs->rf_setfilmode(vol, path->u_name, mode, &path->st);
+    return vol->vfs->vfs_setfilmode(vol, path->u_name, mode, &path->st);
 }
 
 
@@ -339,6 +338,10 @@ int setdirunixmode(const struct vol *vol, const char *name, mode_t mode)
 {
 
     int dropbox = (vol->v_flags & AFPVOL_DROPBOX);
+
+    LOG(log_debug, logtype_afpd, "setdirunixmode('%s', mode:%04o) {v_dperm:%04o}",
+        fullpathname(name), mode, vol->v_dperm);
+
     mode |= vol->v_dperm;
 
     if (dir_rx_set(mode)) {
@@ -346,7 +349,7 @@ int setdirunixmode(const struct vol *vol, const char *name, mode_t mode)
     	if ( stickydirmode(name, DIRBITS | mode, dropbox, vol->v_umask) < 0 )
         	return -1;
     }
-    if (vol->vfs->rf_setdirunixmode(vol, name, mode, NULL) < 0 && !vol_noadouble(vol)) {
+    if (vol->vfs->vfs_setdirunixmode(vol, name, mode, NULL) < 0 && !vol_noadouble(vol)) {
         return  -1 ;
     }
     if (!dir_rx_set(mode)) {
@@ -401,7 +404,7 @@ int setdirmode(const struct vol *vol, const char *name, mode_t mode)
     }
     closedir( dir );
     
-    if (vol->vfs->rf_setdirmode(vol, name, mode, NULL) < 0 && !vol_noadouble(vol)) {
+    if (vol->vfs->vfs_setdirmode(vol, name, mode, NULL) < 0 && !vol_noadouble(vol)) {
         return  -1 ;
     }
 
@@ -492,7 +495,7 @@ int setfilowner(const struct vol *vol, const uid_t uid, const gid_t gid, struct
 	return -1;
     }
 
-    if (vol->vfs->rf_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;
@@ -535,7 +538,7 @@ int setdirowner(const struct vol *vol, const char *name, const uid_t uid, const
     }
     closedir( dir );
 
-    if (vol->vfs->rf_setdirowner(vol, name, uid, gid) < 0) {
+    if (vol->vfs->vfs_setdirowner(vol, name, uid, gid) < 0) {
         return -1;
     }
     
@@ -597,45 +600,3 @@ recursive_chown_end:
 }
 #endif
 
-/* This is equivalent of unix rename(). */
-int unix_rename(const char *oldpath, const char *newpath)
-{
-#if 0
-	char pd_name[PATH_MAX+1];
-	int i;
-        struct stat pd_stat;
-        uid_t uid;
-#endif
-
-	if (rename(oldpath, newpath) < 0)
-		return -1;
-#if 0
-	for (i = 0; i <= PATH_MAX && newpath[i] != '\0'; i++)
-		pd_name[i] = newpath[i];
-	pd_name[i] = '\0';
-
-	while (i > 0 && pd_name[i] != '/') i--;
-	if (pd_name[i] == '/') i++;
-
-        pd_name[i++] = '.'; pd_name[i++] = '\0';
-
-        if (stat(pd_name, &pd_stat) < 0) {
-	    LOG(log_error, logtype_afpd, "stat() of parent dir failed: pd_name = %s, uid = %d: %s",
-		pd_name, geteuid(), strerror(errno));
-		return 0;
-	}
-
-	/* So we have SGID bit set... */
-        if ((S_ISGID & pd_stat.st_mode)	!= 0) {
-            uid = geteuid();
-            if (seteuid(0) < 0)
-		LOG(log_error, logtype_afpd, "seteuid() failed: %s", strerror(errno));
-            if (recursive_chown(newpath, uid, pd_stat.st_gid) < 0)
-		LOG(log_error, logtype_afpd, "chown() of parent dir failed: newpath=%s, uid=%d: %s",
-		    pd_name, geteuid(), strerror(errno));
-            seteuid(uid);
-	}
-#endif
-	return 0;
-}
-