Assigns password from the shadow file for RADIUS password "UNIX"

diff --git a/TODO b/TODO
index c82d5cb..56e78c2 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.9 1998-10-13 09:17:20 ivan Exp $
+$Id: TODO,v 1.10 1998-10-13 12:07:49 ivan Exp $

 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 


@@ -6,8 +6,6 @@ duplication of effort.
 
 -- 1.1.x --
 
 
 -- 1.1.x --
 

-svc_acct.import should recognize "UNIX" in the RADIUS password file as null.
-

 radius logfile parsing and perl expression check.
 
 mailing list archive, faq
 radius logfile parsing and perl expression check.
 
 mailing list archive, faq

diff --git a/bin/svc_acct.import b/bin/svc_acct.import
index c4b8c5e..60deac5 100755 (executable)
--- a/bin/svc_acct.import
+++ b/bin/svc_acct.import
@@ -1,5 +1,7 @@
 #!/usr/bin/perl -Tw
 #
 #!/usr/bin/perl -Tw
 #

+# $Id: svc_acct.import,v 1.2 1998-10-13 12:07:51 ivan Exp $
+#

 # ivan@sisd.com 98-mar-9
 #
 # changed 'password' field to '_password' because PgSQL 6.3 reserves this word
 # ivan@sisd.com 98-mar-9
 #
 # changed 'password' field to '_password' because PgSQL 6.3 reserves this word


@@ -13,6 +15,11 @@
 # arbitrary radius attributes ivan@sisd.com 98-aug-9
 #
 # don't import /var/spool/freeside/conf/shells!  ivan@sisd.com 98-aug-13
 # arbitrary radius attributes ivan@sisd.com 98-aug-9
 #
 # don't import /var/spool/freeside/conf/shells!  ivan@sisd.com 98-aug-13

+#
+# $Log: svc_acct.import,v $
+# Revision 1.2  1998-10-13 12:07:51  ivan
+# Assigns password from the shadow file for RADIUS password "UNIX"
+#

 
 use strict;
 use vars qw(%part_svc);
 
 use strict;
 use vars qw(%part_svc);


@@ -122,6 +129,7 @@ while (<USERS>) {
       or die "1Unexpected line in users.import: $_";
     my($password,$expiration);
     ($username,$password,$expiration)=(lc($1),$2,$4);
       or die "1Unexpected line in users.import: $_";
     my($password,$expiration);
     ($username,$password,$expiration)=(lc($1),$2,$4);

+    $password = '' if $password eq 'UNIX';

     $upassword{$username}=$password;
     undef %param;
   } else {
     $upassword{$username}=$password;
     undef %param;
   } else {