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

diff --git a/libcitadel/lib/tools.c b/libcitadel/lib/tools.c
index b269433ef7cfb07cb4127a0fdc92adb4262874f1..0c012e7955e184d128b589ad547b1bf645ebb767 100644 (file)
--- a/libcitadel/lib/tools.c
+++ b/libcitadel/lib/tools.c
@@ -1,22 +1,6 @@
 /*
  * A basic toolset containing miscellaneous functions for string manipluation,
  * encoding/decoding, and a bunch of other stuff.
- *
- * Copyright (c) 1987-2011 by the citadel.org team
- *
- * This program is open source software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
 
@@ -876,12 +860,9 @@ 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) ;