X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=bin%2Fbind.export;h=055782a20b8391df7ef662e7590b606c4a9eb926;hb=5cd4431111f10bd75ef7abebaf995f6b9c84231f;hp=62b7abb51e3c874ae3b50646b0c36a3fb88c0907;hpb=fe45096f26f6267607ffe63eb3003ef3450a2a87;p=freeside.git

diff --git a/bin/bind.export b/bin/bind.export
index 62b7abb51..055782a20 100755
--- a/bin/bind.export
+++ b/bin/bind.export
@@ -15,7 +15,7 @@ my $user = shift or die &usage;
 adminsuidsetup $user;
 
 my $spooldir = "/usr/local/etc/freeside/export.". datasrc. "/bind";
-mkdir $spooldir unless -d $spooldir;
+mkdir $spooldir, 0700 unless -d $spooldir;
 
 my @exports = qsearch('part_export', { 'exporttype' => 'bind' } );
 my @sexports = qsearch('part_export', { 'exporttype' => 'bind_slave' } );
@@ -33,24 +33,20 @@ foreach my $export ( @exports ) {
   #prevent old domain files from piling up
   #rmtree "$prefix" or die "can't rmtree $prefix.db: $!";
 
-  mkdir $prefix unless -d $prefix;
+  mkdir $prefix, 0700 unless -d $prefix;
 
   open(NAMED_CONF,">$prefix/named.conf")
     or die "can't open $prefix/named.conf: $!";
 
-  open(CONF_HEADER,"<$prefix/named.conf.HEADER"); #or die
+  open(CONF_HEADER,"<$prefix/named.conf.HEADER")
+    or die "can't open $prefix/named.conf.HEADER: $!";
   while (<CONF_HEADER>) { print NAMED_CONF $_; }
   close CONF_HEADER;
 
   my $zonepath = $export->option('zonepath');
   $zonepath =~ s/\/$//;
 
-  #false laziness with  freeside-sqlradius-reset and shell.export
-  my @svc_domain =
-    map { qsearchs('svc_domain', { 'svcnum' => $_->svcnum } ) }
-      map { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) }
-        grep { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) }
-          $export->export_svc;
+  my @svc_domain = $export->svc_x;
 
   foreach my $svc_domain ( @svc_domain ) {
     my $domain = $svc_domain->domain;
@@ -132,12 +128,13 @@ foreach my $sexport ( @sexports ) { #false laziness with above
   #prevent old domain files from piling up
   #rmtree "$prefix" or die "can't rmtree $prefix.db: $!";
 
-  mkdir $prefix unless -d $prefix;
+  mkdir $prefix, 0700 unless -d $prefix;
 
   open(NAMED_CONF,">$prefix/named.conf")
     or die "can't open $prefix/named.conf: $!";
 
-  open(CONF_HEADER,"<$prefix/named.conf.HEADER"); #or die
+  open(CONF_HEADER,"<$prefix/named.conf.HEADER")
+    or die "can't open $prefix/named.conf.HEADER: $!";
   while (<CONF_HEADER>) { print NAMED_CONF $_; }
   close CONF_HEADER;