diff options
| author | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2002-07-17 20:19:35 +0000 |
|---|---|---|
| committer | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2002-07-17 20:19:35 +0000 |
| commit | 231a397efba637c8304018428ee404159dc96ea5 (patch) | |
| tree | 42f3dfa609a4421bc968dee3e69528346a313ed2 | |
| parent | 0de5bb2b65d811bf3e3ac95c6584cfd14d29d015 (diff) | |
| download | libapr-231a397efba637c8304018428ee404159dc96ea5.tar.gz | |
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>
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@63702 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | libapr.dsp | 4 | ||||
| -rw-r--r-- | misc/win32/rand.c | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/libapr.dsp b/libapr.dsp index a0e03cdb3..dab9ea37f 100644 --- a/libapr.dsp +++ b/libapr.dsp @@ -53,7 +53,7 @@ BSC32=bscmake.exe # 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 @@ BSC32=bscmake.exe # 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 diff --git a/misc/win32/rand.c b/misc/win32/rand.c index 0e3b47be6..562e56ccc 100644 --- a/misc/win32/rand.c +++ b/misc/win32/rand.c @@ -93,9 +93,12 @@ APR_DECLARE(apr_status_t) apr_os_uuid_get(unsigned char *uuid_data) * 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; } |