Convert UUIDs to uppercase more certainly

diff --git a/etc/afpd/volume.c b/etc/afpd/volume.c
index d5e81a4551abc83ba8ac5b47448e7454a972842e..652483110677212ef264d459ece613ad83704c6b 100644 (file)
--- a/etc/afpd/volume.c
+++ b/etc/afpd/volume.c
@@ -2680,6 +2680,8 @@ char *get_uuid(const AFPObj *obj, const char *volname)
                 p++;
 
             if (sscanf(p, "%36s", uuid) == 1 ) {
+                for (int i=0; uuid[i]; i++)
+                    uuid[i] = toupper(uuid[i]);
                 LOG(log_debug, logtype_afpd, "get_uuid('%s'): UUID: '%s'", volname, uuid);
                 fclose(fp);
                 return strdup(uuid);
@@ -2709,9 +2711,7 @@ char *get_uuid(const AFPObj *obj, const char *volname)
     /* generate uuid and write to file */
     uuid_t id;
     uuid_generate(id);
-    uuid_unparse(id, uuid);
-    for (int i=0; uuid[i]; i++)
-        uuid[i] = toupper(uuid[i]);
+    uuid_unparse_upper(id, uuid);
     LOG(log_debug, logtype_afpd, "get_uuid('%s'): generated UUID '%s'", volname, uuid);
 
     fprintf(fp, "\"%s\"\t%36s\n", volname, uuid);