#!/usr/bin/perl -w
#
-# $Id: svc_acct.export,v 1.26 2001-10-24 15:29:30 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
warn "using depriciated textradiusprepend file" if $textradiusprepend;
+
+my $radiusprepend =
+ $conf->exists('radiusprepend')
+ ? $conf->config('radiusprepend')
+ : '';
+
my @vpopmailmachines = $conf->config('vpopmailmachines')
if $conf->exists('vpopmailmachines');
my $vpopmailrestart = '';
setpriority(0,0,10);
+print USERS "$radiusprepend\n";
+
my %usernames; ## this hack helps keep the passwd files sane
my @sendmail;
$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";
}
ssh("root\@$bsdshellmachine",
"( ".
"mv /etc/passwd.new /etc/passwd; ".
- "mv /etc/master.passwd.new /etc/master.passwd; ".
+ #"mv /etc/master.passwd.new /etc/master.passwd; ".
+ "pwd_mkdb /etc/master.passwd.new; ".
" )"
)
== 0 or die "ssh error: $!";