From 8c68e0193cb9cf5aec380b899241661a4b1d4689 Mon Sep 17 00:00:00 2001
From: Jaime Perez Crespo <jaime.perez@uninett.no>
Date: Wed, 15 Apr 2015 19:43:23 +0200
Subject: [PATCH] Remove unreachable code.
---
modules/metarefresh/bin/metarefresh.php | 7 -------
modules/negotiate/lib/Auth/Source/Negotiate.php | 4 +---
2 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/modules/metarefresh/bin/metarefresh.php b/modules/metarefresh/bin/metarefresh.php
index fd51caaab..2e351f357 100755
--- a/modules/metarefresh/bin/metarefresh.php
+++ b/modules/metarefresh/bin/metarefresh.php
@@ -144,8 +144,6 @@ if($toStdOut) {
$metaloader->writeMetadataFiles($outputDir);
}
-exit(0);
-
/**
* This function prints the help output.
*/
@@ -178,8 +176,3 @@ function printHelp() {
echo(' seperate files in the output directory.' . "\n");
echo("\n");
}
-
-
-
-
-
diff --git a/modules/negotiate/lib/Auth/Source/Negotiate.php b/modules/negotiate/lib/Auth/Source/Negotiate.php
index e956a00ed..07893002a 100644
--- a/modules/negotiate/lib/Auth/Source/Negotiate.php
+++ b/modules/negotiate/lib/Auth/Source/Negotiate.php
@@ -160,9 +160,7 @@ class sspmod_negotiate_Auth_Source_Negotiate extends SimpleSAML_Auth_Source {
if (array_key_exists('negotiate:disable', $spMetadata)) {
if ($spMetadata['negotiate:disable'] == TRUE) {
SimpleSAML_Logger::debug('Negotiate - SP disabled. falling back');
- return True;
- // Never executed
- assert('FALSE');
+ return true;
} else {
SimpleSAML_Logger::debug('Negotiate - SP disable flag found but set to FALSE');
}
--
GitLab