use strict;
use vars qw( @ISA $nossh_hack $conf $dir_prefix @shells $usernamemin
- $usernamemax $passwordmin
+ $usernamemax $passwordmin $username_letter $username_letterfirst
$shellmachine $useradd $usermod $userdel
@saltset @pw_set);
use Carp;
'rm -rf $old_dir'.
')';
}
+ $username_letter = $conf->exists('username-letter');
+ $username_letterfirst = $conf->exists('username-letterfirst');
};
@saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
%hash = $record->radius;
+ %hash = $record->radius_reply;
+
+ %hash = $record->radius_check;
+
=head1 DESCRIPTION
An FS::svc_acct object represents an account. FS::svc_acct inherits from
=item radius_I<Radius_Attribute> - I<Radius-Attribute>
+=item domsvc - service number of svc_domain with which to associate
+
=back
=head1 METHODS
return $error if $error;
return "Username ". $self->username. " in use"
- if qsearchs( 'svc_acct', { 'username' => $self->username } );
+ if qsearchs( 'svc_acct', { 'username' => $self->username,
+ 'domsvc' => $self->domsvc,
+ } );
my $part_svc = qsearchs( 'part_svc', { 'svcpart' => $self->svcpart } );
return "Unknown svcpart" unless $part_svc;
return $x unless ref($x);
my $part_svc = $x;
+ my $error = $self->ut_number('domsvc');
+ return $error if $error;
+
my $ulen = $usernamemax || $self->dbdef_table->column('username')->length;
$recref->{username} =~ /^([a-z0-9_\-\.]{$usernamemin,$ulen})$/
or return "Illegal username";
$recref->{username} = $1;
- $recref->{username} =~ /[a-z]/ or return "Illegal username";
+ if ( $username_letterfirst ) {
+ $recref->{username} =~ /^[a-z]/ or return "Illegal username";
+ } elsif ( $username_letter ) {
+ $recref->{username} =~ /[a-z]/ or return "Illegal username";
+ }
$recref->{popnum} =~ /^(\d*)$/ or return "Illegal popnum: ".$recref->{popnum};
$recref->{popnum} = $1;
return "Only root can have uid 0"
if $recref->{uid} == 0 && $recref->{username} ne 'root';
- my($error);
- return $error if $error=$self->ut_textn('finger');
+ $error = $self->ut_textn('finger');
+ return $error if $error;
$recref->{dir} =~ /^([\/\w\-]*)$/
or return "Illegal directory";
$recref->{_password} = $1.$3;
} elsif ( $recref->{_password} eq '*' ) {
$recref->{_password} = '*';
+ } elsif ( $recref->{_password} eq '!!' ) {
+ $recref->{_password} = '!!';
} else {
return "Illegal password";
}
} grep { /^rc_/ && $self->getfield($_) } fields( $self->table );
}
+=item email
+
+Returns an email address associated with the account.
+
=cut
+sub email {
+ my $self = shift;
+ my $domain;
+ my $svc_domain = qsearchs( 'svc_domain', { 'svcnum' => $self->domsvc } );
+ if ($svc_domain) {
+ $domain=$svc_domain->domain;
+ }else{
+ warn "couldn't find svc_acct.domsvc " . $self->domsvc . "!";
+ $domain="unknown";
+ }
+ return $self->username . "@" . $domain;
+}
+
+=back
+
=head1 VERSION
-$Id: svc_acct.pm,v 1.16 2001-06-03 11:37:08 ivan Exp $
+$Id: svc_acct.pm,v 1.24 2001-08-19 15:53:34 jeff Exp $
=head1 BUGS