/[smeserver]/rpms/e-smith-base/sme10/e-smith-base-5.8.0-bz11250-drop-pptpd.patch
ViewVC logotype

Annotation of /rpms/e-smith-base/sme10/e-smith-base-5.8.0-bz11250-drop-pptpd.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.2 - (hide annotations) (download)
Fri Dec 11 17:54:20 2020 UTC (3 years, 6 months ago) by jpp
Branch: MAIN
CVS Tags: e-smith-base-5_8_0-71_el7_sme, e-smith-base-5_8_0-67_el7_sme, e-smith-base-5_8_0-69_el7_sme, e-smith-base-5_8_0-70_el7_sme, e-smith-base-5_8_0-83_el7_sme, e-smith-base-5_8_0-96_el7_sme, e-smith-base-5_8_0-95_el7_sme, e-smith-base-5_8_0-80_el7_sme, e-smith-base-5_8_0-85_el7_sme, e-smith-base-5_8_0-81_el7_sme, e-smith-base-5_8_0-82_el7_sme, e-smith-base-5_8_0-88_el7_sme, e-smith-base-5_8_0-99_el7_sme, e-smith-base-5_8_0-94_el7_sme, e-smith-base-5_8_0-98_el7_sme, e-smith-base-5_8_0-97_el7_sme, e-smith-base-5_8_0-92_el7_sme, e-smith-base-5_8_0-75_el7_sme, e-smith-base-5_8_0-78_el7_sme, e-smith-base-5_8_0-90_el7_sme, e-smith-base-5_8_0-93_el7_sme, e-smith-base-5_8_0-74_el7_sme, e-smith-base-5_8_0-77_el7_sme, e-smith-base-5_8_0-73_el7_sme, e-smith-base-5_8_0-76_el7_sme, e-smith-base-5_8_0-79_el7_sme, e-smith-base-5_8_0-91_el7_sme, e-smith-base-5_8_0-86_el7_sme, e-smith-base-5_8_0-87_el7_sme, e-smith-base-5_8_0-66_el7_sme, e-smith-base-5_8_0-68_el7_sme, e-smith-base-5_8_0-72_el7_sme, e-smith-base-5_8_0-84_el7_sme, e-smith-base-5_8_0-89_el7_sme
Changes since 1.1: +0 -52 lines 
* Fri Dec 11 2020 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-66.sme
- drop pptpd support [SME: 11250]
1 jpp 1.1 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
2     --- e-smith-base-5.8.0.old/root/etc/e-smith/db/configuration/migrate/50RemoveObsoleteServices 2020-12-09 22:24:31.525000000 -0500
3     +++ e-smith-base-5.8.0/root/etc/e-smith/db/configuration/migrate/50RemoveObsoleteServices 2020-12-11 12:47:37.190000000 -0500
4     @@ -1,7 +1,7 @@
5     {
6    
7     # Remove old, unused services from the configuration database
8     - my @services = qw(haldaemon smolt udev-post messagebus ctrlaltdel);
9     + my @services = qw(haldaemon smolt udev-post messagebus ctrlaltdel pptpd);
10     foreach my $service (@services){
11     my $entry = $DB->get($service);
12     $entry->delete if $entry;
13     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
14     --- 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
15     +++ 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
16     @@ -1,3 +0,0 @@
17     - pptpd)
18     - /sbin/e-smith/signal-event ip-up.pptpd "$@"
19     - ;;
20     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
21     --- e-smith-base-5.8.0.old/root/etc/e-smith/web/functions/remoteaccess 2016-02-04 18:14:13.000000000 -0500
22     +++ e-smith-base-5.8.0/root/etc/e-smith/web/functions/remoteaccess 2020-12-11 12:42:52.181000000 -0500
23     @@ -60,7 +60,6 @@
24     ok ($ua->{form}->find_input('sshAccess'), 'Finding the sshAccess field');
25     ok ($ua->{form}->find_input('sshPermitRootLogin'), 'Finding the sshPermitRootLogin field');
26     ok ($ua->{form}->find_input('sshTCPPort'), 'Finding the sshTCPPort field');
27     -ok ($ua->{form}->find_input('pptpSessions'), 'Finding the pptpSessions field');
28     ok ($ua->{form}->find_input('sshPasswordAuthentication'), 'Finding the sshPasswordAuthentication field');
29     ok ($ua->{form}->find_input('FTPLimits'), 'Finding the FTPLimits field');
30     ok ($ua->{form}->find_input('TelnetAccess'), 'Finding the TelnetAccess field');
31     @@ -70,7 +69,6 @@
32     $ua->field('sshAccess' => 'public');
33     $ua->field('sshPermitRootLogin' => 'yes');
34     $ua->field('sshTCPPort' => '22');
35     - $ua->field('pptpSessions' => '10');
36     $ua->field('sshPasswordAuthentication' => 'yes');
37     $ua->field('FTPLimits' => 'normal');
38     $ua->field('TelnetAccess' => 'private');
39     @@ -96,8 +94,6 @@
40    
41     is ($db->get('ftp')->prop('access'), 'private', "ftp access is private");
42     is ($db->get('ftp')->prop('accessLimits'), 'normal', "ftp access limits are normal");
43     - is ($db->get('pptpd')->prop('sessions') ,'10', "Got the right sesison count for pptp");
44     - is ($db->get('pptpd')->prop('status') ,'enabled', "pptp is enabled");
45     is ($db->get('telnet')->prop('access'), 'private', "Private telnet turned on");
46     }
47    
48     @@ -113,12 +109,6 @@
49    
50     <subroutine src="show_ipsecrw_section()"/>
51    
52     - <field type="text" id="pptpSessions" size="3" validation="zero_or_positive(), pptp_and_dhcp_range ()"
53     - value="get_pptp_sessions()">
54     - <label>LABEL_PPTP</label>
55     - <description>DESC_PPTP</description>
56     - </field>
57     -
58     <subroutine src="show_valid_from_list()"/>
59     <field type="text" id="validFromNetwork" size="15"
60     value="" validation="ip_number_or_blank">
61     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
62     --- e-smith-base-5.8.0.old/root/etc/e-smith/web/functions/useraccounts 2013-01-31 10:52:03.000000000 -0500
63     +++ e-smith-base-5.8.0/root/etc/e-smith/web/functions/useraccounts 2020-12-11 12:43:58.987000000 -0500
64     @@ -211,10 +211,6 @@
65     >
66     <label>FORWARDING_ADDRESS</label>
67     </field>
68     - <field type="select" id="VPNClientAccess" options="'yes' => 'YES',
69     - 'no' => 'NO'" validation="nonblank" value="get_pptp_value()">
70     - <label>VPN_CLIENT_ACCESS</label>
71     - </field>
72     <subroutine src="print_ipsec_client_section()" />
73     <subroutine src="print_groupMemberships_field()" />
74     <subroutine src="print_save_or_add_button()" />
75     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
76     --- 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
77     +++ 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
78     @@ -37,12 +37,12 @@
79     our @ISA = qw(esmith::FormMagick Exporter);
80    
81     our @EXPORT = qw(get_ssh_permit_root_login get_ssh_access get_telnet_mode
82     - change_settings get_ftp_access get_pptp_sessions get_ftp_password_login_access
83     + change_settings get_ftp_access get_ftp_password_login_access
84     get_value get_prop get_ssh_password_auth zero_or_positive
85     show_valid_from_list add_new_valid_from remove_valid_from
86     validate_network_and_mask ip_number_or_blank subnet_mask_or_blank
87     show_telnet_section get_serial_console show_ftp_section
88     - get_ipsecrw_sessions show_ipsecrw_section pptp_and_dhcp_range
89     + get_ipsecrw_sessions show_ipsecrw_section
90     );
91    
92    
93     @@ -143,23 +143,6 @@
94     return ($access eq 'public') ? 'normal' : 'private';
95     }
96    
97     -=head2 get_pptp_sessions
98     -
99     -Get the # of pptp sessions defined in the sessions property of the pptp config file variable
100     -
101     -=cut
102     -
103     - sub get_pptp_sessions {
104     - my $status = get_prop('','pptpd','status');
105     - if (defined($status) && ($status eq 'enabled')) {
106     -
107     - return(get_prop('','pptpd','sessions') || 'no');
108     - }
109     - else {
110     - return('0');
111     - }
112     -}
113     -
114     =head2 get_ssh_permit_root_login
115    
116     returns 'yes' or 'no' depending on whether ssh permit root login is enabled
117     @@ -663,7 +646,6 @@
118     my $sshTCPPort = ($q->param ('sshTCPPort') || '22');
119     my $ftplogin = ($q->param ('FTPPasswordLogin') || 'private');
120     my $ftpaccess = ($q->param ('FTPAccess') || 'off');
121     - my $pptpSessions = ($q->param ('pptpSessions') || '0');
122     # my $serialConsole = ($q->param ('serialConsole') || 'disabled');
123    
124     #------------------------------------------------------------
125     @@ -715,15 +697,6 @@
126     }
127     }
128    
129     - if ($pptpSessions == 0)
130     - {
131     - $db->get('pptpd')->set_prop('status', 'disabled');
132     - }
133     - else
134     - {
135     - $db->get('pptpd')->set_prop('status', 'enabled');
136     - $db->get('pptpd')->set_prop('sessions', $pptpSessions);
137     - }
138    
139     # REMOVED by markk, May 16 2005 - see DPAR MN00084537
140     # $rec = $db->get('serial-console');
141     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
142     --- 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
143     +++ 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
144     @@ -51,7 +51,6 @@
145     reset_password
146     check_password
147     print_save_or_add_button
148     - get_pptp_value
149     print_ipsec_client_section
150     get_prop
151    
152     @@ -287,9 +286,6 @@
153     my $fwd = $cgi->param('ForwardAddress') ?
154     $cgi->param('ForwardAddress') :
155     ($rec ? ($rec->prop('ForwardAddress')) : '');
156     - my $pptp = $cgi->param('VPNClientAccess') ?
157     - $cgi->param('VPNClientAccess') :
158     - ($rec ? ($rec->prop('VPNClientAccess')) : 'no');
159     # now that we're down with the 411, let's set the values
160     $cgi->param(-name=>'FirstName', -value=>$fn);
161     $cgi->param(-name=>'LastName', -value=>$ln);
162     @@ -300,7 +296,6 @@
163     $cgi->param(-name=>'Phone', -value=>$phone);
164     $cgi->param(-name=>'EmailForward', -value=>$emf);
165     $cgi->param(-name=>'ForwardAddress', -value=>$fwd);
166     - $cgi->param(-name=>'VPNClientAccess', -value=>$pptp);
167     } else {
168     print qq(
169     <td><input type="text" name="acctName" value="$an">
170     @@ -466,11 +461,6 @@
171     return $configdb->get('ldap')->prop($CGIParam2DBfield{$field});
172     }
173    
174     -sub get_pptp_value
175     -{
176     - return $configdb->get('pptpd')->prop('AccessDefault') || 'no';
177     -}
178     -
179     =head1 VALIDATION ROUTINES
180    
181     =head2 pseudonym_clash
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed