apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: apr/misc/win32 rand.c
Date Wed, 17 Jul 2002 20:19:35 GMT
wrowe       2002/07/17 13:19:35

  Modified:    .        libapr.dsp
               misc/win32 rand.c
  Log:
    Skip the entire CoAPI garbage and go right for UuidCreate(), which on
    Win2000/XP no longer reveals the mac address.
  
  Submitted by:	David Shane Holden <dpejesh@yahoo.com>
  
  Revision  Changes    Path
  1.73      +2 -2      apr/libapr.dsp
  
  Index: libapr.dsp
  ===================================================================
  RCS file: /home/cvs/apr/libapr.dsp,v
  retrieving revision 1.72
  retrieving revision 1.73
  diff -u -r1.72 -r1.73
  --- libapr.dsp	17 Jul 2002 05:15:17 -0000	1.72
  +++ libapr.dsp	17 Jul 2002 20:19:35 -0000	1.73
  @@ -53,7 +53,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib
/nologo /base:"0x6EE00000" /subsystem:windows /dll /map /machine:I386 /OPT:NOREF
  -# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib /nologo
/base:"0x6EE00000" /subsystem:windows /dll /map /machine:I386 /OPT:NOREF
  +# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib
/nologo /base:"0x6EE00000" /subsystem:windows /dll /map /machine:I386 /OPT:NOREF
   
   !ELSEIF  "$(CFG)" == "libapr - Win32 Debug"
   
  @@ -79,7 +79,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib
/nologo /base:"0x6EE00000" /subsystem:windows /dll /incremental:no /map /debug /machine:I386
/OPT:NOREF
  -# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib /nologo
/base:"0x6EE00000" /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /OPT:NOREF
  +# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib
/nologo /base:"0x6EE00000" /subsystem:windows /dll /incremental:no /map /debug /machine:I386
/OPT:NOREF
   
   !ENDIF 
   
  
  
  
  1.16      +5 -2      apr/misc/win32/rand.c
  
  Index: rand.c
  ===================================================================
  RCS file: /home/cvs/apr/misc/win32/rand.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- rand.c	17 Jul 2002 04:11:33 -0000	1.15
  +++ rand.c	17 Jul 2002 20:19:35 -0000	1.16
  @@ -93,9 +93,12 @@
        * possible misuse/abuse since uuid is based on the NIC address, and
        * is therefore not only a uniqifier, but an identity (which might not
        * be appropriate in all cases.
  +     *
  +     * Note that Win2000, XP and later no longer suffer from this problem,
  +     * a scrambling fix is only needed for (apr_os_level < APR_WIN_2000)
        */
  -    if (FAILED(CoCreateGuid((LPGUID)uuid_data))) {
  -	return APR_EGENERAL;
  +    if (FAILED(UuidCreate((UUID *)uuid_data))) {
  +        return APR_EGENERAL;
       }
       return APR_SUCCESS;
   }
  
  
  

Mime
View raw message