Inherit from GSSCommand publicly, rather than privately.

[gssweb.git] / json_gssapi / src / commands / GSSWrap.h

diff --git a/json_gssapi/src/commands/GSSWrap.h b/json_gssapi/src/commands/GSSWrap.h
index e7f27c6..f7d9405 100644 (file)
--- a/json_gssapi/src/commands/GSSWrap.h
+++ b/json_gssapi/src/commands/GSSWrap.h
@@ -1,7 +1,34 @@
 /*
- * Copyright (c) 2014 <copyright holder> <email>
+ * Copyright (c) 2014, JANET(UK)
+ * All rights reserved.
  *
- * For license details, see the LICENSE file in the root of this project.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of JANET(UK) nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT 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.
  *
  */
 
@@ -13,7 +40,7 @@
 #include "GSSCommand.h"
 #include "datamodel/GSSBuffer.h"
 
-typedef OM_uint32 (*gss_wrap_type) (
+typedef OM_uint32 (KRB5_CALLCONV *gss_wrap_type) (
     OM_uint32 *,        /* minor_status */
     gss_ctx_id_t,       /* context_handle */
     int,                /* conf_req_flag */
@@ -23,7 +50,7 @@ typedef OM_uint32 (*gss_wrap_type) (
     gss_buffer_t);      /* output_message_buffer */
 
 
-class GSSWrap :  GSSCommand
+class GSSWrap : public GSSCommand
 {
 public:
     GSSWrap( gss_wrap_type fn = &gss_wrap ) : function(fn) {};