Imported upstream 1.2.8

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

diff --git a/utils/gssd/svcgssd_proc.c b/utils/gssd/svcgssd_proc.c
index c714d99dd654aaff3b3369bebcbc0df0946284dd..3757d5191041b0341ea8ed11db6b26d3bea4f460 100644 (file)
--- a/utils/gssd/svcgssd_proc.c
+++ b/utils/gssd/svcgssd_proc.c
@@ -369,12 +369,8 @@ get_hostbased_client_name(gss_name_t client_name, gss_OID mech,
        if (g_OID_equal(&krb5oid, mech)) {
                if (get_krb5_hostbased_name(&name, &cname) == 0)
                        *hostbased_name = cname;
-       }
-
-       /* No support for SPKM3, just print a warning (for now) */
-       if (g_OID_equal(&spkm3oid, mech)) {
-               printerr(1, "WARNING: get_hostbased_client_name: "
-                        "no hostbased_name support for SPKM3\n");
+       } else {
+               printerr(1, "WARNING: unknown/unsupport mech OID\n");
        }
 
        res = 0;
@@ -488,7 +484,7 @@ handle_nullreq(FILE *f) {
 
        /* kernel needs ctx to calculate verifier on null response, so
         * must give it context before doing null call: */
-       if (serialize_context_for_kernel(ctx, &ctx_token, mech, &ctx_endtime)) {
+       if (serialize_context_for_kernel(&ctx, &ctx_token, mech, &ctx_endtime)) {
                printerr(0, "WARNING: handle_nullreq: "
                            "serialize_context_for_kernel failed\n");
                maj_stat = GSS_S_FAILURE;