The branch, v3-3-test has been updated
via 42b8b6ab563ad70fa4acca191dc3878be6e771ec (commit)
from f2648a5d7e894d89802915c1a83908dde19e7c13 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -----------------------------------------------------------------
commit 42b8b6ab563ad70fa4acca191dc3878be6e771ec
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Fri Aug 29 11:38:02 2008 +0200
kerberos: fix HAVE_KRB5 related build issue.
Guenther
(cherry picked from commit 7d7ba8397743af52a74d00fd717bdeb5e3e12a28)
-----------------------------------------------------------------------
Summary of changes:
source/include/ads.h | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/include/ads.h b/source/include/ads.h
index ebe8be0..97faf0b 100644
--- a/source/include/ads.h
+++ b/source/include/ads.h
@@ -372,9 +372,8 @@ typedef struct {
krb5_addresses *addrs;
#else
#error UNKNOWN_KRB5_ADDRESS_TYPE
-#endif
+#endif /* defined(HAVE_MAGIC_IN_KRB5_ADDRESS) &&
defined(HAVE_ADDRTYPE_IN_KRB5_ADDRESS) */
} smb_krb5_addresses;
-#endif
#ifdef HAVE_KRB5_KEYBLOCK_KEYVALUE /* Heimdal */
#define KRB5_KEY_TYPE(k) ((k)->keytype)
@@ -394,7 +393,9 @@ typedef struct {
#define KRB5_KT_KEY(k) (&(k)->keyblock)
#else
#error krb5_keytab_entry has no key or keyblock member
-#endif
+#endif /* HAVE_KRB5_KEYTAB_ENTRY_KEY */
+
+#endif /* HAVE_KRB5 */
enum ads_extended_dn_flags {
ADS_EXTENDED_DN_HEX_STRING = 0,
--
Samba Shared Repository
