1 |
snetram |
1.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 |
|
|
#------------------------------------------------------------ |