Build without krb4 if it's unavailable.

[moira.git] / incremental / winad / setpw.c

diff --git a/incremental/winad/setpw.c b/incremental/winad/setpw.c
index 4ea37971d22fea71eebe6d574b63af0fc8b7d0a5..3a53f51205235a72c536e0823a1d5d8bb2161064 100644 (file)
--- a/incremental/winad/setpw.c
+++ b/incremental/winad/setpw.c
@@ -45,14 +45,18 @@ Abstract:
 
 
 #define NEED_SOCKETS
+#ifndef _WIN32
+#include "port-sockets.h"
+#endif
 #include <krb5.h>
+#ifdef HAVE_KRB4
 #include <krb.h>
+#endif
 #include <ldap.h>
 #ifdef _WIN32
 #include <wshelper.h>
 #include "krb5_err.h"
 #else
-#include "port-sockets.h"
 #include <sys/socket.h>
 #include <netdb.h>
 #include <sys/select.h>
@@ -696,7 +700,7 @@ int ad_connect(LDAP **ldap_handle, char *ldap_domain, char *dn_path,
   static char temp[128];
   ULONG       version = LDAP_VERSION3;
   ULONG       rc;
-  int         Max_wait_time = 500;
+  int         Max_wait_time = 1000;
   int         Max_size_limit = LDAP_NO_LIMIT;
 
   if (strlen(ldap_domain) == 0)
@@ -762,7 +766,7 @@ int ad_connect(LDAP **ldap_handle, char *ldap_domain, char *dn_path,
           rc = ldap_set_option((*ldap_handle), LDAP_OPT_SIZELIMIT, 
                                (void *)&Max_size_limit);
           rc = ldap_set_option((*ldap_handle), LDAP_OPT_REFERRALS, LDAP_OPT_OFF);
-          rc = ldap_adgssapi_bind((*ldap_handle), dn_path, GSSSASL_PRIVACY_PROTECTION);
+          rc = ldap_adgssapi_bind((*ldap_handle), dn_path, 0);
           if (rc == LDAP_SUCCESS)
             {
               if (connect_to_kdc)