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

Guenther

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 37cb611a9150109969fec741bdf0dccded172d94..cf0979592c823a8a080c18105e14bce4b9c400ff 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -652,7 +652,6 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
 #include "passdb.h"
 #include "rpc_secdes.h"
 #include "../libgpo/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 35d5ef9f3170ae064abf95b4f8d3193001aa9764..ed158ee2d8c0cf2387768720247d947413054f2c 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