|
Ian Kent |
e61a39 |
autofs-5.0.8 - fix undefined authtype_requires_creds err if ldap enabled but without sasl
|
|
Ian Kent |
e61a39 |
|
|
Ian Kent |
e61a39 |
From: Lan Yixun (dlan) <dennis.yxun@gmail.com>
|
|
Ian Kent |
e61a39 |
|
|
Ian Kent |
e61a39 |
This patch is moving "WITH_SASL" into authtype_requires_creds function
|
|
Ian Kent |
e61a39 |
make it return 0 if sasl not enabled, which mean authtype_requires_creds is not enabled
|
|
Ian Kent |
e61a39 |
|
|
Ian Kent |
e61a39 |
https://bugs.gentoo.org/show_bug.cgi?id=489128
|
|
Ian Kent |
e61a39 |
---
|
|
Ian Kent |
e61a39 |
CHANGELOG | 4 ++++
|
|
Ian Kent |
e61a39 |
modules/lookup_ldap.c | 4 ++--
|
|
Ian Kent |
e61a39 |
2 files changed, 6 insertions(+), 2 deletions(-)
|
|
Ian Kent |
e61a39 |
|
|
Ian Kent |
e61a39 |
diff --git a/CHANGELOG b/CHANGELOG
|
|
Ian Kent |
e61a39 |
index 62dac81..a45ca6a 100644
|
|
Ian Kent |
e61a39 |
--- a/CHANGELOG
|
|
Ian Kent |
e61a39 |
+++ b/CHANGELOG
|
|
Ian Kent |
e61a39 |
@@ -1,3 +1,7 @@
|
|
Ian Kent |
e61a39 |
+??/??/20?? autofs-5.0.9
|
|
Ian Kent |
e61a39 |
+=======================
|
|
Ian Kent |
e61a39 |
+- fix undefined authtype_requires_creds err if ldap enabled but without sasl.
|
|
Ian Kent |
e61a39 |
+
|
|
Ian Kent |
e61a39 |
17/10/2013 autofs-5.0.8
|
|
Ian Kent |
e61a39 |
=======================
|
|
Ian Kent |
e61a39 |
- fix nobind sun escaped map entries.
|
|
Ian Kent |
e61a39 |
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
|
|
Ian Kent |
e61a39 |
index 2ab1e8c..04b1da7 100644
|
|
Ian Kent |
e61a39 |
--- a/modules/lookup_ldap.c
|
|
Ian Kent |
e61a39 |
+++ b/modules/lookup_ldap.c
|
|
Ian Kent |
e61a39 |
@@ -846,20 +846,20 @@ int get_property(unsigned logopt, xmlNodePtr node, const char *prop, char **valu
|
|
Ian Kent |
e61a39 |
return 0;
|
|
Ian Kent |
e61a39 |
}
|
|
Ian Kent |
e61a39 |
|
|
Ian Kent |
e61a39 |
-#ifdef WITH_SASL
|
|
Ian Kent |
e61a39 |
/*
|
|
Ian Kent |
e61a39 |
* For plain text, login and digest-md5 authentication types, we need
|
|
Ian Kent |
e61a39 |
* user and password credentials.
|
|
Ian Kent |
e61a39 |
*/
|
|
Ian Kent |
e61a39 |
int authtype_requires_creds(const char *authtype)
|
|
Ian Kent |
e61a39 |
{
|
|
Ian Kent |
e61a39 |
+#ifdef WITH_SASL
|
|
Ian Kent |
e61a39 |
if (!strncmp(authtype, "PLAIN", strlen("PLAIN")) ||
|
|
Ian Kent |
e61a39 |
!strncmp(authtype, "DIGEST-MD5", strlen("DIGEST-MD5")) ||
|
|
Ian Kent |
e61a39 |
!strncmp(authtype, "LOGIN", strlen("LOGIN")))
|
|
Ian Kent |
e61a39 |
return 1;
|
|
Ian Kent |
e61a39 |
+#endif
|
|
Ian Kent |
e61a39 |
return 0;
|
|
Ian Kent |
e61a39 |
}
|
|
Ian Kent |
e61a39 |
-#endif
|
|
Ian Kent |
e61a39 |
|
|
Ian Kent |
e61a39 |
/*
|
|
Ian Kent |
e61a39 |
* Returns:
|