import fixes...

diff --git a/bin/bind.import b/bin/bind.import
index 5c41495..688e322 100755 (executable)
--- a/bin/bind.import
+++ b/bin/bind.import
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: bind.import,v 1.1 2002-05-23 13:00:08 ivan Exp $
+# $Id: bind.import,v 1.2 2002-06-21 09:13:16 ivan Exp $
 
 #need to manually put header in /usr/local/etc/freeside/export.<datasrc./bind/<machine>/named.conf.HEADER
 
@@ -23,6 +23,7 @@ use FS::domain_record;
 my $user = shift or die &usage;
 adminsuidsetup $user;
 
+$FS::svc_Common::noexport_hack = 1;
 $FS::domain_record::noserial_hack = 1;
 
 use vars qw($spooldir);

diff --git a/bin/fs-migrate-svc_acct_sm b/bin/fs-migrate-svc_acct_sm
index ae2dc76..e34b235 100755 (executable)
--- a/bin/fs-migrate-svc_acct_sm
+++ b/bin/fs-migrate-svc_acct_sm
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-migrate-svc_acct_sm,v 1.3 2001-08-21 02:43:18 ivan Exp $
+# $Id: fs-migrate-svc_acct_sm,v 1.4 2002-06-21 09:13:16 ivan Exp $
 #
 # jeff@cmh.net 01-Jul-20
 
@@ -52,8 +52,7 @@ my($dbh)=adminsuidsetup $user;
 
 $|=1;
 
-$FS::svc_acct::nossh_hack = 1;
-$FS::svc_forward::nossh_hack = 1;
+$FS::svc_Common::noexport_hack = 1;
 $FS::svc_domain::whois_hack = 1;
 
 %part_domain_svc=map { $_->svcpart, $_ } qsearch('part_svc',{'svcdb'=>'svc_domain'});

diff --git a/bin/passwd.import b/bin/passwd.import
index aa4f90f..09af6a3 100755 (executable)
--- a/bin/passwd.import
+++ b/bin/passwd.import
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -Tw
-# $Id: passwd.import,v 1.2 2002-06-21 09:11:09 ivan Exp $
+# $Id: passwd.import,v 1.3 2002-06-21 09:13:16 ivan Exp $
 
 use strict;
 use vars qw(%part_svc);
@@ -19,7 +19,7 @@ push @FS::svc_acct::shells, qw(/bin/sync /sbin/shuddown /bin/halt); #others?
 my($spooldir)="/usr/local/etc/freeside/export.". datasrc;
 
 #$FS::svc_acct::nossh_hack = 1;
-$FS::svc_acct::noexport_hack = 1;
+$FS::svc_Common::noexport_hack = 1;
 
 ###