ec6c3d3ee3
- patch-sshd.c unconditionally includes <gssapi.h>. Include "ssh-gss.h" instead. [1] PR: 104481 [1] Submitted by: Mark Andrews <Mark_Andrews___isc.org> [1]
46 lines
1,004 B
C
46 lines
1,004 B
C
--- sshd.c.patch Sun Sep 17 01:04:46 2006
|
|
+++ sshd.c Sat Sep 30 10:38:05 2006
|
|
@@ -80,6 +81,13 @@
|
|
#include <prot.h>
|
|
#endif
|
|
|
|
+#ifdef __FreeBSD__
|
|
+#include <resolv.h>
|
|
+#ifdef GSSAPI
|
|
+#include "ssh-gss.h"
|
|
+#endif
|
|
+#endif
|
|
+
|
|
#include "xmalloc.h"
|
|
#include "ssh.h"
|
|
#include "ssh1.h"
|
|
@@ -1697,6 +1705,29 @@
|
|
signal(SIGQUIT, SIG_DFL);
|
|
signal(SIGCHLD, SIG_DFL);
|
|
signal(SIGINT, SIG_DFL);
|
|
+
|
|
+#ifdef __FreeBSD__
|
|
+ /*
|
|
+ * Initialize the resolver. This may not happen automatically
|
|
+ * before privsep chroot().
|
|
+ */
|
|
+ if ((_res.options & RES_INIT) == 0) {
|
|
+ debug("res_init()");
|
|
+ res_init();
|
|
+ }
|
|
+#ifdef GSSAPI
|
|
+ /*
|
|
+ * Force GSS-API to parse its configuration and load any
|
|
+ * mechanism plugins.
|
|
+ */
|
|
+ {
|
|
+ gss_OID_set mechs;
|
|
+ OM_uint32 minor_status;
|
|
+ gss_indicate_mechs(&minor_status, &mechs);
|
|
+ gss_release_oid_set(&minor_status, &mechs);
|
|
+ }
|
|
+#endif
|
|
+#endif
|
|
|
|
/*
|
|
* Register our connection. This turns encryption off because we do
|