fix license spdx and cleanup some unused vars

lib/libgssapi/context.h

@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
@@ -24,7 +24,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
  */
 
 struct _gss_context {

lib/libgssapi/cred.h

@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
@@ -24,7 +24,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
  */
 
 #include <sys/queue.h>

lib/libgssapi/gss_accept_sec_context.3

@@ -24,7 +24,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"
 .\" The following commands are required for all man pages.
 .Dd January 26, 2010
 .Dt GSS_ACCEPT_SEC_CONTEXT 3 PRM
@@ -51,8 +50,9 @@
 .Fa "gss_cred_id_t *delegated_cred_handle"
 .Fc
 .Sh DESCRIPTION
-Allows a remotely initiated security context between the application
-and a remote peer to be established.  The routine may return a
+Allows a remotely initiated security context between the application and a remote
+peer to be established.
+The routine may return a
 .Fa output_token
 which should be transferred to the peer application,
 where the peer application will present it to
@@ -77,7 +77,8 @@ parameters.
 .Pp
 Portable applications should be constructed to use the token length
 and return status to determine whether a token needs to be sent or
-waited for.  Thus a typical portable caller should always invoke
+waited for.
+Thus a typical portable caller should always invoke
 .Fn gss_accept_sec_context
 within a loop:
 .Bd -literal
@@ -165,10 +166,9 @@ returned to a caller
 (i.e. when accompanied by a
 .Dv GSS_S_COMPLETE
 status code), applications
-should not rely on this behavior as the flag was not defined in
-Version 1 of the GSS-API. Instead, applications should be prepared to
-use per-message services after a successful context establishment,
-according to the
+should not rely on this behavior as the flag was not defined in Version 1 of the GSS-API.
+Instead, applications should be prepared to use per-message services after a
+successful context establishment, according to the
 .Dv GSS_C_INTEG_FLAG
 and
 .Dv GSS_C_CONF_FLAG values.
@@ -189,9 +189,10 @@ fails, the
 implementation should not create a context object, and should leave
 the value of the context_handle parameter set to
 .Dv GSS_C_NO_CONTEXT to
-indicate this.  In the event of a failure on a subsequent call, the
-implementation is permitted to delete the "half-built" security
-context (in which case it should set the
+indicate this.
+In the event of a failure on a subsequent call, the implementation is
+permitted to delete the "half-built" security context (in which case it
+should set the
 .Fa context_handle
 parameter to
 .Dv GSS_C_NO_CONTEXT ), but the preferred behavior is to leave the

lib/libgssapi/gss_accept_sec_context.c

@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
@@ -24,7 +24,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
  */
 
 #include <gssapi/gssapi.h>

lib/libgssapi/gss_acquire_cred.3

@@ -24,7 +24,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"
 .\" The following commands are required for all man pages.
 .Dd January 26, 2010
 .Dt GSS_ACQUIRE_CRED 3 PRM

lib/libgssapi/gss_acquire_cred.c

@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
@@ -24,7 +24,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
  */
 
 #include <gssapi/gssapi.h>

lib/libgssapi/gss_add_cred.3

@@ -24,7 +24,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"
 .\" The following commands are required for all man pages.
 .Dd January 26, 2010
 .Dt GSS_ADD_CRED 3 PRM

lib/libgssapi/gss_add_cred.c

@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
@@ -24,7 +24,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
  */
 
 #include <gssapi/gssapi.h>

lib/libgssapi/gss_add_oid_set_member.3

@@ -24,7 +24,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"
 .\" The following commands are required for all man pages.
 .Dd January 26, 2010
 .Dt GSS_ADD_OID_SET_MEMBER 3 PRM

lib/libgssapi/gss_add_oid_set_member.c

@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
@@ -24,7 +24,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
  */
 
 #include <gssapi/gssapi.h>

lib/libgssapi/gss_canonicalize_name.3

@@ -24,7 +24,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"
 .\" The following commands are required for all man pages.
 .Dd January 26, 2010
 .Dt GSS_CANONICALIZE_NAME 3 PRM

lib/libgssapi/gss_canonicalize_name.c

@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
@@ -24,7 +24,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
  */
 
 #include <gssapi/gssapi.h>

lib/libgssapi/gss_compare_name.3

@@ -24,7 +24,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"
 .\" The following commands are required for all man pages.
 .Dd January 26, 2010
 .Dt GSS_COMPARE_NAME 3 PRM

lib/libgssapi/gss_compare_name.c

@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
@@ -24,7 +24,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
  */
 
 #include <gssapi/gssapi.h>

lib/libgssapi/gss_context_time.3

@@ -24,7 +24,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"
 .\" The following commands are required for all man pages.
 .Dd January 26, 2010
 .Dt GSS_CONTEXT_TIME 3 PRM

lib/libgssapi/gss_context_time.c

@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
@@ -24,7 +24,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
  */
 
 #include <gssapi/gssapi.h>

lib/libgssapi/gss_create_empty_oid_set.3

@@ -24,7 +24,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"
 .\" The following commands are required for all man pages.
 .Dd January 26, 2010
 .Dt GSS_CREATE_EMPTY_OID_SET 3 PRM

lib/libgssapi/gss_create_empty_oid_set.c

@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
@@ -24,7 +24,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
  */
 
 #include <gssapi/gssapi.h>

lib/libgssapi/gss_decapsulate_token.c

@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2008 Doug Rabson
  * All rights reserved.
@@ -24,7 +24,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
  */
 
 #include <gssapi/gssapi.h>

lib/libgssapi/gss_delete_sec_context.3

@@ -24,7 +24,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"
 .\" The following commands are required for all man pages.
 .Dd January 26, 2010
 .Dt GSS_DELETE_SEC_CONTEXT 3 PRM

lib/libgssapi/gss_delete_sec_context.c

@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
@@ -24,7 +24,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
  */
 
 #include <gssapi/gssapi.h>
@@ -40,7 +39,6 @@ gss_delete_sec_context(OM_uint32 *minor_status,
     gss_ctx_id_t *context_handle,
     gss_buffer_t output_token)
 {
-	OM_uint32 major_status;
 	struct _gss_context *ctx = (struct _gss_context *) *context_handle;
 
 	if (output_token)
@@ -53,7 +51,7 @@ gss_delete_sec_context(OM_uint32 *minor_status,
 		 * otherwise fake an empty token.
 		 */
 		if (ctx->gc_ctx) {
-			major_status = ctx->gc_mech->gm_delete_sec_context(
+			(void) ctx->gc_mech->gm_delete_sec_context(
 				minor_status, &ctx->gc_ctx, output_token);
 		}
 		free(ctx);

lib/libgssapi/gss_display_name.3

@@ -24,7 +24,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"
 .\" The following commands are required for all man pages.
 .Dd January 26, 2010
 .Dt GSS_DISPLAY_NAME 3 PRM

lib/libgssapi/gss_display_name.c

@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
@@ -24,7 +24,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
  */
 
 #include <gssapi/gssapi.h>

lib/libgssapi/gss_display_status.3

@@ -24,7 +24,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"
 .\" The following commands are required for all man pages.
 .Dd January 26, 2010
 .Dt GSS_DISPLAY_STATUS 3 PRM

lib/libgssapi/gss_duplicate_name.3

@@ -24,7 +24,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"
 .\" The following commands are required for all man pages.
 .Dd January 26, 2010
 .Dt GSS_DUPLICATE_NAME 3 PRM

lib/libgssapi/gss_duplicate_name.c

@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2005 Doug Rabson
  * All rights reserved.
@@ -24,7 +24,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
  */
 
 #include <gssapi/gssapi.h>

lib/libgssapi/gss_duplicate_oid.c

@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2008 Doug Rabson
  * All rights reserved.
@@ -24,7 +24,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
  */
 
 #include <gssapi/gssapi.h>