[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  5186421... nsswitch: fix compile of winbind_krb5_locator with recent Heimdal versions.
       via  660ee2e... cifs.upcall: 2nd part of fix for Bug #6868: support building with Heimdal we well as with MIT.
      from  17caf63... s3 selftest: Add RAW-SFILEINFO-END-OF-FILE to selftest

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 51864219cc12ceb66c281355f3e1191d5e32842d
Author: Günther Deschner <gd at samba.org>
Date:   Wed Nov 25 15:21:54 2009 +0100

    nsswitch: fix compile of winbind_krb5_locator with recent Heimdal versions.
    
    Guenther

commit 660ee2e74523194e5f6b2b6428d76628beb74717
Author: Günther Deschner <gd at samba.org>
Date:   Wed Nov 25 15:06:19 2009 +0100

    cifs.upcall: 2nd part of fix for Bug #6868: support building with Heimdal we well as with MIT.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 client/cifs.upcall.c            |    2 ++
 nsswitch/winbind_krb5_locator.c |    1 +
 2 files changed, 3 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/client/cifs.upcall.c b/client/cifs.upcall.c
index d3ff5f1..063e423 100644
--- a/client/cifs.upcall.c
+++ b/client/cifs.upcall.c
@@ -105,7 +105,9 @@ err_endseq:
 err_ccstart:
 	krb5_free_principal(context, principal);
 err_princ:
+#if defined(KRB5_TC_OPENCLOSE)
 	krb5_cc_set_flags(context, ccache, KRB5_TC_OPENCLOSE);
+#endif
 	krb5_cc_close(context, ccache);
 err_cache:
 	krb5_free_context(context);
diff --git a/nsswitch/winbind_krb5_locator.c b/nsswitch/winbind_krb5_locator.c
index b9e35bd..272e7db 100644
--- a/nsswitch/winbind_krb5_locator.c
+++ b/nsswitch/winbind_krb5_locator.c
@@ -26,6 +26,7 @@
 
 #if defined(HAVE_KRB5) && defined(HAVE_KRB5_LOCATE_PLUGIN_H)
 
+#include <krb5/krb5.h>
 #include <krb5/locate_plugin.h>
 
 #ifndef KRB5_PLUGIN_NO_HANDLE


-- 
Samba Shared Repository