X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=bin%2Fsvc_acct.export;h=3ac7a4f8fc4714870e0b06ed779b3dfc951be083;hb=79f83ad93cc6f77a155528661a4681946fdd17a6;hp=7271860857ec6792a7c53734e2ad694035081d17;hpb=e6b57805f6b3e76448ab9b6d280f2c53bc1410f3;p=freeside.git diff --git a/bin/svc_acct.export b/bin/svc_acct.export index 727186085..3ac7a4f8f 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.26 2001-10-24 15:29:30 ivan 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 @@ -68,6 +68,12 @@ my $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 = ''; @@ -190,6 +196,8 @@ if ( $icradiusmachines ) { setpriority(0,0,10); +print USERS "$radiusprepend\n"; + my %usernames; ## this hack helps keep the passwd files sane my @sendmail; @@ -565,7 +573,8 @@ foreach $bsdshellmachine (@bsdshellmachines) { 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: $!";