| 1 |
jpp |
1.1 |
diff -Nur e-smith-base-5.8.0.old/createlinks e-smith-base-5.8.0/createlinks |
| 2 |
|
|
--- e-smith-base-5.8.0.old/createlinks 2020-12-09 22:24:31.760000000 -0500 |
| 3 |
|
|
+++ e-smith-base-5.8.0/createlinks 2020-12-09 22:33:47.569000000 -0500 |
| 4 |
|
|
@@ -579,6 +579,7 @@ |
| 5 |
|
|
#-------------------------------------------------- |
| 6 |
|
|
|
| 7 |
|
|
$event = "local"; |
| 8 |
|
|
+safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/rc-local"); |
| 9 |
|
|
|
| 10 |
|
|
#-------------------------------------------------- |
| 11 |
|
|
# actions for ldap-update event |
| 12 |
|
|
diff -Nur e-smith-base-5.8.0.old/root/etc/e-smith/db/configuration/defaults/rc-local/status e-smith-base-5.8.0/root/etc/e-smith/db/configuration/defaults/rc-local/status |
| 13 |
|
|
--- e-smith-base-5.8.0.old/root/etc/e-smith/db/configuration/defaults/rc-local/status 1969-12-31 19:00:00.000000000 -0500 |
| 14 |
|
|
+++ e-smith-base-5.8.0/root/etc/e-smith/db/configuration/defaults/rc-local/status 2020-12-09 22:30:03.095000000 -0500 |
| 15 |
|
|
@@ -0,0 +1 @@ |
| 16 |
|
|
+enabled |
| 17 |
|
|
diff -Nur e-smith-base-5.8.0.old/root/etc/e-smith/db/configuration/defaults/rc-local/type e-smith-base-5.8.0/root/etc/e-smith/db/configuration/defaults/rc-local/type |
| 18 |
|
|
--- e-smith-base-5.8.0.old/root/etc/e-smith/db/configuration/defaults/rc-local/type 1969-12-31 19:00:00.000000000 -0500 |
| 19 |
|
|
+++ e-smith-base-5.8.0/root/etc/e-smith/db/configuration/defaults/rc-local/type 2020-12-09 22:29:53.888000000 -0500 |
| 20 |
|
|
@@ -0,0 +1 @@ |
| 21 |
|
|
+configuration |
| 22 |
|
|
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 |
| 23 |
|
|
--- e-smith-base-5.8.0.old/root/etc/e-smith/db/configuration/migrate/50RemoveObsoleteServices 2020-12-09 22:24:31.525000000 -0500 |
| 24 |
|
|
+++ e-smith-base-5.8.0/root/etc/e-smith/db/configuration/migrate/50RemoveObsoleteServices 2020-12-11 12:47:37.190000000 -0500 |
| 25 |
|
|
@@ -1,7 +1,7 @@ |
| 26 |
|
|
{ |
| 27 |
|
|
|
| 28 |
|
|
# Remove old, unused services from the configuration database |
| 29 |
|
|
- my @services = qw(haldaemon smolt udev-post messagebus ctrlaltdel); |
| 30 |
|
|
+ my @services = qw(haldaemon smolt udev-post messagebus ctrlaltdel pptpd); |
| 31 |
|
|
foreach my $service (@services){ |
| 32 |
|
|
my $entry = $DB->get($service); |
| 33 |
|
|
$entry->delete if $entry; |
| 34 |
|
|
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 |
| 35 |
|
|
--- 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 |
| 36 |
|
|
+++ 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 |
| 37 |
|
|
@@ -1,3 +0,0 @@ |
| 38 |
|
|
- pptpd) |
| 39 |
|
|
- /sbin/e-smith/signal-event ip-up.pptpd "$@" |
| 40 |
|
|
- ;; |
| 41 |
|
|
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 |
| 42 |
|
|
--- e-smith-base-5.8.0.old/root/etc/e-smith/web/functions/remoteaccess 2016-02-04 18:14:13.000000000 -0500 |
| 43 |
|
|
+++ e-smith-base-5.8.0/root/etc/e-smith/web/functions/remoteaccess 2020-12-11 12:42:52.181000000 -0500 |
| 44 |
|
|
@@ -60,7 +60,6 @@ |
| 45 |
|
|
ok ($ua->{form}->find_input('sshAccess'), 'Finding the sshAccess field'); |
| 46 |
|
|
ok ($ua->{form}->find_input('sshPermitRootLogin'), 'Finding the sshPermitRootLogin field'); |
| 47 |
|
|
ok ($ua->{form}->find_input('sshTCPPort'), 'Finding the sshTCPPort field'); |
| 48 |
|
|
-ok ($ua->{form}->find_input('pptpSessions'), 'Finding the pptpSessions field'); |
| 49 |
|
|
ok ($ua->{form}->find_input('sshPasswordAuthentication'), 'Finding the sshPasswordAuthentication field'); |
| 50 |
|
|
ok ($ua->{form}->find_input('FTPLimits'), 'Finding the FTPLimits field'); |
| 51 |
|
|
ok ($ua->{form}->find_input('TelnetAccess'), 'Finding the TelnetAccess field'); |
| 52 |
|
|
@@ -70,7 +69,6 @@ |
| 53 |
|
|
$ua->field('sshAccess' => 'public'); |
| 54 |
|
|
$ua->field('sshPermitRootLogin' => 'yes'); |
| 55 |
|
|
$ua->field('sshTCPPort' => '22'); |
| 56 |
|
|
- $ua->field('pptpSessions' => '10'); |
| 57 |
|
|
$ua->field('sshPasswordAuthentication' => 'yes'); |
| 58 |
|
|
$ua->field('FTPLimits' => 'normal'); |
| 59 |
|
|
$ua->field('TelnetAccess' => 'private'); |
| 60 |
|
|
@@ -96,8 +94,6 @@ |
| 61 |
|
|
|
| 62 |
|
|
is ($db->get('ftp')->prop('access'), 'private', "ftp access is private"); |
| 63 |
|
|
is ($db->get('ftp')->prop('accessLimits'), 'normal', "ftp access limits are normal"); |
| 64 |
|
|
- is ($db->get('pptpd')->prop('sessions') ,'10', "Got the right sesison count for pptp"); |
| 65 |
|
|
- is ($db->get('pptpd')->prop('status') ,'enabled', "pptp is enabled"); |
| 66 |
|
|
is ($db->get('telnet')->prop('access'), 'private', "Private telnet turned on"); |
| 67 |
|
|
} |
| 68 |
|
|
|
| 69 |
|
|
@@ -113,12 +109,6 @@ |
| 70 |
|
|
|
| 71 |
|
|
<subroutine src="show_ipsecrw_section()"/> |
| 72 |
|
|
|
| 73 |
|
|
- <field type="text" id="pptpSessions" size="3" validation="zero_or_positive(), pptp_and_dhcp_range ()" |
| 74 |
|
|
- value="get_pptp_sessions()"> |
| 75 |
|
|
- <label>LABEL_PPTP</label> |
| 76 |
|
|
- <description>DESC_PPTP</description> |
| 77 |
|
|
- </field> |
| 78 |
|
|
- |
| 79 |
|
|
<subroutine src="show_valid_from_list()"/> |
| 80 |
|
|
<field type="text" id="validFromNetwork" size="15" |
| 81 |
|
|
value="" validation="ip_number_or_blank"> |
| 82 |
|
|
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 |
| 83 |
|
|
--- e-smith-base-5.8.0.old/root/etc/e-smith/web/functions/useraccounts 2013-01-31 10:52:03.000000000 -0500 |
| 84 |
|
|
+++ e-smith-base-5.8.0/root/etc/e-smith/web/functions/useraccounts 2020-12-11 12:43:58.987000000 -0500 |
| 85 |
|
|
@@ -211,10 +211,6 @@ |
| 86 |
|
|
> |
| 87 |
|
|
<label>FORWARDING_ADDRESS</label> |
| 88 |
|
|
</field> |
| 89 |
|
|
- <field type="select" id="VPNClientAccess" options="'yes' => 'YES', |
| 90 |
|
|
- 'no' => 'NO'" validation="nonblank" value="get_pptp_value()"> |
| 91 |
|
|
- <label>VPN_CLIENT_ACCESS</label> |
| 92 |
|
|
- </field> |
| 93 |
|
|
<subroutine src="print_ipsec_client_section()" /> |
| 94 |
|
|
<subroutine src="print_groupMemberships_field()" /> |
| 95 |
|
|
<subroutine src="print_save_or_add_button()" /> |
| 96 |
|
|
diff -Nur e-smith-base-5.8.0.old/root/usr/lib/systemd/system/local.service e-smith-base-5.8.0/root/usr/lib/systemd/system/local.service |
| 97 |
|
|
--- e-smith-base-5.8.0.old/root/usr/lib/systemd/system/local.service 2020-12-09 22:24:31.778000000 -0500 |
| 98 |
|
|
+++ e-smith-base-5.8.0/root/usr/lib/systemd/system/local.service 2020-12-09 22:31:09.422000000 -0500 |
| 99 |
|
|
@@ -7,7 +7,6 @@ |
| 100 |
|
|
ExecStartPre=/sbin/e-smith/service-status local |
| 101 |
|
|
ExecStartPre=/usr/bin/chmod +x /etc/rc.d/rc.local |
| 102 |
|
|
ExecStart=/sbin/e-smith/signal-event local |
| 103 |
|
|
-ExecStart=/usr/bin/systemctl restart rc-local.service |
| 104 |
|
|
RemainAfterExit=yes |
| 105 |
|
|
|
| 106 |
|
|
[Install] |
| 107 |
|
|
diff -Nur e-smith-base-5.8.0.old/root/usr/lib/systemd/system-preset/50-koozali.preset e-smith-base-5.8.0/root/usr/lib/systemd/system-preset/50-koozali.preset |
| 108 |
|
|
--- e-smith-base-5.8.0.old/root/usr/lib/systemd/system-preset/50-koozali.preset 2020-12-09 22:24:31.756000000 -0500 |
| 109 |
|
|
+++ e-smith-base-5.8.0/root/usr/lib/systemd/system-preset/50-koozali.preset 2020-12-09 22:32:19.660000000 -0500 |
| 110 |
|
|
@@ -35,6 +35,8 @@ |
| 111 |
|
|
enable ldap.service |
| 112 |
|
|
enable ldap.init.service |
| 113 |
|
|
enable local.service |
| 114 |
|
|
+enable yum.service |
| 115 |
|
|
+disable rc-local.service |
| 116 |
|
|
|
| 117 |
|
|
#need to change after integration |
| 118 |
|
|
#enable mariadb.service |
| 119 |
|
|
@@ -65,7 +67,6 @@ |
| 120 |
|
|
disable squid.service |
| 121 |
|
|
disable sshd.service |
| 122 |
|
|
enable tinydns.service |
| 123 |
|
|
-enable wan.service |
| 124 |
|
|
disable nut-server.service |
| 125 |
|
|
disable nut-monitor.service |
| 126 |
|
|
disable ntpdate.service |
| 127 |
|
|
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 |
| 128 |
|
|
--- 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 |
| 129 |
|
|
+++ 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 |
| 130 |
|
|
@@ -37,12 +37,12 @@ |
| 131 |
|
|
our @ISA = qw(esmith::FormMagick Exporter); |
| 132 |
|
|
|
| 133 |
|
|
our @EXPORT = qw(get_ssh_permit_root_login get_ssh_access get_telnet_mode |
| 134 |
|
|
- change_settings get_ftp_access get_pptp_sessions get_ftp_password_login_access |
| 135 |
|
|
+ change_settings get_ftp_access get_ftp_password_login_access |
| 136 |
|
|
get_value get_prop get_ssh_password_auth zero_or_positive |
| 137 |
|
|
show_valid_from_list add_new_valid_from remove_valid_from |
| 138 |
|
|
validate_network_and_mask ip_number_or_blank subnet_mask_or_blank |
| 139 |
|
|
show_telnet_section get_serial_console show_ftp_section |
| 140 |
|
|
- get_ipsecrw_sessions show_ipsecrw_section pptp_and_dhcp_range |
| 141 |
|
|
+ get_ipsecrw_sessions show_ipsecrw_section |
| 142 |
|
|
); |
| 143 |
|
|
|
| 144 |
|
|
|
| 145 |
|
|
@@ -143,23 +143,6 @@ |
| 146 |
|
|
return ($access eq 'public') ? 'normal' : 'private'; |
| 147 |
|
|
} |
| 148 |
|
|
|
| 149 |
|
|
-=head2 get_pptp_sessions |
| 150 |
|
|
- |
| 151 |
|
|
-Get the # of pptp sessions defined in the sessions property of the pptp config file variable |
| 152 |
|
|
- |
| 153 |
|
|
-=cut |
| 154 |
|
|
- |
| 155 |
|
|
- sub get_pptp_sessions { |
| 156 |
|
|
- my $status = get_prop('','pptpd','status'); |
| 157 |
|
|
- if (defined($status) && ($status eq 'enabled')) { |
| 158 |
|
|
- |
| 159 |
|
|
- return(get_prop('','pptpd','sessions') || 'no'); |
| 160 |
|
|
- } |
| 161 |
|
|
- else { |
| 162 |
|
|
- return('0'); |
| 163 |
|
|
- } |
| 164 |
|
|
-} |
| 165 |
|
|
- |
| 166 |
|
|
=head2 get_ssh_permit_root_login |
| 167 |
|
|
|
| 168 |
|
|
returns 'yes' or 'no' depending on whether ssh permit root login is enabled |
| 169 |
|
|
@@ -663,7 +646,6 @@ |
| 170 |
|
|
my $sshTCPPort = ($q->param ('sshTCPPort') || '22'); |
| 171 |
|
|
my $ftplogin = ($q->param ('FTPPasswordLogin') || 'private'); |
| 172 |
|
|
my $ftpaccess = ($q->param ('FTPAccess') || 'off'); |
| 173 |
|
|
- my $pptpSessions = ($q->param ('pptpSessions') || '0'); |
| 174 |
|
|
# my $serialConsole = ($q->param ('serialConsole') || 'disabled'); |
| 175 |
|
|
|
| 176 |
|
|
#------------------------------------------------------------ |
| 177 |
|
|
@@ -715,15 +697,6 @@ |
| 178 |
|
|
} |
| 179 |
|
|
} |
| 180 |
|
|
|
| 181 |
|
|
- if ($pptpSessions == 0) |
| 182 |
|
|
- { |
| 183 |
|
|
- $db->get('pptpd')->set_prop('status', 'disabled'); |
| 184 |
|
|
- } |
| 185 |
|
|
- else |
| 186 |
|
|
- { |
| 187 |
|
|
- $db->get('pptpd')->set_prop('status', 'enabled'); |
| 188 |
|
|
- $db->get('pptpd')->set_prop('sessions', $pptpSessions); |
| 189 |
|
|
- } |
| 190 |
|
|
|
| 191 |
|
|
# REMOVED by markk, May 16 2005 - see DPAR MN00084537 |
| 192 |
|
|
# $rec = $db->get('serial-console'); |
| 193 |
|
|
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 |
| 194 |
|
|
--- 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 |
| 195 |
|
|
+++ 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 |
| 196 |
|
|
@@ -51,7 +51,6 @@ |
| 197 |
|
|
reset_password |
| 198 |
|
|
check_password |
| 199 |
|
|
print_save_or_add_button |
| 200 |
|
|
- get_pptp_value |
| 201 |
|
|
print_ipsec_client_section |
| 202 |
|
|
get_prop |
| 203 |
|
|
|
| 204 |
|
|
@@ -287,9 +286,6 @@ |
| 205 |
|
|
my $fwd = $cgi->param('ForwardAddress') ? |
| 206 |
|
|
$cgi->param('ForwardAddress') : |
| 207 |
|
|
($rec ? ($rec->prop('ForwardAddress')) : ''); |
| 208 |
|
|
- my $pptp = $cgi->param('VPNClientAccess') ? |
| 209 |
|
|
- $cgi->param('VPNClientAccess') : |
| 210 |
|
|
- ($rec ? ($rec->prop('VPNClientAccess')) : 'no'); |
| 211 |
|
|
# now that we're down with the 411, let's set the values |
| 212 |
|
|
$cgi->param(-name=>'FirstName', -value=>$fn); |
| 213 |
|
|
$cgi->param(-name=>'LastName', -value=>$ln); |
| 214 |
|
|
@@ -300,7 +296,6 @@ |
| 215 |
|
|
$cgi->param(-name=>'Phone', -value=>$phone); |
| 216 |
|
|
$cgi->param(-name=>'EmailForward', -value=>$emf); |
| 217 |
|
|
$cgi->param(-name=>'ForwardAddress', -value=>$fwd); |
| 218 |
|
|
- $cgi->param(-name=>'VPNClientAccess', -value=>$pptp); |
| 219 |
|
|
} else { |
| 220 |
|
|
print qq( |
| 221 |
|
|
<td><input type="text" name="acctName" value="$an"> |
| 222 |
|
|
@@ -466,11 +461,6 @@ |
| 223 |
|
|
return $configdb->get('ldap')->prop($CGIParam2DBfield{$field}); |
| 224 |
|
|
} |
| 225 |
|
|
|
| 226 |
|
|
-sub get_pptp_value |
| 227 |
|
|
-{ |
| 228 |
|
|
- return $configdb->get('pptpd')->prop('AccessDefault') || 'no'; |
| 229 |
|
|
-} |
| 230 |
|
|
- |
| 231 |
|
|
=head1 VALIDATION ROUTINES |
| 232 |
|
|
|
| 233 |
|
|
=head2 pseudonym_clash |
Parent Directory
| 
Revision Log
| 
Revision Graph
