summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2012-12-12 02:09:24 +0100
committerMichael Tänzer <neo@nhng.de>2012-12-12 02:09:24 +0100
commit8bd80350a7024663d32bb70065c7e998051a8483 (patch)
tree3bda211838d9f76580dc84fb46ae5012d1bf1d5f
parentb4587b9578be1816259202517fcf24956c76ae62 (diff)
downloadcacert-devel-8bd80350a7024663d32bb70065c7e998051a8483.tar.gz
cacert-devel-8bd80350a7024663d32bb70065c7e998051a8483.tar.xz
cacert-devel-8bd80350a7024663d32bb70065c7e998051a8483.zip
Cherry-pick fix that got lost on merge conflict resolution
bug 1072: Change IP addresses Signed-off-by: Michael Tänzer <neo@nhng.de> (cherry picked from commit 042c5b32c12de2122170c0849b4fd6417427b923) Conflicts: www/cats/cats_import.php Signed-off-by: Michael Tänzer <neo@nhng.de>
-rw-r--r--www/cats/cats_import.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/www/cats/cats_import.php b/www/cats/cats_import.php
index 037586d..e4e83c5 100644
--- a/www/cats/cats_import.php
+++ b/www/cats/cats_import.php
@@ -33,8 +33,8 @@ function sanitize_string($buffer) {
define ('UNDEFINED', 'nd');
// Specific for testserver: Accept Test-CATS-Server
define ('ALLOWED_IP', '10.38.6.88');
-//define ('ALLOWED_IP', '213.154.225.228');
-define ('ALLOWED_IP2', '193.238.157.112');
+//define ('ALLOWED_IP', '213.154.225.243');
+define ('ALLOWED_IP2', '172.16.2.27');
define ('CONFIG_FILEPATH', '/www/');
$remote_addr = (isset($_SERVER['REMOTE_ADDR']))?$_SERVER['REMOTE_ADDR']:UNDEFINED;