Clean up file headers and NOTICE file.

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

diff --git a/src/shibresolver/resolver.h b/src/shibresolver/resolver.h
index ffbdc7c..3eee765 100644 (file)
--- a/src/shibresolver/resolver.h
+++ b/src/shibresolver/resolver.h
@@ -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
  *
@@ -100,23 +99,15 @@ namespace shibresolver {
 
 #ifdef SHIBRESOLVER_HAVE_GSSAPI
         /**
-         * Adds a GSS-API security context as input to the resolver.
-         * <p>The caller loses ownership of the context.
-         *
-         * @param ctx an input context to evaluate
-         */
-        void addToken(gss_ctx_id_t* ctx);
-
-        /**
-         * Adds a GSS-API exported security context as input to
+         * Adds a GSS-API exported mechanism name as input to
          * the resolver.
          * <p>The caller retains ownership of the buffer.
          *
-         * @param ctx an input exported security context to evaluate
+         * @param ctx an input exported mechanism name to evaluate
          */
-        void addToken(const gss_buffer_t token);
+        void addToken(const gss_buffer_t name);
 
-# ifndef SHIBRESOLVER_HAVE_GSSAPI_COMPOSITE_NAME
+# ifdef SHIBRESOLVER_HAVE_GSSAPI_NAMINGEXTS
         /**
          * Adds a GSS-API mechanism name as input to the resolver.
          * <p>The caller retains ownership of the name.
@@ -125,6 +116,14 @@ namespace shibresolver {
          */
         void addToken(gss_name_t name);
 # endif
+
+        /**
+         * Adds a GSS-API security context as input to the resolver.
+         * <p>The caller loses ownership of the context.
+         *
+         * @param ctx an input context to evaluate
+         */
+        void addToken(gss_ctx_id_t* ctx);
 #endif
 
         /**