#!/usr/bin/perl -w
#
-# $Id: svc_acct.export,v 1.22 2001-08-12 19:41:25 jeff Exp $
+# $Id: svc_acct.export,v 1.28 2001-12-12 07:59:33 ivan Exp $
#
# Create and export password, radius and vpopmail password files:
# passwd, passwd.adjunct, shadow, acp_passwd, acp_userinfo, acp_dialup
# users/assign, domains/vdomain/vpasswd
# Also export sendmail and qmail config files.
-#
-#
-# $Log: svc_acct.export,v $
-# Revision 1.22 2001-08-12 19:41:25 jeff
-# merging vpopmail support branch
-#
-#
use strict;
use vars qw($conf);
my $icradiusmachines = $conf->exists('icradiusmachines');
my @icradiusmachines = $conf->config('icradiusmachines') if $icradiusmachines;
my $icradius_mysqldest =
- $conf->config('icradius_mysqldest') || "/usr/local/var/"
+ $conf->config('icradius_mysqldest') || "/usr/local/var"
if $icradiusmachines;
my $icradius_mysqlsource =
$conf->config('icradius_mysqlsource') || "/usr/local/var/freeside"
my $icradius_dbh;
if ( $icradiusmachines && $conf->exists('icradius_secrets') ) {
$icradius_dbh = DBI->connect($conf->config('icradius_secrets'))
- or die $DBI::errstr;;
+ or die $DBI::errstr;
} else {
$icradius_dbh = dbh;
}
? $conf->config('textradiusprepend')
: '';
+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 = '';
+$vpopmailrestart = $conf->config('vpopmailrestart')
+ if $conf->exists('vpopmailrestart');
-my ($machine, $vpopdir, $vpopuid, $vpopgid) = split (/\s+/, $vpopmailmachines[0]);
+my ($machine, $vpopdir, $vpopuid, $vpopgid) = split (/\s+/, $vpopmailmachines[0]) if $vpopmailmachines[0];
my($shellmachine, @qmailmachines);
if ( $conf->exists('qmailmachines') ) {
setpriority(0,0,10);
+print USERS "$radiusprepend\n";
+
my %usernames; ## this hack helps keep the passwd files sane
my @sendmail;
"-",
"",
"",
- ), "\n";
+ ), "\n" if $vpopmailmachines[0];
(mkdir "$spooldir/domains/" . $domain, 0700)
or die "Can't create $spooldir/domains/" . $domain .": $!";
my ($svc_acct);
- if ($svc_domain->catchall) {
+ if ($svc_domain->getfield('catchall')) {
$svc_acct = qsearchs('svc_acct', {'svcnum' => $svc_domain->catchall});
die "Cannot find catchall account for domain $domain\n" unless $svc_acct;
###
# FORMAT OF THE .QMAIL-DEFAULT FILE HERE
- print QMAILDEFAULT "| $vpopdir/bin/vdelivermail \"\" $username\@$domain\n";
+ print QMAILDEFAULT "| $vpopdir/bin/vdelivermail \"\" " . $svc_acct->email . "\n"
+ if $vpopmailmachines[0];
}else{
###
# FORMAT OF THE .QMAIL-DEFAULT FILE HERE
- print QMAILDEFAULT "| $vpopdir/bin/vdelivermail \"\" bounce-no-mailbox\n";
+ print QMAILDEFAULT "| $vpopdir/bin/vdelivermail \"\" bounce-no-mailbox\n"
+ if $vpopmailmachines[0];
}
print VPOPVIRTUALDOMAINS "$domain:$domain\n";
foreach $svc_acct (qsearch('svc_acct', {'domsvc' => $svc_domain->svcnum})) {
my($password)=$svc_acct->getfield('_password');
my($cpassword,$rpassword);
- if ( ( length($password) <= 8 )
+ #if ( ( length($password) <= 8 )
+ if ( ( length($password) <= 12 )
&& ( $password ne '*' )
&& ( $password ne '!!' )
&& ( $password ne '' )
) ). " )"
);
$sth->execute or die "Can't insert into radreply table: ". $sth->errstr; }
+
+ if ( $ip && $ip ne '0e0' ) {
+ my $sth = $icradius_dbh->prepare(
+ "INSERT INTO radreply (id, UserName, Attribute, Value) VALUES ( ".
+ join(", ", map { $icradius_dbh->quote( $_ ) } (
+ '',
+ $username,
+ 'Framed-IP-Address',
+ $ip,
+ ) ). " )"
+ );
+ $sth->execute or die "Can't insert into radreply table: ". $sth->errstr; }
}
}
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: $!";
or die "scp error: ". $scp->{errstr};
$scp->scp("$spooldir/vpoprcpthosts","root\@$machine:/var/qmail/control/rcpthosts")
or die "scp error: ". $scp->{errstr};
+
+ ssh("root\@$machine",
+ "( ".
+ $vpopmailrestart .
+ " )"
+ )
+ == 0 or die "ssh error: $!";
+
+
}
my($sendmailmachine);