[SCM] Samba Shared Repository - branch v3-4-test updated

[Karolin Seeger]

The branch, v3-4-test has been updated
       via  579ac85... s3-kerberos: do not include authdata headers before including krb5 headers.
      from  24282f2... Fix bug #6898 - Samba duplicates file content on appending. Move posix case semantics out from under the VFS. Jeremy.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -----------------------------------------------------------------
commit 579ac85a8e8f640790878cef5a35debec999dd0e
Author: Günther Deschner <gd at samba.org>
Date:   Fri Nov 27 18:30:18 2009 +0100

    s3-kerberos: do not include authdata headers before including krb5 headers.
    
    Guenther
    
    Part of a fix for bug #6929.

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

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


Changeset truncated at 500 lines:

diff --git a/source3/include/authdata.h b/source3/include/authdata.h
index 70f6d2d..e1a5155 100644
--- a/source3/include/authdata.h
+++ b/source3/include/authdata.h
@@ -21,8 +21,6 @@
 #ifndef _AUTHDATA_H
 #define _AUTHDATA_H
 
-#include "rpc_misc.h"
-
 #define PAC_TYPE_LOGON_INFO 1
 #define PAC_TYPE_SERVER_CHECKSUM 6
 #define PAC_TYPE_PRIVSVR_CHECKSUM 7
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 471b955..922ec6b 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -608,7 +608,6 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
 #include "passdb.h"
 #include "rpc_secdes.h"
 #include "gpo.h"
-#include "authdata.h"
 #include "msdfs.h"
 #include "rap.h"
 #include "../lib/crypto/md5.h"
diff --git a/source3/libads/authdata.c b/source3/libads/authdata.c
index 7d566ab..d242919 100644
--- a/source3/libads/authdata.c
+++ b/source3/libads/authdata.c
@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_krb5pac.h"
 #include "smb_krb5.h"
+#include "authdata.h"
 
 #ifdef HAVE_KRB5
 


-- 
Samba Shared Repository