[PATCH] vncserver (fwd)

[Jeff Chua]

Where can I send this patch to so that it can be incorporated to the next
release?



Thanks,
Jeff
[ [EMAIL PROTECTED] ]

---------- Forwarded message ----------
Date: Thu, 5 Jul 2001 18:50:06 +0800 (SGT)
From: Jeff Chua <[EMAIL PROTECTED]>
To: Vnc <[EMAIL PROTECTED]>
Cc: Jeff Chua <[EMAIL PROTECTED]>
Subject: [PATCH] vncserver


Here's my patch to vncserver ...

1) to read from the XAUTHORITY environment variable if it's set
2) not read the .Xresources
3) use fvwm2 instead of twm
4) read from the correct .Xauthority with "-auth"
5) read "-ac" for no authorization

I hope this is the right place to post this patch.


Thanks,
Jeff
[ [EMAIL PROTECTED] ]


------------------------------
--- vncserver           Wed Jul  4 08:00:52 2001
+++ vncserver.new       Wed Jul  4 08:22:03 2001
@@ -37,14 +37,15 @@
 $desktopName = "X";
 $vncClasses = "/usr/local/vnc/classes";
 $vncUserDir = "$ENV{HOME}/.vnc";
-$xauthorityFile = "$ENV{HOME}/.Xauthority";
+#$xauthorityFile = "$ENV{HOME}/.Xauthority";
+$xauthorityFile = "$ENV{XAUTHORITY}";

 $defaultXStartup
     = ("#!/bin/sh\n\n".
-       "xrdb \$HOME/.Xresources\n".
+       "#xrdb \$HOME/.Xresources\n".
        "xsetroot -solid grey\n".
        "xterm -geometry 80x24+10+10 -ls -title \"\$VNCDESKTOP Desktop\" &\n".
-       "twm &\n");
+       "fvwm2 &\n");

 chop($host = `uname -n`);

@@ -52,7 +53,7 @@
 # Check command line options

 &ParseOptions("-geometry",1,"-depth",1,"-pixelformat",1,"-name",1,"-kill",1,
-             "-help",0,"-h",0,"--help",0);
+             "-help",0,"-h",0,"--help",0, "-ac", 0, "-auth", 1);

 &Usage() if ($opt{'-help'} || $opt{'-h'} || $opt{'--help'});

@@ -62,6 +63,12 @@
 # to match the current X display:
 # &GetXDisplayDefaults();

+if ($opt{'-ac'}) {
+    $ac = "-ac";
+}
+if ($opt{'-auth'}) {
+    $xauthorityFile = $opt{'-auth'};
+}
 if ($opt{'-geometry'}) {
     $geometry = $opt{'-geometry'};
 }
@@ -136,6 +143,7 @@
 $cmd = "Xvnc :$displayNumber";
 $cmd .= " -desktop " . &quotedString($desktopName);
 $cmd .= " -httpd $vncClasses";
+$cmd .= " $ac";
 $cmd .= " -auth $xauthorityFile";
 $cmd .= " -geometry $geometry" if ($geometry);
 $cmd .= " -depth $depth" if ($depth);
@@ -143,6 +151,8 @@
 $cmd .= " -rfbwait 120000";
 $cmd .= " -rfbauth $vncUserDir/passwd";
 $cmd .= " -rfbport $vncPort";
+
+print "$cmd";

 # Add font path and color database stuff here, e.g.:
 #
---------------------------------------------------------------------
To unsubscribe, send a message with the line: unsubscribe vnc-list
to [EMAIL PROTECTED]
See also: http://www.uk.research.att.com/vnc/intouch.html
---------------------------------------------------------------------