/[smeserver]/rpms/e-smith-ntp/sme8/e-smith-ntp-2.2.0-no-pool.ntp.org.patch
ViewVC logotype

Contents of /rpms/e-smith-ntp/sme8/e-smith-ntp-2.2.0-no-pool.ntp.org.patch

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


Revision 1.1 - (show annotations) (download)
Tue Jun 8 20:18:10 2010 UTC (14 years, 4 months ago) by snetram
Branch: MAIN
CVS Tags: e-smith-ntp-2_2_0-3_el5_sme, e-smith-ntp-2_2_0-5_el5_sme, e-smith-ntp-2_2_0-8_el5_sme, e-smith-ntp-2_2_0-6_el5_sme, e-smith-ntp-2_2_0-4_el5_sme, e-smith-ntp-2_2_0-2_el5_sme, e-smith-ntp-2_2_0-7_el5_sme, HEAD
* Tue Jun 8 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-2.sme
- Do not allow pool.ntp.org as NTP server [SME: 5957]

1 diff -up e-smith-ntp-2.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/datetime.pm.no-pool.ntp.org e-smith-ntp-2.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/datetime.pm
2 --- e-smith-ntp-2.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/datetime.pm.no-pool.ntp.org 2008-10-07 19:36:26.000000000 +0200
3 +++ e-smith-ntp-2.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/datetime.pm 2010-06-08 22:14:39.000000000 +0200
4 @@ -704,7 +704,11 @@ sub _performSetTimeserver
5 }
6 else # enable service and synch with ntpServer
7 {
8 - if ($ntpServer =~ /^([a-zA-Z0-9\.\-]+)$/)
9 + if ($ntpServer eq "pool.ntp.org")
10 + {
11 + return $self->error('INVALID_NTP_ADDR');
12 + }
13 + elsif ($ntpServer =~ /^([a-zA-Z0-9\.\-]+)$/)
14 {
15 $ntpServer = $1;
16 }
17 @@ -714,7 +718,7 @@ sub _performSetTimeserver
18 }
19 else
20 {
21 - return return $self->error('INVALID_NTP_ADDR');
22 + return $self->error('INVALID_NTP_ADDR');
23 }
24
25 #------------------------------------------------------------

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed