diff -Nur e-smith-base-5.8.0.old/root/etc/e-smith/db/configuration/migrate/50RemoveObsoleteServices e-smith-base-5.8.0/root/etc/e-smith/db/configuration/migrate/50RemoveObsoleteServices
--- e-smith-base-5.8.0.old/root/etc/e-smith/db/configuration/migrate/50RemoveObsoleteServices 2020-12-09 22:24:31.525000000 -0500
+++ e-smith-base-5.8.0/root/etc/e-smith/db/configuration/migrate/50RemoveObsoleteServices 2020-12-11 12:47:37.190000000 -0500
@@ -1,7 +1,7 @@
{
# Remove old, unused services from the configuration database
- my @services = qw(haldaemon smolt udev-post messagebus ctrlaltdel);
+ my @services = qw(haldaemon smolt udev-post messagebus ctrlaltdel pptpd);
foreach my $service (@services){
my $entry = $DB->get($service);
$entry->delete if $entry;
diff -Nur e-smith-base-5.8.0.old/root/etc/e-smith/templates/etc/ppp/ip-up.local/30ipparam20pptpd e-smith-base-5.8.0/root/etc/e-smith/templates/etc/ppp/ip-up.local/30ipparam20pptpd
--- e-smith-base-5.8.0.old/root/etc/e-smith/templates/etc/ppp/ip-up.local/30ipparam20pptpd 2005-11-20 23:28:08.000000000 -0500
+++ e-smith-base-5.8.0/root/etc/e-smith/templates/etc/ppp/ip-up.local/30ipparam20pptpd 1969-12-31 19:00:00.000000000 -0500
@@ -1,3 +0,0 @@
- pptpd)
- /sbin/e-smith/signal-event ip-up.pptpd "$@"
- ;;
diff -Nur e-smith-base-5.8.0.old/root/etc/e-smith/web/functions/remoteaccess e-smith-base-5.8.0/root/etc/e-smith/web/functions/remoteaccess
--- e-smith-base-5.8.0.old/root/etc/e-smith/web/functions/remoteaccess 2016-02-04 18:14:13.000000000 -0500
+++ e-smith-base-5.8.0/root/etc/e-smith/web/functions/remoteaccess 2020-12-11 12:42:52.181000000 -0500
@@ -60,7 +60,6 @@
ok ($ua->{form}->find_input('sshAccess'), 'Finding the sshAccess field');
ok ($ua->{form}->find_input('sshPermitRootLogin'), 'Finding the sshPermitRootLogin field');
ok ($ua->{form}->find_input('sshTCPPort'), 'Finding the sshTCPPort field');
-ok ($ua->{form}->find_input('pptpSessions'), 'Finding the pptpSessions field');
ok ($ua->{form}->find_input('sshPasswordAuthentication'), 'Finding the sshPasswordAuthentication field');
ok ($ua->{form}->find_input('FTPLimits'), 'Finding the FTPLimits field');
ok ($ua->{form}->find_input('TelnetAccess'), 'Finding the TelnetAccess field');
@@ -70,7 +69,6 @@
$ua->field('sshAccess' => 'public');
$ua->field('sshPermitRootLogin' => 'yes');
$ua->field('sshTCPPort' => '22');
- $ua->field('pptpSessions' => '10');
$ua->field('sshPasswordAuthentication' => 'yes');
$ua->field('FTPLimits' => 'normal');
$ua->field('TelnetAccess' => 'private');
@@ -96,8 +94,6 @@
is ($db->get('ftp')->prop('access'), 'private', "ftp access is private");
is ($db->get('ftp')->prop('accessLimits'), 'normal', "ftp access limits are normal");
- is ($db->get('pptpd')->prop('sessions') ,'10', "Got the right sesison count for pptp");
- is ($db->get('pptpd')->prop('status') ,'enabled', "pptp is enabled");
is ($db->get('telnet')->prop('access'), 'private', "Private telnet turned on");
}
@@ -113,12 +109,6 @@
-
-
- DESC_PPTP
-
-
diff -Nur e-smith-base-5.8.0.old/root/etc/e-smith/web/functions/useraccounts e-smith-base-5.8.0/root/etc/e-smith/web/functions/useraccounts
--- e-smith-base-5.8.0.old/root/etc/e-smith/web/functions/useraccounts 2013-01-31 10:52:03.000000000 -0500
+++ e-smith-base-5.8.0/root/etc/e-smith/web/functions/useraccounts 2020-12-11 12:43:58.987000000 -0500
@@ -211,10 +211,6 @@
>
-
-
-
diff -Nur e-smith-base-5.8.0.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/remoteaccess.pm e-smith-base-5.8.0/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/remoteaccess.pm
--- e-smith-base-5.8.0.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/remoteaccess.pm 2020-12-09 22:24:31.665000000 -0500
+++ e-smith-base-5.8.0/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/remoteaccess.pm 2020-12-11 12:40:27.646000000 -0500
@@ -37,12 +37,12 @@
our @ISA = qw(esmith::FormMagick Exporter);
our @EXPORT = qw(get_ssh_permit_root_login get_ssh_access get_telnet_mode
- change_settings get_ftp_access get_pptp_sessions get_ftp_password_login_access
+ change_settings get_ftp_access get_ftp_password_login_access
get_value get_prop get_ssh_password_auth zero_or_positive
show_valid_from_list add_new_valid_from remove_valid_from
validate_network_and_mask ip_number_or_blank subnet_mask_or_blank
show_telnet_section get_serial_console show_ftp_section
- get_ipsecrw_sessions show_ipsecrw_section pptp_and_dhcp_range
+ get_ipsecrw_sessions show_ipsecrw_section
);
@@ -143,23 +143,6 @@
return ($access eq 'public') ? 'normal' : 'private';
}
-=head2 get_pptp_sessions
-
-Get the # of pptp sessions defined in the sessions property of the pptp config file variable
-
-=cut
-
- sub get_pptp_sessions {
- my $status = get_prop('','pptpd','status');
- if (defined($status) && ($status eq 'enabled')) {
-
- return(get_prop('','pptpd','sessions') || 'no');
- }
- else {
- return('0');
- }
-}
-
=head2 get_ssh_permit_root_login
returns 'yes' or 'no' depending on whether ssh permit root login is enabled
@@ -663,7 +646,6 @@
my $sshTCPPort = ($q->param ('sshTCPPort') || '22');
my $ftplogin = ($q->param ('FTPPasswordLogin') || 'private');
my $ftpaccess = ($q->param ('FTPAccess') || 'off');
- my $pptpSessions = ($q->param ('pptpSessions') || '0');
# my $serialConsole = ($q->param ('serialConsole') || 'disabled');
#------------------------------------------------------------
@@ -715,15 +697,6 @@
}
}
- if ($pptpSessions == 0)
- {
- $db->get('pptpd')->set_prop('status', 'disabled');
- }
- else
- {
- $db->get('pptpd')->set_prop('status', 'enabled');
- $db->get('pptpd')->set_prop('sessions', $pptpSessions);
- }
# REMOVED by markk, May 16 2005 - see DPAR MN00084537
# $rec = $db->get('serial-console');
diff -Nur e-smith-base-5.8.0.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/useraccounts.pm e-smith-base-5.8.0/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/useraccounts.pm
--- e-smith-base-5.8.0.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/useraccounts.pm 2020-12-09 22:24:31.551000000 -0500
+++ e-smith-base-5.8.0/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/useraccounts.pm 2020-12-11 12:42:02.398000000 -0500
@@ -51,7 +51,6 @@
reset_password
check_password
print_save_or_add_button
- get_pptp_value
print_ipsec_client_section
get_prop
@@ -287,9 +286,6 @@
my $fwd = $cgi->param('ForwardAddress') ?
$cgi->param('ForwardAddress') :
($rec ? ($rec->prop('ForwardAddress')) : '');
- my $pptp = $cgi->param('VPNClientAccess') ?
- $cgi->param('VPNClientAccess') :
- ($rec ? ($rec->prop('VPNClientAccess')) : 'no');
# now that we're down with the 411, let's set the values
$cgi->param(-name=>'FirstName', -value=>$fn);
$cgi->param(-name=>'LastName', -value=>$ln);
@@ -300,7 +296,6 @@
$cgi->param(-name=>'Phone', -value=>$phone);
$cgi->param(-name=>'EmailForward', -value=>$emf);
$cgi->param(-name=>'ForwardAddress', -value=>$fwd);
- $cgi->param(-name=>'VPNClientAccess', -value=>$pptp);
} else {
print qq(
|
@@ -466,11 +461,6 @@
return $configdb->get('ldap')->prop($CGIParam2DBfield{$field});
}
-sub get_pptp_value
-{
- return $configdb->get('pptpd')->prop('AccessDefault') || 'no';
-}
-
=head1 VALIDATION ROUTINES
=head2 pseudonym_clash
|