Fix dircache bug

diff --git a/NEWS b/NEWS
index 36d7649a707f247b775f0738592f19d2c34acf47..7ce4036a6a616fee202637c68264532bfd41b35b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,7 @@ Changes in 2.2.2
 * FIX: afpd: Read-only filesystems lead to afpd processes running as root
 * FIX: afpd: Fix for filesystem without NFSv4 ACL support on Solaris
 * FIX: afpd: Fix catsearch bug, NetAFP Bug ID #12
+* FIX: afpd: Fix dircache bug, NetAFP Bug ID #13
 * FIX: dbd: Better checking for duplicated or bogus CNIDs from AppleDouble files
 * FIX: Fix compilation error when AppleTalk support is disabled
 * FIX: Portability fixes

diff --git a/etc/afpd/dircache.c b/etc/afpd/dircache.c
index 3db94d192742973d1dcd92d411b431d9be61ac17..d3b8b6fc5fea30c64fefe9da4ec7d259fa9c15c4 100644 (file)
--- a/etc/afpd/dircache.c
+++ b/etc/afpd/dircache.c
@@ -462,7 +462,7 @@ int dircache_add(const struct vol *vol,
         dircache_stat.expunged++;
     }
     key.d_vid = vol->v_vid;
-    key.d_pdid = dir->d_did;
+    key.d_pdid = dir->d_pdid;
     key.d_u_name = dir->d_u_name;
     if ((hn = hash_lookup(index_didname, &key))) {
         /* Found an entry with the same DID/name, delete it */

diff --git a/etc/afpd/directory.c b/etc/afpd/directory.c
index 50e3df32eb8e46fa6cf7c443b6b0afa4fb0f1d2e..02f60108383a51364cec30702f433faecdbffdf9 100644 (file)
--- a/etc/afpd/directory.c
+++ b/etc/afpd/directory.c
@@ -2430,7 +2430,7 @@ int deletecurdir(struct vol *vol)
         dir_remove( vol, fdir );
     } else {
         LOG(log_error, logtype_afpd, "deletecurdir(\"%s\"): netatalk_rmdir_all_errors error",
-            curdir->d_fullpath);
+            cfrombstr(curdir->d_fullpath));
     }
 
 delete_done: