X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=libcitadel%2Flib%2Ftools.c;h=d4bb9d0e2e575538c3d02905b52e1c93f2ceda4a;hb=9a92864bb590e94fe826049ef8750d73bc5af3fa;hp=0c012e7955e184d128b589ad547b1bf645ebb767;hpb=fe991146d55ae2d92f4efb65f5e3a72f0c6f0453;p=citadel.git

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) ;