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

[Adam Tkac]

On Thu, Mar 03, 2011 at 04:54:19AM -0600, DRC wrote:
> I felt it reasonable enough to check this into trunk.  It tests out fine
> for me.  If someone wants to include it in the 1.1 branch, I'm OK with
> that as well.

+1 for inclusion in the 1_1 branch. It seems fine for me, can you pls
merge (or commit) it there, please?

Regards, Adam

> On 3/3/11 4:13 AM, Sebastiaan Breedveld wrote:
> > This patch needs another line modified, to display the option when run 
> > with vncserver -h.
> > 
> > The second patch is for the man-page (I have not updated the date of the 
> > page, I will leave that to you).
> > 
> > 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;
> > @@ -527,6 +535,7 @@
> >       "                 [-geometry<width>x<height>]\n".
> >       "                 [-pixelformat rgbNNN|bgrNNN]\n".
> >       "                 [-fp<font-path>]\n".
> > +    "                 [-fg]\n".
> >       "<Xvnc-options>...\n\n".
> >       "       $prog -kill<X-display>\n\n".
> >       "       $prog -list\n\n");
> > 
> > 
> > 
> > Patch for man:
> > 
> > --- vncserver.1.org    2011-03-03 11:09:13.209078453 +0100
> > 
> > +++ vncserver.1    2011-03-03 11:11:15.807863890 +0100
> > 
> > @@ -14,6 +14,7 @@
> > 
> >   .IR format ]
> > 
> >   .RB [ \-fp
> > 
> >   .IR font-path ]
> > 
> > +.RB [ \-fg]
> > 
> >   .RI [ Xvnc-options... ]
> > 
> >   .br
> > 
> >   .BI "vncserver \-kill :" display#
> > 
> > @@ -105,6 +106,11 @@
> > 
> >   argument allows you to override the above fallback logic and specify a 
> > font
> > 
> >   path for Xvnc to use.
> > 
> >   
> > 
> > +.TP
> > 
> > +.B \-fg
> > 
> > +Run vncserver in the foreground. On finishing the Xsession (i.e. user logs
> > 
> > +out from its desktop) the VNC session is also terminated.
> > 
> > +
> > 
> >   .SH FILES
> > 
> >   Several VNC-related files are found in the directory $HOME/.vnc:
> > 
> >   .TP
> > 
> > 
> > 
> > 
> > 
> > ------------------------------------------------------------------------------
> > 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
> 
> ------------------------------------------------------------------------------
> 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

-- 
Adam Tkac, Red Hat, Inc.

------------------------------------------------------------------------------
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