projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
61e25db
)
radius-password config value to set the attribute used for plaintext pw's
author
ivan
<ivan>
Wed, 9 Oct 2002 13:07:54 +0000
(13:07 +0000)
committer
ivan
<ivan>
Wed, 9 Oct 2002 13:07:54 +0000
(13:07 +0000)
FS/FS/Conf.pm
patch
|
blob
|
history
FS/FS/svc_acct.pm
patch
|
blob
|
history
diff --git
a/FS/FS/Conf.pm
b/FS/FS/Conf.pm
index
3fdaf21
..
4dd80c1
100644
(file)
--- a/
FS/FS/Conf.pm
+++ b/
FS/FS/Conf.pm
@@
-967,6
+967,14
@@
httemplate/docs/config.html
'type' => 'textarea',
},
'type' => 'textarea',
},
+ {
+ 'key' => 'raidus-password',
+ 'section' => 'unclassified',
+ 'description' => 'RADIUS attribute for plain-text passwords.',
+ 'type' => 'select',
+ 'select_enum' => [ 'Password', 'User-Password' ],
+ },
+
);
1;
);
1;
diff --git
a/FS/FS/svc_acct.pm
b/FS/FS/svc_acct.pm
index
6c0807d
..
b5ade6f
100644
(file)
--- a/
FS/FS/svc_acct.pm
+++ b/
FS/FS/svc_acct.pm
@@
-9,6
+9,7
@@
use vars qw( @ISA $noexport_hack $conf
$username_uppercase
$welcome_template $welcome_from $welcome_subject $welcome_mimetype
$smtpmachine
$username_uppercase
$welcome_template $welcome_from $welcome_subject $welcome_mimetype
$smtpmachine
+ $radius_password
$dirhash
@saltset @pw_set );
use Carp;
$dirhash
@saltset @pw_set );
use Carp;
@@
-60,6
+61,7
@@
$FS::UID::callback{'FS::svc_acct'} = sub {
$welcome_template = '';
}
$smtpmachine = $conf->config('smtpmachine');
$welcome_template = '';
}
$smtpmachine = $conf->config('smtpmachine');
+ $radius_password = $conf->config('radius-password') || 'Password';
};
@saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
};
@saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
@@
-858,7
+860,7
@@
expected to change in the future.
sub radius_check {
my $self = shift;
my $password = $self->_password;
sub radius_check {
my $self = shift;
my $password = $self->_password;
- my $pw_attrib = length($password) <= 12 ?
'Password'
: 'Crypt-Password';
+ my $pw_attrib = length($password) <= 12 ?
$radius_password
: 'Crypt-Password';
( $pw_attrib => $password,
map {
/^(rc_(.*))$/;
( $pw_attrib => $password,
map {
/^(rc_(.*))$/;