Clean up file headers and NOTICE file.

[shibboleth/cpp-sp-resolver.git] / src / shibresolver / resolver.cpp

diff --git a/src/shibresolver/resolver.cpp b/src/shibresolver/resolver.cpp
index a5e03b5..2098f8f 100644 (file)
--- a/src/shibresolver/resolver.cpp
+++ b/src/shibresolver/resolver.cpp
@@ -1,9 +1,8 @@
-/*
- *  Copyright 2010-2011 JANET(UK)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * See the NOTICE file distributed with this work for information
+ * regarding copyright ownership. Licensed under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
@@ -23,7 +22,9 @@
 #include "internal.h"
 
 #ifdef SHIBRESOLVER_HAVE_GSSAPI_NAMINGEXTS
-# include <gssapi/gssapi_ext.h>
+# ifdef SHIBRESOLVER_HAVE_GSSMIT
+#  include <gssapi/gssapi_ext.h>
+# endif
 #endif
 
 #include <shibsp/exceptions.h>
@@ -403,7 +404,7 @@ void RemotedResolver::resolve(
         log.warn("no metadata providers are configured");
     }
     else {
-        if (!issuerstr.empty()) {
+        if (issuerstr.empty()) {
             // Attempt to locate an issuer based on input token.
             for (vector<const XMLObject*>::const_iterator t = tokens.begin(); t!=tokens.end(); ++t) {
                 const saml2::Assertion* assertion = dynamic_cast<const saml2::Assertion*>(*t);