svn commit: samba r12594 - in branches/SAMBA_4_0/source: auth/kerberos smbd

[abartlet at samba.org]

Author: abartlet
Date: 2005-12-30 03:57:11 +0000 (Fri, 30 Dec 2005)
New Revision: 12594

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12594

Log:
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

Modified:
   branches/SAMBA_4_0/source/auth/kerberos/gssapi_parse.c
   branches/SAMBA_4_0/source/auth/kerberos/kerberos.c
   branches/SAMBA_4_0/source/auth/kerberos/kerberos_pac.c
   branches/SAMBA_4_0/source/auth/kerberos/kerberos_util.c
   branches/SAMBA_4_0/source/auth/kerberos/kerberos_verify.c
   branches/SAMBA_4_0/source/auth/kerberos/krb5_init_context.c
   branches/SAMBA_4_0/source/smbd/server.c


Changeset:
Modified: branches/SAMBA_4_0/source/auth/kerberos/gssapi_parse.c
===================================================================
--- branches/SAMBA_4_0/source/auth/kerberos/gssapi_parse.c	2005-12-29 23:47:58 UTC (rev 12593)
+++ branches/SAMBA_4_0/source/auth/kerberos/gssapi_parse.c	2005-12-30 03:57:11 UTC (rev 12594)
@@ -24,7 +24,6 @@
 
 #include "includes.h"
 #include "asn_1.h"
-#include "system/kerberos.h"
 #include "auth/gensec/gensec.h"
 
 /*

Modified: branches/SAMBA_4_0/source/auth/kerberos/kerberos.c
===================================================================
--- branches/SAMBA_4_0/source/auth/kerberos/kerberos.c	2005-12-29 23:47:58 UTC (rev 12593)
+++ branches/SAMBA_4_0/source/auth/kerberos/kerberos.c	2005-12-30 03:57:11 UTC (rev 12594)
@@ -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
 

Modified: branches/SAMBA_4_0/source/auth/kerberos/kerberos_pac.c
===================================================================
--- branches/SAMBA_4_0/source/auth/kerberos/kerberos_pac.c	2005-12-29 23:47:58 UTC (rev 12593)
+++ branches/SAMBA_4_0/source/auth/kerberos/kerberos_pac.c	2005-12-30 03:57:11 UTC (rev 12594)
@@ -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"

Modified: branches/SAMBA_4_0/source/auth/kerberos/kerberos_util.c
===================================================================
--- branches/SAMBA_4_0/source/auth/kerberos/kerberos_util.c	2005-12-29 23:47:58 UTC (rev 12593)
+++ branches/SAMBA_4_0/source/auth/kerberos/kerberos_util.c	2005-12-30 03:57:11 UTC (rev 12594)
@@ -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"
 

Modified: branches/SAMBA_4_0/source/auth/kerberos/kerberos_verify.c
===================================================================
--- branches/SAMBA_4_0/source/auth/kerberos/kerberos_verify.c	2005-12-29 23:47:58 UTC (rev 12593)
+++ branches/SAMBA_4_0/source/auth/kerberos/kerberos_verify.c	2005-12-30 03:57:11 UTC (rev 12594)
@@ -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) {

Modified: branches/SAMBA_4_0/source/auth/kerberos/krb5_init_context.c
===================================================================
--- branches/SAMBA_4_0/source/auth/kerberos/krb5_init_context.c	2005-12-29 23:47:58 UTC (rev 12593)
+++ branches/SAMBA_4_0/source/auth/kerberos/krb5_init_context.c	2005-12-30 03:57:11 UTC (rev 12594)
@@ -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"
 

Modified: branches/SAMBA_4_0/source/smbd/server.c
===================================================================
--- branches/SAMBA_4_0/source/smbd/server.c	2005-12-29 23:47:58 UTC (rev 12593)
+++ branches/SAMBA_4_0/source/smbd/server.c	2005-12-30 03:57:11 UTC (rev 12594)
@@ -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"