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.
42 lines
1.3 KiB
42 lines
1.3 KiB
Index: lib/server.c |
|
--- lib/server.c.orig 2012-10-12 16:05:48.000000000 +0200 |
|
+++ lib/server.c 2015-01-01 20:27:04.004094718 +0100 |
|
@@ -610,16 +610,8 @@ |
|
return SASL_CONTINUE; |
|
} |
|
|
|
- /* get the path to the config file */ |
|
- getconfpath_cb = _sasl_find_getconfpath_callback( global_callbacks.callbacks ); |
|
- if (getconfpath_cb == NULL) return SASL_BADPARAM; |
|
- |
|
- /* getconfpath_cb->proc MUST be a sasl_getconfpath_t; if only C had a type |
|
- system */ |
|
- result = ((sasl_getconfpath_t *)(getconfpath_cb->proc))(getconfpath_cb->context, |
|
- (char **) &path_to_config); |
|
- if (result != SASL_OK) goto done; |
|
- if (path_to_config == NULL) path_to_config = ""; |
|
+ result = SASL_OK; |
|
+ path_to_config = "@l_sysconfdir@"; |
|
|
|
next = path_to_config; |
|
|
|
Index: saslauthd/lak.c |
|
--- saslauthd/lak.c.orig 2012-10-12 16:05:48.000000000 +0200 |
|
+++ saslauthd/lak.c 2015-01-01 20:27:04.014153399 +0100 |
|
@@ -47,6 +47,7 @@ |
|
#include <crypt.h> |
|
#endif |
|
|
|
+#include "saslauthd.h" /* get strlcpy macro for non-BSD; get HAVE_OPENSSL from config.h */ |
|
#ifdef HAVE_OPENSSL |
|
#ifndef OPENSSL_DISABLE_OLD_DES_SUPPORT |
|
#define OPENSSL_DISABLE_OLD_DES_SUPPORT |
|
@@ -58,7 +59,7 @@ |
|
#define LDAP_DEPRECATED 1 |
|
#include <ldap.h> |
|
#include <lber.h> |
|
-#include <sasl.h> |
|
+#include "sasl.h" |
|
#include "lak.h" |
|
|
|
typedef struct lak_auth_method {
|
|
|