svn commit: samba r23710 - in branches: SAMBA_3_0/source/libsmb SAMBA_3_0_26/source/libsmb

[vlendec at samba.org]

Author: vlendec
Date: 2007-07-04 22:30:25 +0000 (Wed, 04 Jul 2007)
New Revision: 23710

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23710

Log:
Remove some code duplication, we do have a random number generator
Modified:
   branches/SAMBA_3_0/source/libsmb/namequery.c
   branches/SAMBA_3_0_26/source/libsmb/namequery.c


Changeset:
Modified: branches/SAMBA_3_0/source/libsmb/namequery.c
===================================================================
--- branches/SAMBA_3_0/source/libsmb/namequery.c	2007-07-04 22:28:04 UTC (rev 23709)
+++ branches/SAMBA_3_0/source/libsmb/namequery.c	2007-07-04 22:30:25 UTC (rev 23710)
@@ -145,15 +145,11 @@
 
 static int generate_trn_id(void)
 {
-	static int trn_id;
+	uint16 id;
 
-	if (trn_id == 0) {
-		sys_srandom(sys_getpid());
-	}
+	generate_random_buffer((uint8 *)&id, sizeof(id));
 
-	trn_id = sys_random();
-
-	return trn_id % (unsigned)0x7FFF;
+	return id % (unsigned)0x7FFF;
 }
 
 /****************************************************************************

Modified: branches/SAMBA_3_0_26/source/libsmb/namequery.c
===================================================================
--- branches/SAMBA_3_0_26/source/libsmb/namequery.c	2007-07-04 22:28:04 UTC (rev 23709)
+++ branches/SAMBA_3_0_26/source/libsmb/namequery.c	2007-07-04 22:30:25 UTC (rev 23710)
@@ -145,15 +145,11 @@
 
 static int generate_trn_id(void)
 {
-	static int trn_id;
+	uint16 id;
 
-	if (trn_id == 0) {
-		sys_srandom(sys_getpid());
-	}
+	generate_random_buffer((uint8 *)&id, sizeof(id));
 
-	trn_id = sys_random();
-
-	return trn_id % (unsigned)0x7FFF;
+	return id % (unsigned)0x7FFF;
 }
 
 /****************************************************************************