gah

diff --git a/bin/dbdef-create b/bin/dbdef-create
index 902f7f1..e71eb36 100755 (executable)
--- a/bin/dbdef-create
+++ b/bin/dbdef-create
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
 #!/usr/bin/perl -Tw
 #

-# $Id: dbdef-create,v 1.3 2001-04-15 12:56:31 ivan Exp $
+# $Id: dbdef-create,v 1.4 2001-08-17 10:57:40 ivan Exp $

 #
 # create dbdef file for existing mySQL database (needs SHOW|DESCRIBE command
 # not in Pg) based on fs-setup
 #
 # create dbdef file for existing mySQL database (needs SHOW|DESCRIBE command
 # not in Pg) based on fs-setup


@@ -8,7 +8,10 @@
 # ivan@sisd.com 98-jun-2
 #
 # $Log: dbdef-create,v $
 # ivan@sisd.com 98-jun-2
 #
 # $Log: dbdef-create,v $

-# Revision 1.3  2001-04-15 12:56:31  ivan
+# Revision 1.4  2001-08-17 10:57:40  ivan
+# gah
+#
+# Revision 1.3  2001/04/15 12:56:31  ivan

 # s/dbdef/DBIx::DBSchema/
 #
 # Revision 1.2  1998/11/19 11:17:44  ivan
 # s/dbdef/DBIx::DBSchema/
 #
 # Revision 1.2  1998/11/19 11:17:44  ivan


@@ -29,6 +32,8 @@ my($dbdef_file) = "/usr/local/etc/freeside/dbdef.". datasrc;
 
 my $dbdef = new_native DBIx::DBSchema $dbh;
 
 
 my $dbdef = new_native DBIx::DBSchema $dbh;
 

+#print $dbdef->pretty_print;
+

 #important
 $dbdef->save($dbdef_file);
 
 #important
 $dbdef->save($dbdef_file);
 

diff --git a/bin/svc_acct.export b/bin/svc_acct.export
index a7a21b3..a5ec45d 100755 (executable)
--- a/bin/svc_acct.export
+++ b/bin/svc_acct.export
@@ -1,18 +1,11 @@
 #!/usr/bin/perl -w
 #
 #!/usr/bin/perl -w
 #

-# $Id: svc_acct.export,v 1.22 2001-08-12 19:41:25 jeff Exp $
+# $Id: svc_acct.export,v 1.23 2001-08-17 10:57:40 ivan Exp $

 #
 # Create and export password, radius and vpopmail password files:
 # passwd, passwd.adjunct, shadow, acp_passwd, acp_userinfo, acp_dialup
 # users/assign, domains/vdomain/vpasswd
 # Also export sendmail and qmail config files.
 #
 # Create and export password, radius and vpopmail password files:
 # passwd, passwd.adjunct, shadow, acp_passwd, acp_userinfo, acp_dialup
 # users/assign, domains/vdomain/vpasswd
 # Also export sendmail and qmail config files.

-#
-#
-# $Log: svc_acct.export,v $
-# Revision 1.22  2001-08-12 19:41:25  jeff
-# merging vpopmail support branch
-#
-#

 
 use strict;
 use vars qw($conf);
 
 use strict;
 use vars qw($conf);


@@ -73,6 +66,8 @@ my $textradiusprepend =
     ? $conf->config('textradiusprepend')
     : '';
 
     ? $conf->config('textradiusprepend')
     : '';
 

+warn "using depriciated textradiusprepend file" if $textradiusprepend;
+

 my @vpopmailmachines = $conf->config('vpopmailmachines')
   if $conf->exists('vpopmailmachines');
 
 my @vpopmailmachines = $conf->config('vpopmailmachines')
   if $conf->exists('vpopmailmachines');
 

diff --git a/bin/svc_acct.import b/bin/svc_acct.import
index eaf0c03..119f770 100755 (executable)
--- a/bin/svc_acct.import
+++ b/bin/svc_acct.import
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
 #!/usr/bin/perl -Tw
 #

-# $Id: svc_acct.import,v 1.15 2001-07-30 06:07:47 ivan Exp $
+# $Id: svc_acct.import,v 1.16 2001-08-17 10:57:40 ivan Exp $

 #
 # ivan@sisd.com 98-mar-9
 #
 #
 # ivan@sisd.com 98-mar-9
 #


@@ -17,7 +17,10 @@
 # don't import /var/spool/freeside/conf/shells!  ivan@sisd.com 98-aug-13
 #
 # $Log: svc_acct.import,v $
 # don't import /var/spool/freeside/conf/shells!  ivan@sisd.com 98-aug-13
 #
 # $Log: svc_acct.import,v $

-# Revision 1.15  2001-07-30 06:07:47  ivan
+# Revision 1.16  2001-08-17 10:57:40  ivan
+# gah
+#
+# Revision 1.15  2001/07/30 06:07:47  ivan

 # allow !! for locked accounts instead of changing to *SUSPENDED*
 #
 # Revision 1.14  2001/05/07 15:24:15  ivan
 # allow !! for locked accounts instead of changing to *SUSPENDED*
 #
 # Revision 1.14  2001/05/07 15:24:15  ivan


@@ -166,7 +169,7 @@ while (<USERS>) {
   next if /^\s*$/;
   next if /^\s*#/;
   if ( /^\S/ ) {
   next if /^\s*$/;
   next if /^\s*#/;
   if ( /^\S/ ) {

-    /^(\w+)\s+(Auth-Type\s+=\s+Local,\s+)Password\s+=\s+"([^"]+)"(,\s+Expiration\s+=\s+"([^"]*")\s*)?$/
+    /^(\w+)\s+(Auth-Type\s+=\s+Local,\s+)?Password\s+=\s+"([^"]+)"(,\s+Expiration\s+=\s+"([^"]*")\s*)?$/

       or die "1Unexpected line in users.import: $_";
     my($password,$expiration);
     ($username,$password,$expiration)=(lc($1),$3,$5);
       or die "1Unexpected line in users.import: $_";
     my($password,$expiration);
     ($username,$password,$expiration)=(lc($1),$3,$5);