X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=bin%2Fsvc_acct.export;h=e28de4aa79e59b1a0f8ca5627b848bfd338a29d8;hp=3ac7a4f8fc4714870e0b06ed779b3dfc951be083;hb=ae23f6fe1ca915c995cfbf29bb39e7ed5e1cce2c;hpb=a2c24812441a8f8ae3045a8c0c93c7f009d4f494 diff --git a/bin/svc_acct.export b/bin/svc_acct.export index 3ac7a4f8f..e28de4aa7 100755 --- a/bin/svc_acct.export +++ b/bin/svc_acct.export @@ -1,6 +1,6 @@ #!/usr/bin/perl -w # -# $Id: svc_acct.export,v 1.28 2001-12-12 07:59:33 ivan Exp $ +# $Id: svc_acct.export,v 1.29 2002-02-12 02:11:07 ivan Exp $ # # Create and export password, radius and vpopmail password files: # passwd, passwd.adjunct, shadow, acp_passwd, acp_userinfo, acp_dialup @@ -287,6 +287,10 @@ foreach $svc_domain (sort {$a->domain cmp $b->domain} @svc_domain) { $username=$svc_acct->username . $svc_acct->domsvc; } elsif ($userpolicy =~ /^append domain$/) { $username=$svc_acct->username . $svc_domain->domain; + } elsif ($userpolicy =~ /^append domain$/) { + $username=$svc_acct->username . $svc_domain->domain; + } elsif ($userpolicy =~ /^append @domain$/) { + $username=$svc_acct->username . '@'. $svc_domain->domain; } else { die "Unknown policy in username_policy\n"; }