s3-kerberos: do not include authdata headers before including krb5 headers.

Guenther

Part of a fix for bug #6929.

diff --git a/source3/include/authdata.h b/source3/include/authdata.h
index 70f6d2da9ac5129eeafca30af336b4d5d2ec0e28..e1a5155927196b51679b2dad2bdc57f24dfcef9c 100644 (file)
--- 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 471b95552f59fdd94fc17cb8e52c8e82cb5d0c34..922ec6bf1fa9cf28fe8f3d0edf72b80b31591b7d 100644 (file)
--- 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 7d566ab89e7d237bb748a38a8e22400ea74d8e93..d242919f048af4f836b3f66a70ed8a8f229412b4 100644 (file)
--- 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