dovecot/original-hg/dovecot-1.2: src/auth/db-ldap.c annotate

annotate src/auth/db-ldap.c @ 7191:1cbaa724aba8 HEAD

Added support for OpenLDAP-specific TLS settings.

author	Timo Sirainen <tss@iki.fi>
date	Fri, 25 Jan 2008 14:25:11 +0200
parents	7ed926ed7aa4
children	5b654defd376

rev	line source
7086 7ed926ed7aa4 Updated copyright notices to include year 2008. Timo Sirainen <tss@iki.fi> parents: 7079 diff changeset	1 /* Copyright (c) 2003-2008 Dovecot authors, see the included COPYING file */
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	2
3474 9096b7957413 Removed direct config.h including. I'm not sure why it was done before, Timo Sirainen <tss@iki.fi> parents: 3306 diff changeset	3 #include "common.h"
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	4
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	5 #if defined(PASSDB_LDAP) \|\| defined(USERDB_LDAP)
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	6
1075 f1401fa7ab03 auth process fixes, LDAP seems to be working (with the kludge define or Timo Sirainen <tss@iki.fi> parents: 1062 diff changeset	7 #include "network.h"
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	8 #include "ioloop.h"
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	9 #include "array.h"
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	10 #include "hash.h"
7079 d45c3058b91a Renamed queue to aqueue ("array queue") because struct queue already exists Timo Sirainen <tss@iki.fi> parents: 7062 diff changeset	11 #include "aqueue.h"
1189 2cb8e2136283 Escape special chars in username if needed. Timo Sirainen <tss@iki.fi> parents: 1182 diff changeset	12 #include "str.h"
5884 1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	13 #include "var-expand.h"
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	14 #include "settings.h"
3502 5e78500f1aee user_global_uid and user_global_gid settings weren't working. Also changed Timo Sirainen <tss@iki.fi> parents: 3474 diff changeset	15 #include "userdb.h"
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	16 #include "db-ldap.h"
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	17
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	18 #include <stddef.h>
1610 6850142c4e25 New configuration file code. Some syntax changes, but tries to be somewhat Timo Sirainen <tss@iki.fi> parents: 1330 diff changeset	19 #include <stdlib.h>
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	20
4426 b8089cf41c96 Check for sasl.h and sasl/sasl.h existence and use the one that's found. If Timo Sirainen <tss@iki.fi> parents: 4415 diff changeset	21 #define HAVE_LDAP_SASL
4427 ffafc8583e06 Prefer sasl/sasl.h. Require SASL v2, otherwise disable it. Timo Sirainen <tss@iki.fi> parents: 4426 diff changeset	22 #ifdef HAVE_SASL_SASL_H
ffafc8583e06 Prefer sasl/sasl.h. Require SASL v2, otherwise disable it. Timo Sirainen <tss@iki.fi> parents: 4426 diff changeset	23 # include <sasl/sasl.h>
ffafc8583e06 Prefer sasl/sasl.h. Require SASL v2, otherwise disable it. Timo Sirainen <tss@iki.fi> parents: 4426 diff changeset	24 #elif defined (HAVE_SASL_H)
4426 b8089cf41c96 Check for sasl.h and sasl/sasl.h existence and use the one that's found. If Timo Sirainen <tss@iki.fi> parents: 4415 diff changeset	25 # include <sasl.h>
b8089cf41c96 Check for sasl.h and sasl/sasl.h existence and use the one that's found. If Timo Sirainen <tss@iki.fi> parents: 4415 diff changeset	26 #else
b8089cf41c96 Check for sasl.h and sasl/sasl.h existence and use the one that's found. If Timo Sirainen <tss@iki.fi> parents: 4415 diff changeset	27 # undef HAVE_LDAP_SASL
b8089cf41c96 Check for sasl.h and sasl/sasl.h existence and use the one that's found. If Timo Sirainen <tss@iki.fi> parents: 4415 diff changeset	28 #endif
7191 1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	29 #ifdef LDAP_OPT_X_TLS
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	30 # define OPENLDAP_TLS_OPTIONS
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	31 #endif
4427 ffafc8583e06 Prefer sasl/sasl.h. Require SASL v2, otherwise disable it. Timo Sirainen <tss@iki.fi> parents: 4426 diff changeset	32 #if SASL_VERSION_MAJOR < 2
ffafc8583e06 Prefer sasl/sasl.h. Require SASL v2, otherwise disable it. Timo Sirainen <tss@iki.fi> parents: 4426 diff changeset	33 # undef HAVE_LDAP_SASL
ffafc8583e06 Prefer sasl/sasl.h. Require SASL v2, otherwise disable it. Timo Sirainen <tss@iki.fi> parents: 4426 diff changeset	34 #endif
4426 b8089cf41c96 Check for sasl.h and sasl/sasl.h existence and use the one that's found. If Timo Sirainen <tss@iki.fi> parents: 4415 diff changeset	35
4806 63ed4f00f6e1 Solaris LDAP compiling fix. Timo Sirainen <tss@iki.fi> parents: 4772 diff changeset	36 #ifndef LDAP_SASL_QUIET
63ed4f00f6e1 Solaris LDAP compiling fix. Timo Sirainen <tss@iki.fi> parents: 4772 diff changeset	37 # define LDAP_SASL_QUIET 0 /* Doesn't exist in Solaris LDAP */
63ed4f00f6e1 Solaris LDAP compiling fix. Timo Sirainen <tss@iki.fi> parents: 4772 diff changeset	38 #endif
63ed4f00f6e1 Solaris LDAP compiling fix. Timo Sirainen <tss@iki.fi> parents: 4772 diff changeset	39
1181 ac7dbb236b59 Rather than block for two seconds, we can just call ldap_result() again if Timo Sirainen <tss@iki.fi> parents: 1143 diff changeset	40 /* Older versions may require calling ldap_result() twice */
ac7dbb236b59 Rather than block for two seconds, we can just call ldap_result() again if Timo Sirainen <tss@iki.fi> parents: 1143 diff changeset	41 #if LDAP_VENDOR_VERSION <= 20112
1086 067130d609b7 Define OPENLDAP_ASYNC_WORKAROUND Timo Sirainen <tss@iki.fi> parents: 1075 diff changeset	42 # define OPENLDAP_ASYNC_WORKAROUND
067130d609b7 Define OPENLDAP_ASYNC_WORKAROUND Timo Sirainen <tss@iki.fi> parents: 1075 diff changeset	43 #endif
067130d609b7 Define OPENLDAP_ASYNC_WORKAROUND Timo Sirainen <tss@iki.fi> parents: 1075 diff changeset	44
2325 7613e0f68513 Fixed to compile with Solaris LDAP library Timo Sirainen <tss@iki.fi> parents: 1910 diff changeset	45 /* Solaris LDAP library doesn't have LDAP_OPT_SUCCESS */
7613e0f68513 Fixed to compile with Solaris LDAP library Timo Sirainen <tss@iki.fi> parents: 1910 diff changeset	46 #ifndef LDAP_OPT_SUCCESS
7613e0f68513 Fixed to compile with Solaris LDAP library Timo Sirainen <tss@iki.fi> parents: 1910 diff changeset	47 # define LDAP_OPT_SUCCESS LDAP_SUCCESS
7613e0f68513 Fixed to compile with Solaris LDAP library Timo Sirainen <tss@iki.fi> parents: 1910 diff changeset	48 #endif
7613e0f68513 Fixed to compile with Solaris LDAP library Timo Sirainen <tss@iki.fi> parents: 1910 diff changeset	49
5884 1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	50 struct db_ldap_result_iterate_context {
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	51 struct ldap_connection *conn;
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	52 LDAPMessage *entry;
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	53 struct auth_request *auth_request;
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	54
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	55 struct hash_table *attr_map;
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	56 struct var_expand_table *var_table;
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	57
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	58 char attr, *vals;
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	59 const char name, value, template, val_1_arr[2];
6149 a744ae38a9e1 Having =key=value in pass_attrs or user_attrs allows returning static Timo Sirainen <tss@iki.fi> parents: 6148 diff changeset	60 const char const static_attrs;
5884 1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	61 BerElement *ber;
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	62
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	63 string_t var, debug;
6144 d779b7220e23 LDAP crashfixes. Based on patch by Katsu Yamamoto. Timo Sirainen <tss@iki.fi> parents: 5884 diff changeset	64 unsigned int value_idx;
5884 1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	65 };
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	66
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	67 struct db_ldap_sasl_bind_context {
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	68 const char *authcid;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	69 const char *passwd;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	70 const char *realm;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	71 const char *authzid;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	72 };
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	73
5474 331337b735c9 Added type checks to setting defines. Timo Sirainen <tss@iki.fi> parents: 5040 diff changeset	74 #define DEF_STR(name) DEF_STRUCT_STR(name, ldap_settings)
331337b735c9 Added type checks to setting defines. Timo Sirainen <tss@iki.fi> parents: 5040 diff changeset	75 #define DEF_INT(name) DEF_STRUCT_INT(name, ldap_settings)
331337b735c9 Added type checks to setting defines. Timo Sirainen <tss@iki.fi> parents: 5040 diff changeset	76 #define DEF_BOOL(name) DEF_STRUCT_BOOL(name, ldap_settings)
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	77
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	78 static struct setting_def setting_defs[] = {
5474 331337b735c9 Added type checks to setting defines. Timo Sirainen <tss@iki.fi> parents: 5040 diff changeset	79 DEF_STR(hosts),
331337b735c9 Added type checks to setting defines. Timo Sirainen <tss@iki.fi> parents: 5040 diff changeset	80 DEF_STR(uris),
331337b735c9 Added type checks to setting defines. Timo Sirainen <tss@iki.fi> parents: 5040 diff changeset	81 DEF_STR(dn),
331337b735c9 Added type checks to setting defines. Timo Sirainen <tss@iki.fi> parents: 5040 diff changeset	82 DEF_STR(dnpass),
331337b735c9 Added type checks to setting defines. Timo Sirainen <tss@iki.fi> parents: 5040 diff changeset	83 DEF_BOOL(auth_bind),
331337b735c9 Added type checks to setting defines. Timo Sirainen <tss@iki.fi> parents: 5040 diff changeset	84 DEF_STR(auth_bind_userdn),
331337b735c9 Added type checks to setting defines. Timo Sirainen <tss@iki.fi> parents: 5040 diff changeset	85 DEF_BOOL(tls),
331337b735c9 Added type checks to setting defines. Timo Sirainen <tss@iki.fi> parents: 5040 diff changeset	86 DEF_BOOL(sasl_bind),
331337b735c9 Added type checks to setting defines. Timo Sirainen <tss@iki.fi> parents: 5040 diff changeset	87 DEF_STR(sasl_mech),
331337b735c9 Added type checks to setting defines. Timo Sirainen <tss@iki.fi> parents: 5040 diff changeset	88 DEF_STR(sasl_realm),
331337b735c9 Added type checks to setting defines. Timo Sirainen <tss@iki.fi> parents: 5040 diff changeset	89 DEF_STR(sasl_authz_id),
7191 1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	90 DEF_STR(tls_ca_cert_file),
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	91 DEF_STR(tls_ca_cert_dir),
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	92 DEF_STR(tls_cert_file),
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	93 DEF_STR(tls_key_file),
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	94 DEF_STR(tls_cipher_suite),
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	95 DEF_STR(tls_require_cert),
5474 331337b735c9 Added type checks to setting defines. Timo Sirainen <tss@iki.fi> parents: 5040 diff changeset	96 DEF_STR(deref),
331337b735c9 Added type checks to setting defines. Timo Sirainen <tss@iki.fi> parents: 5040 diff changeset	97 DEF_STR(scope),
331337b735c9 Added type checks to setting defines. Timo Sirainen <tss@iki.fi> parents: 5040 diff changeset	98 DEF_STR(base),
331337b735c9 Added type checks to setting defines. Timo Sirainen <tss@iki.fi> parents: 5040 diff changeset	99 DEF_INT(ldap_version),
331337b735c9 Added type checks to setting defines. Timo Sirainen <tss@iki.fi> parents: 5040 diff changeset	100 DEF_STR(user_attrs),
331337b735c9 Added type checks to setting defines. Timo Sirainen <tss@iki.fi> parents: 5040 diff changeset	101 DEF_STR(user_filter),
331337b735c9 Added type checks to setting defines. Timo Sirainen <tss@iki.fi> parents: 5040 diff changeset	102 DEF_STR(pass_attrs),
331337b735c9 Added type checks to setting defines. Timo Sirainen <tss@iki.fi> parents: 5040 diff changeset	103 DEF_STR(pass_filter),
331337b735c9 Added type checks to setting defines. Timo Sirainen <tss@iki.fi> parents: 5040 diff changeset	104 DEF_STR(default_pass_scheme),
3913 af15aab60ff1 Settings' default listing wasn't ended properly, which could have caused Timo Sirainen <tss@iki.fi> parents: 3908 diff changeset	105
af15aab60ff1 Settings' default listing wasn't ended properly, which could have caused Timo Sirainen <tss@iki.fi> parents: 3908 diff changeset	106 { 0, NULL, 0 }
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	107 };
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	108
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	109 struct ldap_settings default_ldap_settings = {
1910 b9005f93be70 Patch by Quentin Garnier: Timo Sirainen <tss@iki.fi> parents: 1897 diff changeset	110 MEMBER(hosts) NULL,
b9005f93be70 Patch by Quentin Garnier: Timo Sirainen <tss@iki.fi> parents: 1897 diff changeset	111 MEMBER(uris) NULL,
1075 f1401fa7ab03 auth process fixes, LDAP seems to be working (with the kludge define or Timo Sirainen <tss@iki.fi> parents: 1062 diff changeset	112 MEMBER(dn) NULL,
f1401fa7ab03 auth process fixes, LDAP seems to be working (with the kludge define or Timo Sirainen <tss@iki.fi> parents: 1062 diff changeset	113 MEMBER(dnpass) NULL,
3771 4b6d962485b9 Added authentication bind support. Patch by J.M. Maurer. Timo Sirainen <tss@iki.fi> parents: 3731 diff changeset	114 MEMBER(auth_bind) FALSE,
3840 935f12d0d2fe Added fast authbinding and auth_bind_userdn setting. Patch by Geff Timo Sirainen <tss@iki.fi> parents: 3771 diff changeset	115 MEMBER(auth_bind_userdn) NULL,
4415 b91816cd1d16 Added TLS support for LDAP if the library supports it. Timo Sirainen <tss@iki.fi> parents: 4405 diff changeset	116 MEMBER(tls) FALSE,
4319 31a28cd0b020 Added support for SASL binding. Patch by Geert Jansen Timo Sirainen <tss@iki.fi> parents: 4295 diff changeset	117 MEMBER(sasl_bind) FALSE,
31a28cd0b020 Added support for SASL binding. Patch by Geert Jansen Timo Sirainen <tss@iki.fi> parents: 4295 diff changeset	118 MEMBER(sasl_mech) NULL,
31a28cd0b020 Added support for SASL binding. Patch by Geert Jansen Timo Sirainen <tss@iki.fi> parents: 4295 diff changeset	119 MEMBER(sasl_realm) NULL,
31a28cd0b020 Added support for SASL binding. Patch by Geert Jansen Timo Sirainen <tss@iki.fi> parents: 4295 diff changeset	120 MEMBER(sasl_authz_id) NULL,
7191 1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	121 MEMBER(tls_ca_cert_file) NULL,
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	122 MEMBER(tls_ca_cert_dir) NULL,
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	123 MEMBER(tls_cert_file) NULL,
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	124 MEMBER(tls_key_file) NULL,
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	125 MEMBER(tls_cipher_suite) NULL,
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	126 MEMBER(tls_require_cert) NULL,
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	127 MEMBER(deref) "never",
1135 81930fff13cf passdb ldap added. fixes to userdb ldap. Timo Sirainen <tss@iki.fi> parents: 1086 diff changeset	128 MEMBER(scope) "subtree",
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	129 MEMBER(base) NULL,
1282 e8894f2c776f Added ldap_version setting. Timo Sirainen <tss@iki.fi> parents: 1265 diff changeset	130 MEMBER(ldap_version) 2,
6147 45a12a1bd299 Changed default pass_attrs and user_attrs to use the new format. Timo Sirainen <tss@iki.fi> parents: 6144 diff changeset	131 MEMBER(user_attrs) "homeDirectory=home,uidNumber=uid,gidNumber=gid",
3094 d78e9a31b6d8 Move default filters/attrs to setting defaults rather than check it from Timo Sirainen <tss@iki.fi> parents: 2994 diff changeset	132 MEMBER(user_filter) "(&(objectClass=posixAccount)(uid=%u))",
6147 45a12a1bd299 Changed default pass_attrs and user_attrs to use the new format. Timo Sirainen <tss@iki.fi> parents: 6144 diff changeset	133 MEMBER(pass_attrs) "uid=user,userPassword=password",
3094 d78e9a31b6d8 Move default filters/attrs to setting defaults rather than check it from Timo Sirainen <tss@iki.fi> parents: 2994 diff changeset	134 MEMBER(pass_filter) "(&(objectClass=posixAccount)(uid=%u))",
5872 93bd157917ca Changed userdb callback API. Don't require uid/gid to be returned by userdb. Timo Sirainen <tss@iki.fi> parents: 5554 diff changeset	135 MEMBER(default_pass_scheme) "crypt"
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	136 };
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	137
1143 50f10a7a3bad Use the same LDAP connection for both userdb and passdb if config_path is Timo Sirainen <tss@iki.fi> parents: 1141 diff changeset	138 static struct ldap_connection *ldap_connections = NULL;
50f10a7a3bad Use the same LDAP connection for both userdb and passdb if config_path is Timo Sirainen <tss@iki.fi> parents: 1141 diff changeset	139
4741 deccf9e1aebc LDAP code changes: If auth binds are used, bind back to the default dn Timo Sirainen <tss@iki.fi> parents: 4624 diff changeset	140 static int db_ldap_bind(struct ldap_connection *conn);
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	141 static void db_ldap_conn_close(struct ldap_connection *conn);
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	142
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	143 static int deref2str(const char *str)
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	144 {
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	145 if (strcasecmp(str, "never") == 0)
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	146 return LDAP_DEREF_NEVER;
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	147 if (strcasecmp(str, "searching") == 0)
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	148 return LDAP_DEREF_SEARCHING;
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	149 if (strcasecmp(str, "finding") == 0)
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	150 return LDAP_DEREF_FINDING;
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	151 if (strcasecmp(str, "always") == 0)
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	152 return LDAP_DEREF_ALWAYS;
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	153
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	154 i_fatal("LDAP: Unknown deref option '%s'", str);
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	155 }
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	156
1135 81930fff13cf passdb ldap added. fixes to userdb ldap. Timo Sirainen <tss@iki.fi> parents: 1086 diff changeset	157 static int scope2str(const char *str)
81930fff13cf passdb ldap added. fixes to userdb ldap. Timo Sirainen <tss@iki.fi> parents: 1086 diff changeset	158 {
81930fff13cf passdb ldap added. fixes to userdb ldap. Timo Sirainen <tss@iki.fi> parents: 1086 diff changeset	159 if (strcasecmp(str, "base") == 0)
81930fff13cf passdb ldap added. fixes to userdb ldap. Timo Sirainen <tss@iki.fi> parents: 1086 diff changeset	160 return LDAP_SCOPE_BASE;
81930fff13cf passdb ldap added. fixes to userdb ldap. Timo Sirainen <tss@iki.fi> parents: 1086 diff changeset	161 if (strcasecmp(str, "onelevel") == 0)
81930fff13cf passdb ldap added. fixes to userdb ldap. Timo Sirainen <tss@iki.fi> parents: 1086 diff changeset	162 return LDAP_SCOPE_ONELEVEL;
81930fff13cf passdb ldap added. fixes to userdb ldap. Timo Sirainen <tss@iki.fi> parents: 1086 diff changeset	163 if (strcasecmp(str, "subtree") == 0)
81930fff13cf passdb ldap added. fixes to userdb ldap. Timo Sirainen <tss@iki.fi> parents: 1086 diff changeset	164 return LDAP_SCOPE_SUBTREE;
81930fff13cf passdb ldap added. fixes to userdb ldap. Timo Sirainen <tss@iki.fi> parents: 1086 diff changeset	165
81930fff13cf passdb ldap added. fixes to userdb ldap. Timo Sirainen <tss@iki.fi> parents: 1086 diff changeset	166 i_fatal("LDAP: Unknown scope option '%s'", str);
81930fff13cf passdb ldap added. fixes to userdb ldap. Timo Sirainen <tss@iki.fi> parents: 1086 diff changeset	167 }
81930fff13cf passdb ldap added. fixes to userdb ldap. Timo Sirainen <tss@iki.fi> parents: 1086 diff changeset	168
7191 1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	169 #ifdef OPENLDAP_TLS_OPTIONS
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	170 static int tls_require_cert2str(const char *str)
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	171 {
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	172 if (strcasecmp(str, "never") == 0)
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	173 return LDAP_OPT_X_TLS_NEVER;
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	174 if (strcasecmp(str, "hard") == 0)
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	175 return LDAP_OPT_X_TLS_HARD;
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	176 if (strcasecmp(str, "demand") == 0)
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	177 return LDAP_OPT_X_TLS_DEMAND;
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	178 if (strcasecmp(str, "allow") == 0)
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	179 return LDAP_OPT_X_TLS_ALLOW;
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	180 if (strcasecmp(str, "try") == 0)
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	181 return LDAP_OPT_X_TLS_TRY;
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	182
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	183 i_fatal("LDAP: Unknown tls_require_cert value '%s'", str);
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	184 }
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	185 #endif
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	186
5006 129aa779a7f8 Last change for making ldap_bind() error handling better was actually Timo Sirainen <tss@iki.fi> parents: 4996 diff changeset	187 static int ldap_get_errno(struct ldap_connection *conn)
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	188 {
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	189 int ret, err;
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	190
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	191 ret = ldap_get_option(conn->ld, LDAP_OPT_ERROR_NUMBER, (void *) &err);
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	192 if (ret != LDAP_SUCCESS) {
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	193 i_error("LDAP: Can't get error number: %s",
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	194 ldap_err2string(ret));
6368 a930c2ecd73c Reconnect if ldap_search() returns a failure related to connection problems. Timo Sirainen <tss@iki.fi> parents: 6198 diff changeset	195 return LDAP_UNAVAILABLE;
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	196 }
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	197
5006 129aa779a7f8 Last change for making ldap_bind() error handling better was actually Timo Sirainen <tss@iki.fi> parents: 4996 diff changeset	198 return err;
129aa779a7f8 Last change for making ldap_bind() error handling better was actually Timo Sirainen <tss@iki.fi> parents: 4996 diff changeset	199 }
129aa779a7f8 Last change for making ldap_bind() error handling better was actually Timo Sirainen <tss@iki.fi> parents: 4996 diff changeset	200
129aa779a7f8 Last change for making ldap_bind() error handling better was actually Timo Sirainen <tss@iki.fi> parents: 4996 diff changeset	201 const char ldap_get_error(struct ldap_connection conn)
129aa779a7f8 Last change for making ldap_bind() error handling better was actually Timo Sirainen <tss@iki.fi> parents: 4996 diff changeset	202 {
129aa779a7f8 Last change for making ldap_bind() error handling better was actually Timo Sirainen <tss@iki.fi> parents: 4996 diff changeset	203 return ldap_err2string(ldap_get_errno(conn));
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	204 }
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	205
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	206 static void ldap_conn_reconnect(struct ldap_connection *conn)
4772 d36a5df3f492 Handle LDAP requests while being disconnected more correctly. Timo Sirainen <tss@iki.fi> parents: 4751 diff changeset	207 {
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	208 db_ldap_conn_close(conn);
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	209 if (db_ldap_connect(conn) < 0)
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	210 db_ldap_conn_close(conn);
4772 d36a5df3f492 Handle LDAP requests while being disconnected more correctly. Timo Sirainen <tss@iki.fi> parents: 4751 diff changeset	211 }
d36a5df3f492 Handle LDAP requests while being disconnected more correctly. Timo Sirainen <tss@iki.fi> parents: 4751 diff changeset	212
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	213 static int ldap_handle_error(struct ldap_connection *conn)
6368 a930c2ecd73c Reconnect if ldap_search() returns a failure related to connection problems. Timo Sirainen <tss@iki.fi> parents: 6198 diff changeset	214 {
a930c2ecd73c Reconnect if ldap_search() returns a failure related to connection problems. Timo Sirainen <tss@iki.fi> parents: 6198 diff changeset	215 int err = ldap_get_errno(conn);
a930c2ecd73c Reconnect if ldap_search() returns a failure related to connection problems. Timo Sirainen <tss@iki.fi> parents: 6198 diff changeset	216
a930c2ecd73c Reconnect if ldap_search() returns a failure related to connection problems. Timo Sirainen <tss@iki.fi> parents: 6198 diff changeset	217 switch (err) {
a930c2ecd73c Reconnect if ldap_search() returns a failure related to connection problems. Timo Sirainen <tss@iki.fi> parents: 6198 diff changeset	218 case LDAP_SUCCESS:
a930c2ecd73c Reconnect if ldap_search() returns a failure related to connection problems. Timo Sirainen <tss@iki.fi> parents: 6198 diff changeset	219 i_unreached();
a930c2ecd73c Reconnect if ldap_search() returns a failure related to connection problems. Timo Sirainen <tss@iki.fi> parents: 6198 diff changeset	220 case LDAP_SIZELIMIT_EXCEEDED:
a930c2ecd73c Reconnect if ldap_search() returns a failure related to connection problems. Timo Sirainen <tss@iki.fi> parents: 6198 diff changeset	221 case LDAP_TIMELIMIT_EXCEEDED:
a930c2ecd73c Reconnect if ldap_search() returns a failure related to connection problems. Timo Sirainen <tss@iki.fi> parents: 6198 diff changeset	222 case LDAP_NO_SUCH_ATTRIBUTE:
a930c2ecd73c Reconnect if ldap_search() returns a failure related to connection problems. Timo Sirainen <tss@iki.fi> parents: 6198 diff changeset	223 case LDAP_UNDEFINED_TYPE:
a930c2ecd73c Reconnect if ldap_search() returns a failure related to connection problems. Timo Sirainen <tss@iki.fi> parents: 6198 diff changeset	224 case LDAP_INAPPROPRIATE_MATCHING:
a930c2ecd73c Reconnect if ldap_search() returns a failure related to connection problems. Timo Sirainen <tss@iki.fi> parents: 6198 diff changeset	225 case LDAP_CONSTRAINT_VIOLATION:
a930c2ecd73c Reconnect if ldap_search() returns a failure related to connection problems. Timo Sirainen <tss@iki.fi> parents: 6198 diff changeset	226 case LDAP_TYPE_OR_VALUE_EXISTS:
a930c2ecd73c Reconnect if ldap_search() returns a failure related to connection problems. Timo Sirainen <tss@iki.fi> parents: 6198 diff changeset	227 case LDAP_INVALID_SYNTAX:
a930c2ecd73c Reconnect if ldap_search() returns a failure related to connection problems. Timo Sirainen <tss@iki.fi> parents: 6198 diff changeset	228 case LDAP_NO_SUCH_OBJECT:
a930c2ecd73c Reconnect if ldap_search() returns a failure related to connection problems. Timo Sirainen <tss@iki.fi> parents: 6198 diff changeset	229 case LDAP_ALIAS_PROBLEM:
a930c2ecd73c Reconnect if ldap_search() returns a failure related to connection problems. Timo Sirainen <tss@iki.fi> parents: 6198 diff changeset	230 case LDAP_INVALID_DN_SYNTAX:
a930c2ecd73c Reconnect if ldap_search() returns a failure related to connection problems. Timo Sirainen <tss@iki.fi> parents: 6198 diff changeset	231 case LDAP_IS_LEAF:
a930c2ecd73c Reconnect if ldap_search() returns a failure related to connection problems. Timo Sirainen <tss@iki.fi> parents: 6198 diff changeset	232 case LDAP_ALIAS_DEREF_PROBLEM:
a930c2ecd73c Reconnect if ldap_search() returns a failure related to connection problems. Timo Sirainen <tss@iki.fi> parents: 6198 diff changeset	233 case LDAP_FILTER_ERROR:
a930c2ecd73c Reconnect if ldap_search() returns a failure related to connection problems. Timo Sirainen <tss@iki.fi> parents: 6198 diff changeset	234 /* invalid input */
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	235 return -1;
6368 a930c2ecd73c Reconnect if ldap_search() returns a failure related to connection problems. Timo Sirainen <tss@iki.fi> parents: 6198 diff changeset	236 case LDAP_SERVER_DOWN:
a930c2ecd73c Reconnect if ldap_search() returns a failure related to connection problems. Timo Sirainen <tss@iki.fi> parents: 6198 diff changeset	237 case LDAP_TIMEOUT:
a930c2ecd73c Reconnect if ldap_search() returns a failure related to connection problems. Timo Sirainen <tss@iki.fi> parents: 6198 diff changeset	238 case LDAP_UNAVAILABLE:
a930c2ecd73c Reconnect if ldap_search() returns a failure related to connection problems. Timo Sirainen <tss@iki.fi> parents: 6198 diff changeset	239 case LDAP_BUSY:
a930c2ecd73c Reconnect if ldap_search() returns a failure related to connection problems. Timo Sirainen <tss@iki.fi> parents: 6198 diff changeset	240 #ifdef LDAP_CONNECT_ERROR
a930c2ecd73c Reconnect if ldap_search() returns a failure related to connection problems. Timo Sirainen <tss@iki.fi> parents: 6198 diff changeset	241 case LDAP_CONNECT_ERROR:
a930c2ecd73c Reconnect if ldap_search() returns a failure related to connection problems. Timo Sirainen <tss@iki.fi> parents: 6198 diff changeset	242 #endif
a930c2ecd73c Reconnect if ldap_search() returns a failure related to connection problems. Timo Sirainen <tss@iki.fi> parents: 6198 diff changeset	243 case LDAP_LOCAL_ERROR:
a930c2ecd73c Reconnect if ldap_search() returns a failure related to connection problems. Timo Sirainen <tss@iki.fi> parents: 6198 diff changeset	244 case LDAP_INVALID_CREDENTIALS:
a930c2ecd73c Reconnect if ldap_search() returns a failure related to connection problems. Timo Sirainen <tss@iki.fi> parents: 6198 diff changeset	245 default:
a930c2ecd73c Reconnect if ldap_search() returns a failure related to connection problems. Timo Sirainen <tss@iki.fi> parents: 6198 diff changeset	246 /* connection problems */
a930c2ecd73c Reconnect if ldap_search() returns a failure related to connection problems. Timo Sirainen <tss@iki.fi> parents: 6198 diff changeset	247 ldap_conn_reconnect(conn);
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	248 return 0;
6368 a930c2ecd73c Reconnect if ldap_search() returns a failure related to connection problems. Timo Sirainen <tss@iki.fi> parents: 6198 diff changeset	249 }
a930c2ecd73c Reconnect if ldap_search() returns a failure related to connection problems. Timo Sirainen <tss@iki.fi> parents: 6198 diff changeset	250 }
a930c2ecd73c Reconnect if ldap_search() returns a failure related to connection problems. Timo Sirainen <tss@iki.fi> parents: 6198 diff changeset	251
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	252 static int db_ldap_request_bind(struct ldap_connection *conn,
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	253 struct ldap_request *request)
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	254 {
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	255 struct ldap_request_bind *brequest =
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	256 (struct ldap_request_bind *)request;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	257
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	258 i_assert(request->type == LDAP_REQUEST_TYPE_BIND);
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	259 i_assert(request->msgid == -1);
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	260 i_assert(conn->conn_state == LDAP_CONN_STATE_BOUND_AUTH \|\|
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	261 conn->conn_state == LDAP_CONN_STATE_BOUND_DEFAULT);
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	262 i_assert(conn->pending_count == 0);
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	263
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	264 request->msgid = ldap_bind(conn->ld, brequest->dn,
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	265 request->auth_request->mech_password,
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	266 LDAP_AUTH_SIMPLE);
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	267 if (request->msgid == -1) {
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	268 auth_request_log_error(request->auth_request, "ldap",
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	269 "ldap_bind(%s) failed: %s",
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	270 brequest->dn, ldap_get_error(conn));
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	271 if (ldap_handle_error(conn) < 0) {
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	272 /* broken request, remove it */
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	273 return 0;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	274 }
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	275 return -1;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	276 }
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	277 conn->conn_state = LDAP_CONN_STATE_BINDING;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	278 return 1;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	279 }
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	280
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	281 static int db_ldap_request_search(struct ldap_connection *conn,
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	282 struct ldap_request *request)
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	283 {
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	284 struct ldap_request_search *srequest =
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	285 (struct ldap_request_search *)request;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	286
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	287 i_assert(conn->conn_state == LDAP_CONN_STATE_BOUND_DEFAULT);
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	288 i_assert(request->msgid == -1);
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	289
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	290 request->msgid =
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	291 ldap_search(conn->ld, srequest->base, conn->set.ldap_scope,
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	292 srequest->filter, srequest->attributes, 0);
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	293 if (request->msgid == -1) {
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	294 auth_request_log_error(request->auth_request, "ldap",
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	295 "ldap_search() failed (filter %s): %s",
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	296 srequest->filter, ldap_get_error(conn));
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	297 if (ldap_handle_error(conn) < 0) {
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	298 /* broken request, remove it */
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	299 return 0;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	300 }
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	301 return -1;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	302 }
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	303 return 1;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	304 }
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	305
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	306 static bool db_ldap_request_queue_next(struct ldap_connection *conn)
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	307 {
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	308 struct ldap_request const requestp, *request;
7079 d45c3058b91a Renamed queue to aqueue ("array queue") because struct queue already exists Timo Sirainen <tss@iki.fi> parents: 7062 diff changeset	309 unsigned int queue_size = aqueue_count(conn->request_queue);
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	310 int ret = -1;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	311
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	312 if (conn->pending_count == queue_size) {
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	313 /* no non-pending requests */
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	314 return FALSE;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	315 }
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	316 if (queue_size > DB_LDAP_MAX_PENDING_REQUESTS) {
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	317 /* wait until server has replied to some requests */
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	318 return FALSE;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	319 }
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	320
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	321 if (db_ldap_connect(conn) < 0)
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	322 return FALSE;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	323
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	324 requestp = array_idx(&conn->request_array,
7079 d45c3058b91a Renamed queue to aqueue ("array queue") because struct queue already exists Timo Sirainen <tss@iki.fi> parents: 7062 diff changeset	325 aqueue_idx(conn->request_queue,
d45c3058b91a Renamed queue to aqueue ("array queue") because struct queue already exists Timo Sirainen <tss@iki.fi> parents: 7062 diff changeset	326 conn->pending_count));
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	327 request = *requestp;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	328
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	329 if (conn->pending_count > 0 &&
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	330 request->type == LDAP_REQUEST_TYPE_BIND) {
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	331 /* we can't do binds until all existing requests are finished */
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	332 return FALSE;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	333 }
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	334
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	335 switch (conn->conn_state) {
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	336 case LDAP_CONN_STATE_DISCONNECTED:
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	337 case LDAP_CONN_STATE_BINDING:
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	338 /* wait until we're in bound state */
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	339 return FALSE;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	340 case LDAP_CONN_STATE_BOUND_AUTH:
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	341 if (request->type == LDAP_REQUEST_TYPE_BIND)
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	342 break;
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	343
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	344 /* bind to default dn first */
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	345 i_assert(conn->pending_count == 0);
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	346 (void)db_ldap_bind(conn);
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	347 return FALSE;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	348 case LDAP_CONN_STATE_BOUND_DEFAULT:
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	349 /* we can do anything in this state */
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	350 break;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	351 }
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	352
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	353 switch (request->type) {
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	354 case LDAP_REQUEST_TYPE_BIND:
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	355 ret = db_ldap_request_bind(conn, request);
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	356 break;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	357 case LDAP_REQUEST_TYPE_SEARCH:
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	358 ret = db_ldap_request_search(conn, request);
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	359 break;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	360 }
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	361
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	362 if (ret > 0) {
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	363 /* success */
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	364 i_assert(request->msgid != -1);
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	365 conn->pending_count++;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	366 return TRUE;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	367 } else if (ret < 0) {
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	368 /* disconnected */
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	369 return FALSE;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	370 } else {
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	371 /* broken request, remove from queue */
7079 d45c3058b91a Renamed queue to aqueue ("array queue") because struct queue already exists Timo Sirainen <tss@iki.fi> parents: 7062 diff changeset	372 aqueue_delete_tail(conn->request_queue);
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	373 request->callback(conn, request, NULL);
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	374 return TRUE;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	375 }
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	376 }
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	377
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	378 void db_ldap_request(struct ldap_connection *conn,
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	379 struct ldap_request *request)
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	380 {
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	381 request->msgid = -1;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	382 request->create_time = ioloop_time;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	383
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	384 if (conn->request_queue->full &&
7079 d45c3058b91a Renamed queue to aqueue ("array queue") because struct queue already exists Timo Sirainen <tss@iki.fi> parents: 7062 diff changeset	385 aqueue_count(conn->request_queue) >= DB_LDAP_MAX_QUEUE_SIZE) {
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	386 /* Queue is full already, fail this request */
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	387 auth_request_log_error(request->auth_request, "ldap",
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	388 "Request queue is full");
4742 62a5d2c10ecd Crashfixes Timo Sirainen <tss@iki.fi> parents: 4741 diff changeset	389 request->callback(conn, request, NULL);
62a5d2c10ecd Crashfixes Timo Sirainen <tss@iki.fi> parents: 4741 diff changeset	390 return;
4741 deccf9e1aebc LDAP code changes: If auth binds are used, bind back to the default dn Timo Sirainen <tss@iki.fi> parents: 4624 diff changeset	391 }
deccf9e1aebc LDAP code changes: If auth binds are used, bind back to the default dn Timo Sirainen <tss@iki.fi> parents: 4624 diff changeset	392
7079 d45c3058b91a Renamed queue to aqueue ("array queue") because struct queue already exists Timo Sirainen <tss@iki.fi> parents: 7062 diff changeset	393 aqueue_append(conn->request_queue, &request);
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	394 (void)db_ldap_request_queue_next(conn);
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	395 }
4751 aadf124d273f Fixes Timo Sirainen <tss@iki.fi> parents: 4749 diff changeset	396
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	397 static int db_ldap_connect_finish(struct ldap_connection *conn, int ret)
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	398 {
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	399 if (ret == LDAP_SERVER_DOWN) {
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	400 i_error("LDAP: Can't connect to server: %s",
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	401 conn->set.uris != NULL ?
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	402 conn->set.uris : conn->set.hosts);
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	403 return -1;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	404 }
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	405 if (ret != LDAP_SUCCESS) {
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	406 i_error("LDAP: binding failed (dn %s): %s",
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	407 conn->set.dn == NULL ? "(none)" : conn->set.dn,
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	408 ldap_get_error(conn));
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	409 return -1;
6368 a930c2ecd73c Reconnect if ldap_search() returns a failure related to connection problems. Timo Sirainen <tss@iki.fi> parents: 6198 diff changeset	410 }
a930c2ecd73c Reconnect if ldap_search() returns a failure related to connection problems. Timo Sirainen <tss@iki.fi> parents: 6198 diff changeset	411
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	412 conn->conn_state = LDAP_CONN_STATE_BOUND_DEFAULT;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	413 while (db_ldap_request_queue_next(conn))
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	414 ;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	415 return 0;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	416 }
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	417
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	418 static void db_ldap_default_bind_finished(struct ldap_connection *conn,
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	419 LDAPMessage *res)
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	420 {
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	421 int ret;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	422
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	423 i_assert(conn->pending_count == 0);
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	424 conn->default_bind_msgid = -1;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	425
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	426 ret = ldap_result2error(conn->ld, res, FALSE);
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	427 if (db_ldap_connect_finish(conn, ret) < 0) {
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	428 /* lost connection, close it */
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	429 db_ldap_conn_close(conn);
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	430 }
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	431 }
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	432
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	433 static void db_ldap_abort_requests(struct ldap_connection *conn,
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	434 unsigned int max_count,
7062 36402809db43 When aborting queued requests, log the reason for it. Timo Sirainen <tss@iki.fi> parents: 7050 diff changeset	435 unsigned int timeout_secs,
36402809db43 When aborting queued requests, log the reason for it. Timo Sirainen <tss@iki.fi> parents: 7050 diff changeset	436 bool error, const char *reason)
3731 0a7beabfe332 If LDAP lookup fails because connection gets closed, try retrying it again Timo Sirainen <tss@iki.fi> parents: 3657 diff changeset	437 {
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	438 struct ldap_request const requestp, *request;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	439 time_t diff;
3731 0a7beabfe332 If LDAP lookup fails because connection gets closed, try retrying it again Timo Sirainen <tss@iki.fi> parents: 3657 diff changeset	440
7079 d45c3058b91a Renamed queue to aqueue ("array queue") because struct queue already exists Timo Sirainen <tss@iki.fi> parents: 7062 diff changeset	441 while (aqueue_count(conn->request_queue) > 0 && max_count > 0) {
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	442 requestp = array_idx(&conn->request_array,
7079 d45c3058b91a Renamed queue to aqueue ("array queue") because struct queue already exists Timo Sirainen <tss@iki.fi> parents: 7062 diff changeset	443 aqueue_idx(conn->request_queue, 0));
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	444 request = *requestp;
3731 0a7beabfe332 If LDAP lookup fails because connection gets closed, try retrying it again Timo Sirainen <tss@iki.fi> parents: 3657 diff changeset	445
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	446 diff = ioloop_time - request->create_time;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	447 if (diff < (time_t)timeout_secs)
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	448 break;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	449
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	450 /* timed out, abort */
7079 d45c3058b91a Renamed queue to aqueue ("array queue") because struct queue already exists Timo Sirainen <tss@iki.fi> parents: 7062 diff changeset	451 aqueue_delete_tail(conn->request_queue);
3731 0a7beabfe332 If LDAP lookup fails because connection gets closed, try retrying it again Timo Sirainen <tss@iki.fi> parents: 3657 diff changeset	452
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	453 if (request->msgid != -1) {
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	454 i_assert(conn->pending_count > 0);
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	455 conn->pending_count--;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	456 }
7062 36402809db43 When aborting queued requests, log the reason for it. Timo Sirainen <tss@iki.fi> parents: 7050 diff changeset	457 if (error) {
36402809db43 When aborting queued requests, log the reason for it. Timo Sirainen <tss@iki.fi> parents: 7050 diff changeset	458 auth_request_log_error(request->auth_request, "ldap",
36402809db43 When aborting queued requests, log the reason for it. Timo Sirainen <tss@iki.fi> parents: 7050 diff changeset	459 "%s", reason);
36402809db43 When aborting queued requests, log the reason for it. Timo Sirainen <tss@iki.fi> parents: 7050 diff changeset	460 } else {
36402809db43 When aborting queued requests, log the reason for it. Timo Sirainen <tss@iki.fi> parents: 7050 diff changeset	461 auth_request_log_info(request->auth_request, "ldap",
36402809db43 When aborting queued requests, log the reason for it. Timo Sirainen <tss@iki.fi> parents: 7050 diff changeset	462 "%s", reason);
36402809db43 When aborting queued requests, log the reason for it. Timo Sirainen <tss@iki.fi> parents: 7050 diff changeset	463 }
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	464 request->callback(conn, request, NULL);
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	465 max_count--;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	466 }
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	467 }
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	468
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	469 static void
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	470 db_ldap_handle_result(struct ldap_connection conn, LDAPMessage res)
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	471 {
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	472 struct ldap_request const requests, *request = NULL;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	473 unsigned int i, count;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	474 int msgid, ret;
3731 0a7beabfe332 If LDAP lookup fails because connection gets closed, try retrying it again Timo Sirainen <tss@iki.fi> parents: 3657 diff changeset	475
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	476 msgid = ldap_msgid(res);
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	477 if (msgid == conn->default_bind_msgid) {
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	478 db_ldap_default_bind_finished(conn, res);
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	479 return;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	480 }
3731 0a7beabfe332 If LDAP lookup fails because connection gets closed, try retrying it again Timo Sirainen <tss@iki.fi> parents: 3657 diff changeset	481
7079 d45c3058b91a Renamed queue to aqueue ("array queue") because struct queue already exists Timo Sirainen <tss@iki.fi> parents: 7062 diff changeset	482 count = aqueue_count(conn->request_queue);
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	483 requests = count == 0 ? NULL : array_idx(&conn->request_array, 0);
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	484 for (i = 0; i < count; i++) {
7079 d45c3058b91a Renamed queue to aqueue ("array queue") because struct queue already exists Timo Sirainen <tss@iki.fi> parents: 7062 diff changeset	485 request = requests[aqueue_idx(conn->request_queue, i)];
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	486 if (request->msgid == msgid)
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	487 break;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	488 if (request->msgid == -1) {
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	489 request = NULL;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	490 break;
4741 deccf9e1aebc LDAP code changes: If auth binds are used, bind back to the default dn Timo Sirainen <tss@iki.fi> parents: 4624 diff changeset	491 }
3731 0a7beabfe332 If LDAP lookup fails because connection gets closed, try retrying it again Timo Sirainen <tss@iki.fi> parents: 3657 diff changeset	492 }
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	493 if (request == NULL) {
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	494 i_error("LDAP: Reply with unknown msgid %d", msgid);
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	495 return;
4772 d36a5df3f492 Handle LDAP requests while being disconnected more correctly. Timo Sirainen <tss@iki.fi> parents: 4751 diff changeset	496 }
d36a5df3f492 Handle LDAP requests while being disconnected more correctly. Timo Sirainen <tss@iki.fi> parents: 4751 diff changeset	497
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	498 if (request->type == LDAP_REQUEST_TYPE_BIND) {
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	499 i_assert(conn->conn_state == LDAP_CONN_STATE_BINDING);
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	500 i_assert(conn->pending_count == 1);
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	501 conn->conn_state = LDAP_CONN_STATE_BOUND_AUTH;
4741 deccf9e1aebc LDAP code changes: If auth binds are used, bind back to the default dn Timo Sirainen <tss@iki.fi> parents: 4624 diff changeset	502 }
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	503 i_assert(conn->pending_count > 0);
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	504 conn->pending_count--;
7079 d45c3058b91a Renamed queue to aqueue ("array queue") because struct queue already exists Timo Sirainen <tss@iki.fi> parents: 7062 diff changeset	505 aqueue_delete(conn->request_queue, i);
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	506
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	507 ret = ldap_result2error(conn->ld, res, 0);
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	508 if (ret != LDAP_SUCCESS && request->type == LDAP_REQUEST_TYPE_SEARCH) {
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	509 /* handle search failures here */
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	510 struct ldap_request_search *srequest =
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	511 (struct ldap_request_search *)request;
4772 d36a5df3f492 Handle LDAP requests while being disconnected more correctly. Timo Sirainen <tss@iki.fi> parents: 4751 diff changeset	512
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	513 auth_request_log_error(request->auth_request, "ldap",
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	514 "ldap_search(%s) failed: %s",
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	515 srequest->filter, ldap_err2string(ret));
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	516 res = NULL;
4772 d36a5df3f492 Handle LDAP requests while being disconnected more correctly. Timo Sirainen <tss@iki.fi> parents: 4751 diff changeset	517 }
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	518
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	519 T_FRAME(
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	520 request->callback(conn, request, res);
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	521 );
4741 deccf9e1aebc LDAP code changes: If auth binds are used, bind back to the default dn Timo Sirainen <tss@iki.fi> parents: 4624 diff changeset	522
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	523 if (i > 0) {
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	524 /* see if there are timed out requests */
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	525 db_ldap_abort_requests(conn, i,
7062 36402809db43 When aborting queued requests, log the reason for it. Timo Sirainen <tss@iki.fi> parents: 7050 diff changeset	526 DB_LDAP_REQUEST_LOST_TIMEOUT_SECS,
36402809db43 When aborting queued requests, log the reason for it. Timo Sirainen <tss@iki.fi> parents: 7050 diff changeset	527 TRUE, "Request lost");
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	528 }
3731 0a7beabfe332 If LDAP lookup fails because connection gets closed, try retrying it again Timo Sirainen <tss@iki.fi> parents: 3657 diff changeset	529 }
0a7beabfe332 If LDAP lookup fails because connection gets closed, try retrying it again Timo Sirainen <tss@iki.fi> parents: 3657 diff changeset	530
4907 5b4c9b20eba0 Replaced void context from a lot of callbacks with the actual context Timo Sirainen <tss@iki.fi>* parents: 4903 diff changeset	531 static void ldap_input(struct ldap_connection *conn)
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	532 {
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	533 struct timeval timeout;
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	534 LDAPMessage *res;
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	535 int ret;
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	536
5037 d7198e2682c6 Do ldap_bind() only when there are no requests waiting, and don't do Timo Sirainen <tss@iki.fi> parents: 5006 diff changeset	537 for (;;) {
d7198e2682c6 Do ldap_bind() only when there are no requests waiting, and don't do Timo Sirainen <tss@iki.fi> parents: 5006 diff changeset	538 if (conn->ld == NULL)
d7198e2682c6 Do ldap_bind() only when there are no requests waiting, and don't do Timo Sirainen <tss@iki.fi> parents: 5006 diff changeset	539 return;
d7198e2682c6 Do ldap_bind() only when there are no requests waiting, and don't do Timo Sirainen <tss@iki.fi> parents: 5006 diff changeset	540
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	541 memset(&timeout, 0, sizeof(timeout));
1181 ac7dbb236b59 Rather than block for two seconds, we can just call ldap_result() again if Timo Sirainen <tss@iki.fi> parents: 1143 diff changeset	542 ret = ldap_result(conn->ld, LDAP_RES_ANY, 1, &timeout, &res);
1075 f1401fa7ab03 auth process fixes, LDAP seems to be working (with the kludge define or Timo Sirainen <tss@iki.fi> parents: 1062 diff changeset	543 #ifdef OPENLDAP_ASYNC_WORKAROUND
1181 ac7dbb236b59 Rather than block for two seconds, we can just call ldap_result() again if Timo Sirainen <tss@iki.fi> parents: 1143 diff changeset	544 if (ret == 0) {
ac7dbb236b59 Rather than block for two seconds, we can just call ldap_result() again if Timo Sirainen <tss@iki.fi> parents: 1143 diff changeset	545 /* try again, there may be another in buffer */
ac7dbb236b59 Rather than block for two seconds, we can just call ldap_result() again if Timo Sirainen <tss@iki.fi> parents: 1143 diff changeset	546 ret = ldap_result(conn->ld, LDAP_RES_ANY, 1,
ac7dbb236b59 Rather than block for two seconds, we can just call ldap_result() again if Timo Sirainen <tss@iki.fi> parents: 1143 diff changeset	547 &timeout, &res);
ac7dbb236b59 Rather than block for two seconds, we can just call ldap_result() again if Timo Sirainen <tss@iki.fi> parents: 1143 diff changeset	548 }
1075 f1401fa7ab03 auth process fixes, LDAP seems to be working (with the kludge define or Timo Sirainen <tss@iki.fi> parents: 1062 diff changeset	549 #endif
5037 d7198e2682c6 Do ldap_bind() only when there are no requests waiting, and don't do Timo Sirainen <tss@iki.fi> parents: 5006 diff changeset	550 if (ret <= 0)
d7198e2682c6 Do ldap_bind() only when there are no requests waiting, and don't do Timo Sirainen <tss@iki.fi> parents: 5006 diff changeset	551 break;
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	552
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	553 db_ldap_handle_result(conn, res);
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	554 ldap_msgfree(res);
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	555 }
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	556 conn->last_reply_stamp = ioloop_time;
5037 d7198e2682c6 Do ldap_bind() only when there are no requests waiting, and don't do Timo Sirainen <tss@iki.fi> parents: 5006 diff changeset	557
7045 ae0556fb268d If LDAP server disconnects the connection and we haven't sent requests for a Timo Sirainen <tss@iki.fi> parents: 6940 diff changeset	558 if (ret == 0) {
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	559 /* send more requests */
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	560 while (db_ldap_request_queue_next(conn))
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	561 ;
7045 ae0556fb268d If LDAP server disconnects the connection and we haven't sent requests for a Timo Sirainen <tss@iki.fi> parents: 6940 diff changeset	562 } else if (ldap_get_errno(conn) != LDAP_SERVER_DOWN) {
6368 a930c2ecd73c Reconnect if ldap_search() returns a failure related to connection problems. Timo Sirainen <tss@iki.fi> parents: 6198 diff changeset	563 i_error("LDAP: ldap_result() failed: %s", ldap_get_error(conn));
6369 f7cc3723ad99 Actually reconnect always if ldap_result() fails for any reason. There Timo Sirainen <tss@iki.fi> parents: 6368 diff changeset	564 ldap_conn_reconnect(conn);
7079 d45c3058b91a Renamed queue to aqueue ("array queue") because struct queue already exists Timo Sirainen <tss@iki.fi> parents: 7062 diff changeset	565 } else if (aqueue_count(conn->request_queue) > 0 \|\|
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	566 ioloop_time - conn->last_reply_stamp <
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	567 DB_LDAP_IDLE_RECONNECT_SECS) {
7045 ae0556fb268d If LDAP server disconnects the connection and we haven't sent requests for a Timo Sirainen <tss@iki.fi> parents: 6940 diff changeset	568 i_error("LDAP: Connection lost to LDAP server, reconnecting");
ae0556fb268d If LDAP server disconnects the connection and we haven't sent requests for a Timo Sirainen <tss@iki.fi> parents: 6940 diff changeset	569 ldap_conn_reconnect(conn);
5037 d7198e2682c6 Do ldap_bind() only when there are no requests waiting, and don't do Timo Sirainen <tss@iki.fi> parents: 5006 diff changeset	570 } else {
7045 ae0556fb268d If LDAP server disconnects the connection and we haven't sent requests for a Timo Sirainen <tss@iki.fi> parents: 6940 diff changeset	571 /* server probably disconnected an idle connection. don't
ae0556fb268d If LDAP server disconnects the connection and we haven't sent requests for a Timo Sirainen <tss@iki.fi> parents: 6940 diff changeset	572 reconnect until the next request comes. */
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	573 db_ldap_conn_close(conn);
5037 d7198e2682c6 Do ldap_bind() only when there are no requests waiting, and don't do Timo Sirainen <tss@iki.fi> parents: 5006 diff changeset	574 }
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	575 }
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	576
4426 b8089cf41c96 Check for sasl.h and sasl/sasl.h existence and use the one that's found. If Timo Sirainen <tss@iki.fi> parents: 4415 diff changeset	577 #ifdef HAVE_LDAP_SASL
4405 fe17f63521ea Compiler warning fixes and some coding style cleanups. Timo Sirainen <tss@iki.fi> parents: 4319 diff changeset	578 static int
6411 6a64e64fa3a3 Renamed __attr___ to ATTR_. Renamed __attrs_used__ to ATTRS_DEFINED. Timo Sirainen <tss@iki.fi> parents: 6370 diff changeset	579 sasl_interact(LDAP *ld ATTR_UNUSED, unsigned flags ATTR_UNUSED,
4405 fe17f63521ea Compiler warning fixes and some coding style cleanups. Timo Sirainen <tss@iki.fi> parents: 4319 diff changeset	580 void defaults, void interact)
4319 31a28cd0b020 Added support for SASL binding. Patch by Geert Jansen Timo Sirainen <tss@iki.fi> parents: 4295 diff changeset	581 {
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	582 struct db_ldap_sasl_bind_context *context = defaults;
4319 31a28cd0b020 Added support for SASL binding. Patch by Geert Jansen Timo Sirainen <tss@iki.fi> parents: 4295 diff changeset	583 sasl_interact_t *in;
4405 fe17f63521ea Compiler warning fixes and some coding style cleanups. Timo Sirainen <tss@iki.fi> parents: 4319 diff changeset	584 const char *str;
4319 31a28cd0b020 Added support for SASL binding. Patch by Geert Jansen Timo Sirainen <tss@iki.fi> parents: 4295 diff changeset	585
4405 fe17f63521ea Compiler warning fixes and some coding style cleanups. Timo Sirainen <tss@iki.fi> parents: 4319 diff changeset	586 for (in = interact; in->id != SASL_CB_LIST_END; in++) {
fe17f63521ea Compiler warning fixes and some coding style cleanups. Timo Sirainen <tss@iki.fi> parents: 4319 diff changeset	587 switch (in->id) {
4319 31a28cd0b020 Added support for SASL binding. Patch by Geert Jansen Timo Sirainen <tss@iki.fi> parents: 4295 diff changeset	588 case SASL_CB_GETREALM:
4405 fe17f63521ea Compiler warning fixes and some coding style cleanups. Timo Sirainen <tss@iki.fi> parents: 4319 diff changeset	589 str = context->realm;
4319 31a28cd0b020 Added support for SASL binding. Patch by Geert Jansen Timo Sirainen <tss@iki.fi> parents: 4295 diff changeset	590 break;
31a28cd0b020 Added support for SASL binding. Patch by Geert Jansen Timo Sirainen <tss@iki.fi> parents: 4295 diff changeset	591 case SASL_CB_AUTHNAME:
4405 fe17f63521ea Compiler warning fixes and some coding style cleanups. Timo Sirainen <tss@iki.fi> parents: 4319 diff changeset	592 str = context->authcid;
4319 31a28cd0b020 Added support for SASL binding. Patch by Geert Jansen Timo Sirainen <tss@iki.fi> parents: 4295 diff changeset	593 break;
31a28cd0b020 Added support for SASL binding. Patch by Geert Jansen Timo Sirainen <tss@iki.fi> parents: 4295 diff changeset	594 case SASL_CB_USER:
4405 fe17f63521ea Compiler warning fixes and some coding style cleanups. Timo Sirainen <tss@iki.fi> parents: 4319 diff changeset	595 str = context->authzid;
4319 31a28cd0b020 Added support for SASL binding. Patch by Geert Jansen Timo Sirainen <tss@iki.fi> parents: 4295 diff changeset	596 break;
31a28cd0b020 Added support for SASL binding. Patch by Geert Jansen Timo Sirainen <tss@iki.fi> parents: 4295 diff changeset	597 case SASL_CB_PASS:
4405 fe17f63521ea Compiler warning fixes and some coding style cleanups. Timo Sirainen <tss@iki.fi> parents: 4319 diff changeset	598 str = context->passwd;
fe17f63521ea Compiler warning fixes and some coding style cleanups. Timo Sirainen <tss@iki.fi> parents: 4319 diff changeset	599 break;
fe17f63521ea Compiler warning fixes and some coding style cleanups. Timo Sirainen <tss@iki.fi> parents: 4319 diff changeset	600 default:
fe17f63521ea Compiler warning fixes and some coding style cleanups. Timo Sirainen <tss@iki.fi> parents: 4319 diff changeset	601 str = NULL;
4319 31a28cd0b020 Added support for SASL binding. Patch by Geert Jansen Timo Sirainen <tss@iki.fi> parents: 4295 diff changeset	602 break;
31a28cd0b020 Added support for SASL binding. Patch by Geert Jansen Timo Sirainen <tss@iki.fi> parents: 4295 diff changeset	603 }
4405 fe17f63521ea Compiler warning fixes and some coding style cleanups. Timo Sirainen <tss@iki.fi> parents: 4319 diff changeset	604 if (str != NULL) {
fe17f63521ea Compiler warning fixes and some coding style cleanups. Timo Sirainen <tss@iki.fi> parents: 4319 diff changeset	605 in->len = strlen(str);
fe17f63521ea Compiler warning fixes and some coding style cleanups. Timo Sirainen <tss@iki.fi> parents: 4319 diff changeset	606 in->result = str;
4319 31a28cd0b020 Added support for SASL binding. Patch by Geert Jansen Timo Sirainen <tss@iki.fi> parents: 4295 diff changeset	607 }
31a28cd0b020 Added support for SASL binding. Patch by Geert Jansen Timo Sirainen <tss@iki.fi> parents: 4295 diff changeset	608
31a28cd0b020 Added support for SASL binding. Patch by Geert Jansen Timo Sirainen <tss@iki.fi> parents: 4295 diff changeset	609 }
31a28cd0b020 Added support for SASL binding. Patch by Geert Jansen Timo Sirainen <tss@iki.fi> parents: 4295 diff changeset	610 return LDAP_SUCCESS;
31a28cd0b020 Added support for SASL binding. Patch by Geert Jansen Timo Sirainen <tss@iki.fi> parents: 4295 diff changeset	611 }
4426 b8089cf41c96 Check for sasl.h and sasl/sasl.h existence and use the one that's found. If Timo Sirainen <tss@iki.fi> parents: 4415 diff changeset	612 #endif
4319 31a28cd0b020 Added support for SASL binding. Patch by Geert Jansen Timo Sirainen <tss@iki.fi> parents: 4295 diff changeset	613
4741 deccf9e1aebc LDAP code changes: If auth binds are used, bind back to the default dn Timo Sirainen <tss@iki.fi> parents: 4624 diff changeset	614 static int db_ldap_bind(struct ldap_connection *conn)
deccf9e1aebc LDAP code changes: If auth binds are used, bind back to the default dn Timo Sirainen <tss@iki.fi> parents: 4624 diff changeset	615 {
deccf9e1aebc LDAP code changes: If auth binds are used, bind back to the default dn Timo Sirainen <tss@iki.fi> parents: 4624 diff changeset	616 int msgid;
deccf9e1aebc LDAP code changes: If auth binds are used, bind back to the default dn Timo Sirainen <tss@iki.fi> parents: 4624 diff changeset	617
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	618 i_assert(conn->conn_state != LDAP_CONN_STATE_BINDING);
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	619 i_assert(conn->default_bind_msgid == -1);
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	620 i_assert(conn->pending_count == 0);
4741 deccf9e1aebc LDAP code changes: If auth binds are used, bind back to the default dn Timo Sirainen <tss@iki.fi> parents: 4624 diff changeset	621
4996 cfef56a6bf4a If ldap_bind() fails directly, log the "ldap server down" errors more nicely. Timo Sirainen <tss@iki.fi> parents: 4907 diff changeset	622 msgid = ldap_bind(conn->ld, conn->set.dn, conn->set.dnpass,
cfef56a6bf4a If ldap_bind() fails directly, log the "ldap server down" errors more nicely. Timo Sirainen <tss@iki.fi> parents: 4907 diff changeset	623 LDAP_AUTH_SIMPLE);
4741 deccf9e1aebc LDAP code changes: If auth binds are used, bind back to the default dn Timo Sirainen <tss@iki.fi> parents: 4624 diff changeset	624 if (msgid == -1) {
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	625 i_assert(ldap_get_errno(conn) != LDAP_SUCCESS);
6576 66e6311e22b3 If ldap_bind() failed because LDAP server was down, we never reconnected. Timo Sirainen <tss@iki.fi> parents: 6475 diff changeset	626 if (db_ldap_connect_finish(conn, ldap_get_errno(conn)) < 0) {
66e6311e22b3 If ldap_bind() failed because LDAP server was down, we never reconnected. Timo Sirainen <tss@iki.fi> parents: 6475 diff changeset	627 /* lost connection, close it */
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	628 db_ldap_conn_close(conn);
6576 66e6311e22b3 If ldap_bind() failed because LDAP server was down, we never reconnected. Timo Sirainen <tss@iki.fi> parents: 6475 diff changeset	629 }
4741 deccf9e1aebc LDAP code changes: If auth binds are used, bind back to the default dn Timo Sirainen <tss@iki.fi> parents: 4624 diff changeset	630 return -1;
deccf9e1aebc LDAP code changes: If auth binds are used, bind back to the default dn Timo Sirainen <tss@iki.fi> parents: 4624 diff changeset	631 }
4751 aadf124d273f Fixes Timo Sirainen <tss@iki.fi> parents: 4749 diff changeset	632
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	633 conn->conn_state = LDAP_CONN_STATE_BINDING;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	634 conn->default_bind_msgid = msgid;
4741 deccf9e1aebc LDAP code changes: If auth binds are used, bind back to the default dn Timo Sirainen <tss@iki.fi> parents: 4624 diff changeset	635 return 0;
deccf9e1aebc LDAP code changes: If auth binds are used, bind back to the default dn Timo Sirainen <tss@iki.fi> parents: 4624 diff changeset	636 }
deccf9e1aebc LDAP code changes: If auth binds are used, bind back to the default dn Timo Sirainen <tss@iki.fi> parents: 4624 diff changeset	637
4742 62a5d2c10ecd Crashfixes Timo Sirainen <tss@iki.fi> parents: 4741 diff changeset	638 static void db_ldap_get_fd(struct ldap_connection *conn)
62a5d2c10ecd Crashfixes Timo Sirainen <tss@iki.fi> parents: 4741 diff changeset	639 {
62a5d2c10ecd Crashfixes Timo Sirainen <tss@iki.fi> parents: 4741 diff changeset	640 int ret;
62a5d2c10ecd Crashfixes Timo Sirainen <tss@iki.fi> parents: 4741 diff changeset	641
62a5d2c10ecd Crashfixes Timo Sirainen <tss@iki.fi> parents: 4741 diff changeset	642 /* get the connection's fd */
62a5d2c10ecd Crashfixes Timo Sirainen <tss@iki.fi> parents: 4741 diff changeset	643 ret = ldap_get_option(conn->ld, LDAP_OPT_DESC, (void *)&conn->fd);
62a5d2c10ecd Crashfixes Timo Sirainen <tss@iki.fi> parents: 4741 diff changeset	644 if (ret != LDAP_SUCCESS) {
62a5d2c10ecd Crashfixes Timo Sirainen <tss@iki.fi> parents: 4741 diff changeset	645 i_fatal("LDAP: Can't get connection fd: %s",
62a5d2c10ecd Crashfixes Timo Sirainen <tss@iki.fi> parents: 4741 diff changeset	646 ldap_err2string(ret));
62a5d2c10ecd Crashfixes Timo Sirainen <tss@iki.fi> parents: 4741 diff changeset	647 }
6873 3069e66789b3 Die if (Solaris) LDAP library returns wrong file descriptor. Timo Sirainen <tss@iki.fi> parents: 6576 diff changeset	648 if (conn->fd <= CLIENT_LISTEN_FD) {
3069e66789b3 Die if (Solaris) LDAP library returns wrong file descriptor. Timo Sirainen <tss@iki.fi> parents: 6576 diff changeset	649 /* Solaris LDAP library seems to be broken */
3069e66789b3 Die if (Solaris) LDAP library returns wrong file descriptor. Timo Sirainen <tss@iki.fi> parents: 6576 diff changeset	650 i_fatal("LDAP: Buggy LDAP library returned wrong fd: %d",
3069e66789b3 Die if (Solaris) LDAP library returns wrong file descriptor. Timo Sirainen <tss@iki.fi> parents: 6576 diff changeset	651 conn->fd);
3069e66789b3 Die if (Solaris) LDAP library returns wrong file descriptor. Timo Sirainen <tss@iki.fi> parents: 6576 diff changeset	652 }
4742 62a5d2c10ecd Crashfixes Timo Sirainen <tss@iki.fi> parents: 4741 diff changeset	653 i_assert(conn->fd != -1);
62a5d2c10ecd Crashfixes Timo Sirainen <tss@iki.fi> parents: 4741 diff changeset	654 net_set_nonblock(conn->fd, TRUE);
62a5d2c10ecd Crashfixes Timo Sirainen <tss@iki.fi> parents: 4741 diff changeset	655 }
62a5d2c10ecd Crashfixes Timo Sirainen <tss@iki.fi> parents: 4741 diff changeset	656
7191 1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	657 static void
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	658 db_ldap_set_opt(struct ldap_connection conn, int opt, const void value,
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	659 const char optname, const char value_str)
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	660 {
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	661 int ret;
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	662
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	663 ret = ldap_set_option(conn == NULL ? NULL : conn->ld, opt, value);
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	664 if (ret != LDAP_SUCCESS) {
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	665 i_fatal("LDAP: Can't set option %s to %s: %s",
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	666 optname, value_str, ldap_err2string(ret));
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	667 }
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	668 }
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	669
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	670 static void
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	671 db_ldap_set_opt_str(struct ldap_connection conn, int opt, const char value,
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	672 const char *optname)
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	673 {
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	674 if (value != NULL)
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	675 db_ldap_set_opt(conn, opt, value, optname, value);
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	676 }
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	677
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	678 static void db_ldap_set_tls_options(struct ldap_connection *conn)
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	679 {
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	680 if (!conn->set.tls)
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	681 return;
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	682
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	683 #ifdef OPENLDAP_TLS_OPTIONS
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	684 db_ldap_set_opt_str(NULL, LDAP_OPT_X_TLS_CACERTFILE,
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	685 conn->set.tls_ca_cert_file, "tls_ca_cert_file");
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	686 db_ldap_set_opt_str(NULL, LDAP_OPT_X_TLS_CACERTDIR,
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	687 conn->set.tls_ca_cert_dir, "tls_ca_cert_dir");
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	688 db_ldap_set_opt_str(NULL, LDAP_OPT_X_TLS_CERTFILE,
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	689 conn->set.tls_cert_file, "tls_cert_file");
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	690 db_ldap_set_opt_str(NULL, LDAP_OPT_X_TLS_KEYFILE,
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	691 conn->set.tls_key_file, "tls_key_file");
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	692 db_ldap_set_opt_str(NULL, LDAP_OPT_X_TLS_CIPHER_SUITE,
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	693 conn->set.tls_cipher_suite, "tls_cipher_suite");
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	694 if (conn->set.tls_require_cert != NULL) {
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	695 int value = tls_require_cert2str(conn->set.tls_require_cert);
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	696 db_ldap_set_opt(NULL, LDAP_OPT_X_TLS_REQUIRE_CERT, &value,
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	697 "tls_require_cert", conn->set.tls_require_cert);
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	698 }
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	699 #endif
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	700 }
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	701
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	702 static void db_ldap_set_options(struct ldap_connection *conn)
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	703 {
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	704 unsigned int ldap_version;
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	705
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	706 db_ldap_set_opt(conn, LDAP_OPT_DEREF, &conn->set.ldap_deref,
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	707 "deref", conn->set.deref);
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	708
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	709 /* If SASL binds are used, the protocol version needs to be
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	710 at least 3 */
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	711 ldap_version = conn->set.sasl_bind &&
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	712 conn->set.ldap_version < 3 ? 3 : conn->set.ldap_version;
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	713 db_ldap_set_opt(conn, LDAP_OPT_PROTOCOL_VERSION, &ldap_version,
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	714 "protocol_version", dec2str(ldap_version));
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	715 db_ldap_set_tls_options(conn);
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	716 }
1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	717
4741 deccf9e1aebc LDAP code changes: If auth binds are used, bind back to the default dn Timo Sirainen <tss@iki.fi> parents: 4624 diff changeset	718 int db_ldap_connect(struct ldap_connection *conn)
deccf9e1aebc LDAP code changes: If auth binds are used, bind back to the default dn Timo Sirainen <tss@iki.fi> parents: 4624 diff changeset	719 {
deccf9e1aebc LDAP code changes: If auth binds are used, bind back to the default dn Timo Sirainen <tss@iki.fi> parents: 4624 diff changeset	720 int ret;
deccf9e1aebc LDAP code changes: If auth binds are used, bind back to the default dn Timo Sirainen <tss@iki.fi> parents: 4624 diff changeset	721
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	722 if (conn->conn_state != LDAP_CONN_STATE_DISCONNECTED)
4741 deccf9e1aebc LDAP code changes: If auth binds are used, bind back to the default dn Timo Sirainen <tss@iki.fi> parents: 4624 diff changeset	723 return 0;
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	724
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	725 i_assert(conn->pending_count == 0);
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	726 if (conn->ld == NULL) {
1910 b9005f93be70 Patch by Quentin Garnier: Timo Sirainen <tss@iki.fi> parents: 1897 diff changeset	727 if (conn->set.uris != NULL) {
2325 7613e0f68513 Fixed to compile with Solaris LDAP library Timo Sirainen <tss@iki.fi> parents: 1910 diff changeset	728 #ifdef LDAP_HAVE_INITIALIZE
1910 b9005f93be70 Patch by Quentin Garnier: Timo Sirainen <tss@iki.fi> parents: 1897 diff changeset	729 if (ldap_initialize(&conn->ld, conn->set.uris) != LDAP_SUCCESS)
b9005f93be70 Patch by Quentin Garnier: Timo Sirainen <tss@iki.fi> parents: 1897 diff changeset	730 conn->ld = NULL;
2325 7613e0f68513 Fixed to compile with Solaris LDAP library Timo Sirainen <tss@iki.fi> parents: 1910 diff changeset	731 #else
7613e0f68513 Fixed to compile with Solaris LDAP library Timo Sirainen <tss@iki.fi> parents: 1910 diff changeset	732 i_fatal("LDAP: Your LDAP library doesn't support "
7613e0f68513 Fixed to compile with Solaris LDAP library Timo Sirainen <tss@iki.fi> parents: 1910 diff changeset	733 "'uris' setting, use 'hosts' instead.");
7613e0f68513 Fixed to compile with Solaris LDAP library Timo Sirainen <tss@iki.fi> parents: 1910 diff changeset	734 #endif
1910 b9005f93be70 Patch by Quentin Garnier: Timo Sirainen <tss@iki.fi> parents: 1897 diff changeset	735 } else
b9005f93be70 Patch by Quentin Garnier: Timo Sirainen <tss@iki.fi> parents: 1897 diff changeset	736 conn->ld = ldap_init(conn->set.hosts, LDAP_PORT);
b9005f93be70 Patch by Quentin Garnier: Timo Sirainen <tss@iki.fi> parents: 1897 diff changeset	737
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	738 if (conn->ld == NULL)
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	739 i_fatal("LDAP: ldap_init() failed with hosts: %s",
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	740 conn->set.hosts);
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	741
7191 1cbaa724aba8 Added support for OpenLDAP-specific TLS settings. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	742 db_ldap_set_options(conn);
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	743 }
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	744
4415 b91816cd1d16 Added TLS support for LDAP if the library supports it. Timo Sirainen <tss@iki.fi> parents: 4405 diff changeset	745 if (conn->set.tls) {
b91816cd1d16 Added TLS support for LDAP if the library supports it. Timo Sirainen <tss@iki.fi> parents: 4405 diff changeset	746 #ifdef LDAP_HAVE_START_TLS_S
b91816cd1d16 Added TLS support for LDAP if the library supports it. Timo Sirainen <tss@iki.fi> parents: 4405 diff changeset	747 ret = ldap_start_tls_s(conn->ld, NULL, NULL);
b91816cd1d16 Added TLS support for LDAP if the library supports it. Timo Sirainen <tss@iki.fi> parents: 4405 diff changeset	748 if (ret != LDAP_SUCCESS) {
b91816cd1d16 Added TLS support for LDAP if the library supports it. Timo Sirainen <tss@iki.fi> parents: 4405 diff changeset	749 i_error("LDAP: ldap_start_tls_s() failed: %s",
b91816cd1d16 Added TLS support for LDAP if the library supports it. Timo Sirainen <tss@iki.fi> parents: 4405 diff changeset	750 ldap_err2string(ret));
4741 deccf9e1aebc LDAP code changes: If auth binds are used, bind back to the default dn Timo Sirainen <tss@iki.fi> parents: 4624 diff changeset	751 return -1;
4415 b91816cd1d16 Added TLS support for LDAP if the library supports it. Timo Sirainen <tss@iki.fi> parents: 4405 diff changeset	752 }
b91816cd1d16 Added TLS support for LDAP if the library supports it. Timo Sirainen <tss@iki.fi> parents: 4405 diff changeset	753 #else
b91816cd1d16 Added TLS support for LDAP if the library supports it. Timo Sirainen <tss@iki.fi> parents: 4405 diff changeset	754 i_error("LDAP: Your LDAP library doesn't support TLS");
4741 deccf9e1aebc LDAP code changes: If auth binds are used, bind back to the default dn Timo Sirainen <tss@iki.fi> parents: 4624 diff changeset	755 return -1;
4415 b91816cd1d16 Added TLS support for LDAP if the library supports it. Timo Sirainen <tss@iki.fi> parents: 4405 diff changeset	756 #endif
b91816cd1d16 Added TLS support for LDAP if the library supports it. Timo Sirainen <tss@iki.fi> parents: 4405 diff changeset	757 }
b91816cd1d16 Added TLS support for LDAP if the library supports it. Timo Sirainen <tss@iki.fi> parents: 4405 diff changeset	758
4319 31a28cd0b020 Added support for SASL binding. Patch by Geert Jansen Timo Sirainen <tss@iki.fi> parents: 4295 diff changeset	759 if (conn->set.sasl_bind) {
4426 b8089cf41c96 Check for sasl.h and sasl/sasl.h existence and use the one that's found. If Timo Sirainen <tss@iki.fi> parents: 4415 diff changeset	760 #ifdef HAVE_LDAP_SASL
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	761 struct db_ldap_sasl_bind_context context;
4426 b8089cf41c96 Check for sasl.h and sasl/sasl.h existence and use the one that's found. If Timo Sirainen <tss@iki.fi> parents: 4415 diff changeset	762
b8089cf41c96 Check for sasl.h and sasl/sasl.h existence and use the one that's found. If Timo Sirainen <tss@iki.fi> parents: 4415 diff changeset	763 memset(&context, 0, sizeof(context));
4319 31a28cd0b020 Added support for SASL binding. Patch by Geert Jansen Timo Sirainen <tss@iki.fi> parents: 4295 diff changeset	764 context.authcid = conn->set.dn;
31a28cd0b020 Added support for SASL binding. Patch by Geert Jansen Timo Sirainen <tss@iki.fi> parents: 4295 diff changeset	765 context.passwd = conn->set.dnpass;
31a28cd0b020 Added support for SASL binding. Patch by Geert Jansen Timo Sirainen <tss@iki.fi> parents: 4295 diff changeset	766 context.realm = conn->set.sasl_realm;
31a28cd0b020 Added support for SASL binding. Patch by Geert Jansen Timo Sirainen <tss@iki.fi> parents: 4295 diff changeset	767 context.authzid = conn->set.sasl_authz_id;
31a28cd0b020 Added support for SASL binding. Patch by Geert Jansen Timo Sirainen <tss@iki.fi> parents: 4295 diff changeset	768
4743 8f4eb963446c Cleanup Timo Sirainen <tss@iki.fi> parents: 4742 diff changeset	769 /* There doesn't seem to be a way to do SASL binding
8f4eb963446c Cleanup Timo Sirainen <tss@iki.fi> parents: 4742 diff changeset	770 asynchronously.. */
4405 fe17f63521ea Compiler warning fixes and some coding style cleanups. Timo Sirainen <tss@iki.fi> parents: 4319 diff changeset	771 ret = ldap_sasl_interactive_bind_s(conn->ld, NULL,
fe17f63521ea Compiler warning fixes and some coding style cleanups. Timo Sirainen <tss@iki.fi> parents: 4319 diff changeset	772 conn->set.sasl_mech,
4319 31a28cd0b020 Added support for SASL binding. Patch by Geert Jansen Timo Sirainen <tss@iki.fi> parents: 4295 diff changeset	773 NULL, NULL, LDAP_SASL_QUIET,
31a28cd0b020 Added support for SASL binding. Patch by Geert Jansen Timo Sirainen <tss@iki.fi> parents: 4295 diff changeset	774 sasl_interact, &context);
4743 8f4eb963446c Cleanup Timo Sirainen <tss@iki.fi> parents: 4742 diff changeset	775 if (db_ldap_connect_finish(conn, ret) < 0)
8f4eb963446c Cleanup Timo Sirainen <tss@iki.fi> parents: 4742 diff changeset	776 return -1;
4426 b8089cf41c96 Check for sasl.h and sasl/sasl.h existence and use the one that's found. If Timo Sirainen <tss@iki.fi> parents: 4415 diff changeset	777 #else
b8089cf41c96 Check for sasl.h and sasl/sasl.h existence and use the one that's found. If Timo Sirainen <tss@iki.fi> parents: 4415 diff changeset	778 i_fatal("LDAP: sasl_bind=yes but no SASL support compiled in");
b8089cf41c96 Check for sasl.h and sasl/sasl.h existence and use the one that's found. If Timo Sirainen <tss@iki.fi> parents: 4415 diff changeset	779 #endif
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	780 conn->conn_state = LDAP_CONN_STATE_BOUND_DEFAULT;
4319 31a28cd0b020 Added support for SASL binding. Patch by Geert Jansen Timo Sirainen <tss@iki.fi> parents: 4295 diff changeset	781 } else {
4741 deccf9e1aebc LDAP code changes: If auth binds are used, bind back to the default dn Timo Sirainen <tss@iki.fi> parents: 4624 diff changeset	782 if (db_ldap_bind(conn) < 0)
deccf9e1aebc LDAP code changes: If auth binds are used, bind back to the default dn Timo Sirainen <tss@iki.fi> parents: 4624 diff changeset	783 return -1;
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	784 }
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	785
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	786 db_ldap_get_fd(conn);
4741 deccf9e1aebc LDAP code changes: If auth binds are used, bind back to the default dn Timo Sirainen <tss@iki.fi> parents: 4624 diff changeset	787 conn->io = io_add(conn->fd, IO_READ, ldap_input, conn);
deccf9e1aebc LDAP code changes: If auth binds are used, bind back to the default dn Timo Sirainen <tss@iki.fi> parents: 4624 diff changeset	788 return 0;
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	789 }
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	790
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	791 static void db_ldap_disconnect_timeout(struct ldap_connection *conn)
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	792 {
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	793 db_ldap_abort_requests(conn, -1U,
7062 36402809db43 When aborting queued requests, log the reason for it. Timo Sirainen <tss@iki.fi> parents: 7050 diff changeset	794 DB_LDAP_REQUEST_DISCONNECT_TIMEOUT_SECS,
36402809db43 When aborting queued requests, log the reason for it. Timo Sirainen <tss@iki.fi> parents: 7050 diff changeset	795 FALSE, "LDAP server not connected");
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	796
7079 d45c3058b91a Renamed queue to aqueue ("array queue") because struct queue already exists Timo Sirainen <tss@iki.fi> parents: 7062 diff changeset	797 if (aqueue_count(conn->request_queue) == 0) {
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	798 /* no requests left, remove this timeout handler */
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	799 timeout_remove(&conn->to);
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	800 }
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	801 }
1897 1e6ed8045f2b Changed hash_foreach() to iterator. Timo Sirainen <tss@iki.fi> parents: 1709 diff changeset	802
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	803 static void db_ldap_conn_close(struct ldap_connection *conn)
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	804 {
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	805 struct ldap_request const requests, *request;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	806 unsigned int i;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	807
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	808 conn->conn_state = LDAP_CONN_STATE_DISCONNECTED;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	809 conn->default_bind_msgid = -1;
1897 1e6ed8045f2b Changed hash_foreach() to iterator. Timo Sirainen <tss@iki.fi> parents: 1709 diff changeset	810
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	811 if (conn->pending_count != 0) {
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	812 requests = array_idx(&conn->request_array, 0);
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	813 for (i = 0; i < conn->pending_count; i++) {
7079 d45c3058b91a Renamed queue to aqueue ("array queue") because struct queue already exists Timo Sirainen <tss@iki.fi> parents: 7062 diff changeset	814 request = requests[aqueue_idx(conn->request_queue, i)];
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	815
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	816 i_assert(request->msgid != -1);
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	817 request->msgid = -1;
3731 0a7beabfe332 If LDAP lookup fails because connection gets closed, try retrying it again Timo Sirainen <tss@iki.fi> parents: 3657 diff changeset	818 }
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	819 conn->pending_count = 0;
1897 1e6ed8045f2b Changed hash_foreach() to iterator. Timo Sirainen <tss@iki.fi> parents: 1709 diff changeset	820 }
1210 8e6addbf12b3 minor ldap fixes Timo Sirainen <tss@iki.fi> parents: 1191 diff changeset	821
3879 928229f8b3e6 deinit, unref, destroy, close, free, etc. functions now take a pointer to Timo Sirainen <tss@iki.fi> parents: 3863 diff changeset	822 if (conn->io != NULL)
928229f8b3e6 deinit, unref, destroy, close, free, etc. functions now take a pointer to Timo Sirainen <tss@iki.fi> parents: 3863 diff changeset	823 io_remove(&conn->io);
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	824
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	825 if (conn->ld != NULL) {
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	826 ldap_unbind(conn->ld);
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	827 conn->ld = NULL;
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	828 }
4741 deccf9e1aebc LDAP code changes: If auth binds are used, bind back to the default dn Timo Sirainen <tss@iki.fi> parents: 4624 diff changeset	829 conn->fd = -1;
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	830
7079 d45c3058b91a Renamed queue to aqueue ("array queue") because struct queue already exists Timo Sirainen <tss@iki.fi> parents: 7062 diff changeset	831 if (aqueue_count(conn->request_queue) == 0) {
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	832 if (conn->to != NULL)
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	833 timeout_remove(&conn->to);
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	834 } else if (conn->to == NULL) {
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	835 conn->to = timeout_add(DB_LDAP_REQUEST_DISCONNECT_TIMEOUT_SECS *
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	836 1000/2, db_ldap_disconnect_timeout, conn);
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	837 }
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	838 }
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	839
3158 8849f2e380d1 userdb can now return extra parameters to master. Removed special handling Timo Sirainen <tss@iki.fi> parents: 3094 diff changeset	840 void db_ldap_set_attrs(struct ldap_connection conn, const char attrlist,
3306 aebed9a9edac If both userdb and passdb used LDAP the later one was overriding first one's Timo Sirainen <tss@iki.fi> parents: 3212 diff changeset	841 char **attr_names_r, struct hash_table attr_map,
4741 deccf9e1aebc LDAP code changes: If auth binds are used, bind back to the default dn Timo Sirainen <tss@iki.fi> parents: 4624 diff changeset	842 const char *skip_attr)
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	843 {
6175 6c3788e03f7e Ignore spaces after commas in user_attrs and pass_attrs. Timo Sirainen <tss@iki.fi> parents: 6152 diff changeset	844 const char const attr, attr_data, p;
6149 a744ae38a9e1 Having =key=value in pass_attrs or user_attrs allows returning static Timo Sirainen <tss@iki.fi> parents: 6148 diff changeset	845 string_t *static_data;
6175 6c3788e03f7e Ignore spaces after commas in user_attrs and pass_attrs. Timo Sirainen <tss@iki.fi> parents: 6152 diff changeset	846 char name, value;
4741 deccf9e1aebc LDAP code changes: If auth binds are used, bind back to the default dn Timo Sirainen <tss@iki.fi> parents: 4624 diff changeset	847 unsigned int i, j, size;
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	848
3158 8849f2e380d1 userdb can now return extra parameters to master. Removed special handling Timo Sirainen <tss@iki.fi> parents: 3094 diff changeset	849 if (*attrlist == '\0')
8849f2e380d1 userdb can now return extra parameters to master. Removed special handling Timo Sirainen <tss@iki.fi> parents: 3094 diff changeset	850 return;
8849f2e380d1 userdb can now return extra parameters to master. Removed special handling Timo Sirainen <tss@iki.fi> parents: 3094 diff changeset	851
8849f2e380d1 userdb can now return extra parameters to master. Removed special handling Timo Sirainen <tss@iki.fi> parents: 3094 diff changeset	852 attr = t_strsplit(attrlist, ",");
6149 a744ae38a9e1 Having =key=value in pass_attrs or user_attrs allows returning static Timo Sirainen <tss@iki.fi> parents: 6148 diff changeset	853 static_data = t_str_new(128);
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	854
3212 eb840633c9bf LDAP crashfixes. Timo Sirainen <tss@iki.fi> parents: 3161 diff changeset	855 /* @UNSAFE */
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	856 for (size = 0; attr[size] != NULL; size++) ;
3306 aebed9a9edac If both userdb and passdb used LDAP the later one was overriding first one's Timo Sirainen <tss@iki.fi> parents: 3212 diff changeset	857 attr_names_r = p_new(conn->pool, char , size + 1);
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	858
4741 deccf9e1aebc LDAP code changes: If auth binds are used, bind back to the default dn Timo Sirainen <tss@iki.fi> parents: 4624 diff changeset	859 for (i = j = 0; i < size; i++) {
6175 6c3788e03f7e Ignore spaces after commas in user_attrs and pass_attrs. Timo Sirainen <tss@iki.fi> parents: 6152 diff changeset	860 /* allow spaces here so "foo=1, bar=2" works */
6c3788e03f7e Ignore spaces after commas in user_attrs and pass_attrs. Timo Sirainen <tss@iki.fi> parents: 6152 diff changeset	861 attr_data = attr[i];
6c3788e03f7e Ignore spaces after commas in user_attrs and pass_attrs. Timo Sirainen <tss@iki.fi> parents: 6152 diff changeset	862 while (*attr_data == ' ') attr_data++;
6c3788e03f7e Ignore spaces after commas in user_attrs and pass_attrs. Timo Sirainen <tss@iki.fi> parents: 6152 diff changeset	863
6c3788e03f7e Ignore spaces after commas in user_attrs and pass_attrs. Timo Sirainen <tss@iki.fi> parents: 6152 diff changeset	864 p = strchr(attr_data, '=');
6148 668a768fc8fd Removed deprecated pass_attrs and user_attrs configuration method. Timo Sirainen <tss@iki.fi> parents: 6147 diff changeset	865 if (p == NULL)
6175 6c3788e03f7e Ignore spaces after commas in user_attrs and pass_attrs. Timo Sirainen <tss@iki.fi> parents: 6152 diff changeset	866 name = value = p_strdup(conn->pool, attr_data);
6c3788e03f7e Ignore spaces after commas in user_attrs and pass_attrs. Timo Sirainen <tss@iki.fi> parents: 6152 diff changeset	867 else if (p != attr_data) {
6c3788e03f7e Ignore spaces after commas in user_attrs and pass_attrs. Timo Sirainen <tss@iki.fi> parents: 6152 diff changeset	868 name = p_strdup_until(conn->pool, attr_data, p);
3158 8849f2e380d1 userdb can now return extra parameters to master. Removed special handling Timo Sirainen <tss@iki.fi> parents: 3094 diff changeset	869 value = p_strdup(conn->pool, p + 1);
6149 a744ae38a9e1 Having =key=value in pass_attrs or user_attrs allows returning static Timo Sirainen <tss@iki.fi> parents: 6148 diff changeset	870 } else {
a744ae38a9e1 Having =key=value in pass_attrs or user_attrs allows returning static Timo Sirainen <tss@iki.fi> parents: 6148 diff changeset	871 /* =<static key>=<static value> */
a744ae38a9e1 Having =key=value in pass_attrs or user_attrs allows returning static Timo Sirainen <tss@iki.fi> parents: 6148 diff changeset	872 if (str_len(static_data) > 0)
a744ae38a9e1 Having =key=value in pass_attrs or user_attrs allows returning static Timo Sirainen <tss@iki.fi> parents: 6148 diff changeset	873 str_append_c(static_data, ',');
a744ae38a9e1 Having =key=value in pass_attrs or user_attrs allows returning static Timo Sirainen <tss@iki.fi> parents: 6148 diff changeset	874 str_append(static_data, p + 1);
a744ae38a9e1 Having =key=value in pass_attrs or user_attrs allows returning static Timo Sirainen <tss@iki.fi> parents: 6148 diff changeset	875 continue;
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	876 }
3158 8849f2e380d1 userdb can now return extra parameters to master. Removed special handling Timo Sirainen <tss@iki.fi> parents: 3094 diff changeset	877
4816 8ac2a2d27364 Cleanup: Don't put string literals into non-const pointers. Timo Sirainen <tss@iki.fi> parents: 4806 diff changeset	878 if (*name != '\0' &&
8ac2a2d27364 Cleanup: Don't put string literals into non-const pointers. Timo Sirainen <tss@iki.fi> parents: 4806 diff changeset	879 (skip_attr == NULL \|\| strcmp(skip_attr, value) != 0)) {
3306 aebed9a9edac If both userdb and passdb used LDAP the later one was overriding first one's Timo Sirainen <tss@iki.fi> parents: 3212 diff changeset	880 hash_insert(attr_map, name, value);
4741 deccf9e1aebc LDAP code changes: If auth binds are used, bind back to the default dn Timo Sirainen <tss@iki.fi> parents: 4624 diff changeset	881 (*attr_names_r)[j++] = name;
deccf9e1aebc LDAP code changes: If auth binds are used, bind back to the default dn Timo Sirainen <tss@iki.fi> parents: 4624 diff changeset	882 }
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	883 }
6149 a744ae38a9e1 Having =key=value in pass_attrs or user_attrs allows returning static Timo Sirainen <tss@iki.fi> parents: 6148 diff changeset	884 if (str_len(static_data) > 0) {
a744ae38a9e1 Having =key=value in pass_attrs or user_attrs allows returning static Timo Sirainen <tss@iki.fi> parents: 6148 diff changeset	885 hash_insert(attr_map, "",
a744ae38a9e1 Having =key=value in pass_attrs or user_attrs allows returning static Timo Sirainen <tss@iki.fi> parents: 6148 diff changeset	886 p_strdup(conn->pool, str_c(static_data)));
a744ae38a9e1 Having =key=value in pass_attrs or user_attrs allows returning static Timo Sirainen <tss@iki.fi> parents: 6148 diff changeset	887 }
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	888 }
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	889
5884 1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	890 struct var_expand_table *
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	891 db_ldap_value_get_var_expand_table(struct auth_request *auth_request)
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	892 {
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	893 const struct var_expand_table *auth_table;
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	894 struct var_expand_table *table;
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	895 unsigned int count;
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	896
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	897 auth_table = auth_request_get_var_expand_table(auth_request, NULL);
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	898 for (count = 0; auth_table[count].key != '\0'; count++) ;
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	899 count++;
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	900
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	901 table = t_new(struct var_expand_table, count + 1);
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	902 table[0].key = '$';
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	903 memcpy(table + 1, auth_table, sizeof(table) count);
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	904 return table;
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	905 }
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	906
1330 7cde19dbe754 Moved auth_username_chars from db-pgsql to generic for all. Some other Timo Sirainen <tss@iki.fi> parents: 1282 diff changeset	907 #define IS_LDAP_ESCAPED_CHAR(c) \
7cde19dbe754 Moved auth_username_chars from db-pgsql to generic for all. Some other Timo Sirainen <tss@iki.fi> parents: 1282 diff changeset	908 ((c) == '*' \|\| (c) == '(' \|\| (c) == ')' \|\| (c) == '\\')
7cde19dbe754 Moved auth_username_chars from db-pgsql to generic for all. Some other Timo Sirainen <tss@iki.fi> parents: 1282 diff changeset	909
4295 4fc637010202 Escape SQL strings using sql_escape_string(). Fixes the problems with Timo Sirainen <tss@iki.fi> parents: 4180 diff changeset	910 const char ldap_escape(const char str,
6411 6a64e64fa3a3 Renamed __attr___ to ATTR_. Renamed __attrs_used__ to ATTRS_DEFINED. Timo Sirainen <tss@iki.fi> parents: 6370 diff changeset	911 const struct auth_request *auth_request ATTR_UNUSED)
1189 2cb8e2136283 Escape special chars in username if needed. Timo Sirainen <tss@iki.fi> parents: 1182 diff changeset	912 {
2cb8e2136283 Escape special chars in username if needed. Timo Sirainen <tss@iki.fi> parents: 1182 diff changeset	913 const char *p;
1330 7cde19dbe754 Moved auth_username_chars from db-pgsql to generic for all. Some other Timo Sirainen <tss@iki.fi> parents: 1282 diff changeset	914 string_t *ret;
1189 2cb8e2136283 Escape special chars in username if needed. Timo Sirainen <tss@iki.fi> parents: 1182 diff changeset	915
2cb8e2136283 Escape special chars in username if needed. Timo Sirainen <tss@iki.fi> parents: 1182 diff changeset	916 for (p = str; *p != '\0'; p++) {
1330 7cde19dbe754 Moved auth_username_chars from db-pgsql to generic for all. Some other Timo Sirainen <tss@iki.fi> parents: 1282 diff changeset	917 if (IS_LDAP_ESCAPED_CHAR(*p))
1189 2cb8e2136283 Escape special chars in username if needed. Timo Sirainen <tss@iki.fi> parents: 1182 diff changeset	918 break;
2cb8e2136283 Escape special chars in username if needed. Timo Sirainen <tss@iki.fi> parents: 1182 diff changeset	919 }
2cb8e2136283 Escape special chars in username if needed. Timo Sirainen <tss@iki.fi> parents: 1182 diff changeset	920
2cb8e2136283 Escape special chars in username if needed. Timo Sirainen <tss@iki.fi> parents: 1182 diff changeset	921 if (*p == '\0')
2cb8e2136283 Escape special chars in username if needed. Timo Sirainen <tss@iki.fi> parents: 1182 diff changeset	922 return str;
2cb8e2136283 Escape special chars in username if needed. Timo Sirainen <tss@iki.fi> parents: 1182 diff changeset	923
1330 7cde19dbe754 Moved auth_username_chars from db-pgsql to generic for all. Some other Timo Sirainen <tss@iki.fi> parents: 1282 diff changeset	924 ret = t_str_new((size_t) (p - str) + 64);
7cde19dbe754 Moved auth_username_chars from db-pgsql to generic for all. Some other Timo Sirainen <tss@iki.fi> parents: 1282 diff changeset	925 str_append_n(ret, str, (size_t) (p - str));
7cde19dbe754 Moved auth_username_chars from db-pgsql to generic for all. Some other Timo Sirainen <tss@iki.fi> parents: 1282 diff changeset	926
1189 2cb8e2136283 Escape special chars in username if needed. Timo Sirainen <tss@iki.fi> parents: 1182 diff changeset	927 for (; *p != '\0'; p++) {
1330 7cde19dbe754 Moved auth_username_chars from db-pgsql to generic for all. Some other Timo Sirainen <tss@iki.fi> parents: 1282 diff changeset	928 if (IS_LDAP_ESCAPED_CHAR(*p))
7cde19dbe754 Moved auth_username_chars from db-pgsql to generic for all. Some other Timo Sirainen <tss@iki.fi> parents: 1282 diff changeset	929 str_append_c(ret, '\\');
7cde19dbe754 Moved auth_username_chars from db-pgsql to generic for all. Some other Timo Sirainen <tss@iki.fi> parents: 1282 diff changeset	930 str_append_c(ret, *p);
1189 2cb8e2136283 Escape special chars in username if needed. Timo Sirainen <tss@iki.fi> parents: 1182 diff changeset	931 }
1330 7cde19dbe754 Moved auth_username_chars from db-pgsql to generic for all. Some other Timo Sirainen <tss@iki.fi> parents: 1282 diff changeset	932 return str_c(ret);
1189 2cb8e2136283 Escape special chars in username if needed. Timo Sirainen <tss@iki.fi> parents: 1182 diff changeset	933 }
2cb8e2136283 Escape special chars in username if needed. Timo Sirainen <tss@iki.fi> parents: 1182 diff changeset	934
5884 1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	935 struct db_ldap_result_iterate_context *
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	936 db_ldap_result_iterate_init(struct ldap_connection conn, LDAPMessage entry,
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	937 struct auth_request *auth_request,
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	938 struct hash_table *attr_map)
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	939 {
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	940 struct db_ldap_result_iterate_context *ctx;
6149 a744ae38a9e1 Having =key=value in pass_attrs or user_attrs allows returning static Timo Sirainen <tss@iki.fi> parents: 6148 diff changeset	941 const char *static_data;
5884 1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	942
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	943 ctx = t_new(struct db_ldap_result_iterate_context, 1);
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	944 ctx->conn = conn;
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	945 ctx->entry = entry;
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	946 ctx->auth_request = auth_request;
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	947 ctx->attr_map = attr_map;
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	948
6149 a744ae38a9e1 Having =key=value in pass_attrs or user_attrs allows returning static Timo Sirainen <tss@iki.fi> parents: 6148 diff changeset	949 static_data = hash_lookup(attr_map, "");
a744ae38a9e1 Having =key=value in pass_attrs or user_attrs allows returning static Timo Sirainen <tss@iki.fi> parents: 6148 diff changeset	950 if (static_data != NULL)
a744ae38a9e1 Having =key=value in pass_attrs or user_attrs allows returning static Timo Sirainen <tss@iki.fi> parents: 6148 diff changeset	951 ctx->static_attrs = t_strsplit(static_data, ",");
a744ae38a9e1 Having =key=value in pass_attrs or user_attrs allows returning static Timo Sirainen <tss@iki.fi> parents: 6148 diff changeset	952
5884 1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	953 if (auth_request->auth->verbose_debug)
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	954 ctx->debug = t_str_new(256);
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	955
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	956 ctx->attr = ldap_first_attribute(conn->ld, entry, &ctx->ber);
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	957 return ctx;
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	958 }
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	959
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	960 static void
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	961 db_ldap_result_iterate_finish(struct db_ldap_result_iterate_context *ctx)
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	962 {
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	963 if (ctx->debug != NULL && str_len(ctx->debug) > 0) {
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	964 auth_request_log_debug(ctx->auth_request, "ldap",
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	965 "result: %s", str_c(ctx->debug) + 1);
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	966 }
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	967
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	968 ber_free(ctx->ber, 0);
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	969 }
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	970
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	971 static void
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	972 db_ldap_result_change_attr(struct db_ldap_result_iterate_context *ctx)
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	973 {
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	974 ctx->name = hash_lookup(ctx->attr_map, ctx->attr);
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	975
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	976 if (ctx->debug != NULL) {
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	977 str_printfa(ctx->debug, " %s(%s)=", ctx->attr,
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	978 ctx->name != NULL ? ctx->name : "?unknown?");
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	979 }
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	980
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	981 if (ctx->name == NULL \|\| *ctx->name == '\0') {
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	982 ctx->value = NULL;
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	983 return;
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	984 }
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	985
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	986 if (strchr(ctx->name, '%') != NULL &&
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	987 (ctx->template = strchr(ctx->name, '=')) != NULL) {
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	988 /* we want to use variables */
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	989 ctx->name = t_strdup_until(ctx->name, ctx->template);
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	990 ctx->template++;
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	991 if (ctx->var_table == NULL) {
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	992 ctx->var_table = db_ldap_value_get_var_expand_table(
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	993 ctx->auth_request);
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	994 ctx->var = t_str_new(256);
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	995 }
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	996 }
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	997
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	998 ctx->vals = ldap_get_values(ctx->conn->ld, ctx->entry,
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	999 ctx->attr);
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1000 ctx->value = ctx->vals[0];
6144 d779b7220e23 LDAP crashfixes. Based on patch by Katsu Yamamoto. Timo Sirainen <tss@iki.fi> parents: 5884 diff changeset	1001 ctx->value_idx = 0;
5884 1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1002 }
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1003
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1004 static void
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1005 db_ldap_result_return_value(struct db_ldap_result_iterate_context *ctx)
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1006 {
6144 d779b7220e23 LDAP crashfixes. Based on patch by Katsu Yamamoto. Timo Sirainen <tss@iki.fi> parents: 5884 diff changeset	1007 bool first = ctx->value_idx == 0;
5884 1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1008
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1009 if (ctx->template != NULL) {
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1010 ctx->var_table[0].value = ctx->value;
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1011 str_truncate(ctx->var, 0);
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1012 var_expand(ctx->var, ctx->template, ctx->var_table);
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1013 ctx->value = str_c(ctx->var);
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1014 }
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1015
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1016 if (ctx->debug != NULL) {
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1017 if (!first)
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1018 str_append_c(ctx->debug, '/');
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1019 if (ctx->auth_request->auth->verbose_debug_passwords \|\|
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1020 strcmp(ctx->name, "password") != 0)
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1021 str_append(ctx->debug, ctx->value);
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1022 else
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1023 str_append(ctx->debug, PASSWORD_HIDDEN_STR);
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1024 }
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1025 }
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1026
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1027 static bool db_ldap_result_int_next(struct db_ldap_result_iterate_context *ctx)
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1028 {
6149 a744ae38a9e1 Having =key=value in pass_attrs or user_attrs allows returning static Timo Sirainen <tss@iki.fi> parents: 6148 diff changeset	1029 const char *p;
a744ae38a9e1 Having =key=value in pass_attrs or user_attrs allows returning static Timo Sirainen <tss@iki.fi> parents: 6148 diff changeset	1030
5884 1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1031 while (ctx->attr != NULL) {
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1032 if (ctx->vals == NULL) {
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1033 /* a new attribute */
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1034 db_ldap_result_change_attr(ctx);
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1035 } else {
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1036 /* continuing existing attribute */
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1037 if (ctx->value != NULL)
6144 d779b7220e23 LDAP crashfixes. Based on patch by Katsu Yamamoto. Timo Sirainen <tss@iki.fi> parents: 5884 diff changeset	1038 ctx->value = ctx->vals[++ctx->value_idx];
5884 1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1039 }
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1040
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1041 if (ctx->value != NULL) {
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1042 db_ldap_result_return_value(ctx);
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1043 return TRUE;
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1044 }
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1045
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1046 ldap_value_free(ctx->vals); ctx->vals = NULL;
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1047 ldap_memfree(ctx->attr);
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1048 ctx->attr = ldap_next_attribute(ctx->conn->ld, ctx->entry,
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1049 ctx->ber);
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1050 }
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1051
6149 a744ae38a9e1 Having =key=value in pass_attrs or user_attrs allows returning static Timo Sirainen <tss@iki.fi> parents: 6148 diff changeset	1052 if (ctx->static_attrs != NULL && *ctx->static_attrs != NULL) {
a744ae38a9e1 Having =key=value in pass_attrs or user_attrs allows returning static Timo Sirainen <tss@iki.fi> parents: 6148 diff changeset	1053 p = strchr(*ctx->static_attrs, '=');
a744ae38a9e1 Having =key=value in pass_attrs or user_attrs allows returning static Timo Sirainen <tss@iki.fi> parents: 6148 diff changeset	1054 if (p == NULL) {
a744ae38a9e1 Having =key=value in pass_attrs or user_attrs allows returning static Timo Sirainen <tss@iki.fi> parents: 6148 diff changeset	1055 ctx->name = *ctx->static_attrs;
a744ae38a9e1 Having =key=value in pass_attrs or user_attrs allows returning static Timo Sirainen <tss@iki.fi> parents: 6148 diff changeset	1056 ctx->value = "";
a744ae38a9e1 Having =key=value in pass_attrs or user_attrs allows returning static Timo Sirainen <tss@iki.fi> parents: 6148 diff changeset	1057 } else {
a744ae38a9e1 Having =key=value in pass_attrs or user_attrs allows returning static Timo Sirainen <tss@iki.fi> parents: 6148 diff changeset	1058 ctx->name = t_strdup_until(*ctx->static_attrs, p);
a744ae38a9e1 Having =key=value in pass_attrs or user_attrs allows returning static Timo Sirainen <tss@iki.fi> parents: 6148 diff changeset	1059 ctx->value = p + 1;
a744ae38a9e1 Having =key=value in pass_attrs or user_attrs allows returning static Timo Sirainen <tss@iki.fi> parents: 6148 diff changeset	1060 }
a744ae38a9e1 Having =key=value in pass_attrs or user_attrs allows returning static Timo Sirainen <tss@iki.fi> parents: 6148 diff changeset	1061 ctx->static_attrs++;
a744ae38a9e1 Having =key=value in pass_attrs or user_attrs allows returning static Timo Sirainen <tss@iki.fi> parents: 6148 diff changeset	1062 return TRUE;
a744ae38a9e1 Having =key=value in pass_attrs or user_attrs allows returning static Timo Sirainen <tss@iki.fi> parents: 6148 diff changeset	1063 }
a744ae38a9e1 Having =key=value in pass_attrs or user_attrs allows returning static Timo Sirainen <tss@iki.fi> parents: 6148 diff changeset	1064
5884 1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1065 db_ldap_result_iterate_finish(ctx);
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1066 return FALSE;
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1067 }
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1068
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1069 bool db_ldap_result_iterate_next(struct db_ldap_result_iterate_context *ctx,
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1070 const char name_r, const char value_r)
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1071 {
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1072 if (!db_ldap_result_int_next(ctx))
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1073 return FALSE;
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1074
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1075 *name_r = ctx->name;
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1076 *value_r = ctx->value;
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1077 return TRUE;
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1078 }
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1079
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1080 bool db_ldap_result_iterate_next_all(struct db_ldap_result_iterate_context *ctx,
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1081 const char **name_r,
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1082 const char const *values_r)
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1083 {
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1084 if (!db_ldap_result_int_next(ctx))
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1085 return FALSE;
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1086
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1087 if (ctx->template != NULL) {
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1088 /* we can use only one value with templates */
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1089 ctx->val_1_arr[0] = ctx->value;
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1090 *values_r = ctx->val_1_arr;
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1091 } else {
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1092 values_r = (const char const *)ctx->vals;
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1093 }
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1094 ctx->value = NULL;
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1095 *name_r = ctx->name;
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1096 return TRUE;
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1097 }
1c1dee40e495 Moved generic LDAP result iteration to db_ldap. It also supports now Timo Sirainen <tss@iki.fi> parents: 5872 diff changeset	1098
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	1099 static const char parse_setting(const char key, const char *value,
4907 5b4c9b20eba0 Replaced void context from a lot of callbacks with the actual context Timo Sirainen <tss@iki.fi>* parents: 4903 diff changeset	1100 struct ldap_connection *conn)
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	1101 {
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	1102 return parse_setting_from_defs(conn->pool, setting_defs,
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	1103 &conn->set, key, value);
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	1104 }
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	1105
1143 50f10a7a3bad Use the same LDAP connection for both userdb and passdb if config_path is Timo Sirainen <tss@iki.fi> parents: 1141 diff changeset	1106 static struct ldap_connection ldap_conn_find(const char config_path)
50f10a7a3bad Use the same LDAP connection for both userdb and passdb if config_path is Timo Sirainen <tss@iki.fi> parents: 1141 diff changeset	1107 {
50f10a7a3bad Use the same LDAP connection for both userdb and passdb if config_path is Timo Sirainen <tss@iki.fi> parents: 1141 diff changeset	1108 struct ldap_connection *conn;
50f10a7a3bad Use the same LDAP connection for both userdb and passdb if config_path is Timo Sirainen <tss@iki.fi> parents: 1141 diff changeset	1109
50f10a7a3bad Use the same LDAP connection for both userdb and passdb if config_path is Timo Sirainen <tss@iki.fi> parents: 1141 diff changeset	1110 for (conn = ldap_connections; conn != NULL; conn = conn->next) {
50f10a7a3bad Use the same LDAP connection for both userdb and passdb if config_path is Timo Sirainen <tss@iki.fi> parents: 1141 diff changeset	1111 if (strcmp(conn->config_path, config_path) == 0)
50f10a7a3bad Use the same LDAP connection for both userdb and passdb if config_path is Timo Sirainen <tss@iki.fi> parents: 1141 diff changeset	1112 return conn;
50f10a7a3bad Use the same LDAP connection for both userdb and passdb if config_path is Timo Sirainen <tss@iki.fi> parents: 1141 diff changeset	1113 }
50f10a7a3bad Use the same LDAP connection for both userdb and passdb if config_path is Timo Sirainen <tss@iki.fi> parents: 1141 diff changeset	1114
50f10a7a3bad Use the same LDAP connection for both userdb and passdb if config_path is Timo Sirainen <tss@iki.fi> parents: 1141 diff changeset	1115 return NULL;
50f10a7a3bad Use the same LDAP connection for both userdb and passdb if config_path is Timo Sirainen <tss@iki.fi> parents: 1141 diff changeset	1116 }
50f10a7a3bad Use the same LDAP connection for both userdb and passdb if config_path is Timo Sirainen <tss@iki.fi> parents: 1141 diff changeset	1117
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	1118 struct ldap_connection db_ldap_init(const char config_path)
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	1119 {
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	1120 struct ldap_connection *conn;
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	1121 pool_t pool;
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	1122
1143 50f10a7a3bad Use the same LDAP connection for both userdb and passdb if config_path is Timo Sirainen <tss@iki.fi> parents: 1141 diff changeset	1123 /* see if it already exists */
50f10a7a3bad Use the same LDAP connection for both userdb and passdb if config_path is Timo Sirainen <tss@iki.fi> parents: 1141 diff changeset	1124 conn = ldap_conn_find(config_path);
50f10a7a3bad Use the same LDAP connection for both userdb and passdb if config_path is Timo Sirainen <tss@iki.fi> parents: 1141 diff changeset	1125 if (conn != NULL) {
50f10a7a3bad Use the same LDAP connection for both userdb and passdb if config_path is Timo Sirainen <tss@iki.fi> parents: 1141 diff changeset	1126 conn->refcount++;
50f10a7a3bad Use the same LDAP connection for both userdb and passdb if config_path is Timo Sirainen <tss@iki.fi> parents: 1141 diff changeset	1127 return conn;
50f10a7a3bad Use the same LDAP connection for both userdb and passdb if config_path is Timo Sirainen <tss@iki.fi> parents: 1141 diff changeset	1128 }
50f10a7a3bad Use the same LDAP connection for both userdb and passdb if config_path is Timo Sirainen <tss@iki.fi> parents: 1141 diff changeset	1129
3908 afe21b6d4b68 Give a clear error message if SQL/LDAP configuration file path was left Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	1130 if (*config_path == '\0')
afe21b6d4b68 Give a clear error message if SQL/LDAP configuration file path was left Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	1131 i_fatal("LDAP: Configuration file path not given");
afe21b6d4b68 Give a clear error message if SQL/LDAP configuration file path was left Timo Sirainen <tss@iki.fi> parents: 3879 diff changeset	1132
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	1133 pool = pool_alloconly_create("ldap_connection", 1024);
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	1134 conn = p_new(pool, struct ldap_connection, 1);
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	1135 conn->pool = pool;
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	1136 conn->refcount = 1;
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	1137
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	1138 conn->conn_state = LDAP_CONN_STATE_DISCONNECTED;
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	1139 conn->default_bind_msgid = -1;
4741 deccf9e1aebc LDAP code changes: If auth binds are used, bind back to the default dn Timo Sirainen <tss@iki.fi> parents: 4624 diff changeset	1140 conn->fd = -1;
1143 50f10a7a3bad Use the same LDAP connection for both userdb and passdb if config_path is Timo Sirainen <tss@iki.fi> parents: 1141 diff changeset	1141 conn->config_path = p_strdup(pool, config_path);
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	1142 conn->set = default_ldap_settings;
4903 204d7edc7cdc Added context parameter type safety checks for most callback APIs. Timo Sirainen <tss@iki.fi> parents: 4816 diff changeset	1143 if (!settings_read(config_path, NULL, parse_setting,
204d7edc7cdc Added context parameter type safety checks for most callback APIs. Timo Sirainen <tss@iki.fi> parents: 4816 diff changeset	1144 null_settings_section_callback, conn))
1610 6850142c4e25 New configuration file code. Some syntax changes, but tries to be somewhat Timo Sirainen <tss@iki.fi> parents: 1330 diff changeset	1145 exit(FATAL_DEFAULT);
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	1146
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	1147 if (conn->set.base == NULL)
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	1148 i_fatal("LDAP: No base given");
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	1149
4006 0e8f0647504b Check that uris and hosts settings are correct. Timo Sirainen <tss@iki.fi> parents: 3913 diff changeset	1150 if (conn->set.uris == NULL && conn->set.hosts == NULL)
0e8f0647504b Check that uris and hosts settings are correct. Timo Sirainen <tss@iki.fi> parents: 3913 diff changeset	1151 i_fatal("LDAP: No uris or hosts set");
0e8f0647504b Check that uris and hosts settings are correct. Timo Sirainen <tss@iki.fi> parents: 3913 diff changeset	1152 #ifndef LDAP_HAVE_INITIALIZE
4180 92b572fbb88a If LDAP library didn't have ldap_initialize() function, we always complained Timo Sirainen <tss@iki.fi> parents: 4006 diff changeset	1153 if (conn->set.uris != NULL) {
4006 0e8f0647504b Check that uris and hosts settings are correct. Timo Sirainen <tss@iki.fi> parents: 3913 diff changeset	1154 i_fatal("LDAP: Dovecot compiled without support for LDAP uris "
0e8f0647504b Check that uris and hosts settings are correct. Timo Sirainen <tss@iki.fi> parents: 3913 diff changeset	1155 "(ldap_initialize not found)");
0e8f0647504b Check that uris and hosts settings are correct. Timo Sirainen <tss@iki.fi> parents: 3913 diff changeset	1156 }
0e8f0647504b Check that uris and hosts settings are correct. Timo Sirainen <tss@iki.fi> parents: 3913 diff changeset	1157 #endif
0e8f0647504b Check that uris and hosts settings are correct. Timo Sirainen <tss@iki.fi> parents: 3913 diff changeset	1158
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	1159 conn->set.ldap_deref = deref2str(conn->set.deref);
3502 5e78500f1aee user_global_uid and user_global_gid settings weren't working. Also changed Timo Sirainen <tss@iki.fi> parents: 3474 diff changeset	1160 conn->set.ldap_scope = scope2str(conn->set.scope);
5e78500f1aee user_global_uid and user_global_gid settings weren't working. Also changed Timo Sirainen <tss@iki.fi> parents: 3474 diff changeset	1161
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	1162 i_array_init(&conn->request_array, DB_LDAP_MAX_QUEUE_SIZE);
7079 d45c3058b91a Renamed queue to aqueue ("array queue") because struct queue already exists Timo Sirainen <tss@iki.fi> parents: 7062 diff changeset	1163 conn->request_queue = aqueue_init(&conn->request_array.arr);
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	1164
1143 50f10a7a3bad Use the same LDAP connection for both userdb and passdb if config_path is Timo Sirainen <tss@iki.fi> parents: 1141 diff changeset	1165 conn->next = ldap_connections;
50f10a7a3bad Use the same LDAP connection for both userdb and passdb if config_path is Timo Sirainen <tss@iki.fi> parents: 1141 diff changeset	1166 ldap_connections = conn;
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	1167 return conn;
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	1168 }
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	1169
3879 928229f8b3e6 deinit, unref, destroy, close, free, etc. functions now take a pointer to Timo Sirainen <tss@iki.fi> parents: 3863 diff changeset	1170 void db_ldap_unref(struct ldap_connection **_conn)
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	1171 {
3879 928229f8b3e6 deinit, unref, destroy, close, free, etc. functions now take a pointer to Timo Sirainen <tss@iki.fi> parents: 3863 diff changeset	1172 struct ldap_connection conn = _conn;
3657 0c10475d9968 Separated passdb_module's interface and the actual data struct. Now it's Timo Sirainen <tss@iki.fi> parents: 3502 diff changeset	1173 struct ldap_connection **p;
0c10475d9968 Separated passdb_module's interface and the actual data struct. Now it's Timo Sirainen <tss@iki.fi> parents: 3502 diff changeset	1174
3879 928229f8b3e6 deinit, unref, destroy, close, free, etc. functions now take a pointer to Timo Sirainen <tss@iki.fi> parents: 3863 diff changeset	1175 *_conn = NULL;
3657 0c10475d9968 Separated passdb_module's interface and the actual data struct. Now it's Timo Sirainen <tss@iki.fi> parents: 3502 diff changeset	1176 i_assert(conn->refcount >= 0);
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	1177 if (--conn->refcount > 0)
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	1178 return;
3657 0c10475d9968 Separated passdb_module's interface and the actual data struct. Now it's Timo Sirainen <tss@iki.fi> parents: 3502 diff changeset	1179
0c10475d9968 Separated passdb_module's interface and the actual data struct. Now it's Timo Sirainen <tss@iki.fi> parents: 3502 diff changeset	1180 for (p = &ldap_connections; p != NULL; p = &(p)->next) {
0c10475d9968 Separated passdb_module's interface and the actual data struct. Now it's Timo Sirainen <tss@iki.fi> parents: 3502 diff changeset	1181 if (*p == conn) {
0c10475d9968 Separated passdb_module's interface and the actual data struct. Now it's Timo Sirainen <tss@iki.fi> parents: 3502 diff changeset	1182 *p = conn->next;
0c10475d9968 Separated passdb_module's interface and the actual data struct. Now it's Timo Sirainen <tss@iki.fi> parents: 3502 diff changeset	1183 break;
0c10475d9968 Separated passdb_module's interface and the actual data struct. Now it's Timo Sirainen <tss@iki.fi> parents: 3502 diff changeset	1184 }
0c10475d9968 Separated passdb_module's interface and the actual data struct. Now it's Timo Sirainen <tss@iki.fi> parents: 3502 diff changeset	1185 }
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	1186
7062 36402809db43 When aborting queued requests, log the reason for it. Timo Sirainen <tss@iki.fi> parents: 7050 diff changeset	1187 db_ldap_abort_requests(conn, -1U, 0, FALSE, "Shutting down");
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	1188 i_assert(conn->pending_count == 0);
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	1189 db_ldap_conn_close(conn);
0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	1190 i_assert(conn->to == NULL);
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	1191
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	1192 array_free(&conn->request_array);
7079 d45c3058b91a Renamed queue to aqueue ("array queue") because struct queue already exists Timo Sirainen <tss@iki.fi> parents: 7062 diff changeset	1193 aqueue_deinit(&conn->request_queue);
7050 0dcea80312b0 LDAP handling rewrite. Reconnections are handled a lot better now. If Timo Sirainen <tss@iki.fi> parents: 7045 diff changeset	1194
3306 aebed9a9edac If both userdb and passdb used LDAP the later one was overriding first one's Timo Sirainen <tss@iki.fi> parents: 3212 diff changeset	1195 if (conn->pass_attr_map != NULL)
6417 047d0d8bbf0a hash_destroy() and hash_iterate_deinit() now take ** pointer. Timo Sirainen <tss@iki.fi> parents: 6411 diff changeset	1196 hash_destroy(&conn->pass_attr_map);
3306 aebed9a9edac If both userdb and passdb used LDAP the later one was overriding first one's Timo Sirainen <tss@iki.fi> parents: 3212 diff changeset	1197 if (conn->user_attr_map != NULL)
6417 047d0d8bbf0a hash_destroy() and hash_iterate_deinit() now take ** pointer. Timo Sirainen <tss@iki.fi> parents: 6411 diff changeset	1198 hash_destroy(&conn->user_attr_map);
6428 7cad076906eb pool_unref() now takes ** pointer. Timo Sirainen <tss@iki.fi> parents: 6417 diff changeset	1199 pool_unref(&conn->pool);
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	1200 }
0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	1201
6198 4f6c4aeafafb --with-ldap=plugin builds LDAP passdb and userdb support as a plugin. Timo Sirainen <tss@iki.fi> parents: 6175 diff changeset	1202 #ifndef BUILTIN_LDAP
4f6c4aeafafb --with-ldap=plugin builds LDAP passdb and userdb support as a plugin. Timo Sirainen <tss@iki.fi> parents: 6175 diff changeset	1203 /* Building a plugin */
4f6c4aeafafb --with-ldap=plugin builds LDAP passdb and userdb support as a plugin. Timo Sirainen <tss@iki.fi> parents: 6175 diff changeset	1204 extern struct passdb_module_interface passdb_ldap;
4f6c4aeafafb --with-ldap=plugin builds LDAP passdb and userdb support as a plugin. Timo Sirainen <tss@iki.fi> parents: 6175 diff changeset	1205 extern struct userdb_module_interface userdb_ldap;
4f6c4aeafafb --with-ldap=plugin builds LDAP passdb and userdb support as a plugin. Timo Sirainen <tss@iki.fi> parents: 6175 diff changeset	1206
4f6c4aeafafb --with-ldap=plugin builds LDAP passdb and userdb support as a plugin. Timo Sirainen <tss@iki.fi> parents: 6175 diff changeset	1207 void authdb_ldap_init(void);
4f6c4aeafafb --with-ldap=plugin builds LDAP passdb and userdb support as a plugin. Timo Sirainen <tss@iki.fi> parents: 6175 diff changeset	1208 void authdb_ldap_deinit(void);
4f6c4aeafafb --with-ldap=plugin builds LDAP passdb and userdb support as a plugin. Timo Sirainen <tss@iki.fi> parents: 6175 diff changeset	1209
4f6c4aeafafb --with-ldap=plugin builds LDAP passdb and userdb support as a plugin. Timo Sirainen <tss@iki.fi> parents: 6175 diff changeset	1210 void authdb_ldap_init(void)
4f6c4aeafafb --with-ldap=plugin builds LDAP passdb and userdb support as a plugin. Timo Sirainen <tss@iki.fi> parents: 6175 diff changeset	1211 {
4f6c4aeafafb --with-ldap=plugin builds LDAP passdb and userdb support as a plugin. Timo Sirainen <tss@iki.fi> parents: 6175 diff changeset	1212 passdb_register_module(&passdb_ldap);
4f6c4aeafafb --with-ldap=plugin builds LDAP passdb and userdb support as a plugin. Timo Sirainen <tss@iki.fi> parents: 6175 diff changeset	1213 userdb_register_module(&userdb_ldap);
4f6c4aeafafb --with-ldap=plugin builds LDAP passdb and userdb support as a plugin. Timo Sirainen <tss@iki.fi> parents: 6175 diff changeset	1214
4f6c4aeafafb --with-ldap=plugin builds LDAP passdb and userdb support as a plugin. Timo Sirainen <tss@iki.fi> parents: 6175 diff changeset	1215 }
4f6c4aeafafb --with-ldap=plugin builds LDAP passdb and userdb support as a plugin. Timo Sirainen <tss@iki.fi> parents: 6175 diff changeset	1216 void authdb_ldap_deinit(void)
4f6c4aeafafb --with-ldap=plugin builds LDAP passdb and userdb support as a plugin. Timo Sirainen <tss@iki.fi> parents: 6175 diff changeset	1217 {
4f6c4aeafafb --with-ldap=plugin builds LDAP passdb and userdb support as a plugin. Timo Sirainen <tss@iki.fi> parents: 6175 diff changeset	1218 passdb_unregister_module(&passdb_ldap);
4f6c4aeafafb --with-ldap=plugin builds LDAP passdb and userdb support as a plugin. Timo Sirainen <tss@iki.fi> parents: 6175 diff changeset	1219 userdb_unregister_module(&userdb_ldap);
4f6c4aeafafb --with-ldap=plugin builds LDAP passdb and userdb support as a plugin. Timo Sirainen <tss@iki.fi> parents: 6175 diff changeset	1220 }
1062 0522a0315d2f Cleanups, LDAP support compiles again and generally looks ok, even if it Timo Sirainen <tss@iki.fi> parents: diff changeset	1221 #endif
6198 4f6c4aeafafb --with-ldap=plugin builds LDAP passdb and userdb support as a plugin. Timo Sirainen <tss@iki.fi> parents: 6175 diff changeset	1222
4f6c4aeafafb --with-ldap=plugin builds LDAP passdb and userdb support as a plugin. Timo Sirainen <tss@iki.fi> parents: 6175 diff changeset	1223 #endif

Mercurial > dovecot > original-hg > dovecot-1.2

annotate src/auth/db-ldap.c @ 7191:1cbaa724aba8 HEAD