From: Art Cancro <ajc@uncensored.citadel.org>
Date: Wed, 6 Apr 2011 19:38:27 +0000 (-0400)
Subject: generate_uuid() now generates more or less DCE-compliant uuid's
X-Git-Tag: v8.11~790
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=9a92864bb590e94fe826049ef8750d73bc5af3fa

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

diff --git a/libcitadel/lib/tools.c b/libcitadel/lib/tools.c
index 0c012e795..d4bb9d0e2 100644
--- 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) ;