diff options
author | Andrew Bartlett <abartlet@samba.org> | 2008-08-12 17:46:48 +1000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2008-08-12 17:46:48 +1000 |
commit | 3bd2a50bab2fdb1e25f61d625b920bac016a261b (patch) | |
tree | 4a785cbead3905e9f0462dae1e299d20e61628e8 /source4/heimdal/lib/gssapi/krb5/gsskrb5-private.h | |
parent | f2eaa4beaa1439a9b60005791a764019ae975853 (diff) | |
parent | 0965b22ec561588201a3a79f1f1e316834c8ce0b (diff) | |
download | samba-3bd2a50bab2fdb1e25f61d625b920bac016a261b.tar.gz samba-3bd2a50bab2fdb1e25f61d625b920bac016a261b.tar.bz2 samba-3bd2a50bab2fdb1e25f61d625b920bac016a261b.zip |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit 7ad0d8dd4dab6119ca6f94b64b35c8f975a27d0a)
Diffstat (limited to 'source4/heimdal/lib/gssapi/krb5/gsskrb5-private.h')
-rw-r--r-- | source4/heimdal/lib/gssapi/krb5/gsskrb5-private.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source4/heimdal/lib/gssapi/krb5/gsskrb5-private.h b/source4/heimdal/lib/gssapi/krb5/gsskrb5-private.h index 64a0dd36b1..f6edb8b247 100644 --- a/source4/heimdal/lib/gssapi/krb5/gsskrb5-private.h +++ b/source4/heimdal/lib/gssapi/krb5/gsskrb5-private.h @@ -661,6 +661,7 @@ _gsskrb5cfx_max_wrap_length_cfx ( krb5_error_code _gsskrb5cfx_wrap_length_cfx ( + const gsskrb5_ctx /*context_handle*/, krb5_context /*context*/, krb5_crypto /*crypto*/, int /*conf_req_flag*/, |