diff options
| author | marha <marha@users.sourceforge.net> | 2010-02-23 05:57:53 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-02-23 05:57:53 +0000 |
| commit | 64eebb5eeb9556dab6f16757f7e836e4846b15d6 (patch) | |
| tree | 7b42caece7dff6674ecbc6f1b54f94c698b40e61 | |
| parent | 3582078999db699c45afb800cd8b78f8a04baf91 (diff) | |
| download | vcxsrv-64eebb5eeb9556dab6f16757f7e836e4846b15d6.tar.gz vcxsrv-64eebb5eeb9556dab6f16757f7e836e4846b15d6.tar.bz2 vcxsrv-64eebb5eeb9556dab6f16757f7e836e4846b15d6.zip | |
Enabled XCSECURITY
| -rw-r--r-- | include/dix-config.h | 2 | ||||
| -rw-r--r-- | xorg-server/os/auth.c | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/include/dix-config.h b/include/dix-config.h index 8f5aab905..53cbd31ba 100644 --- a/include/dix-config.h +++ b/include/dix-config.h @@ -357,7 +357,7 @@ #define XCMISC 1 /* Build Security extension */ -#undef XCSECURITY +#define XCSECURITY 1 /* Support Xdmcp */ #define XDMCP 1 diff --git a/xorg-server/os/auth.c b/xorg-server/os/auth.c index a852e1c3b..0514d1788 100644 --- a/xorg-server/os/auth.c +++ b/xorg-server/os/auth.c @@ -317,11 +317,23 @@ GenerateAuthorization( void GenerateRandomData (int len, char *buf) { +#ifdef _MSC_VER + static HANDLE hAdvApi32; + static BOOLEAN (_stdcall * RtlGenRandom)(void *,unsigned long); + + if (!hAdvApi32) + { + hAdvApi32=LoadLibrary("advapi32.dll"); + RtlGenRandom=(BOOLEAN (_stdcall *)(void*,unsigned long))GetProcAddress(hAdvApi32,"SystemFunction036"); + } + RtlGenRandom(buf, len); +#else int fd; fd = open("/dev/urandom", O_RDONLY); read(fd, buf, len); close(fd); +#endif } #endif /* XCSECURITY */ |