generate_uuid() now generates more or less DCE-compliant uuid's

diff --git a/libcitadel/lib/tools.c b/libcitadel/lib/tools.c
index 0c012e7955e184d128b589ad547b1bf645ebb767..d4bb9d0e2e575538c3d02905b52e1c93f2ceda4a 100644 (file)
--- a/libcitadel/lib/tools.c
+++ b/libcitadel/lib/tools.c
@@ -860,9 +860,12 @@ char *strcpy(char *dest, const char *src) {
 void generate_uuid(char *buf) {
        static int seq = (-1);
 
+<<<<<<< HEAD
        if (seq == (-1)) {
                seq = (int)rand();
        }
+=======
+>>>>>>> d0e228d... generate_uuid() now generates more or less DCE-compliant uuid's
        ++seq;
        seq = (seq % 0x0FFF) ;