Imported upstream 1.2.6

[nfs-utils.git] / utils / gssd / context.c

diff --git a/utils/gssd/context.c b/utils/gssd/context.c
index 4bab3e7955101bd616b014b0a3f2229902b172bb..fee7da27906e94b990fb7c49d73bf4f27a7003ac 100644 (file)
--- a/utils/gssd/context.c
+++ b/utils/gssd/context.c
@@ -28,7 +28,10 @@
   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif /* HAVE_CONFIG_H */
+
 #include <stdio.h>
 #include <syslog.h>
 #include <string.h>
@@ -43,14 +46,11 @@
 int
 serialize_context_for_kernel(gss_ctx_id_t ctx,
                             gss_buffer_desc *buf,
-                            gss_OID mech)
+                            gss_OID mech,
+                            int32_t *endtime)
 {
        if (g_OID_equal(&krb5oid, mech))
-               return serialize_krb5_ctx(ctx, buf);
-#ifdef HAVE_SPKM3_H
-       else if (g_OID_equal(&spkm3oid, mech))
-               return serialize_spkm3_ctx(ctx, buf);
-#endif
+               return serialize_krb5_ctx(ctx, buf, endtime);
        else {
                printerr(0, "ERROR: attempting to serialize context with "
                                "unknown/unsupported mechanism oid\n");