From d4e9b3b0b80a25992fa7194464efa06deb484185 Mon Sep 17 00:00:00 2001 From: ivan Date: Tue, 13 Oct 1998 12:07:51 +0000 Subject: Assigns password from the shadow file for RADIUS password "UNIX" --- bin/svc_acct.import | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'bin') diff --git a/bin/svc_acct.import b/bin/svc_acct.import index c4b8c5ec5..60deac539 100755 --- a/bin/svc_acct.import +++ b/bin/svc_acct.import @@ -1,5 +1,7 @@ #!/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 @@ -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 +# +# $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); @@ -122,6 +129,7 @@ while () { 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 { -- cgit v1.2.1 From d914c9c9f2e73f58c3bd9b70738747d2c7e6c05b Mon Sep 17 00:00:00 2001 From: ivan Date: Wed, 14 Oct 1998 07:05:06 +0000 Subject: 1.1.4 release, fix postgresql --- bin/fs-setup | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'bin') diff --git a/bin/fs-setup b/bin/fs-setup index 45332d85c..22891ec0f 100755 --- a/bin/fs-setup +++ b/bin/fs-setup @@ -68,7 +68,7 @@ my($char_d) = 80; #default maxlength for text fields #my(@date_type) = ( 'timestamp', '', '' ); my(@date_type) = ( 'int', 'NULL', '' ); -my(@perl_type) = ( 'long varchar', 'NULL', '' ); +my(@perl_type) = ( 'varchar', 'NULL', '' ); my(@money_type); if (datasrc =~ m/Pg/) { #Pg can't do decimal(10,2) @money_type = ( 'money', '', '' ); @@ -315,7 +315,7 @@ sub tables_hash_hack { 'columns' => [ 'taxnum', 'int', '', '', 'state', 'char', '', 2, #two letters max in US... elsewhere? - 'county', 'varchar', '', $char_d, + 'county', 'varchar', 'NULL', $char_d, 'tax', 'real', '', '', #tax % ], 'primary_key' => 'taxnum', @@ -353,7 +353,7 @@ sub tables_hash_hack { 'state', 'char', '', 2, 'zip', 'varchar', '', 10, 'country', 'char', '', 2, - 'trancode', 'TINYINT', '', '', + 'trancode', 'int', '', '', 'cardnum', 'varchar', '', 16, 'exp', @date_type, 'payname', 'varchar', 'NULL', $char_d, @@ -476,8 +476,8 @@ sub tables_hash_hack { 'username', 'varchar', '', $username_len, #unique (& remove dup code) '_password', 'varchar', '', 25, #13 for encryped pw's plus ' *SUSPENDED* 'popnum', 'int', 'NULL', '', - 'uid', 'bigint', 'NULL', '', - 'gid', 'bigint', 'NULL', '', + 'uid', 'int', 'NULL', '', + 'gid', 'int', 'NULL', '', 'finger', 'varchar', 'NULL', $char_d, 'dir', 'varchar', 'NULL', $char_d, 'shell', 'varchar', 'NULL', $char_d, @@ -493,7 +493,7 @@ sub tables_hash_hack { 'columns' => [ 'svcnum', 'int', '', '', 'domsvc', 'int', '', '', - 'domuid', 'bigint', '', '', + 'domuid', 'int', '', '', 'domuser', 'varchar', '', $char_d, ], 'primary_key' => 'svcnum', -- cgit v1.2.1 From b8f8d9c3a07d4cb18ab6ec49fcd5ee0620c04a24 Mon Sep 17 00:00:00 2001 From: ivan Date: Thu, 22 Oct 1998 15:46:28 +0000 Subject: now smallint is illegal, so remove that too. --- bin/fs-setup | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/fs-setup b/bin/fs-setup index 22891ec0f..dc732e5ed 100755 --- a/bin/fs-setup +++ b/bin/fs-setup @@ -30,6 +30,11 @@ # ivan@sisd.com 98-sep-4 # # fix radius attributes ivan@sisd.com 98-sep-27 +# +# $Log: fs-setup,v $ +# Revision 1.3 1998-10-22 15:46:28 ivan +# now smallint is illegal, so remove that too. +# #to delay loading dbdef until we're ready BEGIN { $FS::Record::setup_hack = 1; } @@ -206,7 +211,7 @@ sub tables_hash_hack { 'agentnum', 'int', '', '', 'agent', 'varchar', '', $char_d, 'typenum', 'int', '', '', - 'freq', 'smallint', 'NULL', '', + 'freq', 'int', 'NULL', '', 'prog', @perl_type, ], 'primary_key' => 'agentnum', @@ -415,7 +420,7 @@ sub tables_hash_hack { 'pkg', 'varchar', '', $char_d, 'comment', 'varchar', '', $char_d, 'setup', @perl_type, - 'freq', 'smallint', '', '', #billing frequency (months) + 'freq', 'int', '', '', #billing frequency (months) 'recur', @perl_type, ], 'primary_key' => 'pkgpart', -- cgit v1.2.1 From 9061feef2e36c8a58a612be0e4e80853715bacb2 Mon Sep 17 00:00:00 2001 From: ivan Date: Thu, 22 Oct 1998 15:51:23 +0000 Subject: also varchar with no length specified - postgresql fix broke mysql. --- bin/fs-setup | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/fs-setup b/bin/fs-setup index dc732e5ed..98e754261 100755 --- a/bin/fs-setup +++ b/bin/fs-setup @@ -32,7 +32,10 @@ # fix radius attributes ivan@sisd.com 98-sep-27 # # $Log: fs-setup,v $ -# Revision 1.3 1998-10-22 15:46:28 ivan +# Revision 1.4 1998-10-22 15:51:23 ivan +# also varchar with no length specified - postgresql fix broke mysql. +# +# Revision 1.3 1998/10/22 15:46:28 ivan # now smallint is illegal, so remove that too. # @@ -73,7 +76,7 @@ my($char_d) = 80; #default maxlength for text fields #my(@date_type) = ( 'timestamp', '', '' ); my(@date_type) = ( 'int', 'NULL', '' ); -my(@perl_type) = ( 'varchar', 'NULL', '' ); +my(@perl_type) = ( 'varchar', 'NULL', 255 ); my(@money_type); if (datasrc =~ m/Pg/) { #Pg can't do decimal(10,2) @money_type = ( 'money', '', '' ); -- cgit v1.2.1 From 79556e1cfa147d8c9b2fc8142ed03ff067360030 Mon Sep 17 00:00:00 2001 From: ivan Date: Sat, 7 Nov 1998 08:08:12 +0000 Subject: Removed depriciated FS::Bill (now in FS::cust_main) --- bin/bill | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'bin') diff --git a/bin/bill b/bin/bill index 5c5be703d..ef321002b 100755 --- a/bin/bill +++ b/bin/bill @@ -76,6 +76,12 @@ # s/suidsetup/adminsuidsetup/, s/FS::Search/FS::Record/, added some batch # exporting stuff (which still needs to be generalized) and removed &idiot # ivan@sisd.com 98-may-27 +# +# $Log: bill,v $ +# Revision 1.2 1998-11-07 08:08:12 ivan +# +# Removed depriciated FS::Bill (now in FS::cust_main) +# # setup @@ -85,7 +91,6 @@ use Date::Parse; use Getopt::Std; use FS::UID qw(adminsuidsetup swapuid); use FS::Record qw(qsearch qsearchs); -use FS::Bill; my($batchfile)="/var/spool/freeside/batch"; my($batchlock)="/var/spool/freeside/batch.lock"; @@ -118,8 +123,6 @@ foreach $cust_main ( print "Billing customer #" . $cust_main->getfield('custnum') . "\n"; - bless($cust_main,"FS::Bill"); - my($error); $error=$cust_main->bill('time'=>$time); -- cgit v1.2.1 From e4ad777a6ffa5b2cc28bf26681bcfa56f83df7e9 Mon Sep 17 00:00:00 2001 From: ivan Date: Sat, 7 Nov 1998 08:19:21 +0000 Subject: still need to bless into FS::cust_main (for now) --- bin/bill | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/bill b/bin/bill index ef321002b..7b1e162c2 100755 --- a/bin/bill +++ b/bin/bill @@ -78,9 +78,9 @@ # ivan@sisd.com 98-may-27 # # $Log: bill,v $ -# Revision 1.2 1998-11-07 08:08:12 ivan +# Revision 1.3 1998-11-07 08:19:21 ivan # -# Removed depriciated FS::Bill (now in FS::cust_main) +# still need to bless into FS::cust_main (for now) # # setup @@ -123,6 +123,8 @@ foreach $cust_main ( print "Billing customer #" . $cust_main->getfield('custnum') . "\n"; + bless($cust_main,"FS::cust_main"); + my($error); $error=$cust_main->bill('time'=>$time); -- cgit v1.2.1 From de5bd53fdf4d115a26c1b51fefa83a114735f9bc Mon Sep 17 00:00:00 2001 From: ivan Date: Sat, 7 Nov 1998 08:21:26 +0000 Subject: missing use --- bin/bill | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'bin') diff --git a/bin/bill b/bin/bill index 7b1e162c2..3bc995d35 100755 --- a/bin/bill +++ b/bin/bill @@ -78,9 +78,8 @@ # ivan@sisd.com 98-may-27 # # $Log: bill,v $ -# Revision 1.3 1998-11-07 08:19:21 ivan -# -# still need to bless into FS::cust_main (for now) +# Revision 1.4 1998-11-07 08:21:26 ivan +# missing use # # setup @@ -91,6 +90,7 @@ use Date::Parse; use Getopt::Std; use FS::UID qw(adminsuidsetup swapuid); use FS::Record qw(qsearch qsearchs); +use FS::cust_main; my($batchfile)="/var/spool/freeside/batch"; my($batchlock)="/var/spool/freeside/batch.lock"; -- cgit v1.2.1