Merge symlink branch

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

diff --git a/etc/afpd/filedir.c b/etc/afpd/filedir.c
index f5ce7fbca6dc341ec637786624336ca7a1ab3e19..4451ae804c29ec0a2717ae488e93db7f4ad5d0a6 100644 (file)
--- a/etc/afpd/filedir.c
+++ b/etc/afpd/filedir.c
@@ -1,5 +1,5 @@
 /*
- * $Id: filedir.c,v 1.62 2009-10-29 12:58:11 didg Exp $
+ * $Id: filedir.c,v 1.70 2010-02-10 14:05:37 franklahm Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -66,8 +66,8 @@ more information */
     uid_t       uid;
     int         ret = AFP_OK;
 #ifdef DEBUG
-    LOG(log_info, logtype_afpd, "begin matchfile2dirperms:");
-#endif /* DEBUG */
+    LOG(log_debug9, logtype_afpd, "begin matchfile2dirperms:");
+#endif 
 
     if (stat(upath, &st ) < 0) {
         LOG(log_error, logtype_afpd, "Could not stat %s: %s", upath, strerror(errno));
@@ -98,7 +98,7 @@ more information */
                     upath, strerror(errno));
                 ret = AFPERR_ACCESS;
             }
-            else if (chmod(upath,(st.st_mode&~default_options.umask)| S_IRGRP| S_IROTH) < 0)
+            else if ((!S_ISLNK(st->st_mode)) && (chmod(upath,(st.st_mode&~default_options.umask)| S_IRGRP| S_IROTH) < 0))
             {
                 LOG(log_error, logtype_afpd,
                     "matchfile2dirperms(%s): Error adding file read permissions: %s",
@@ -124,8 +124,8 @@ more information */
     } /* end else if stat success */
 
 #ifdef DEBUG
-    LOG(log_info, logtype_afpd, "end matchfile2dirperms:");
-#endif /* DEBUG */
+    LOG(log_debug9, logtype_afpd, "end matchfile2dirperms:");
+#endif
     return ret;
 }
 #endif
@@ -171,6 +171,9 @@ int afp_getfildirparams(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *r
         return get_afp_errno(AFPERR_NOOBJ); 
     }
 
+    LOG(log_debug, logtype_afpd, "getfildirparams(vid:%u, did:%u, name:'%s', f/d:%04x/%04x) {cwd: %s}",
+        ntohs(vid), ntohl(dir->d_did), s_path->u_name, fbitmap, dbitmap, getcwdpath());
+
     st   = &s_path->st;
     if (!s_path->st_valid) {
         /* it's a dir and it should be there
@@ -184,6 +187,7 @@ int afp_getfildirparams(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *r
         return( AFPERR_NOOBJ );
     }
 
+
     buflen = 0;
     if (S_ISDIR(st->st_mode)) {
         if (dbitmap) {
@@ -297,7 +301,7 @@ int check_name(const struct vol *vol, char *name)
         return AFPERR_PARAM;
 
     if (!vol->vfs->vfs_validupath(vol, name)) {
-        LOG(log_info, logtype_afpd, "check_name: illegal name: '%s'", name);
+        LOG(log_error, logtype_afpd, "check_name: illegal name: '%s'", name);
         return AFPERR_EXIST;
     }
 
@@ -730,7 +734,7 @@ int veto_file(const char*veto_str, const char*path)
     for(i=0, j=0; veto_str[i] != '\0'; i++) {
         if (veto_str[i] == '/') {
             if ((j>0) && (path[j] == '\0')) {
-                LOG(log_info, logtype_afpd, "vetoed file:'%s'", path);
+                LOG(log_debug, logtype_afpd, "vetoed file:'%s'", path);
                 return 1;
             }
             j = 0;