summaryrefslogtreecommitdiff
path: root/source4/smbd
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2005-10-27 05:33:49 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:45:19 -0500
commit1244a97dbe900551b978b63cd07afe6cf4a61c60 (patch)
tree296c8362dc8630d074dbf8884fd9205a92b1f959 /source4/smbd
parente5445967bc2c33b17060b465ac218c2427ceb761 (diff)
downloadsamba-1244a97dbe900551b978b63cd07afe6cf4a61c60.tar.gz
samba-1244a97dbe900551b978b63cd07afe6cf4a61c60.tar.bz2
samba-1244a97dbe900551b978b63cd07afe6cf4a61c60.zip
r11317: An ugly hack to setup the global gssapi_krb5_context early, when we
have easy access to the event context. This stops Samba dead-locking against itself when the winbindd client tries to contact the KDC. Andrew Bartlett (This used to be commit 57f811115ed768ea1f170dcd71038398bf2ab6e9)
Diffstat (limited to 'source4/smbd')
-rw-r--r--source4/smbd/server.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index 93399b15f3..41d6329b02 100644
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -29,7 +29,10 @@
#include "lib/cmdline/popt_common.h"
#include "system/dir.h"
#include "system/filesys.h"
+#include "system/kerberos.h"
+/* For sepecifiying event context to GSSAPI below */
+#include "heimdal/lib/gssapi/gssapi_locl.h"
/*
recursively delete a directory tree
@@ -236,6 +239,9 @@ static int binary_smbd_main(int argc, const char *argv[])
return 1;
}
+ /* Hack to ensure that GSSAPI uses the right event context */
+ gssapi_krb5_init_ev(event_ctx);
+
/* wait for events - this is where smbd sits for most of its
life */
event_loop_wait(event_ctx);