3 files changed, 13 insertions, 6 deletions
diff --git a/unix/xserver/hw/vnc/RFBGlue.cc b/unix/xserver/hw/vnc/RFBGlue.cc
index 19338fc7..09832ab7 100644
--- a/unix/xserver/hw/vnc/RFBGlue.cc
+++ b/unix/xserver/hw/vnc/RFBGlue.cc
@@ -23,6 +23,7 @@
 #include <rfb/Configuration.h>
 #include <rfb/LogWriter.h>
 #include <rfb/Logger_stdio.h>
+#include <rfb/Logger_syslog.h>
 
 #include "RFBGlue.h"
 
@@ -34,6 +35,7 @@ static LogWriter inputLog("Input");
 void vncInitRFB(void)
 {
   rfb::initStdIOLoggers();
+  rfb::initSyslogLogger();
   rfb::LogWriter::setLogParams("*:stderr:30");
   rfb::Configuration::enableServerParams();
 }
diff --git a/unix/xserver/hw/vnc/Xvnc.man b/unix/xserver/hw/vnc/Xvnc.man
index 18957bf9..9e86fa4f 100644
--- a/unix/xserver/hw/vnc/Xvnc.man
+++ b/unix/xserver/hw/vnc/Xvnc.man
@@ -274,11 +274,11 @@ stop non-SSH connections from any other hosts.
 .
 .TP
 .B \-Log \fIlogname\fP:\fIdest\fP:\fIlevel\fP
-Configures the debug log settings.  \fIdest\fP can currently be \fBstderr\fP or
-\fBstdout\fP, and \fIlevel\fP is between 0 and 100, 100 meaning most verbose
-output.  \fIlogname\fP is usually \fB*\fP meaning all, but you can target a
-specific source file if you know the name of its "LogWriter".  Default is
-\fB*:stderr:30\fP.
+Configures the debug log settings.  \fIdest\fP can currently be \fBstderr\fP,
+\fBstdout\fP or \fBsyslog\fP, and \fIlevel\fP is between 0 and 100, 100 meaning
+most verbose output.  \fIlogname\fP is usually \fB*\fP meaning all, but you can
+target a specific source file if you know the name of its "LogWriter".  Default
+is \fB*:stderr:30\fP.
 .
 .TP
 .B \-RemapKeys \fImapping
diff --git a/unix/xserver/hw/vnc/xvnc.c b/unix/xserver/hw/vnc/xvnc.c
index af04c171..085c4f6e 100644
--- a/unix/xserver/hw/vnc/xvnc.c
+++ b/unix/xserver/hw/vnc/xvnc.c
@@ -1579,7 +1579,12 @@ vfbScreenInit(ScreenPtr pScreen, int argc, char **argv)
 
 
 static void vfbClientStateChange(CallbackListPtr *a, void *b, void *c) {
-  dispatchException &= ~DE_RESET;
+    if (dispatchException & DE_RESET) {
+        ErrorF("Warning: VNC extension does not support -reset, terminating instead. Use -noreset to prevent termination.\n");
+
+        dispatchException |= DE_TERMINATE;
+        dispatchException &= ~DE_RESET;
+    }
 }
  
 #if XORG >= 113