diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2006-11-07 06:59:56 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:25:03 -0500 |
| commit | 3c1e780ec7e16dc6667402bbc65708bf9a5c062f (patch) | |
| tree | 2102bb577ea9f00751b8c869b0a5c756fc2ae8e5 /source4/smbd | |
| parent | 8b91594e0936bbaedf5430406fcf8df3ea406c10 (diff) | |
| download | samba-3c1e780ec7e16dc6667402bbc65708bf9a5c062f.tar.gz samba-3c1e780ec7e16dc6667402bbc65708bf9a5c062f.tar.bz2 samba-3c1e780ec7e16dc6667402bbc65708bf9a5c062f.zip | |
r19604: This is a massive commit, and I appologise in advance for it's size.
This merges Samba4 with lorikeet-heimdal, which itself has been
tracking Heimdal CVS for the past couple of weeks.
This is such a big change because Heimdal reorganised it's internal
structures, with the mechglue merge, and because many of our 'wishes' have been granted: we now have DCE_STYLE GSSAPI, send_to_kdc hooks and many other features merged into the mainline code. We have adapted to upstream's choice of API in these cases.
In gensec_gssapi and gensec_krb5, we either expect a valid PAC, or NO
PAC. This matches windows behavour. We also have an option to
require the PAC to be present (which allows us to automate the testing
of this code).
This also includes a restructure of how the kerberos dependencies are
handled, due to the fallout of the merge.
Andrew Bartlett
(This used to be commit 4826f1735197c2a471d771495e6d4c1051b4c471)
Diffstat (limited to 'source4/smbd')
| -rw-r--r-- | source4/smbd/process_single.c | 7 | ||||
| -rw-r--r-- | source4/smbd/process_standard.c | 7 |
2 files changed, 0 insertions, 14 deletions
diff --git a/source4/smbd/process_single.c b/source4/smbd/process_single.c index b8708f9ebe..60e5b1f584 100644 --- a/source4/smbd/process_single.c +++ b/source4/smbd/process_single.c @@ -25,18 +25,11 @@ #include "includes.h" #include "smbd/process_model.h" -/* For sepecifiying event context to GSSAPI below */ -#include "system/kerberos.h" -#include "heimdal/lib/gssapi/gssapi_locl.h" - - /* called when the process model is selected */ static void single_model_init(struct event_context *ev) { - /* Hack to ensure that GSSAPI uses the right event context */ - gssapi_krb5_init_ev(ev); } /* diff --git a/source4/smbd/process_standard.c b/source4/smbd/process_standard.c index 1efdd3d0c4..ec774b92df 100644 --- a/source4/smbd/process_standard.c +++ b/source4/smbd/process_standard.c @@ -28,10 +28,6 @@ #include "lib/socket/socket.h" #include "smbd/process_model.h" -/* For specifiying event context to GSSAPI below */ -#include "system/kerberos.h" -#include "heimdal/lib/gssapi/gssapi_locl.h" - #include "param/secrets.h" #ifdef HAVE_SETPROCTITLE @@ -115,9 +111,6 @@ static void standard_accept_connection(struct event_context *ev, DEBUG(0,("standard_accept_connection: tdb_reopen_all failed.\n")); } - /* Hack to ensure that GSSAPI uses the right event context */ - gssapi_krb5_init_ev(ev2); - /* Ensure that the forked children do not expose identical random streams */ set_need_random_reseed(); |