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/patchlevel.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/patchlevel.h') diff --git a/src/patchlevel.h b/src/patchlevel.h index 2884222871..a2e47aef87 100644 --- a/src/patchlevel.h +++ b/src/patchlevel.h @@ -55,4 +55,4 @@ #define KRB5_PATCHLEVEL 0 #define KRB5_RELTAIL "prerelease" /* #undef KRB5_RELDATE */ -#define KRB5_RELTAG "trunk" +#define KRB5_RELTAG "mskrb-integ" -- cgit