[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  9c2aa5b s3-krb5 Move #ifdef HAVE_KRB5 above #include of libcli/auth/krb5_wrap.h
      from  4389bf4 Ensure change_dir_owner_to_parent() can't be raced.

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


- Log -----------------------------------------------------------------
commit 9c2aa5b18d60237a8afb5537b91b8d3d45353fd4
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Fri Apr 15 08:29:45 2011 +1000

    s3-krb5 Move #ifdef HAVE_KRB5 above #include of libcli/auth/krb5_wrap.h
    
    Autobuild-User: Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date: Fri Apr 15 01:22:51 CEST 2011 on sn-devel-104

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

Summary of changes:
 source3/include/smb_krb5.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/smb_krb5.h b/source3/include/smb_krb5.h
index 042b7eb..d87dc79 100644
--- a/source3/include/smb_krb5.h
+++ b/source3/include/smb_krb5.h
@@ -1,6 +1,8 @@
 #ifndef _HEADER_smb_krb5_h
 #define _HEADER_smb_krb5_h
 
+#ifdef HAVE_KRB5
+
 #define KRB5_PRIVATE    1       /* this file uses PRIVATE interfaces! */
 /* this file uses DEPRECATED interfaces! */
 
@@ -40,7 +42,6 @@
 #define AP_OPTS_USE_SUBKEY 0
 #endif
 
-#ifdef HAVE_KRB5
 typedef struct {
 #if defined(HAVE_MAGIC_IN_KRB5_ADDRESS) && defined(HAVE_ADDRTYPE_IN_KRB5_ADDRESS) /* MIT */
 	krb5_address **addrs;


-- 
Samba Shared Repository