From 0ba5ccd7bb3ea15e44a87f84ca6feed8890f657d Mon Sep 17 00:00:00 2001 From: Sam Hartman Date: Sat, 3 Jan 2009 23:19:42 +0000 Subject: Merge mskrb-integ onto trunk The mskrb-integ branch includes support for the following projects: Projects/Aliases * Projects/PAC and principal APIs * Projects/AEAD encryption API * Projects/GSSAPI DCE * Projects/RFC 3244 In addition, it includes support for enctype negotiation, and a variety of GSS-API extensions. In the KDC it includes support for protocol transition, constrained delegation and a new authorization data interface. The old authorization data interface is also supported. This commit merges the mskrb-integ branch on to the trunk. Additional review and testing is required. Merge commit 'mskrb-integ' into trunk ticket: new status: open git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@21690 dc483132-0cff-0310-8789-dd5450dbe970 --- src/include/k5-plugin.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/include/k5-plugin.h') diff --git a/src/include/k5-plugin.h b/src/include/k5-plugin.h index 5bb9be7a0..f5f4f43c2 100644 --- a/src/include/k5-plugin.h +++ b/src/include/k5-plugin.h @@ -45,6 +45,9 @@ So, no krb5 types. */ +#ifndef K5_PLUGIN_H +#define K5_PLUGIN_H + #if defined(_MSDOS) || defined(_WIN32) #include "win-mac.h" #endif @@ -102,3 +105,5 @@ krb5int_get_plugin_dir_func (struct plugin_dir_handle *, const char *, void (***)(void), struct errinfo *); void KRB5_CALLCONV krb5int_free_plugin_dir_func (void (**)(void)); + +#endif /* K5_PLUGIN_H */ -- cgit