X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=bin%2Fsendmail.import;h=ef745fc46ef94252cb4e33c020e9a24acc97b111;hp=8a9de9fd3c2315b3653c83182ee70bb2cd6b2ed3;hb=4dbd0e09bd8fe1958eb294ebd425878c420afe6a;hpb=da5339ccbdc3a42e536124524ce6c484c320ffc9

diff --git a/bin/sendmail.import b/bin/sendmail.import
index 8a9de9fd3..ef745fc46 100644
--- a/bin/sendmail.import
+++ b/bin/sendmail.import
@@ -20,15 +20,15 @@ adminsuidsetup $user;
 #$FS::domain_record::noserial_hack = 1;
 
 use vars qw($defaultdomain);
-$defaultdomain = 'surferz.net';
+$defaultdomain = '295.ca';
 
-use vars qw($svcpart $forward_svcpart);
-$svcpart = 2;
-$forward_svcpart = 4;
+use vars qw(@svcpart $forward_svcpart);
+@svcpart = qw( 2 4 );
+$forward_svcpart = 7;
 
 use vars qw($spooldir);
 $spooldir = "/usr/local/etc/freeside/export.". datasrc. "/sendmail";
-mkdir $spooldir unless -d $spooldir;
+mkdir($spooldir, 0755) unless -d $spooldir;
 
 print "\n\n", <<END;
 Enter the location and name of your Sendmail aliases file, for example
@@ -39,7 +39,7 @@ my($aliases)=&getvalue(":");
 use vars qw($aliases_machine $aliases_prefix);
 $aliases_machine = (split(/:/, $aliases))[0];
 $aliases_prefix = "$spooldir/$aliases_machine";
-mkdir $aliases_prefix unless -d $aliases_prefix;
+mkdir($aliases_prefix, 0755) unless -d $aliases_prefix;
 
 #iscp("root\@$aliases","$aliases_prefix/aliases.import");
 iscp("ivan\@$aliases","$aliases_prefix/aliases.import");
@@ -53,8 +53,8 @@ my($virtusertable)=&getvalue(":");
 use vars qw($virtusertable_machine $virtusertable_prefix);
 $virtusertable_machine = (split(/:/, $virtusertable))[0];
 $virtusertable_prefix = "$spooldir/$virtusertable_machine";
-mkdir $virtusertable_prefix unless -d $virtusertable_prefix;
-mkdir "$virtusertable_prefix/virtusertable.import"
+mkdir($virtusertable_prefix, 0755) unless -d $virtusertable_prefix;
+mkdir("$virtusertable_prefix/virtusertable.import", 0755)
   unless -d "$virtusertable_prefix/virtusertable.import";
 
 #iscp("root\@$virtusertable/*","$aliases_prefix/virtusertable.import/");
@@ -144,7 +144,9 @@ sub svcnum_or_literal {
   my $svc_domain = qsearchs('svc_domain', { 'domain' => $domain } );
   my $domsvc = $svc_domain ? $svc_domain->svcnum : '';
 
-  my @svc_acct = grep { $_->cust_svc->svcpart == $svcpart }
+  my @svc_acct = grep { my $svc_acct = $_;
+                        grep { $svc_acct->cust_svc->svcpart == $_ } @svcpart
+                      }
                    qsearch('svc_acct', {
                      'username' => $username,
                      'domsvc'   => $domsvc,