diff options
author | Andrew Bartlett <abartlet@samba.org> | 2005-12-30 03:57:11 +0000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2005-12-30 03:57:11 +0000 |
commit | f7f2971f176cf1f06640765749e2fab1c885a4c9 (patch) | |
tree | ceea4f1f541c36ab80e2a7d77a3e133b3cb51882 /source | |
parent | af9132bfa1eb60faabbe7b41b5d3feafbde74505 (diff) | |
download | samba-f7f2971f176cf1f06640765749e2fab1c885a4c9.tar.gz samba-f7f2971f176cf1f06640765749e2fab1c885a4c9.tar.xz samba-f7f2971f176cf1f06640765749e2fab1c885a4c9.zip |
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
Diffstat (limited to 'source')
-rw-r--r-- | source/auth/kerberos/gssapi_parse.c | 1 | ||||
-rw-r--r-- | source/auth/kerberos/kerberos.c | 5 | ||||
-rw-r--r-- | source/auth/kerberos/kerberos_pac.c | 3 | ||||
-rw-r--r-- | source/auth/kerberos/kerberos_util.c | 2 | ||||
-rw-r--r-- | source/auth/kerberos/kerberos_verify.c | 10 | ||||
-rw-r--r-- | source/auth/kerberos/krb5_init_context.c | 3 | ||||
-rw-r--r-- | source/smbd/server.c | 1 |
7 files changed, 2 insertions, 23 deletions
diff --git a/source/auth/kerberos/gssapi_parse.c b/source/auth/kerberos/gssapi_parse.c index 524eedc4488..a48179cc1a2 100644 --- a/source/auth/kerberos/gssapi_parse.c +++ b/source/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/source/auth/kerberos/kerberos.c b/source/auth/kerberos/kerberos.c index 71d9859df62..5e2b6ce019d 100644 --- a/source/auth/kerberos/kerberos.c +++ b/source/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/source/auth/kerberos/kerberos_pac.c b/source/auth/kerberos/kerberos_pac.c index 55805f0c4a5..743d3428e49 100644 --- a/source/auth/kerberos/kerberos_pac.c +++ b/source/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/source/auth/kerberos/kerberos_util.c b/source/auth/kerberos/kerberos_util.c index d3edd1b26c9..ad0e18b2e74 100644 --- a/source/auth/kerberos/kerberos_util.c +++ b/source/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/source/auth/kerberos/kerberos_verify.c b/source/auth/kerberos/kerberos_verify.c index 020b63478ec..29d704b148b 100644 --- a/source/auth/kerberos/kerberos_verify.c +++ b/source/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/source/auth/kerberos/krb5_init_context.c b/source/auth/kerberos/krb5_init_context.c index 77f16b35cf6..895553cceeb 100644 --- a/source/auth/kerberos/krb5_init_context.c +++ b/source/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/source/smbd/server.c b/source/smbd/server.c index d6bc88248f6..e09c993f3c8 100644 --- a/source/smbd/server.c +++ b/source/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" |