From: Frank Lahm Date: Sun, 1 May 2011 17:43:42 +0000 (+0200) Subject: only use volume UUIDs in master afpd X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=commitdiff_plain;h=d634fa9a0694cfe314e3f1d8e19fb6af58125ccb only use volume UUIDs in master afpd --- diff --git a/NEWS b/NEWS index 95049780..bb5b26e3 100644 --- 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 4e17eb13..15bfee6d 100644 --- 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",