X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fsvc_acct_sm.pm;h=8cec60b6958668fd1bdcbd36c9700553480261a2;hb=52579cd417a8a7103a01b0b08945f648e8255707;hp=96bc3a27bbb6e1568ecb08cad06afadd874c917b;hpb=6cd87c0d3b5280446301c647fa5f1ec5a593fa3f;p=freeside.git

diff --git a/FS/FS/svc_acct_sm.pm b/FS/FS/svc_acct_sm.pm
index 96bc3a27b..8cec60b69 100644
--- a/FS/FS/svc_acct_sm.pm
+++ b/FS/FS/svc_acct_sm.pm
@@ -5,7 +5,7 @@ use vars qw( @ISA $nossh_hack $conf $shellmachine @qmailmachines );
 use FS::Record qw( fields qsearch qsearchs );
 use FS::svc_Common;
 use FS::cust_svc;
-use FS::SSH qw(ssh);
+use Net::SSH qw(ssh);
 use FS::Conf;
 use FS::svc_acct;
 use FS::svc_domain;
@@ -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.3 2001-04-22 01:56:15 ivan Exp $
 
 =head1 BUGS
 
@@ -243,7 +244,7 @@ The $recref stuff in sub check should be cleaned up.
 =head1 SEE ALSO
 
 L<FS::Record>, L<FS::Conf>, L<FS::cust_svc>, L<FS::part_svc>, L<FS::cust_pkg>,
-L<FS::svc_acct>, L<FS::svc_domain>, L<FS::SSH>, L<ssh>, L<dot-qmail>,
+L<FS::svc_acct>, L<FS::svc_domain>, L<Net::SSH>, L<ssh>, L<dot-qmail>,
 schema.html from the base documentation.
 
 =cut