Re: [Tigervnc-devel] [PATCH] vncserver checks ~/.vnc/passwd when not needed and -TermOnLogout option

[DRC]

-rfbauth only specifies the path of the passwd file.  It doesn't enable
or disable VncAuth.  However, there is more complexity to it, because:

(1) -SecurityTypes can be specified without =, i.e. "-SecurityTypes
{whatever}".

(2) TLSVnc also uses the VNC password, so the logic will have to check
for whether or not "TLSVnc" is specified as well.


I'm attaching a patch for the "vncserver -fg" mod, which is fairly
simple.  I don't have time at the moment to hack up a mod for checking
the security types argument.


On 3/1/11 7:10 AM, Sebastiaan Breedveld wrote:
> On 03/01/2011 12:13 PM, DRC wrote:
>>
>> As far as checking for the VNC password, we're no longer requiring
>> "VeNCrypt" to be specified in the -SecurityTypes parameter, so checking
>> for that won't work.  The correct approach is to check whether
>> -SecurityTypes is not specified -- or -- whether -SecurityTypes is
>> specified and contains (case insensitive) "VncAuth".  If either of those
>> conditions is true, then and only then should vncserver check for the
>> existence of the VNC password.
>>
> Looking at it again, the vncserver script adds --rfbauth automatically, 
> so a more structural change is necessary:
> 
> - if no options are given, force VeNCrypt, and do not use --rfbauth anymore
> - force VeNCrypt by specifying SecurityTypes, and do not use --rfbauth 
> in that case
> 
> Or am I misunderstanding something?
> 
> Greetings,
> Sebastiaan
> 
> 
> ------------------------------------------------------------------------------
> Free Software Download: Index, Search & Analyze Logs and other IT data in 
> Real-Time with Splunk. Collect, index and harness all the fast moving IT data 
> generated by your applications, servers and devices whether physical, virtual
> or in the cloud. Deliver compliance at lower cost and gain new business 
> insights. http://p.sf.net/sfu/splunk-dev2dev 
> _______________________________________________
> Tigervnc-devel mailing list
> Tigervnc-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/tigervnc-devel

Index: unix/vncserver
===================================================================
--- unix/vncserver      (revision 4301)
+++ unix/vncserver      (working copy)
@@ -122,7 +122,7 @@
 # Check command line options
 
 &ParseOptions("-geometry",1,"-depth",1,"-pixelformat",1,"-name",1,"-kill",1,
-             "-help",0,"-h",0,"--help",0,"-fp",1,"-list",0);
+             "-help",0,"-h",0,"--help",0,"-fp",1,"-list",0,"-fg",0);
 
 &Usage() if ($opt{'-help'} || $opt{'-h'} || $opt{'--help'});
 
@@ -306,7 +306,15 @@
 }
 $ENV{VNCDESKTOP}= $desktopName;
 
-system("$vncUserDir/xstartup >> " . &quotedString($desktopLog) . " 2>&1 &");
+if ($opt{'-fg'}) {
+    system("$vncUserDir/xstartup >> " . &quotedString($desktopLog) . " 2>&1");
+    if (kill 0, `cat $pidFile`) {
+        $opt{'-kill'} = ':'.$displayNumber;
+        &Kill();
+    }
+} else {
+    system("$vncUserDir/xstartup >> " . &quotedString($desktopLog) . " 2>&1 
&");
+}
 
 exit;
 

------------------------------------------------------------------------------
Free Software Download: Index, Search & Analyze Logs and other IT data in 
Real-Time with Splunk. Collect, index and harness all the fast moving IT data 
generated by your applications, servers and devices whether physical, virtual
or in the cloud. Deliver compliance at lower cost and gain new business 
insights. http://p.sf.net/sfu/splunk-dev2dev 
_______________________________________________
Tigervnc-devel mailing list
Tigervnc-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tigervnc-devel