diff options
| author | ivan <ivan> | 2003-03-20 03:42:51 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2003-03-20 03:42:51 +0000 |
| commit | e95b8c2e1138594f6bc3715fd9c24a06636311d8 (patch) | |
| tree | 479556539b1510b6567dbe127b6cf9eb2d294423 /bin | |
| parent | 9ba9f5252cceb2385c914127062e1ca3954b6d60 (diff) | |
apache export!
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/bind.export | 7 | ||||
| -rwxr-xr-x | bin/bsdshell.export | 7 | ||||
| -rwxr-xr-x | bin/sysvshell.export | 7 |
3 files changed, 3 insertions, 18 deletions
diff --git a/bin/bind.export b/bin/bind.export index 943aefbb0..055782a20 100755 --- a/bin/bind.export +++ b/bin/bind.export @@ -46,12 +46,7 @@ foreach my $export ( @exports ) { 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; diff --git a/bin/bsdshell.export b/bin/bsdshell.export index 10c27671e..6e0d1037e 100755 --- a/bin/bsdshell.export +++ b/bin/bsdshell.export @@ -43,12 +43,7 @@ foreach my $export ( @bsd_exports ) { chmod 0644, "$prefix/passwd"; chmod 0600, "$prefix/master.passwd"; - #false laziness with freeside-sqlradius-reset and bind.export - my @svc_acct = - map { qsearchs('svc_acct', { 'svcnum' => $_->svcnum } ) } - map { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) } - grep { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) } - $export->export_svc; + my @svc_acct = $export->svc_x; next unless @svc_acct; diff --git a/bin/sysvshell.export b/bin/sysvshell.export index 859766103..c13912c3f 100755 --- a/bin/sysvshell.export +++ b/bin/sysvshell.export @@ -43,12 +43,7 @@ foreach my $export ( @sysv_exports ) { chmod 0644, "$prefix/passwd"; chmod 0600, "$prefix/shadow"; - #false laziness with freeside-sqlradius-reset and bind.export - my @svc_acct = - map { qsearchs('svc_acct', { 'svcnum' => $_->svcnum } ) } - map { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) } - grep { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) } - $export->export_svc; + my @svc_acct = $export->svc_x; next unless @svc_acct; |