|
|
|
|
Index: lib/server.c
|
|
|
|
|
--- lib/server.c.orig 2004-07-06 15:42:23 +0200
|
|
|
|
|
+++ lib/server.c 2004-07-14 19:38:16 +0200
|
|
|
|
|
@@ -470,16 +470,8 @@
|
|
|
|
|
return SASL_CONTINUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- /* get the path to the plugins; for now the config file will reside there */
|
|
|
|
|
- getpath_cb=_sasl_find_getpath_callback( global_callbacks.callbacks );
|
|
|
|
|
- if (getpath_cb==NULL) return SASL_BADPARAM;
|
|
|
|
|
-
|
|
|
|
|
- /* getpath_cb->proc MUST be a sasl_getpath_t; if only c had a type
|
|
|
|
|
- system */
|
|
|
|
|
- result = ((sasl_getpath_t *)(getpath_cb->proc))(getpath_cb->context,
|
|
|
|
|
- &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@";
|
|
|
|
|
|
|
|
|
|
c = strchr(path_to_config, PATHS_DELIMITER);
|
|
|
|
|
|
|
|
|
|
Index: saslauthd/lak.c
|
|
|
|
|
--- saslauthd/lak.c.orig 2003-10-30 18:21:47.000000000 +0100
|
|
|
|
|
+++ saslauthd/lak.c 2004-02-08 11:56:59.000000000 +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
|
|
|
|
|
@@ -57,7 +58,7 @@
|
|
|
|
|
|
|
|
|
|
#include <ldap.h>
|
|
|
|
|
#include <lber.h>
|
|
|
|
|
-#include <sasl.h>
|
|
|
|
|
+#include "sasl.h"
|
|
|
|
|
#include "lak.h"
|
|
|
|
|
|
|
|
|
|
typedef struct lak_auth_method {
|
