s/create/new/

[freeside.git] / fs_passwd / fs_passwd_server

diff --git a/fs_passwd/fs_passwd_server b/fs_passwd/fs_passwd_server
index 99e7c43..cb0e693 100755 (executable)
--- a/fs_passwd/fs_passwd_server
+++ b/fs_passwd/fs_passwd_server
@@ -17,14 +17,14 @@ use FS::UID qw(adminsuidsetup);
 use FS::Record qw(qsearchs);
 use FS::svc_acct;
 
 use FS::Record qw(qsearchs);
 use FS::svc_acct;
 

-$SIG{CHLD} = sub { wait() };
+my $user = shift or die &usage;
+adminsuidsetup $user; 

 
 

-&adminsuidsetup; 
+my($shellmachine)=shift or die &usage;

 
 

-my($fs_passwdd)="/usr/local/sbin/fs_passwdd";
+$SIG{CHLD} = sub { wait() };

 
 

-my($shellmachine)=shift;
-die "Usage: fs_passwd_server shellmachine\n" unless $shellmachine;
+my($fs_passwdd)="/usr/local/sbin/fs_passwdd";

 
 while (1) {
   my($reader,$writer)=(new IO::Handle, new IO::Handle);
 
 while (1) {
   my($reader,$writer)=(new IO::Handle, new IO::Handle);


@@ -57,7 +57,7 @@ while (1) {
     unless ( $svc_acct ) { print $writer "Incorrect password.\n"; next; }
 
     my(%hash)=$svc_acct->hash;
     unless ( $svc_acct ) { print $writer "Incorrect password.\n"; next; }
 
     my(%hash)=$svc_acct->hash;

-    my($new_svc_acct) = create FS::svc_acct ( \%hash );
+    my($new_svc_acct) = new FS::svc_acct ( \%hash );

     $new_svc_acct->setfield('_password',$new_password) 
       if $new_password && $new_password ne $old_password;
     $new_svc_acct->setfield('finger',$new_gecos) if $new_gecos;
     $new_svc_acct->setfield('_password',$new_password) 
       if $new_password && $new_password ne $old_password;
     $new_svc_acct->setfield('finger',$new_gecos) if $new_gecos;


@@ -71,3 +71,7 @@ while (1) {
   warn "Connection to $shellmachine lost!  Reconnecting...\n";
 }
 
   warn "Connection to $shellmachine lost!  Reconnecting...\n";
 }
 

+sub usage {
+  die "Usage:\n\n  fs_passwd_server user shellmachine\n";
+}
+