diff options
| author | Simo Sorce <simo@redhat.com> | 2012-03-12 15:43:22 -0400 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2012-03-12 15:56:06 -0400 |
| commit | 715ac25aae582788f304e239c07b3db4ced2db4d (patch) | |
| tree | 4b61ea43ece8698c59ae06ddeed8fc9cea51ccf4 | |
| parent | c58b9cf71f4b8d03e31a7b9b35a4bc6553761336 (diff) | |
| download | nfs-utils-715ac25aae582788f304e239c07b3db4ced2db4d.tar.gz nfs-utils-715ac25aae582788f304e239c07b3db4ced2db4d.tar.xz nfs-utils-715ac25aae582788f304e239c07b3db4ced2db4d.zip | |
Kill SPKM3: Remove spkm3 references from svcgssd
Signed-off-by: Simo Sorce <simo@redhat.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
| -rw-r--r-- | utils/gssd/svcgssd_mech2file.c | 1 | ||||
| -rw-r--r-- | utils/gssd/svcgssd_proc.c | 8 |
2 files changed, 2 insertions, 7 deletions
diff --git a/utils/gssd/svcgssd_mech2file.c b/utils/gssd/svcgssd_mech2file.c index 65de8d0..a3177f6 100644 --- a/utils/gssd/svcgssd_mech2file.c +++ b/utils/gssd/svcgssd_mech2file.c @@ -53,7 +53,6 @@ struct mech2file { struct mech2file m2f[] = { {{9, "\052\206\110\206\367\022\001\002\002"}, "krb5"}, - {{7, "\053\006\001\005\005\001\003"}, "spkm3"}, {{7, "\053\006\001\005\005\001\009"}, "lipkey"}, {{0,0},""}, }; diff --git a/utils/gssd/svcgssd_proc.c b/utils/gssd/svcgssd_proc.c index c714d99..0d4f78d 100644 --- 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; |