From: ivan <ivan>
Date: Fri, 30 Jun 2000 10:37:18 +0000 (+0000)
Subject: maildisablecatchall configuration file
X-Git-Tag: freeside_1_3_0~101
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=5a698d284b646e4077144193ead58cf0f0f91893

maildisablecatchall configuration file
---

diff --git a/FS/FS/svc_acct_sm.pm b/FS/FS/svc_acct_sm.pm
index 96bc3a27b..15cf86d9b 100644
--- a/FS/FS/svc_acct_sm.pm
+++ b/FS/FS/svc_acct_sm.pm
@@ -117,8 +117,9 @@ sub insert {
 
   return "First domain username (domuser) for domain (domsvc) must be " .
          qq='*' (catch-all)!=
-    if $self->domuser ne '*' &&
-       ! qsearch('svc_acct_sm',{ 'domsvc' => $self->domsvc } );
+    if $self->domuser ne '*'
+       && ! qsearch('svc_acct_sm',{ 'domsvc' => $self->domsvc } )
+       && ! $conf->exists('maildisablecatchall');
 
   $error = $self->SUPER::insert;
   return $error if $error;
@@ -232,7 +233,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: svc_acct_sm.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+$Id: svc_acct_sm.pm,v 1.2 2000-06-30 10:37:18 ivan Exp $
 
 =head1 BUGS