diff options
| author | Uri Simchoni <uri@samba.org> | 2016-09-23 19:28:10 +0300 |
|---|---|---|
| committer | Uri Simchoni <uri@samba.org> | 2016-10-03 11:12:29 +0200 |
| commit | 3f1f6e03cd38e241060ff10f1f153cc266dca888 (patch) | |
| tree | 78d3d9cc3c65027d2baf347b7b6e01616fb63dde /source4/heimdal | |
| parent | 0b61d9e02ea0680fbb3ef927d09a573813b4ed15 (diff) | |
| download | samba-3f1f6e03cd38e241060ff10f1f153cc266dca888.tar.gz | |
heimdal: revert 1f90983324b9f5804dc57f87c5f7695b0e53db8d
A different version has gone upstream, fixing the problem
elsewhere.
Signed-off-by: Uri Simchoni <uri@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Uri Simchoni <uri@samba.org>
Autobuild-Date(master): Mon Oct 3 11:12:29 CEST 2016 on sn-devel-144
Diffstat (limited to 'source4/heimdal')
| -rw-r--r-- | source4/heimdal/lib/gssapi/krb5/init_sec_context.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/source4/heimdal/lib/gssapi/krb5/init_sec_context.c b/source4/heimdal/lib/gssapi/krb5/init_sec_context.c index efc421521ce..0a89ae1f36c 100644 --- a/source4/heimdal/lib/gssapi/krb5/init_sec_context.c +++ b/source4/heimdal/lib/gssapi/krb5/init_sec_context.c @@ -427,12 +427,15 @@ init_auth /* * This is hideous glue for (NFS) clients that wants to limit the * available enctypes to what it can support (encryption in - * kernel). + * kernel). If there is no enctypes selected for this credential, + * reset it to the default set of enctypes. */ { - if (cred && cred->enctypes) { - krb5_set_default_in_tkt_etypes(context, cred->enctypes); - } + krb5_enctype *enctypes = NULL; + + if (cred && cred->enctypes) + enctypes = cred->enctypes; + krb5_set_default_in_tkt_etypes(context, enctypes); } /* canon name if needed for client + target realm */ |