[26893] in CVS-changelog-for-Kerberos-V5

home help back first fref pref prev next nref lref last post

krb5 commit: Minor fixes for leashwin.h

daemon@ATHENA.MIT.EDU (Benjamin Kaduk)
Fri Aug 24 15:57:26 2012

Date: Fri, 24 Aug 2012 15:55:25 -0400
From: Benjamin Kaduk <kaduk@mit.edu>
Message-Id: <201208241955.q7OJtPhX004301@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu

https://github.com/krb5/krb5/commit/68c9b0afef303114c7a43cb90d2516e5d7e2d817
commit 68c9b0afef303114c7a43cb90d2516e5d7e2d817
Author: Kevin Wasserman <kevin.wasserman@painless-security.com>
Date:   Sat Jun 9 14:21:13 2012 -0400

    Minor fixes for leashwin.h
    
    -explicitly include krb5.h (for krb5_timestamp)
    -add extern "C" scope for c++ compatibility
    
    Signed-off-by: Kevin Wasserman <kevin.wasserman@painless-security.com>
    
    ticket: 7267 (new)
    queue: kfw
    target_version: 1.10.4
    tags: pullup

 src/windows/include/leashwin.h |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/src/windows/include/leashwin.h b/src/windows/include/leashwin.h
index 39a7d1a..fc210a6 100644
--- a/src/windows/include/leashwin.h
+++ b/src/windows/include/leashwin.h
@@ -5,6 +5,7 @@
 #ifndef NO_KRB4
 #include <krb.h>
 #else
+#include <krb5.h>
 #define ANAME_SZ	        40
 #define	REALM_SZ	        40
 #define	SNAME_SZ	        40
@@ -127,6 +128,10 @@ struct TICKETINFO {
     unsigned long flags;
 };
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 int FAR Leash_kinit_dlg(HWND hParent, LPLSH_DLGINFO lpdlginfo);
 int FAR Leash_kinit_dlg_ex(HWND hParent, LPLSH_DLGINFO_EX lpdlginfoex);
 int FAR Leash_changepwd_dlg(HWND hParent, LPLSH_DLGINFO lpdlginfo);
@@ -208,5 +213,8 @@ DWORD Leash_reset_default_mslsa_import();
 DWORD Leash_get_default_preserve_kinit_settings();
 DWORD Leash_set_default_preserve_kinit_settings(DWORD onoff);
 DWORD Leash_reset_default_preserve_kinit_settings();
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* LEASHWIN */
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5

home help back first fref pref prev next nref lref last post