Changeset 136

Show
Ignore:
Timestamp:
03/20/06 17:21:45 (3 years ago)
Author:
ludo
Message:

v0.9.3: log the webmin user (from r3130)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/webmin/lbs-vnc/debian/changelog

    r106 r136  
    1 webmin-lbs-vnc (0.9.2) stable; urgency=low 
     1webmin-lbs-vnc (0.9.3) stable; urgency=low 
    22 
    33  * New release. 

  • trunk/webmin/lbs-vnc/logs.cgi

    r106 r136  
    2929 
    3030$lines = file("/var/log/daemon.log"); 
    31 $proxy = preg_grep("/proxy.pl /", $lines); 
     31$proxy = preg_grep("/ proxy.pl:? /", $lines); 
    3232print( join("<br>",array_reverse($proxy))); 
    3333 

  • trunk/webmin/lbs-vnc/module.info

    r106 r136  
    33desc_fr=LRS : Prise de Contrôle à Distance 
    44depends=0.94 lbs_common 
    5 version=0.9.2 
     5version=0.9.3 

  • trunk/webmin/lbs-vnc/proxy.pl

    r106 r136  
    2020# command line parsing: simple, always 6 arguments 
    2121 
    22 if ( $#ARGV != 6 ) 
     22if ( $#ARGV != 7 ) 
    2323  { 
    24     print "Usage: proxy.pl run|test from.ip dest.ip dest.port key user host\n"; 
     24    print "Usage: proxy.pl run|test from.ip dest.ip dest.port key user host loguser\n"; 
    2525    exit 1; 
    2626  } 
    2727 
    28 my ($command, $from, $dest, $destport, $key, $sshuser, $host) = @ARGV; 
     28my ($command, $from, $dest, $destport, $key, $sshuser, $host, $loguser) = @ARGV; 
    2929 
    3030# globals 
    …… 
    250250 
    251251setlogsock('unix'); 
    252 openlog("proxy.pl $host", "", "daemon"); 
     252openlog("proxy.pl: to $host as $loguser", "", "daemon"); 
    253253 
    254254$pid = 0;                       # SSH pid 

  • trunk/webmin/lbs-vnc/ssh.php

    r106 r136  
    5151  function connect() 
    5252    { 
    53       global $nbname; 
     53      global $nbname, $remote_user; 
    5454     
    55       $cmd = escapeshellcmd("./proxy.pl run $this->from $this->ip $this->port $this->key $this->user $nbname"); 
     55      $cmd = escapeshellcmd("./proxy.pl run $this->from $this->ip $this->port $this->key $this->user $nbname $remote_user"); 
    5656      $handle = popen($cmd, "r"); 
    5757      $string = fgets($handle, 100);