diff options
| author | marha <marha@users.sourceforge.net> | 2009-11-17 15:53:57 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-11-17 15:53:57 +0000 |
| commit | 3fce787ffe938bb3e959ff0b3ec231e54d086c76 (patch) | |
| tree | 198f537b43a34301bf781c67193c572f6743f925 /xorg-server/hw/xwin/winclipboardthread.c | |
| parent | 236c69d6034b152598ce35abaf3559b0eaa89c12 (diff) | |
| parent | 578938f1cdd5a06dd6fa28167d575ec980322a5d (diff) | |
| download | vcxsrv-3fce787ffe938bb3e959ff0b3ec231e54d086c76.tar.gz vcxsrv-3fce787ffe938bb3e959ff0b3ec231e54d086c76.tar.bz2 vcxsrv-3fce787ffe938bb3e959ff0b3ec231e54d086c76.zip | |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/hw/xwin/winclipboardthread.c')
| -rw-r--r-- | xorg-server/hw/xwin/winclipboardthread.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/xorg-server/hw/xwin/winclipboardthread.c b/xorg-server/hw/xwin/winclipboardthread.c index fcae5f851..80381ac51 100644 --- a/xorg-server/hw/xwin/winclipboardthread.c +++ b/xorg-server/hw/xwin/winclipboardthread.c @@ -38,7 +38,6 @@ #ifdef __CYGWIN__
#include <errno.h>
#endif
-#include "X11/Xauth.h"
#include "misc.h"
#include "winmsg.h"
@@ -47,22 +46,11 @@ #endif
/*
- * Constants
- */
-
-#define AUTH_NAME "MIT-MAGIC-COOKIE-1"
-
-
-/*
* References to external symbols
*/
extern Bool g_fUnicodeClipboard;
extern unsigned long serverGeneration;
-#if defined(XCSECURITY)
-extern unsigned int g_uiAuthDataLen;
-extern char *g_pAuthData;
-#endif
extern Bool g_fClipboardLaunched;
extern Bool g_fClipboardStarted;
extern HWND g_hwndClipboard;
@@ -158,13 +146,8 @@ winClipboardProc (void *pvNotUsed) //goto thread_errorexit;
}
-#if defined(XCSECURITY)
/* Use our generated cookie for authentication */
- XSetAuthorization (AUTH_NAME,
- strlen (AUTH_NAME),
- g_pAuthData,
- g_uiAuthDataLen);
-#endif
+ winSetAuthorization();
/* Set error handler */
XSetErrorHandler (winClipboardErrorHandler);
|