fixup init_sec_context function typedef

diff --git a/json_gssapi/src/commands/GSSInitSecContext.cpp b/json_gssapi/src/commands/GSSInitSecContext.cpp
index 6f8df60..58803fd 100644 (file)
--- a/json_gssapi/src/commands/GSSInitSecContext.cpp
+++ b/json_gssapi/src/commands/GSSInitSecContext.cpp
@@ -291,14 +291,14 @@ JSONObject *GSSInitSecContext::toJSON()
 
 GSSInitSecContext::GSSInitSecContext(
   JSONObject *params, 
-  pfn_init_sec_context fn)
+  init_sec_context_type fn)
 {
   zeroOut(false);
   loadParameters(params);
   function = fn;
 }
 
-GSSInitSecContext::GSSInitSecContext(pfn_init_sec_context fn)
+GSSInitSecContext::GSSInitSecContext(init_sec_context_type fn)
 {
   zeroOut(false);
   function = fn;

diff --git a/json_gssapi/src/commands/GSSInitSecContext.h b/json_gssapi/src/commands/GSSInitSecContext.h
index 85c9766..a3454e3 100644 (file)
--- a/json_gssapi/src/commands/GSSInitSecContext.h
+++ b/json_gssapi/src/commands/GSSInitSecContext.h
@@ -41,7 +41,7 @@
 #include <datamodel/GSSOID.h>
 #include <gssapi.h>
 
-typedef OM_uint32 (KRB5_CALLCONV *pfn_init_sec_context)(
+typedef OM_uint32 (KRB5_CALLCONV *init_sec_context_type)(
     OM_uint32 *,        /* minor_status */
     gss_cred_id_t,      /* claimant_cred_handle */
     gss_ctx_id_t *,     /* context_handle */
@@ -75,8 +75,8 @@ public:
   
     void execute();
     JSONObject *toJSON();
-    GSSInitSecContext(pfn_init_sec_context fn = &gss_init_sec_context);
-    GSSInitSecContext(JSONObject *params,  pfn_init_sec_context fn = &gss_init_sec_context);
+    GSSInitSecContext(init_sec_context_type fn = &gss_init_sec_context);
+    GSSInitSecContext(JSONObject *params,  init_sec_context_type fn = &gss_init_sec_context);
     
     bool loadParameters(JSONObject *params);
     bool zeroOut(bool initialized = true);
@@ -86,7 +86,7 @@ public:
     OM_uint32 getReqFlags() { return req_flags; }
     OM_uint32 getTimeReq() { return time_req; }
     gss_ctx_id_t getContextHandle() { return context_handle; }
-    void *getGSSFunction() { return function; }
+    init_sec_context_type getGSSFunction() { return function; }
     GSSOID getMechType() { return mechType; };
     GSSOID getActualMechType() { return actualMechType; };
     
@@ -94,7 +94,7 @@ public:
     const char * getTargetDisplayName();
     
 private:
-    pfn_init_sec_context function;
+    init_sec_context_type function;
     GSSContext context;
     GSSOID mechType;
     GSSOID actualMechType;