export getsecrets from FS::UID instead of calling it explicitly

diff --git a/bin/fs-setup b/bin/fs-setup
index b7d4a18..d21b41d 100755 (executable)
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
 #!/usr/bin/perl -Tw
 #

-# $Id: fs-setup,v 1.16 1999-02-28 19:44:16 ivan Exp $
+# $Id: fs-setup,v 1.17 1999-04-14 07:58:39 ivan Exp $

 #
 # ivan@sisd.com 97-nov-8,9
 #
 #
 # ivan@sisd.com 97-nov-8,9
 #


@@ -32,7 +32,10 @@
 # fix radius attributes ivan@sisd.com 98-sep-27
 #
 # $Log: fs-setup,v $
 # fix radius attributes ivan@sisd.com 98-sep-27
 #
 # $Log: fs-setup,v $

-# Revision 1.16  1999-02-28 19:44:16  ivan
+# Revision 1.17  1999-04-14 07:58:39  ivan
+# export getsecrets from FS::UID instead of calling it explicitly
+#
+# Revision 1.16  1999/02/28 19:44:16  ivan

 # constructors s/create/new/ pointed out by "Bao C. Ha" <bao@hacom.net>
 #
 # Revision 1.15  1999/02/27 21:06:21  ivan
 # constructors s/create/new/ pointed out by "Bao C. Ha" <bao@hacom.net>
 #
 # Revision 1.15  1999/02/27 21:06:21  ivan


@@ -82,14 +85,14 @@ BEGIN { $FS::Record::setup_hack = 1; }
 use strict;
 use DBI;
 use FS::dbdef;
 use strict;
 use DBI;
 use FS::dbdef;

-use FS::UID qw(adminsuidsetup datasrc checkeuid);
+use FS::UID qw(adminsuidsetup datasrc checkeuid getsecrets);

 use FS::Record;
 use FS::cust_main_county;
 
 die "Not running uid freeside!" unless checkeuid();
 
 my $user = shift or die &usage;
 use FS::Record;
 use FS::cust_main_county;
 
 die "Not running uid freeside!" unless checkeuid();
 
 my $user = shift or die &usage;

-FS::UID::getsecrets $user;
+getsecrets($user);

 
 #needs to match FS::Record
 my($dbdef_file) = "/usr/local/etc/freeside/dbdef.". datasrc;
 
 #needs to match FS::Record
 my($dbdef_file) = "/usr/local/etc/freeside/dbdef.". datasrc;

diff --git a/site_perl/UID.pm b/site_perl/UID.pm
index ad7c89d..889ccb6 100644 (file)
--- a/site_perl/UID.pm
+++ b/site_perl/UID.pm
@@ -15,7 +15,7 @@ use FS::Conf;
 
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(checkeuid checkruid swapuid cgisuidsetup
 
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(checkeuid checkruid swapuid cgisuidsetup

-                adminsuidsetup getotaker dbh datasrc);
+                adminsuidsetup getotaker dbh datasrc getsecrets );

 
 $freeside_uid = scalar(getpwnam('freeside'));
 
 
 $freeside_uid = scalar(getpwnam('freeside'));
 


@@ -241,7 +241,7 @@ coderef into the hash %FS::UID::callback :
 
 =head1 VERSION
 
 
 =head1 VERSION
 

-$Id: UID.pm,v 1.10 1999-04-12 22:41:09 ivan Exp $
+$Id: UID.pm,v 1.11 1999-04-14 07:58:39 ivan Exp $

 
 =head1 BUGS
 
 
 =head1 BUGS
 


@@ -287,7 +287,10 @@ inlined suidsetup
 ivan@sisd.com 98-sep-12
 
 $Log: UID.pm,v $
 ivan@sisd.com 98-sep-12
 
 $Log: UID.pm,v $

-Revision 1.10  1999-04-12 22:41:09  ivan
+Revision 1.11  1999-04-14 07:58:39  ivan
+export getsecrets from FS::UID instead of calling it explicitly
+
+Revision 1.10  1999/04/12 22:41:09  ivan

 bugfix; $user is a global (yuck)
 
 Revision 1.9  1999/04/12 21:09:39  ivan
 bugfix; $user is a global (yuck)
 
 Revision 1.9  1999/04/12 21:09:39  ivan