X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-sql%2Finit.c;h=c4fb088a518e945b63058645570edefbd12ae93d;hb=9647ccd9456b8781066dbba5a063bf6c6c9dab6d;hp=79d8dec530d590a7e78b5331f2e2671fd4c58e68;hpb=05348c5fc5fb0803ddaeeb6c50a6513c03e9a765;p=openldap

diff --git a/servers/slapd/back-sql/init.c b/servers/slapd/back-sql/init.c
index 79d8dec530..c4fb088a51 100644
--- a/servers/slapd/back-sql/init.c
+++ b/servers/slapd/back-sql/init.c
@@ -1,10 +1,21 @@
-/*
- *	 Copyright 1999, Dmitry Kovalev <mit@openldap.org>, All rights reserved.
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- *	 Redistribution and use in source and binary forms are permitted only
- *	 as authorized by the OpenLDAP Public License.	A copy of this
- *	 license is available at http://www.OpenLDAP.org/license.html or
- *	 in file LICENSE in the top-level directory of the distribution.
+ * Copyright 1999-2003 The OpenLDAP Foundation.
+ * Portions Copyright 1999 Dmitry Kovalev.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* ACKNOWLEDGEMENTS:
+ * This work was initially developed by Dmitry Kovalev for inclusion
+ * by OpenLDAP Software.
  */
 
 #include "portable.h"
@@ -23,7 +34,7 @@
 #ifdef SLAPD_SQL_DYNAMIC
 
 int
-backsql_LTX_init_module(
+init_module(
 	int 		argc, 
 	char 		*argv[] )
 {
@@ -31,18 +42,30 @@ backsql_LTX_init_module(
 
 	memset( &bi, '\0', sizeof( bi ) );
 	bi.bi_type = "sql";
-	bi.bi_init = backbacksql_initialize;
+	bi.bi_init = sql_back_initialize;
 
 	backend_add( &bi );
 	return 0;
 }
 
-#endif /* SLAPD_SHELL_DYNAMIC */
+#endif /* SLAPD_SQL_DYNAMIC */
 
 int
 sql_back_initialize(
 	BackendInfo	*bi )
 { 
+	static char *controls[] = {
+#ifdef LDAP_CONTROL_NOOP
+		LDAP_CONTROL_NOOP,
+#endif
+#ifdef LDAP_CONTROL_VALUESRETURNFILTER
+ 		LDAP_CONTROL_VALUESRETURNFILTER,
+#endif
+		NULL
+	};
+
+	bi->bi_controls = controls;
+
 	Debug( LDAP_DEBUG_TRACE,"==>backsql_initialize()\n", 0, 0, 0 );
 	
 	bi->bi_open = 0;
@@ -56,24 +79,18 @@ sql_back_initialize(
 	bi->bi_db_close = backsql_db_close;
 	bi->bi_db_destroy = backsql_db_destroy;
 
-#ifdef BACKSQL_ALL_DONE
-	bi->bi_op_abandon = backsql_abandon;
-	bi->bi_op_compare = backsql_compare;
-#else
 	bi->bi_op_abandon = 0;
-	bi->bi_op_compare = 0;
-#endif
+	bi->bi_op_compare = backsql_compare;
 	bi->bi_op_bind = backsql_bind;
-	bi->bi_op_unbind = backsql_unbind;
+	bi->bi_op_unbind = 0;
 	bi->bi_op_search = backsql_search;
 	bi->bi_op_modify = backsql_modify;
 	bi->bi_op_modrdn = backsql_modrdn;
 	bi->bi_op_add = backsql_add;
 	bi->bi_op_delete = backsql_delete;
 	
-	bi->bi_acl_group = 0;
-	bi->bi_acl_attribute = 0;
 	bi->bi_chk_referrals = 0;
+	bi->bi_operational = backsql_operational;
  
 	bi->bi_connection_init = 0;
 	bi->bi_connection_destroy = backsql_connection_destroy;
@@ -100,10 +117,10 @@ backsql_db_init(
  
 	Debug( LDAP_DEBUG_TRACE, "==>backsql_db_init()\n", 0, 0, 0 );
 	si = (backsql_info *)ch_calloc( 1, sizeof( backsql_info ) );
+	memset( si, '\0', sizeof( backsql_info ) );
 	ldap_pvt_thread_mutex_init( &si->dbconn_mutex );
 	ldap_pvt_thread_mutex_init( &si->schema_mutex );
 	backsql_init_db_env( si );
-	si->has_ldapinfo_dn_ru = -1;
 
 	bd->be_private = si;
 	Debug( LDAP_DEBUG_TRACE, "<==backsql_db_init()\n", 0, 0, 0 );
@@ -120,11 +137,11 @@ backsql_db_destroy(
 	ldap_pvt_thread_mutex_lock( &si->dbconn_mutex );
 	backsql_free_db_env( si );
 	ldap_pvt_thread_mutex_unlock( &si->dbconn_mutex );
+	ldap_pvt_thread_mutex_destroy( &si->dbconn_mutex );
 	ldap_pvt_thread_mutex_lock( &si->schema_mutex );
 	backsql_destroy_schema_map( si );
 	ldap_pvt_thread_mutex_unlock( &si->schema_mutex );
 	ldap_pvt_thread_mutex_destroy( &si->schema_mutex );
-	ldap_pvt_thread_mutex_destroy( &si->dbconn_mutex );
 	free( si->dbname );
 	free( si->dbuser );
 	if ( si->dbpasswd ) {
@@ -133,11 +150,13 @@ backsql_db_destroy(
 	if ( si->dbhost ) {
 		free( si->dbhost );
 	}
-	if ( si->upper_func ) {
-		free( si->upper_func );
+	if ( si->upper_func.bv_val ) {
+		free( si->upper_func.bv_val );
+		free( si->upper_func_open.bv_val );
+		free( si->upper_func_close.bv_val );
 	}
 	
-	free( si->subtree_cond );
+	free( si->subtree_cond.bv_val );
 	free( si->oc_query );
 	free( si->at_query );
 	free( si->insentry_query );
@@ -153,62 +172,183 @@ backsql_db_open(
 	BackendDB 	*bd )
 {
 	backsql_info 	*si = (backsql_info*)bd->be_private;
-	Connection 	tmp;
 	SQLHDBC 	dbh;
-	int 		idq_len;
-	struct berval	bv;
+	ber_len_t	idq_len;
+	struct berbuf	bb = BB_NULL;
 
+	Operation	otmp;
+		
 	Debug( LDAP_DEBUG_TRACE, "==>backsql_db_open(): "
 		"testing RDBMS connection\n", 0, 0, 0 );
 	if ( si->dbname == NULL ) {
 		Debug( LDAP_DEBUG_TRACE, "backsql_db_open(): "
 			"datasource name not specified "
-			"(use dbname directive in slapd.conf)\n", 0, 0, 0 );
+			"(use \"dbname\" directive in slapd.conf)\n", 0, 0, 0 );
 		return 1;
 	}
-	
+
+	if ( si->concat_func == NULL ) {
+		Debug( LDAP_DEBUG_TRACE, "backsql_db_open(): "
+			"concat func not specified (use \"concat_pattern\" "
+			"directive in slapd.conf)\n", 0, 0, 0 );
+
+		if ( backsql_split_pattern( backsql_def_concat_func, 
+				&si->concat_func, 2 ) ) {
+			Debug( LDAP_DEBUG_TRACE, "backsql_db_open(): "
+				"unable to parse pattern '%s'",
+				backsql_def_concat_func, 0, 0 );
+			return 1;
+		}
+	}
+
+	/*
+	 * Prepare cast string as required
+	 */
+	if ( si->upper_func.bv_val ) {
+		char buf[1024];
+
+		if ( BACKSQL_UPPER_NEEDS_CAST( si ) ) {
+			snprintf( buf, sizeof( buf ), 
+				"%s(cast (" /* ? as varchar(%d))) */ , 
+				si->upper_func.bv_val );
+			ber_str2bv( buf, 0, 1, &si->upper_func_open );
+
+			snprintf( buf, sizeof( buf ),
+				/* (cast(? */ " as varchar(%d)))",
+				BACKSQL_MAX_DN_LEN );
+			ber_str2bv( buf, 0, 1, &si->upper_func_close );
+
+		} else {
+			snprintf( buf, sizeof( buf ), "%s(" /* ?) */ ,
+					si->upper_func.bv_val );
+			ber_str2bv( buf, 0, 1, &si->upper_func_open );
+
+			ber_str2bv( /* (? */ ")", 0, 1, &si->upper_func_close );
+		}
+	}
+
+	/* normalize filter values only if necessary */
+	si->bi_caseIgnoreMatch = mr_find( "caseIgnoreMatch" );
+
 	if ( si->dbuser == NULL ) {
 		Debug( LDAP_DEBUG_TRACE, "backsql_db_open(): "
 			"user name not specified "
-			"(use dbuser directive in slapd.conf)\n", 0, 0, 0 );
+			"(use \"dbuser\" directive in slapd.conf)\n", 0, 0, 0 );
 		return 1;
 	}
 	
-	if ( si->subtree_cond == NULL ) {
+	if ( si->subtree_cond.bv_val == NULL ) {
+		/*
+		 * Prepare concat function for subtree search condition
+		 */
+		struct berval	concat;
+		struct berval	values[] = {
+			{ sizeof( "'%'" ) - 1,	"'%'" },
+			{ sizeof( "?" ) - 1,	"?" },
+			{ 0,			NULL }
+		};
+		struct berbuf	bb = BB_NULL;
+
+		if ( backsql_prepare_pattern( si->concat_func, values, 
+				&concat ) ) {
+			Debug( LDAP_DEBUG_TRACE, "backsql_db_open(): "
+				"unable to prepare CONCAT pattern", 0, 0, 0 );
+			return 1;
+		}
+			
 		Debug( LDAP_DEBUG_TRACE, "backsql_db_open(): "
 			"subtree search SQL condition not specified "
-			"(use subtree_cond directive in slapd.conf)\n", 
+			"(use \"subtree_cond\" directive in slapd.conf)\n", 
 			0, 0, 0);
-		if ( si->upper_func ) {
-			struct berval	bv = { 0, NULL };
-			int		len = 0;
 
-			backsql_strcat( &bv, &len, si->upper_func,
-					backsql_def_upper_subtree_cond, NULL );
-			si->subtree_cond = bv.bv_val;
+		if ( si->upper_func.bv_val ) {
+
+			/*
+			 * UPPER(ldap_entries.dn) LIKE UPPER(CONCAT('%',?))
+			 */
+
+			backsql_strfcat( &bb, "blbbb",
+					&si->upper_func,
+					(ber_len_t)sizeof( "(ldap_entries.dn) LIKE " ) - 1,
+						"(ldap_entries.dn) LIKE ",
+					&si->upper_func_open,
+					&concat,
+					&si->upper_func_close );
+
 		} else {
-			si->subtree_cond = ch_strdup( backsql_def_subtree_cond );
+
+			/*
+			 * ldap_entries.dn LIKE CONCAT('%',?)
+			 */
+
+			backsql_strfcat( &bb, "lb",
+					(ber_len_t)sizeof( "ldap_entries.dn LIKE " ) - 1,
+						"ldap_entries.dn LIKE ",
+					&concat );
 		}
+
+		si->subtree_cond = bb.bb_val;
 			
 		Debug( LDAP_DEBUG_TRACE, "backsql_db_open(): "
 			"setting '%s' as default\n",
-			si->subtree_cond, 0, 0 );
+			si->subtree_cond.bv_val, 0, 0 );
+	}
+
+	if ( si->children_cond.bv_val == NULL ) {
+		struct berbuf	bb = BB_NULL;
+
+		if ( si->upper_func.bv_val ) {
+
+			/*
+			 * UPPER(ldap_entries.dn) LIKE UPPER(CONCAT('%,',?))
+			 */
+
+			backsql_strfcat( &bb, "blbl",
+					&si->upper_func,
+					(ber_len_t)sizeof( "(ldap_entries.dn)=" ) - 1,
+						"(ldap_entries.dn)=",
+					&si->upper_func,
+					(ber_len_t)sizeof( "(?)" ) - 1, "(?)" );
+
+		} else {
+
+			/*
+			 * ldap_entries.dn LIKE CONCAT('%,',?)
+			 */
+
+			backsql_strfcat( &bb, "l",
+					(ber_len_t)sizeof( "ldap_entries.dn=?" ) - 1,
+						"ldap_entries.dn=?");
+		}
+
+		si->children_cond = bb.bb_val;
+			
+		Debug( LDAP_DEBUG_TRACE, "backsql_db_open(): "
+			"setting '%s' as default\n",
+			si->children_cond.bv_val, 0, 0 );
 	}
 
 	if ( si->oc_query == NULL ) {
+		if ( BACKSQL_CREATE_NEEDS_SELECT( si ) ) {
+			si->oc_query =
+				ch_strdup( backsql_def_needs_select_oc_query );
+
+		} else {
+			si->oc_query = ch_strdup( backsql_def_oc_query );
+		}
+
 		Debug( LDAP_DEBUG_TRACE, "backsql_db_open(): "
 			"objectclass mapping SQL statement not specified "
-			"(use oc_query directive in slapd.conf)\n", 0, 0, 0 );
+			"(use \"oc_query\" directive in slapd.conf)\n", 
+			0, 0, 0 );
 		Debug( LDAP_DEBUG_TRACE, "backsql_db_open(): "
-			"setting '%s' by default\n", 
-			backsql_def_oc_query, 0, 0 );
-		si->oc_query = ch_strdup( backsql_def_oc_query );
+			"setting '%s' by default\n", si->oc_query, 0, 0 );
 	}
 	
 	if ( si->at_query == NULL ) {
 		Debug( LDAP_DEBUG_TRACE, "backsql_db_open(): "
 			"attribute mapping SQL statement not specified "
-			"(use at_query directive in slapd.conf)\n",
+			"(use \"at_query\" directive in slapd.conf)\n",
 			0, 0, 0 );
 		Debug(LDAP_DEBUG_TRACE, "backsql_db_open(): "
 			"setting '%s' by default\n",
@@ -219,7 +359,7 @@ backsql_db_open(
 	if ( si->insentry_query == NULL ) {
 		Debug( LDAP_DEBUG_TRACE, "backsql_db_open(): "
 			"entry insertion SQL statement not specified "
-			"(use insentry_query directive in slapd.conf)\n",
+			"(use \"insentry_query\" directive in slapd.conf)\n",
 			0, 0, 0 );
 		Debug(LDAP_DEBUG_TRACE, "backsql_db_open(): "
 			"setting '%s' by default\n",
@@ -230,51 +370,69 @@ backsql_db_open(
 	if ( si->delentry_query == NULL ) {
 		Debug( LDAP_DEBUG_TRACE, "backsql_db_open(): "
 			"entry deletion SQL statement not specified "
-			"(use delentry_query directive in slapd.conf)\n",
+			"(use \"delentry_query\" directive in slapd.conf)\n",
 			0, 0, 0 );
 		Debug( LDAP_DEBUG_TRACE, "backsql_db_open(): "
 			"setting '%s' by default\n",
 			backsql_def_delentry_query, 0, 0 );
 		si->delentry_query = ch_strdup( backsql_def_delentry_query );
 	}
-	
-	tmp.c_connid =- 1;
-	if ( backsql_get_db_conn( bd, &tmp, &dbh ) != LDAP_SUCCESS ) {
+
+	otmp.o_connid = -1;
+	otmp.o_bd = bd;
+	if ( backsql_get_db_conn( &otmp, &dbh ) != LDAP_SUCCESS ) {
 		Debug( LDAP_DEBUG_TRACE, "backsql_db_open(): "
 			"connection failed, exiting\n", 0, 0, 0 );
 		return 1;
 	}
 
+	/*
+	 * Prepare ID selection query
+	 */
 	si->id_query = NULL;
 	idq_len = 0;
 
-	bv.bv_val = NULL;
-	bv.bv_len = 0;
-	if ( si->upper_func == NULL ) {
-		backsql_strcat( &bv, &idq_len, backsql_id_query, 
-				"dn=?", NULL );
+	if ( si->upper_func.bv_val == NULL ) {
+		backsql_strcat( &bb, backsql_id_query, "dn=?", NULL );
 	} else {
-		if ( si->has_ldapinfo_dn_ru ) {
-			backsql_strcat( &bv, &idq_len, backsql_id_query,
+		if ( BACKSQL_HAS_LDAPINFO_DN_RU( si ) ) {
+			backsql_strcat( &bb, backsql_id_query,
 					"dn_ru=?", NULL );
 		} else {
-			if ( si->isTimesTen ) {
-				backsql_strcat( &bv, &idq_len, 
+			if ( BACKSQL_USE_REVERSE_DN( si ) ) {
+				backsql_strfcat( &bb, "sbl",
 						backsql_id_query,
-						si->upper_func, "(dn)=?",
-						NULL );
+						&si->upper_func, 
+						(ber_len_t)sizeof( "(dn)=?" ) - 1, "(dn)=?" );
 			} else {
-				backsql_strcat( &bv, &idq_len, 
+				backsql_strfcat( &bb, "sblbcb",
 						backsql_id_query,
-						si->upper_func, "(dn)=",
-						si->upper_func, "(?)", NULL );
+						&si->upper_func, 
+						(ber_len_t)sizeof( "(dn)=" ) - 1, "(dn)=",
+						&si->upper_func_open, 
+						'?', 
+						&si->upper_func_close );
 			}
 		}
 	}
-	si->id_query = bv.bv_val;
+	si->id_query = bb.bb_val.bv_val;
+
+       	/*
+	 * Prepare children ID selection query
+	 */
+	si->has_children_query = NULL;
+
+	bb.bb_val.bv_val = NULL;
+	bb.bb_val.bv_len = 0;
+	bb.bb_len = 0;
+	backsql_strfcat( &bb, "sb",
+			"SELECT COUNT(distinct subordinates.id) FROM ldap_entries,ldap_entries subordinates WHERE subordinates.parent=ldap_entries.id AND ",
+
+			&si->children_cond );
+	si->has_children_query = bb.bb_val.bv_val;
  
-	backsql_free_db_conn( bd, &tmp );
-	if ( !si->schema_loaded ) {
+	backsql_free_db_conn( &otmp );
+	if ( !BACKSQL_SCHEMA_LOADED( si ) ) {
 		Debug( LDAP_DEBUG_TRACE, "backsql_db_open(): "
 			"test failed, schema map not loaded - exiting\n",
 			0, 0, 0 );
@@ -296,12 +454,14 @@ backsql_db_close(
 }
 
 int
-backsql_connection_destroy(
-	BackendDB 	*be,
-	Connection 	*conn )
+backsql_connection_destroy( Backend *bd, Connection *c )
 {
+	Operation o;
+	o.o_bd = bd;
+	o.o_connid = c->c_connid;
+
 	Debug( LDAP_DEBUG_TRACE, "==>backsql_connection_destroy()\n", 0, 0, 0 );
-	backsql_free_db_conn( be, conn );
+	backsql_free_db_conn( &o );
 	Debug( LDAP_DEBUG_TRACE, "<==backsql_connection_destroy()\n", 0, 0, 0 );
 	return 0;
 }