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