File freeradius-server-2.1.6-dialup_admin.patch of Package freeradius-server.971

Index: dialup_admin/bin/backup_radacct
===================================================================
--- dialup_admin/bin/backup_radacct.orig	2010-06-21 21:15:56.000000000 +0200
+++ dialup_admin/bin/backup_radacct	2010-06-21 21:15:57.000000000 +0200
@@ -2,7 +2,7 @@
 use POSIX;
 use File::Temp;
 
-$conf=shift||'/data/local/dialupadmin/conf/admin.conf';
+$conf=shift||'/usr/share/dialup_admin/conf/admin.conf';
 $back_days = 80;
 $backup_directory = "/logs/radiusd/accounting";
 
@@ -48,4 +48,4 @@ $comm = "$sqlcmd  -U $sql_username -f $t
 $command = "$sqlcmd  $sql_username/$pass" . "@" . "$sql_database <$tmpfile.$server" if ($sql_type eq 'oracle');
 $command = "$sqlcmd '$sql_server' '$sql_port' '' '$sql_username' '$sql_password' < $tmp_filename >$backup_directory/$date3" if ($sql_type eq 'sqlrelay');
 `$comm`;
-`/usr/local/bin/gzip -9 $backup_directory/$date3`;
+`/usr/bin/gzip -9 $backup_directory/$date3`;
Index: dialup_admin/bin/clean_radacct
===================================================================
--- dialup_admin/bin/clean_radacct.orig	2010-06-21 21:15:56.000000000 +0200
+++ dialup_admin/bin/clean_radacct	2010-06-21 21:15:57.000000000 +0200
@@ -7,7 +7,7 @@
 use POSIX;
 use File::Temp;
 
-$conf=shift||'/usr/local/dialup_admin/conf/admin.conf';
+$conf=shift||'/usr/share/dialup_admin/conf/admin.conf';
 $back_days = 35;
 
 
Index: dialup_admin/bin/clearsession
===================================================================
--- dialup_admin/bin/clearsession.orig	2010-06-21 21:15:56.000000000 +0200
+++ dialup_admin/bin/clearsession	2010-06-21 21:15:57.000000000 +0200
@@ -49,8 +49,8 @@ if ($nastype eq 'cisco' && $type eq 'tel
 }
 if ($nastype eq 'cisco' && $type eq 'snmp'){
 
-	$SNMPGET="/usr/local/bin/snmpget";
-	$SNMPSET="/usr/local/bin/snmpset";
+	$SNMPGET="/usr/bin/snmpget";
+	$SNMPSET="/usr/bin/snmpset";
 
 	die "Could not find snmpwalk binary. Please make sure that the \$SNMPGET variable points to the right location\n" if (! -x $SNMPGET);
 	die "Could not find snmpset binary. Please make sure that the \$SNMPSET variable points to the right location\n" if (! -x $SNMPSET);
Index: dialup_admin/bin/dialup_admin.cron
===================================================================
--- dialup_admin/bin/dialup_admin.cron.orig	2010-06-21 21:15:56.000000000 +0200
+++ dialup_admin/bin/dialup_admin.cron	2010-06-21 21:15:57.000000000 +0200
@@ -1,4 +1,4 @@
-1 0 * * * /usr/local/dialup_admin/bin/tot_stats >/dev/null 2>&1
-5 0 * * * /usr/local/dialup_admin/bin/monthly_tot_stats >/dev/null 2>&1
-10 0 1 * * /usr/local/dialup_admin/bin/truncate_radacct >/dev/null 2>&1
-15 0 1 * * /usr/local/dialup_admin/bin/clean_radacct >/dev/null 2>&1
+1 0 * * * /usr/share/dialup_admin/bin/tot_stats >/dev/null 2>&1
+5 0 * * * /usr/share/dialup_admin/bin/monthly_tot_stats >/dev/null 2>&1
+10 0 1 * * /usr/share/dialup_admin/bin/truncate_radacct >/dev/null 2>&1
+15 0 1 * * /usr/share/dialup_admin/bin/clean_radacct >/dev/null 2>&1
Index: dialup_admin/bin/log_badlogins
===================================================================
--- dialup_admin/bin/log_badlogins.orig	2010-06-21 21:15:56.000000000 +0200
+++ dialup_admin/bin/log_badlogins	2010-06-21 21:15:57.000000000 +0200
@@ -18,7 +18,7 @@ use File::Temp;
 $|=1;
 
 $file=shift||'none';
-$conf=shift||'/usr/local/dialup_admin/conf/admin.conf';
+$conf=shift||'/usr/share/dialup_admin/conf/admin.conf';
 $all_file=shift||'no';
 #
 # Uncomment to force inserts even if there are sql errors. That can
Index: dialup_admin/bin/monthly_tot_stats
===================================================================
--- dialup_admin/bin/monthly_tot_stats.orig	2010-06-21 21:15:56.000000000 +0200
+++ dialup_admin/bin/monthly_tot_stats	2010-06-21 21:15:57.000000000 +0200
@@ -9,7 +9,7 @@ use File::Temp;
 # Works only with mysql and postgresql
 #
 
-$conf=shift||'/usr/local/dialup_admin/conf/admin.conf';
+$conf=shift||'/usr/sharel/dialup_admin/conf/admin.conf';
 
 
 open CONF, "<$conf"
Index: dialup_admin/bin/showmodem
===================================================================
--- dialup_admin/bin/showmodem.orig	2010-06-21 21:15:56.000000000 +0200
+++ dialup_admin/bin/showmodem	2010-06-21 21:15:57.000000000 +0200
@@ -7,7 +7,7 @@ $user=shift;
 $comm=shift || "public";
 $type=shift|| "xml";
 
-$conf='/usr/local/dialup_admin/conf/admin.conf';
+$conf='/usr/share/dialup_admin/conf/admin.conf';
 open CONF, "<$conf"
 	or die "Could not open configuration file\n";
 while(<CONF>){
Index: dialup_admin/bin/snmpfinger
===================================================================
--- dialup_admin/bin/snmpfinger.orig	2010-06-21 21:15:56.000000000 +0200
+++ dialup_admin/bin/snmpfinger	2010-06-21 21:15:57.000000000 +0200
@@ -6,7 +6,7 @@ $host=shift;
 $comm=shift || 'public';
 $type=shift || 'cisco';
 
-$conf='/usr/local/dialup_admin/conf/admin.conf';
+$conf='/usr/share/dialup_admin/conf/admin.conf';
 open CONF, "<$conf"
 	or die "Could not open configuration file\n";
 while(<CONF>){
Index: dialup_admin/bin/tot_stats
===================================================================
--- dialup_admin/bin/tot_stats.orig	2010-06-21 21:15:56.000000000 +0200
+++ dialup_admin/bin/tot_stats	2010-06-21 21:15:57.000000000 +0200
@@ -8,7 +8,7 @@ use File::Temp;
 # Works with mysql and postgresql
 #
 
-$conf=shift||'/usr/local/dialup_admin/conf/admin.conf';
+$conf=shift||'/usr/share/dialup_admin/conf/admin.conf';
 
 
 open CONF, "<$conf"
Index: dialup_admin/bin/truncate_radacct
===================================================================
--- dialup_admin/bin/truncate_radacct.orig	2010-06-21 21:15:56.000000000 +0200
+++ dialup_admin/bin/truncate_radacct	2010-06-21 21:15:57.000000000 +0200
@@ -7,7 +7,7 @@
 use POSIX;
 use File::Temp;
 
-$conf=shift||'/usr/local/dialup_admin/conf/admin.conf';
+$conf=shift||'/usr/share/dialup_admin/conf/admin.conf';
 $back_days = 90;
 
 
Index: dialup_admin/conf/admin.conf
===================================================================
--- dialup_admin/conf/admin.conf.orig	2010-06-21 21:15:56.000000000 +0200
+++ dialup_admin/conf/admin.conf	2010-06-21 21:15:57.000000000 +0200
@@ -19,11 +19,11 @@ general_charset: iso-8859-1
 #
 # The directory where dialupadmin is installed
 #
-general_base_dir: /usr/local/dialup_admin
+general_base_dir: /usr/share/dialup_admin
 #
 # The base directory of the freeradius radius installation
 #
-general_radiusd_base_dir: /usr/local/radiusd
+general_radiusd_base_dir: /
 general_domain: company.com
 #
 # Set it to yes to use sessions and cache the various mappings
@@ -66,8 +66,8 @@ general_show_user_password: yes
 general_raddb_dir: %{general_radiusd_base_dir}/etc/raddb
 general_ldap_attrmap: %{general_raddb_dir}/ldap.attrmap
 # Need to fix admin.conf file parser
-#general_clients_conf: %{general_raddb_dir}/clients.conf
-general_clients_conf: /usr/local/etc/raddb/clients.conf
+general_clients_conf: %{general_raddb_dir}/clients.conf
+#general_clients_conf: /usr/local/etc/raddb/clients.conf
 general_sql_attrmap: %{general_base_dir}/conf/sql.attrmap
 general_accounting_attrs_file: %{general_base_dir}/conf/accounting.attrs
 general_extra_ldap_attrmap: %{general_base_dir}/conf/extra.ldap-attrmap
@@ -260,7 +260,7 @@ sql_show_all_groups: true
 # This variable is used by the scripts in the bin folder
 # It should contain the path to the sql binary used to run
 # sql commands (mysql, psql, oracle and sqlrelay are only supported for now)
-sql_command: /usr/local/bin/mysql
+sql_command: /usr/bin/mysql
 #sql_command: /usr/bin/psql
 #sql_command: /usr/bin/sqlplus
 #
@@ -269,12 +269,12 @@ sql_command: /usr/local/bin/mysql
 # used to run snmp commands. 
 # (ucd = UCD-Snmp and net = Net-Snmp are only supported for now)
 general_snmp_type: net
-general_snmpwalk_command: /usr/local/bin/snmpwalk
-general_snmpget_command: /usr/local/bin/snmpget
+general_snmpwalk_command: /usr/bin/snmpwalk
+general_snmpget_command: /usr/bin/snmpget
 #
 # Uncomment to enable sql debug
 #
-sql_debug: true
+#sql_debug: true
 #
 # If set to yes then the HTTP credentials (http authentication)
 # will be used to connect to the sql server instead of sql_username