autofs-5.0.5 - fix add simple bind auth
From: Ian Kent <raven@themaw.net>
Simple authentication should not require SASL.
---
CHANGELOG | 1 +
include/lookup_ldap.h | 5 +++++
modules/cyrus-sasl.c | 1 -
modules/lookup_ldap.c | 1 -
4 files changed, 6 insertions(+), 2 deletions(-)
--- autofs-5.0.5.orig/CHANGELOG
+++ autofs-5.0.5/CHANGELOG
@@ -52,6 +52,7 @@
- always read file maps mount lookup map read fix.
- fix direct map not updating on reread.
- add external bind method.
+- fix add simple bind auth.
03/09/2009 autofs-5.0.5
-----------------------
--- autofs-5.0.5.orig/include/lookup_ldap.h
+++ autofs-5.0.5/include/lookup_ldap.h
@@ -1,6 +1,8 @@
#ifndef LOOKUP_LDAP_H
#define LOOKUP_LDAP_H
+#include <ldap.h>
+
#ifdef WITH_SASL
#include <openssl/ssl.h>
#include <openssl/evp.h>
@@ -102,6 +104,8 @@ struct lookup_context {
#define LDAP_AUTH_NOTREQUIRED 0x0001
#define LDAP_AUTH_REQUIRED 0x0002
#define LDAP_AUTH_AUTODETECT 0x0004
+#endif
+
#define LDAP_AUTH_USESIMPLE 0x0008
/* lookup_ldap.c */
@@ -109,6 +113,7 @@ LDAP *init_ldap_connection(unsigned logo
int unbind_ldap_connection(unsigned logopt, LDAP *ldap, struct lookup_context *ctxt);
int authtype_requires_creds(const char *authtype);
+#ifdef WITH_SASL
/* cyrus-sasl.c */
int autofs_sasl_client_init(unsigned logopt);
int autofs_sasl_init(unsigned logopt, LDAP *ldap, struct lookup_context *ctxt);
--- autofs-5.0.5.orig/modules/cyrus-sasl.c
+++ autofs-5.0.5/modules/cyrus-sasl.c
@@ -51,7 +51,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ldap.h>
#include <sasl/sasl.h>
#include "automount.h"
--- autofs-5.0.5.orig/modules/lookup_ldap.c
+++ autofs-5.0.5/modules/lookup_ldap.c
@@ -28,7 +28,6 @@
#include <arpa/nameser.h>
#include <resolv.h>
#include <lber.h>
-#include <ldap.h>
#define MODULE_LOOKUP
#include "automount.h"