r12594: Jelmer pushed some proposed header reductions to the list today. This

commits some of these that I know to be correct in the kerberos area.

Andrew Bartlett
(This used to be commit 6787b3737c27f5136152b007b0ee2ae314efac3c)

7 files changed, 2 insertions, 23 deletions

diff --git a/source4/auth/kerberos/gssapi_parse.c b/source4/auth/kerberos/gssapi_parse.c
index 524eedc448..a48179cc1a 100644
--- a/source4/auth/kerberos/gssapi_parse.c
+++ b/source4/auth/kerberos/gssapi_parse.c
@@ -24,7 +24,6 @@
 
 #include "includes.h"
 #include "asn_1.h"
-#include "system/kerberos.h"
 #include "auth/gensec/gensec.h"
 
 /*
diff --git a/source4/auth/kerberos/kerberos.c b/source4/auth/kerberos/kerberos.c
index 71d9859df6..5e2b6ce019 100644
--- a/source4/auth/kerberos/kerberos.c
+++ b/source4/auth/kerberos/kerberos.c
@@ -23,12 +23,7 @@
 */
 
 #include "includes.h"
-#include "system/network.h"
 #include "system/kerberos.h"
-#include "system/time.h"
-#include "auth/kerberos/kerberos.h"
-#include "secrets.h"
-#include "ads.h"
 
 #ifdef HAVE_KRB5
 
diff --git a/source4/auth/kerberos/kerberos_pac.c b/source4/auth/kerberos/kerberos_pac.c
index 55805f0c4a..743d3428e4 100644
--- a/source4/auth/kerberos/kerberos_pac.c
+++ b/source4/auth/kerberos/kerberos_pac.c
@@ -26,9 +26,6 @@
 
 #include "includes.h"
 #include "system/kerberos.h"
-#include "system/time.h"
-#include "system/network.h"
-#include "auth/auth.h"
 #include "auth/kerberos/kerberos.h"
 #include "librpc/gen_ndr/ndr_krb5pac.h"
 #include "auth/auth.h"
diff --git a/source4/auth/kerberos/kerberos_util.c b/source4/auth/kerberos/kerberos_util.c
index d3edd1b26c..ad0e18b2e7 100644
--- a/source4/auth/kerberos/kerberos_util.c
+++ b/source4/auth/kerberos/kerberos_util.c
@@ -23,8 +23,6 @@
 
 #include "includes.h"
 #include "system/kerberos.h"
-#include "system/time.h"
-#include "system/network.h"
 #include "auth/kerberos/kerberos.h"
 #include "auth/auth.h"
 
diff --git a/source4/auth/kerberos/kerberos_verify.c b/source4/auth/kerberos/kerberos_verify.c
index 020b63478e..29d704b148 100644
--- a/source4/auth/kerberos/kerberos_verify.c
+++ b/source4/auth/kerberos/kerberos_verify.c
@@ -24,12 +24,8 @@
 */
 
 #include "includes.h"
-#include "system/network.h"
 #include "system/kerberos.h"
 #include "auth/kerberos/kerberos.h"
-#include "asn_1.h"
-#include "lib/ldb/include/ldb.h"
-#include "secrets.h"
 
 #ifdef HAVE_KRB5
 
@@ -57,10 +53,6 @@
 
 	struct keytab_container *keytab_container;
 
-	/* This whole process is far more complex than I would
-           like. We have to go through all this to allow us to store
-           the secret internally, instead of using /etc/krb5.keytab */
-
 	/*
 	 * TODO: Actually hook in the replay cache in Heimdal, then
 	 * re-add calls to setup a replay cache here, in our private
@@ -70,11 +62,13 @@
 	packet.length = enc_ticket->length;
 	packet.data = (krb5_pointer)enc_ticket->data;
 
+	/* Grab the keytab, however generated */
 	ret = cli_credentials_get_keytab(machine_account, &keytab_container);
 	if (ret) {
 		return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
 	}
 
+	/* This ensures we lookup the correct entry in that keytab */
 	ret = principal_from_credentials(mem_ctx, machine_account, smb_krb5_context, 
 					 &server);
 	if (ret == 0) {
diff --git a/source4/auth/kerberos/krb5_init_context.c b/source4/auth/kerberos/krb5_init_context.c
index 77f16b35cf..895553ccee 100644
--- a/source4/auth/kerberos/krb5_init_context.c
+++ b/source4/auth/kerberos/krb5_init_context.c
@@ -24,9 +24,6 @@
 #include "includes.h"
 #include "system/kerberos.h"
 #include "auth/kerberos/kerberos.h"
-#include "system/network.h"
-#include "system/select.h"
-#include "system/filesys.h"
 #include "lib/socket/socket.h"
 #include "lib/events/events.h"
 
diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index d6bc88248f..e09c993f3c 100644
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -29,7 +29,6 @@
 #include "lib/cmdline/popt_common.h"
 #include "system/dir.h"
 #include "system/filesys.h"
-#include "system/kerberos.h"
 #include "smb_build.h"
 #include "registry/registry.h"
 #include "ntvfs/ntvfs.h"