Fix UUID random generator to use /dev/random

Only use pseudo-random generator for uuid if using /dev/random fails.
* src/util/uuid.c: The original code. would only print the warning
  message if using /dev/random failed, but would still go ahead and call
  virUUIDGeneratePseudoRandomBytes in all cases anyway.

diff --git a/src/util/uuid.c b/src/util/uuid.c
index 002a64d3be2f8778d25decc86ed10ac78841504c..20ed1189fb7d1f7474ae888380164931c5550963 100644 (file)
--- a/src/util/uuid.c
+++ b/src/util/uuid.c
@@ -104,9 +104,10 @@ virUUIDGenerate(unsigned char *uuid)
         VIR_WARN(_("Falling back to pseudorandom UUID,"
                    " failed to generate random bytes: %s"),
                  virStrerror(err, ebuf, sizeof ebuf));
+        err = virUUIDGeneratePseudoRandomBytes(uuid, VIR_UUID_BUFLEN);
     }
 
-    return virUUIDGeneratePseudoRandomBytes(uuid, VIR_UUID_BUFLEN);
+    return(err);
 }
 
 /* Convert C from hexadecimal character to integer.  */