|
 |
4d476f |
autofs-5.0.8 - fix undefined authtype_requires_creds err if ldap enabled but without sasl
|
|
|
4d476f |
|
|
|
4d476f |
From: Lan Yixun (dlan) <dennis.yxun@gmail.com>
|
|
|
4d476f |
|
|
|
4d476f |
This patch is moving "WITH_SASL" into authtype_requires_creds function
|
|
|
4d476f |
make it return 0 if sasl not enabled, which mean authtype_requires_creds is not enabled
|
|
|
4d476f |
|
|
|
4d476f |
https://bugs.gentoo.org/show_bug.cgi?id=489128
|
|
|
4d476f |
---
|
|
|
4d476f |
CHANGELOG | 1 +
|
|
|
4d476f |
modules/lookup_ldap.c | 4 ++--
|
|
|
4d476f |
2 files changed, 3 insertions(+), 2 deletions(-)
|
|
|
4d476f |
|
|
|
4d476f |
--- autofs-5.0.7.orig/CHANGELOG
|
|
|
4d476f |
+++ autofs-5.0.7/CHANGELOG
|
|
|
4d476f |
@@ -83,6 +83,7 @@
|
|
|
4d476f |
- check for existing offset mount before mounting.
|
|
|
4d476f |
- fix cache readlock not taken on lookup.
|
|
|
4d476f |
- fix compilation of lookup_ldap.c without sasl.
|
|
|
4d476f |
+- fix undefined authtype_requires_creds err if ldap enabled but without sasl.
|
|
|
4d476f |
|
|
|
4d476f |
25/07/2012 autofs-5.0.7
|
|
|
4d476f |
=======================
|
|
|
4d476f |
--- autofs-5.0.7.orig/modules/lookup_ldap.c
|
|
|
4d476f |
+++ autofs-5.0.7/modules/lookup_ldap.c
|
|
|
4d476f |
@@ -813,20 +813,20 @@ int get_property(unsigned logopt, xmlNod
|
|
|
4d476f |
return 0;
|
|
|
4d476f |
}
|
|
|
4d476f |
|
|
|
4d476f |
-#ifdef WITH_SASL
|
|
|
4d476f |
/*
|
|
|
4d476f |
* For plain text, login and digest-md5 authentication types, we need
|
|
|
4d476f |
* user and password credentials.
|
|
|
4d476f |
*/
|
|
|
4d476f |
int authtype_requires_creds(const char *authtype)
|
|
|
4d476f |
{
|
|
|
4d476f |
+#ifdef WITH_SASL
|
|
|
4d476f |
if (!strncmp(authtype, "PLAIN", strlen("PLAIN")) ||
|
|
|
4d476f |
!strncmp(authtype, "DIGEST-MD5", strlen("DIGEST-MD5")) ||
|
|
|
4d476f |
!strncmp(authtype, "LOGIN", strlen("LOGIN")))
|
|
|
4d476f |
return 1;
|
|
|
4d476f |
+#endif
|
|
|
4d476f |
return 0;
|
|
|
4d476f |
}
|
|
|
4d476f |
-#endif
|
|
|
4d476f |
|
|
|
4d476f |
/*
|
|
|
4d476f |
* Returns:
|