only use volume UUIDs in master afpd

diff --git a/NEWS b/NEWS
index 950497802722f3c5dbd7d2fdd0fa62924d6a22a9..bb5b26e32621be9951346f4bd25d714f82692e47 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ Changes in 2.2
 * FIX: afpd: crashes in the dircache
 * FIX: afpd: Correct afp logout vs dsi eof behaviour
 * FIX: afpd: new catsearch was broken
+* FIX: afpd: only use volume UUIDs in master afpd
 * FIX: dbd: Multiple fixes, reliable locking
 * FIX: ad file suite: fix an error that resulted in CNID database inconsistencies
 

diff --git a/etc/afpd/volume.c b/etc/afpd/volume.c
index 4e17eb137ee81e299091f23e25405e40b8a909f8..15bfee6d66001b09b6b12253875e2fd9e6626fb3 100644 (file)
--- a/etc/afpd/volume.c
+++ b/etc/afpd/volume.c
@@ -886,8 +886,8 @@ static int creatvol(AFPObj *obj, struct passwd *pwd,
         check_ea_sys_support(volume);
     initvol_vfs(volume);
 
-    /* get/store uuid from file */
-    if (volume->v_flags & AFPVOL_TM) {
+    /* get/store uuid from file in afpd master*/
+    if ((parent_or_child == 0) && (volume->v_flags & AFPVOL_TM)) {
         char *uuid = get_vol_uuid(obj, volume->v_localname);
         if (!uuid) {
             LOG(log_error, logtype_afpd, "Volume '%s': couldn't get UUID",