Time Machine volume is enable even if cannot get UUID

diff --git a/etc/afpd/afp_avahi.c b/etc/afpd/afp_avahi.c
index 55fd6e96bffbcb4fe8ced82ba7a7a37200475a52..1ceb7458540829ce8a16e814bf7f51e165bee7c1 100644 (file)
--- a/etc/afpd/afp_avahi.c
+++ b/etc/afpd/afp_avahi.c
@@ -73,11 +73,18 @@ static void register_stuff(void) {
                        if (convert_string(CH_UCS2, CH_UTF8_MAC, volume->v_name, -1, tmpname, 255) <= 0)
                                goto fail;
 
-                       if ((volume->v_flags & AFPVOL_TM) && volume->v_uuid) {
-                               LOG(log_info, logtype_afpd, "Registering volume '%s' with UUID: '%s' for TimeMachine",
-                                               volume->v_localname, volume->v_uuid);
-                               strlist = avahi_string_list_add_printf(strlist, "dk%u=adVN=%s,adVF=0xa1,adVU=%s",
-                                                                                                                                                                                        i++, tmpname, volume->v_uuid);
+                       if (volume->v_flags & AFPVOL_TM) {
+                               if (volume->v_uuid) {
+                                       LOG(log_info, logtype_afpd, "Registering volume '%s' with UUID: '%s' for TimeMachine",
+                                                       volume->v_localname, volume->v_uuid);
+                                       strlist = avahi_string_list_add_printf(strlist, "dk%u=adVN=%s,adVF=0xa1,adVU=%s",
+                                                                                                                                                                                                i++, tmpname, volume->v_uuid);
+                               } else {
+                                       LOG(log_warning, logtype_afpd, "Registering volume '%s' for TimeMachine. But UUID is invalid.",
+                                                       volume->v_localname);
+                                       strlist = avahi_string_list_add_printf(strlist, "dk%u=adVN=%s,adVF=0xa1",
+                                                                                                                                                                                                i++, tmpname);
+                               }       
                        }
                }
 

diff --git a/etc/afpd/volume.c b/etc/afpd/volume.c
index 88b55ce1e37e8e357c6866234bcdaf4748dc2a9f..b5ab59694b612b371c028aa4a3ddfad7b80a76e1 100644 (file)
--- a/etc/afpd/volume.c
+++ b/etc/afpd/volume.c
@@ -861,9 +861,8 @@ static int creatvol(AFPObj *obj, struct passwd *pwd,
     if (volume->v_flags & AFPVOL_TM) {
         char *uuid = get_uuid(obj, volume->v_localname);
         if (!uuid) {
-            LOG(log_error, logtype_afpd, "Volume '%s': couldn't get UUID, disabling TM support",
+            LOG(log_error, logtype_afpd, "Volume '%s': couldn't get UUID",
                 volume->v_localname);
-            volume->v_flags &= ~AFPVOL_TM;
         } else {
             volume->v_uuid = uuid;
             LOG(log_debug, logtype_afpd, "Volume '%s': UUID '%s'",