diff options
| author | Günther Deschner <gdeschner@redhat.com> | 2013-02-23 11:09:18 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2013-03-22 19:28:33 +0100 |
| commit | bb222bca264c4d4e1dc212f4363deafefa264e19 (patch) | |
| tree | 924cad4c45d21e008c5c77147557d9750bc0f0a8 | |
| parent | efc6c73cb02ce9d067c8e887254364c8af8e0039 (diff) | |
| download | nfs-utils-bb222bca264c4d4e1dc212f4363deafefa264e19.tar.gz nfs-utils-bb222bca264c4d4e1dc212f4363deafefa264e19.tar.xz nfs-utils-bb222bca264c4d4e1dc212f4363deafefa264e19.zip | |
rpc.gssd: use gss_krb5_set_allowable_enctypes() directly.
| -rw-r--r-- | utils/gssd/krb5_util.c | 10 | ||||
| -rw-r--r-- | utils/gssd/svcgssd_krb5.c | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/utils/gssd/krb5_util.c b/utils/gssd/krb5_util.c index aeb8f70..c826e32 100644 --- a/utils/gssd/krb5_util.c +++ b/utils/gssd/krb5_util.c @@ -1391,14 +1391,14 @@ limit_krb5_enctypes(struct rpc_gss_sec *sec) * list of supported enctypes, use local default here. */ if (krb5_enctypes == NULL || limit_to_legacy_enctypes) - maj_stat = gss_set_allowable_enctypes(&min_stat, credh, - &krb5oid, num_enctypes, enctypes); + maj_stat = gss_krb5_set_allowable_enctypes(&min_stat, credh, + num_enctypes, enctypes); else - maj_stat = gss_set_allowable_enctypes(&min_stat, credh, - &krb5oid, num_krb5_enctypes, krb5_enctypes); + maj_stat = gss_krb5_set_allowable_enctypes(&min_stat, credh, + num_krb5_enctypes, krb5_enctypes); if (maj_stat != GSS_S_COMPLETE) { - pgsserr("gss_set_allowable_enctypes", + pgsserr("gss_krb5_set_allowable_enctypes", maj_stat, min_stat, &krb5oid); gss_release_cred(&min_stat, &credh); return -1; diff --git a/utils/gssd/svcgssd_krb5.c b/utils/gssd/svcgssd_krb5.c index 1d44d34..43e071f 100644 --- a/utils/gssd/svcgssd_krb5.c +++ b/utils/gssd/svcgssd_krb5.c @@ -208,20 +208,20 @@ svcgssd_limit_krb5_enctypes(void) if (parsed_enctypes != NULL) { enctypes = parsed_enctypes; num_enctypes = parsed_num_enctypes; - printerr(2, "%s: Calling gss_set_allowable_enctypes with %d " + printerr(2, "%s: Calling gss_krb5_set_allowable_enctypes with %d " "enctypes from the kernel\n", __func__, num_enctypes); } else { enctypes = default_enctypes; num_enctypes = default_num_enctypes; - printerr(2, "%s: Calling gss_set_allowable_enctypes with %d " + printerr(2, "%s: Calling gss_krb5_set_allowable_enctypes with %d " "enctypes from defaults\n", __func__, num_enctypes); } - maj_stat = gss_set_allowable_enctypes(&min_stat, gssd_creds, - &krb5oid, num_enctypes, enctypes); + maj_stat = gss_krb5_set_allowable_enctypes(&min_stat, gssd_creds, + num_enctypes, enctypes); if (maj_stat != GSS_S_COMPLETE) { - printerr(1, "WARNING: gss_set_allowable_enctypes failed\n"); - pgsserr("svcgssd_limit_krb5_enctypes: gss_set_allowable_enctypes", + printerr(1, "WARNING: gss_krb5_set_allowable_enctypes failed\n"); + pgsserr("svcgssd_limit_krb5_enctypes: gss_krb5_set_allowable_enctypes", maj_stat, min_stat, &krb5oid); return -1; } |