summaryrefslogtreecommitdiff
path: root/hw/xwin/winprocarg.c
diff options
context:
space:
mode:
authorColin Harrison <colin.harrison@virgin.net>2009-11-06 17:46:58 +0000
committerJon TURNEY <jon.turney@dronecode.org.uk>2009-11-09 20:33:42 +0000
commit72f81f4e449defb0654e9bdb2c9ec014475a3977 (patch)
treed9b393603e77cf1878a2f434d2bbac3fd9939ac7 /hw/xwin/winprocarg.c
parent6dbf8f27c885ea3a761548183fb00ba3df2df553 (diff)
Xming: Make -auth option work in with -multiwindow
Use an internally generated cookie for authentication of the internal window manager client when using the -auth option in -multiwindow mode. Copyright (C) Colin Harrison 2005-2008 http://www.straightrunning.com/XmingNotes/ http://sourceforge.net/projects/xming/ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Diffstat (limited to 'hw/xwin/winprocarg.c')
-rwxr-xr-xhw/xwin/winprocarg.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/hw/xwin/winprocarg.c b/hw/xwin/winprocarg.c
index 56af643db..3732ecb63 100755
--- a/hw/xwin/winprocarg.c
+++ b/hw/xwin/winprocarg.c
@@ -1,6 +1,7 @@
/*
Copyright 1993, 1998 The Open Group
+Copyright (C) Colin Harrison 2005-2008
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
@@ -57,6 +58,7 @@ extern char * g_pszLogFile;
extern Bool g_fLogFileChanged;
#endif
extern Bool g_fXdmcpEnabled;
+extern Bool g_fAuthEnabled;
extern char * g_pszCommandLine;
extern Bool g_fKeyboardHookLL;
extern Bool g_fNoHelpMessageBox;
@@ -1289,6 +1291,15 @@ ddxProcessArgument (int argc, char *argv[], int i)
}
/*
+ * Look for the '-auth' argument
+ */
+ if (IS_OPTION ("-auth"))
+ {
+ g_fAuthEnabled = TRUE;
+ return 0; /* Let DIX parse this again */
+ }
+
+ /*
* Look for the '-indirect' or '-broadcast' arguments
*/
if (IS_OPTION ("-indirect")