X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=bin%2Fsvc_acct.export;h=53fd1f0c7a50a22d76e6bebfc29168776380f136;hp=598a6df8085d39b4b1617774e41062d895f3f6b9;hb=ba0e7c68fa1a7dd9beff5084ac1a846960f3a477;hpb=6ef8eaebaef9d8c278f5cae6f48ffee8c2359565

diff --git a/bin/svc_acct.export b/bin/svc_acct.export
index 598a6df80..53fd1f0c7 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.12 2000-06-15 14:07:02 ivan Exp $
+# $Id: svc_acct.export,v 1.14 2000-06-29 15:01:25 ivan Exp $
 #
 # Create and export password files: passwd, passwd.adjunct, shadow,
 # acp_passwd, acp_userinfo, acp_dialup, users
@@ -38,7 +38,13 @@
 # ivan@sisd.com 98-sep-18
 # 
 # $Log: svc_acct.export,v $
-# Revision 1.12  2000-06-15 14:07:02  ivan
+# Revision 1.14  2000-06-29 15:01:25  ivan
+# another silly typo in svc_acct.export
+#
+# Revision 1.13  2000/06/28 12:37:28  ivan
+# add support for config option textradiusprepend
+#
+# Revision 1.12  2000/06/15 14:07:02  ivan
 # added ICRADIUS radreply table support, courtesy of Kenny Elliott
 #
 # Revision 1.11  2000/03/06 16:00:39  ivan
@@ -89,6 +95,8 @@ my $icradius_mysqlsource =
 my $icradius_dbh = dbh; #could eventually get it from a config file if you're
                         #not running MySQL for your Freeside database
 
+my $textradiusprepend = $conf->config('textradiusprepend');
+
 my(@saltset)= ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
 require 5.004; #srand(time|$$);
 
@@ -237,7 +245,7 @@ foreach $svc_acct (@svc_acct) {
     ###
     # FORMAT OF THE USERS FILE HERE
     print USERS
-      $svc_acct->username, qq(\tPassword = "$rpassword"\n\t),
+      $svc_acct->username, qq(\t${textradiusprepend}Password = "$rpassword"\n\t),
       join ",\n\t", map { qq($_ = "$radius{$_}") } keys %radius;
     
     if ( $ip && $ip ne '0e0' ) {
@@ -359,7 +367,7 @@ my($radiusmachine);
 foreach $radiusmachine (@radiusmachines) {
   scp("$spooldir/users","root\@$radiusmachine:/etc/raddb/users")
     == 0 or die "scp error: $!";
-  ssh("root\@$erpcdmachine",
+  ssh("root\@$radiusmachine",
     "( ".
       "builddbm".
     " )"