$shellmachine @saltset @pw_set);
use FS::Conf;
use FS::Record qw( qsearchs fields );
+use FS::svc_Common;
use FS::SSH qw(ssh);
-use FS::cust_svc;
+use FS::part_svc;
+use FS::svc_acct_pop;
-@ISA = qw( FS::Record );
+@ISA = qw( FS::svc_Common );
#ask FS::UID to run this stuff for us later
$FS::UID::callback{'FS::svc_acct'} = sub {
=head1 DESCRIPTION
An FS::svc_acct object represents an account. FS::svc_acct inherits from
-FS::Record. The following fields are currently supported:
+FS::svc_Common. The following fields are currently supported:
=over 4
local $SIG{QUIT} = 'IGNORE';
local $SIG{TERM} = 'IGNORE';
local $SIG{TSTP} = 'IGNORE';
+ local $SIG{PIPE} = 'IGNORE';
$error = $self->check;
return $error if $error;
&& $self->username !~ /^(hyla)?fax$/
;
- my $svcnum = $self->svcnum;
- my $cust_svc;
- unless ( $svcnum ) {
- $cust_svc = new FS::cust_svc ( {
- 'svcnum' => $svcnum,
- 'pkgnum' => $self->pkgnum,
- 'svcpart' => $self->svcpart,
- } );
- my $error = $cust_svc->insert;
- return $error if $error;
- $svcnum = $self->svcnum($cust_svc->svcnum);
- }
-
$error = $self->SUPER::insert;
- if ($error) {
- $cust_svc->delete if $cust_svc;
- return $error;
- }
+ return $error if $error;
my ( $username, $uid, $dir, $shell ) = (
$self->username,
local $SIG{QUIT} = 'IGNORE';
local $SIG{TERM} = 'IGNORE';
local $SIG{TSTP} = 'IGNORE';
-
- my $svcnum = $self->getfield('svcnum');
+ local $SIG{PIPE} = 'IGNORE';
$error = $self->SUPER::delete;
return $error if $error;
- my $cust_svc = qsearchs( 'cust_svc' , { 'svcnum' => $svcnum } );
- $error = $cust_svc->delete;
- return $error if $error;
-
my $username = $self->username;
if ( $username && $shellmachine && ! $nossh_hack ) {
ssh("root\@$shellmachine","userdel $username");
=cut
sub replace {
- my ( $new, $old ) = @_;
+ my ( $new, $old ) = ( shift, shift );
my $error;
return "Username in use"
if $old->username ne $new->username &&
qsearchs( 'svc_acct', { 'username' => $new->username } );
- return "Can't change uid!" if $old->uid ne $new->uid;
+ return "Can't change uid!" if $old->uid != $new->uid;
#change homdir when we change username
$new->setfield('dir', '') if $old->username ne $new->username;
local $SIG{QUIT} = 'IGNORE';
local $SIG{TERM} = 'IGNORE';
local $SIG{TSTP} = 'IGNORE';
+ local $SIG{PIPE} = 'IGNORE';
$error = $new->SUPER::replace($old);
return $error if $error;
Called by the cancel method of FS::cust_pkg (see L<FS::cust_pkg>).
-=cut
-
-sub cancel {
- ''; #stub (no error) - taken care of in delete
-}
-
=item check
Checks all fields to make sure this is a valid service. If there is an error,
my($recref) = $self->hashref;
- $recref->{svcnum} =~ /^(\d*)$/ or return "Illegal svcnum";
- $recref->{svcnum} = $1;
+ my $x = $self->setfixed;
+ return $x unless ref($x);
+ my $part_svc = $x;
- #get part_svc
- my($svcpart);
- my($svcnum)=$self->getfield('svcnum');
- if ($svcnum) {
- my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum});
- return "Unknown svcnum" unless $cust_svc;
- $svcpart=$cust_svc->svcpart;
- } else {
- $svcpart=$self->getfield('svcpart');
- }
- my($part_svc)=qsearchs('part_svc',{'svcpart'=>$svcpart});
- return "Unkonwn svcpart" unless $part_svc;
-
- #set fixed fields from part_svc
- my($field);
- foreach $field ( fields('svc_acct') ) {
- if ( $part_svc->getfield('svc_acct__'. $field. '_flag') eq 'F' ) {
- $self->setfield($field,$part_svc->getfield('svc_acct__'. $field) );
- }
- }
-
- my($ulen)=$self->dbdef_table->column('username')->length;
+ my $ulen =$self->dbdef_table->column('username')->length;
$recref->{username} =~ /^([a-z0-9_\-]{2,$ulen})$/
or return "Illegal username";
$recref->{username} = $1;
if ( $shell = (grep $_ eq $recref->{shell}, @shells)[0] ) {
$recref->{shell} = $shell;
} else {
- return "Illegal shell ". $self->shell;
+ return "Illegal shell \`". $self->shell. "\'; ".
+ $conf->dir. "/shells contains: @shells";
}
} else {
$recref->{shell} = '/bin/sync';
=head1 VERSION
-$Id: svc_acct.pm,v 1.3 1998-12-29 11:59:52 ivan Exp $
+$Id: svc_acct.pm,v 1.8 1999-07-29 08:47:26 ivan Exp $
=head1 BUGS
The remote commands should be configurable.
-The new method should set defaults from part_svc (like the check method
-sets fixed values).
-
The bits which ssh should fork before doing so.
The $recref stuff in sub check should be cleaned up.
=head1 SEE ALSO
-L<FS::Record>, L<FS::Conf>, L<FS::cust_svc>, L<FS::part_svc>, L<FS::cust_pkg>,
-L<FS::SSH>, L<ssh>, L<FS::svc_acct_pop>, schema.html from the base
-documentation.
+L<FS::svc_Common>, L<FS::Record>, L<FS::Conf>, L<FS::cust_svc>,
+L<FS::part_svc>, L<FS::cust_pkg>, L<FS::SSH>, L<ssh>, L<FS::svc_acct_pop>,
+schema.html from the base documentation.
=head1 HISTORY
pod and FS::conf ivan@sisd.com 98-sep-22
$Log: svc_acct.pm,v $
-Revision 1.3 1998-12-29 11:59:52 ivan
-mostly properly OO, some work still to be done with svc_ stuff
+Revision 1.8 1999-07-29 08:47:26 ivan
+more informative illegal shells error.
+
+Revision 1.7 1999/04/07 14:37:37 ivan
+use FS::part_svc and FS::svc_acct_pop to avoid warnings
+
+Revision 1.6 1999/01/25 12:26:15 ivan
+yet more mod_perl stuff
+
+Revision 1.5 1999/01/18 21:58:09 ivan
+esthetic: eq and ne were used in a few places instead of == and !=
+
+Revision 1.4 1998/12/30 00:30:45 ivan
+svc_ stuff is more properly OO - has a common superclass FS::svc_Common
Revision 1.2 1998/11/13 09:56:55 ivan
change configuration file layout to support multiple distinct databases (with