Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 1 | autofs: fails to compile with openldap disabled |
| 2 | |
| 3 | As of 5.0.6, it appears that changes were introduced so that |
| 4 | if you compile with openldap disabled and openldap headers are not |
| 5 | available, then autofs fails to build. |
| 6 | |
| 7 | Upstream-Status: Pending |
| 8 | |
| 9 | Signed-off-by: Amy Fong <amy.fong@windriver.com> |
| 10 | -- |
| 11 | lookup_ldap.h | 4 ++++ |
| 12 | 1 file changed, 4 insertions(+) |
| 13 | |
| 14 | --- |
| 15 | include/lookup_ldap.h | 4 ++++ |
| 16 | 1 file changed, 4 insertions(+) |
| 17 | |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 18 | Index: autofs-5.1.2/include/lookup_ldap.h |
| 19 | =================================================================== |
| 20 | --- autofs-5.1.2.orig/include/lookup_ldap.h |
| 21 | +++ autofs-5.1.2/include/lookup_ldap.h |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 22 | @@ -1,7 +1,9 @@ |
| 23 | #ifndef LOOKUP_LDAP_H |
| 24 | #define LOOKUP_LDAP_H |
| 25 | |
| 26 | +#ifdef WITH_LDAP |
| 27 | #include <ldap.h> |
| 28 | +#endif |
| 29 | |
| 30 | #ifdef WITH_SASL |
| 31 | #include <openssl/ssl.h> |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 32 | @@ -117,10 +119,12 @@ struct lookup_context { |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 33 | |
| 34 | #define LDAP_AUTH_USESIMPLE 0x0008 |
| 35 | |
| 36 | +#ifdef WITH_LDAP |
| 37 | /* lookup_ldap.c */ |
| 38 | LDAP *init_ldap_connection(unsigned logopt, const char *uri, struct lookup_context *ctxt); |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 39 | int unbind_ldap_connection(unsigned logopt, struct ldap_conn *conn, struct lookup_context *ctxt); |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 40 | int authtype_requires_creds(const char *authtype); |
| 41 | +#endif |
| 42 | |
| 43 | #ifdef WITH_SASL |
| 44 | /* cyrus-sasl.c */ |