Remove calls to GSSCommand constructor from derived classes

[gssweb.git] / json_gssapi / src / commands / GSSImportName.cpp

diff --git a/json_gssapi/src/commands/GSSImportName.cpp b/json_gssapi/src/commands/GSSImportName.cpp
index 1aeba1f..8c1e9de 100644 (file)
--- a/json_gssapi/src/commands/GSSImportName.cpp
+++ b/json_gssapi/src/commands/GSSImportName.cpp
@@ -1,8 +1,35 @@
 /*
- * Copyright (c) 2014 <copyright holder> <email>
- * 
- * For license details, see the LICENSE file in the root of this project.
- * 
+ * Copyright (c) 2014, JANET(UK)
+ * All rights reserved.
+ *
+ * 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.
+ *
  */
 
 #include "GSSImportName.h"
@@ -11,14 +38,6 @@
 #include <datamodel/GSSDisplayStatus.h>
 
 
-typedef OM_uint32 (*gss_imp_name_type)(
-    OM_uint32 *,        /* minor_status */
-    gss_buffer_t,       /* input_name_buffer */
-    gss_OID,            /* input_name_type(used to be const) */
-    gss_name_t *);      /* output_name */
-
-
-
 void GSSImportName::execute()
 {
   /* Variables */
@@ -86,7 +105,7 @@ GSSImportName::GSSImportName ( gss_imp_name_type fn )
   values = new JSONObject();
 }
 
-GSSImportName::GSSImportName(JSONObject *params, gss_imp_name_type fn) : GSSCommand(params)
+GSSImportName::GSSImportName(JSONObject *params, gss_imp_name_type fn)
 {
   /* Variables */
   /* Error checking */