X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=fs_passwd%2Ffs_passwd_server;h=a29b2c7383fa8dd43021d91bbddcc96eb2905ead;hb=0e8861ca6b3b04b99ea9477e8c1555561b21c929;hp=cb0e693dd3a1d318517d4537d209f6ccd0655852;hpb=9fb39f590f06d9913ec9f433403c67b30c955bd5;p=freeside.git

diff --git a/fs_passwd/fs_passwd_server b/fs_passwd/fs_passwd_server
index cb0e693dd..a29b2c738 100755
--- a/fs_passwd/fs_passwd_server
+++ b/fs_passwd/fs_passwd_server
@@ -11,8 +11,10 @@
 # crypt-aware, s/password/_password/; ivan@sisd.com 98-aug-23
 
 use strict;
+use vars qw($pid);
+use subs qw(killssh);
 use IO::Handle;
-use FS::SSH qw(sshopen2);
+use Net::SSH qw(sshopen2);
 use FS::UID qw(adminsuidsetup);
 use FS::Record qw(qsearchs);
 use FS::svc_acct;
@@ -22,14 +24,23 @@ adminsuidsetup $user;
 
 my($shellmachine)=shift or die &usage;
 
-$SIG{CHLD} = sub { wait() };
+#causing trouble for some folks
+#$SIG{CHLD} = sub { wait() };
+
+$SIG{HUP} = \&killssh;
+$SIG{INT} = \&killssh;
+$SIG{QUIT} = \&killssh;
+$SIG{TERM} = \&killssh;
+$SIG{PIPE} = \&killssh;
+
+sub killssh { kill 'TERM', $pid if $pid; exit; };
 
 my($fs_passwdd)="/usr/local/sbin/fs_passwdd";
 
 while (1) {
   my($reader,$writer)=(new IO::Handle, new IO::Handle);
   $writer->autoflush(1);
-  sshopen2($shellmachine,$reader,$writer,$fs_passwdd);
+  $pid = sshopen2($shellmachine,$reader,$writer,$fs_passwdd);
   while (1) {
     my($username,$old_password,$new_password,$new_gecos,$new_shell);
     defined($username=<$reader>) or last;