Merge branch 'lukeh/moonshot' of github.com:heimdal/heimdal into lukeh/moonshot

Conflicts: lib/gssapi/version-script.map
2011-03-21 23:55:54 +11:00
parent d116a78297 da70ba0e8d
commit 9053e86254
8 changed files with 1897 additions and 1886 deletions
--- a/lib/gssapi/libgssapi-exports.def
+++ b/lib/gssapi/libgssapi-exports.def
@@ -86,6 +86,7 @@ EXPORTS
 	gss_set_name_attribute
 	gss_set_sec_context_option
 	gss_sign
+	gss_store_cred
 	gss_test_oid_set_member
 	gss_unseal
 	gss_unwrap