43 |
-service_link_enhanced("gwd", "K47", "0"); |
-service_link_enhanced("gwd", "K47", "0"); |
44 |
diff -urN smeserver-geneweb-2.1.old/root/etc/e-smith/db/configuration/defaults/geneweb/DBDir smeserver-geneweb-2.1/root/etc/e-smith/db/configuration/defaults/geneweb/DBDir |
diff -urN smeserver-geneweb-2.1.old/root/etc/e-smith/db/configuration/defaults/geneweb/DBDir smeserver-geneweb-2.1/root/etc/e-smith/db/configuration/defaults/geneweb/DBDir |
45 |
--- smeserver-geneweb-2.1.old/root/etc/e-smith/db/configuration/defaults/geneweb/DBDir 1970-01-01 04:00:00.000000000 +0400 |
--- smeserver-geneweb-2.1.old/root/etc/e-smith/db/configuration/defaults/geneweb/DBDir 1970-01-01 04:00:00.000000000 +0400 |
46 |
+++ smeserver-geneweb-2.1/root/etc/e-smith/db/configuration/defaults/geneweb/DBDir 2019-04-03 00:13:09.000000000 +0400 |
+++ smeserver-geneweb-2.1/root/etc/e-smith/db/configuration/defaults/geneweb/DBDir 2019-04-03 20:43:08.000000000 +0400 |
47 |
@@ -0,0 +1,2 @@ |
@@ -0,0 +1 @@ |
48 |
+/opt/geneweb/bases |
+/opt/geneweb/bases |
|
+ |
|
49 |
diff -urN smeserver-geneweb-2.1.old/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/geneweb smeserver-geneweb-2.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/geneweb |
diff -urN smeserver-geneweb-2.1.old/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/geneweb smeserver-geneweb-2.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/geneweb |
50 |
--- smeserver-geneweb-2.1.old/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/geneweb 2007-08-05 16:48:59.000000000 +0400 |
--- smeserver-geneweb-2.1.old/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/geneweb 2007-08-05 16:48:59.000000000 +0400 |
51 |
+++ smeserver-geneweb-2.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/geneweb 2019-04-03 00:16:01.000000000 +0400 |
+++ smeserver-geneweb-2.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/geneweb 2019-04-03 00:16:01.000000000 +0400 |
222 |
|
|
223 |
diff -urN smeserver-geneweb-2.1.old/root/etc/e-smith/templates.metadata/etc/rc.d/init.d/gwd smeserver-geneweb-2.1/root/etc/e-smith/templates.metadata/etc/rc.d/init.d/gwd |
diff -urN smeserver-geneweb-2.1.old/root/etc/e-smith/templates.metadata/etc/rc.d/init.d/gwd smeserver-geneweb-2.1/root/etc/e-smith/templates.metadata/etc/rc.d/init.d/gwd |
224 |
--- smeserver-geneweb-2.1.old/root/etc/e-smith/templates.metadata/etc/rc.d/init.d/gwd 1970-01-01 04:00:00.000000000 +0400 |
--- smeserver-geneweb-2.1.old/root/etc/e-smith/templates.metadata/etc/rc.d/init.d/gwd 1970-01-01 04:00:00.000000000 +0400 |
225 |
+++ smeserver-geneweb-2.1/root/etc/e-smith/templates.metadata/etc/rc.d/init.d/gwd 2019-04-03 00:21:56.000000000 +0400 |
+++ smeserver-geneweb-2.1/root/etc/e-smith/templates.metadata/etc/rc.d/init.d/gwd 2019-04-03 19:18:25.000000000 +0400 |
226 |
@@ -0,0 +1,3 @@ |
@@ -0,0 +1,3 @@ |
227 |
+UID="root" |
+UID="root" |
228 |
+GID="root" |
+GID="root" |
229 |
+PERMS=0751 |
+PERMS=0754 |
230 |
diff -urN smeserver-geneweb-2.1.old/root/etc/e-smith/templates.metadata/opt/geneweb/gw/gw/only.txt smeserver-geneweb-2.1/root/etc/e-smith/templates.metadata/opt/geneweb/gw/gw/only.txt |
diff -urN smeserver-geneweb-2.1.old/root/etc/e-smith/templates.metadata/opt/geneweb/gw/gw/only.txt smeserver-geneweb-2.1/root/etc/e-smith/templates.metadata/opt/geneweb/gw/gw/only.txt |
231 |
--- smeserver-geneweb-2.1.old/root/etc/e-smith/templates.metadata/opt/geneweb/gw/gw/only.txt 1970-01-01 04:00:00.000000000 +0400 |
--- smeserver-geneweb-2.1.old/root/etc/e-smith/templates.metadata/opt/geneweb/gw/gw/only.txt 1970-01-01 04:00:00.000000000 +0400 |
232 |
+++ smeserver-geneweb-2.1/root/etc/e-smith/templates.metadata/opt/geneweb/gw/gw/only.txt 2019-04-03 00:23:24.000000000 +0400 |
+++ smeserver-geneweb-2.1/root/etc/e-smith/templates.metadata/opt/geneweb/gw/gw/only.txt 2019-04-03 19:20:08.000000000 +0400 |
233 |
@@ -0,0 +1 @@ |
@@ -0,0 +1,3 @@ |
234 |
+PERMS=0750 |
+UID="geneweb" |
235 |
|
+GID="geneweb" |
236 |
|
+PERMS=0640 |
237 |
diff -urN smeserver-geneweb-2.1.old/root/etc/e-smith/web/functions/geneweb smeserver-geneweb-2.1/root/etc/e-smith/web/functions/geneweb |
diff -urN smeserver-geneweb-2.1.old/root/etc/e-smith/web/functions/geneweb smeserver-geneweb-2.1/root/etc/e-smith/web/functions/geneweb |
238 |
--- smeserver-geneweb-2.1.old/root/etc/e-smith/web/functions/geneweb 2007-08-05 19:29:43.000000000 +0400 |
--- smeserver-geneweb-2.1.old/root/etc/e-smith/web/functions/geneweb 2007-08-05 19:29:43.000000000 +0400 |
239 |
+++ smeserver-geneweb-2.1/root/etc/e-smith/web/functions/geneweb 2019-04-03 00:27:46.000000000 +0400 |
+++ smeserver-geneweb-2.1/root/etc/e-smith/web/functions/geneweb 2019-04-03 00:27:46.000000000 +0400 |
275 |
|
|
276 |
<subroutine src="print_button('SAVE')" /> |
<subroutine src="print_button('SAVE')" /> |
277 |
|
|
278 |
diff -urN smeserver-geneweb-2.1.old/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/geneweb.pm smeserver-geneweb-2.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/geneweb.pm |
diff -urN smeserver-geneweb-2.1.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/geneweb.pm smeserver-geneweb-2.1/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/geneweb.pm |
279 |
--- smeserver-geneweb-2.1.old/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/geneweb.pm 2019-04-02 23:11:43.000000000 +0400 |
--- smeserver-geneweb-2.1.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/geneweb.pm 2019-04-02 23:11:43.000000000 +0400 |
280 |
+++ smeserver-geneweb-2.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/geneweb.pm 2019-04-03 00:35:30.000000000 +0400 |
+++ smeserver-geneweb-2.1/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/geneweb.pm 2019-04-03 19:14:23.000000000 +0400 |
281 |
@@ -22,8 +22,10 @@ |
@@ -22,8 +22,10 @@ |
282 |
get_prop |
get_prop |
283 |
get_value |
get_value |
327 |
unless ( system ( "/sbin/e-smith/signal-event", "geneweb-modify" ) == 0 ) |
unless ( system ( "/sbin/e-smith/signal-event", "geneweb-modify" ) == 0 ) |
328 |
{ |
{ |
329 |
$self->error("ERROR_UPDATING"); |
$self->error("ERROR_UPDATING"); |
330 |
@@ -163,24 +187,45 @@ |
@@ -163,24 +187,46 @@ |
331 |
{ |
{ |
332 |
my $self = shift; |
my $self = shift; |
333 |
my $q = $self->{cgi}; |
my $q = $self->{cgi}; |
352 |
- return 'OK'; |
- return 'OK'; |
353 |
- } |
- } |
354 |
- } |
- } |
|
- } |
|
355 |
+ if (Net::IPv4Addr::ipv4_in_network($spec, $gw_ip)) |
+ if (Net::IPv4Addr::ipv4_in_network($spec, $gw_ip)) |
356 |
+ { |
+ { |
357 |
+ return 'OK'; |
+ return 'OK'; |
358 |
+ } |
+ } |
359 |
|
} |
360 |
# Not OK. The IP is not on any of our local networks. |
# Not OK. The IP is not on any of our local networks. |
361 |
return 'ERR_IP_NOT_LOCAL'; |
return 'ERR_IP_NOT_LOCAL'; |
362 |
} |
} |