#include <sys/types.h>
#include "ac/string.h"
-#include "lber_pvt.h"
-#include "ldap_pvt.h"
#include "slap.h"
#include "proto-sql.h"
+#ifdef BACKSQL_ARBITRARY_KEY
+struct berval backsql_baseObject_bv = BER_BVC( BACKSQL_BASEOBJECT_IDSTR );
+#endif /* BACKSQL_ARBITRARY_KEY */
+
backsql_entryID *
backsql_free_entryID( backsql_entryID *id, int freeit )
{
next = id->eid_next;
- if ( id->eid_dn.bv_val != NULL ) {
- free( id->eid_dn.bv_val );
+ if ( !BER_BVISNULL( &id->eid_ndn ) ) {
+ if ( !BER_BVISNULL( &id->eid_dn )
+ && id->eid_dn.bv_val != id->eid_ndn.bv_val )
+ {
+ free( id->eid_dn.bv_val );
+ BER_BVZERO( &id->eid_dn );
+ }
+
+ free( id->eid_ndn.bv_val );
+ BER_BVZERO( &id->eid_ndn );
}
#ifdef BACKSQL_ARBITRARY_KEY
if ( id->eid_id.bv_val ) {
free( id->eid_id.bv_val );
+ BER_BVZERO( &id->eid_id );
}
if ( id->eid_keyval.bv_val ) {
free( id->eid_keyval.bv_val );
+ BER_BVZERO( &id->eid_keyval );
}
#endif /* BACKSQL_ARBITRARY_KEY */
return next;
}
+/*
+ * NOTE: the dn must be normalized
+ */
int
backsql_dn2id(
backsql_info *bi,
backsql_entryID *id,
SQLHDBC dbh,
- struct berval *dn )
+ struct berval *ndn )
{
SQLHSTMT sth;
BACKSQL_ROW_NTS row;
/* TimesTen */
char upperdn[ BACKSQL_MAX_DN_LEN + 1 ];
- struct berval toBind;
+ struct berval tbbDN;
int i, j;
/*
*/
Debug( LDAP_DEBUG_TRACE, "==>backsql_dn2id(): dn=\"%s\"%s\n",
- dn->bv_val, id == NULL ? " (no ID)" : "", 0 );
+ ndn->bv_val, id == NULL ? " (no ID)" : "", 0 );
- if ( dn->bv_len > BACKSQL_MAX_DN_LEN ) {
+ if ( ndn->bv_len > BACKSQL_MAX_DN_LEN ) {
Debug( LDAP_DEBUG_TRACE,
"backsql_dn2id(): DN \"%s\" (%ld bytes) "
"exceeds max DN length (%d):\n",
- dn->bv_val, dn->bv_len, BACKSQL_MAX_DN_LEN );
+ ndn->bv_val, ndn->bv_len, BACKSQL_MAX_DN_LEN );
return LDAP_OTHER;
}
+
+ /* return baseObject if available and matches */
+ if ( bi->sql_baseObject != NULL && dn_match( ndn, &bi->sql_baseObject->e_nname ) ) {
+ if ( id != NULL ) {
+#ifdef BACKSQL_ARBITRARY_KEY
+ ber_dupbv( &id->eid_id, &backsql_baseObject_bv );
+ ber_dupbv( &id->eid_keyval, &backsql_baseObject_bv );
+#else /* ! BACKSQL_ARBITRARY_KEY */
+ id->eid_id = BACKSQL_BASEOBJECT_ID;
+ id->eid_keyval = BACKSQL_BASEOBJECT_KEYVAL;
+#endif /* ! BACKSQL_ARBITRARY_KEY */
+ id->eid_oc_id = BACKSQL_BASEOBJECT_OC;
+
+ ber_dupbv( &id->eid_ndn, &bi->sql_baseObject->e_nname );
+ ber_dupbv( &id->eid_dn, &bi->sql_baseObject->e_name );
+
+ id->eid_next = NULL;
+ }
+
+ return LDAP_SUCCESS;
+ }
/* begin TimesTen */
- Debug(LDAP_DEBUG_TRACE, "id_query \"%s\"\n", bi->id_query, 0, 0);
- assert( bi->id_query );
- rc = backsql_Prepare( dbh, &sth, bi->id_query, 0 );
+ Debug( LDAP_DEBUG_TRACE, "id_query \"%s\"\n", bi->sql_id_query, 0, 0 );
+ assert( bi->sql_id_query );
+ rc = backsql_Prepare( dbh, &sth, bi->sql_id_query, 0 );
if ( rc != SQL_SUCCESS ) {
Debug( LDAP_DEBUG_TRACE,
"backsql_dn2id(): error preparing SQL:\n%s",
- bi->id_query, 0, 0);
- backsql_PrintErrors( SQL_NULL_HENV, dbh, sth, rc );
+ bi->sql_id_query, 0, 0);
+ backsql_PrintErrors( bi->sql_db_env, dbh, sth, rc );
SQLFreeStmt( sth, SQL_DROP );
return LDAP_OTHER;
}
* that can be searched using indexes
*/
- for ( i = 0, j = dn->bv_len - 1; dn->bv_val[ i ]; i++, j--) {
- upperdn[ i ] = dn->bv_val[ j ];
+ for ( i = 0, j = ndn->bv_len - 1; ndn->bv_val[ i ]; i++, j--) {
+ upperdn[ i ] = ndn->bv_val[ j ];
}
upperdn[ i ] = '\0';
ldap_pvt_str2upper( upperdn );
Debug( LDAP_DEBUG_TRACE, "==>backsql_dn2id(): upperdn=\"%s\"\n",
upperdn, 0, 0 );
- ber_str2bv( upperdn, 0, 0, &toBind );
+ ber_str2bv( upperdn, 0, 0, &tbbDN );
} else {
if ( BACKSQL_USE_REVERSE_DN( bi ) ) {
- AC_MEMCPY( upperdn, dn->bv_val, dn->bv_len + 1 );
+ AC_MEMCPY( upperdn, ndn->bv_val, ndn->bv_len + 1 );
ldap_pvt_str2upper( upperdn );
Debug( LDAP_DEBUG_TRACE,
"==>backsql_dn2id(): upperdn=\"%s\"\n",
upperdn, 0, 0 );
- ber_str2bv( upperdn, 0, 0, &toBind );
+ ber_str2bv( upperdn, 0, 0, &tbbDN );
} else {
- toBind = *dn;
+ tbbDN = *ndn;
}
}
- rc = backsql_BindParamStr( sth, 1, toBind.bv_val, BACKSQL_MAX_DN_LEN );
+ rc = backsql_BindParamBerVal( sth, 1, SQL_PARAM_INPUT, &tbbDN );
if ( rc != SQL_SUCCESS) {
/* end TimesTen */
Debug( LDAP_DEBUG_TRACE, "backsql_dn2id(): "
"error binding dn=\"%s\" parameter:\n",
- toBind.bv_val, 0, 0 );
- backsql_PrintErrors( SQL_NULL_HENV, dbh, sth, rc );
+ tbbDN.bv_val, 0, 0 );
+ backsql_PrintErrors( bi->sql_db_env, dbh, sth, rc );
SQLFreeStmt( sth, SQL_DROP );
return LDAP_OTHER;
}
if ( rc != SQL_SUCCESS ) {
Debug( LDAP_DEBUG_TRACE, "backsql_dn2id(): "
"error executing query (\"%s\", \"%s\"):\n",
- bi->id_query, toBind.bv_val, 0 );
- backsql_PrintErrors( SQL_NULL_HENV, dbh, sth, rc );
+ bi->sql_id_query, tbbDN.bv_val, 0 );
+ backsql_PrintErrors( bi->sql_db_env, dbh, sth, rc );
SQLFreeStmt( sth, SQL_DROP );
return LDAP_OTHER;
}
backsql_BindRowAsStrings( sth, &row );
rc = SQLFetch( sth );
if ( BACKSQL_SUCCESS( rc ) ) {
- res = LDAP_SUCCESS;
- Debug( LDAP_DEBUG_TRACE, "<==backsql_dn2id(): id=%s keyval=%s oc_id=%s\n",
- row.cols[ 0 ], row.cols[ 1 ], row.cols[ 2 ] );
+ char buf[BUFSIZ];
+#ifdef LDAP_DEBUG
+ snprintf( buf, sizeof(buf),
+ "id=%s keyval=%s oc_id=%s dn=%s",
+ row.cols[ 0 ], row.cols[ 1 ],
+ row.cols[ 2 ], row.cols[ 3 ] );
+ Debug( LDAP_DEBUG_TRACE,
+ "<==backsql_dn2id(): %s\n", buf, 0, 0 );
+#endif /* LDAP_DEBUG */
+
+ res = LDAP_SUCCESS;
if ( id != NULL ) {
+ struct berval dn;
+
#ifdef BACKSQL_ARBITRARY_KEY
ber_str2bv( row.cols[ 0 ], 0, 1, &id->eid_id );
ber_str2bv( row.cols[ 1 ], 0, 1, &id->eid_keyval );
#endif /* ! BACKSQL_ARBITRARY_KEY */
id->eid_oc_id = strtol( row.cols[ 2 ], NULL, 0 );
- ber_dupbv( &id->eid_dn, dn );
+ ber_str2bv( row.cols[ 3 ], 0, 0, &dn );
+
+ res = dnPrettyNormal( NULL, &dn, &id->eid_dn, &id->eid_ndn, NULL );
+ if ( res != LDAP_SUCCESS ) {
+ Debug( LDAP_DEBUG_TRACE,
+ "<==backsql_dn2id(\"%s\"): "
+ "dnPrettyNormal failed (%d: %s)\n",
+ ndn->bv_val, res,
+ ldap_err2string( res ) );
+
+ /* cleanup... */
+ (void)backsql_free_entryID( id, 0 );
+ }
+
id->eid_next = NULL;
}
/* begin TimesTen */
Debug(LDAP_DEBUG_TRACE, "children id query \"%s\"\n",
- bi->has_children_query, 0, 0);
- assert( bi->has_children_query );
- rc = backsql_Prepare( dbh, &sth, bi->has_children_query, 0 );
+ bi->sql_has_children_query, 0, 0);
+ assert( bi->sql_has_children_query );
+ rc = backsql_Prepare( dbh, &sth, bi->sql_has_children_query, 0 );
if ( rc != SQL_SUCCESS ) {
Debug( LDAP_DEBUG_TRACE,
"backsql_count_children(): error preparing SQL:\n%s",
- bi->has_children_query, 0, 0);
- backsql_PrintErrors( SQL_NULL_HENV, dbh, sth, rc );
+ bi->sql_has_children_query, 0, 0);
+ backsql_PrintErrors( bi->sql_db_env, dbh, sth, rc );
SQLFreeStmt( sth, SQL_DROP );
return LDAP_OTHER;
}
- rc = backsql_BindParamStr( sth, 1, dn->bv_val, BACKSQL_MAX_DN_LEN );
+ rc = backsql_BindParamBerVal( sth, 1, SQL_PARAM_INPUT, dn );
if ( rc != SQL_SUCCESS) {
/* end TimesTen */
Debug( LDAP_DEBUG_TRACE, "backsql_count_children(): "
"error binding dn=\"%s\" parameter:\n",
dn->bv_val, 0, 0 );
- backsql_PrintErrors( SQL_NULL_HENV, dbh, sth, rc );
+ backsql_PrintErrors( bi->sql_db_env, dbh, sth, rc );
SQLFreeStmt( sth, SQL_DROP );
return LDAP_OTHER;
}
if ( rc != SQL_SUCCESS ) {
Debug( LDAP_DEBUG_TRACE, "backsql_count_children(): "
"error executing query (\"%s\", \"%s\"):\n",
- bi->has_children_query, dn->bv_val, 0 );
- backsql_PrintErrors( SQL_NULL_HENV, dbh, sth, rc );
+ bi->sql_has_children_query, dn->bv_val, 0 );
+ backsql_PrintErrors( bi->sql_db_env, dbh, sth, rc );
SQLFreeStmt( sth, SQL_DROP );
return LDAP_OTHER;
}
if ( rc != SQL_SUCCESS ) {
Debug( LDAP_DEBUG_TRACE, "backsql_get_attr_values(): "
"error preparing query: %s\n", at->bam_query, 0, 0 );
- backsql_PrintErrors( bi->db_env, bsi->bsi_dbh, sth, rc );
+ backsql_PrintErrors( bi->sql_db_env, bsi->bsi_dbh, sth, rc );
return 1;
}
-#ifdef BACKSQL_ARBITRARY_KEY
- rc = backsql_BindParamStr( sth, 1, bsi->bsi_c_eid->eid_keyval.bv_val,
- BACKSQL_MAX_KEY_LEN );
-#else /* ! BACKSQL_ARBITRARY_KEY */
- rc = backsql_BindParamID( sth, 1, &bsi->bsi_c_eid->eid_keyval );
-#endif /* ! BACKSQL_ARBITRARY_KEY */
+ rc = backsql_BindParamID( sth, 1, SQL_PARAM_INPUT,
+ &bsi->bsi_c_eid->eid_keyval );
if ( rc != SQL_SUCCESS ) {
Debug( LDAP_DEBUG_TRACE, "backsql_get_attr_values(): "
"error binding key value parameter\n", 0, 0, 0 );
return 1;
}
+#ifdef BACKSQL_TRACE
+#ifdef BACKSQL_ARBITRARY_KEY
+ Debug( LDAP_DEBUG_TRACE, "backsql_get_attr_values(): "
+ "query=\"%s\" keyval=%s\n", at->bam_query,
+ bsi->bsi_c_eid->eid_keyval.bv_val, 0 );
+#else /* !BACKSQL_ARBITRARY_KEY */
+ Debug( LDAP_DEBUG_TRACE, "backsql_get_attr_values(): "
+ "query=\"%s\" keyval=%d\n", at->bam_query,
+ bsi->bsi_c_eid->eid_keyval, 0 );
+#endif /* ! BACKSQL_ARBITRARY_KEY */
+#endif /* BACKSQL_TRACE */
+
rc = SQLExecute( sth );
if ( ! BACKSQL_SUCCESS( rc ) ) {
Debug( LDAP_DEBUG_TRACE, "backsql_get_attr_values(): "
"error executing attribute query \"%s\"\n",
at->bam_query, 0, 0 );
- backsql_PrintErrors( bi->db_env, bsi->bsi_dbh, sth, rc );
+ backsql_PrintErrors( bi->sql_db_env, bsi->bsi_dbh, sth, rc );
SQLFreeStmt( sth, SQL_DROP );
return 1;
}
int
backsql_id2entry( backsql_srch_info *bsi, backsql_entryID *eid )
{
+ backsql_info *bi = (backsql_info *)bsi->bsi_op->o_bd->be_private;
int i;
int rc;
AttributeDescription *ad_oc = slap_schema.si_ad_objectClass;
memset( bsi->bsi_e, 0, sizeof( Entry ) );
- rc = dnPrettyNormal( NULL, &eid->eid_dn,
- &bsi->bsi_e->e_name, &bsi->bsi_e->e_nname,
- bsi->bsi_op->o_tmpmemctx );
- if ( rc != LDAP_SUCCESS ) {
- return rc;
+ if ( bi->sql_baseObject && BACKSQL_IS_BASEOBJECT_ID( &eid->eid_id ) ) {
+ Entry *e;
+
+ e = entry_dup( bi->sql_baseObject );
+ if ( e == NULL ) {
+ return LDAP_NO_MEMORY;
+ }
+
+ *bsi->bsi_e = *e;
+ free( e );
+ goto done;
}
+ ber_dupbv_x( &bsi->bsi_e->e_name, &eid->eid_dn, bsi->bsi_op->o_tmpmemctx );
+ ber_dupbv_x( &bsi->bsi_e->e_nname, &eid->eid_ndn, bsi->bsi_op->o_tmpmemctx );
+
bsi->bsi_e->e_attrs = NULL;
bsi->bsi_e->e_private = NULL;
}
}
+done:;
Debug( LDAP_DEBUG_TRACE, "<==backsql_id2entry()\n", 0, 0, 0 );
return LDAP_SUCCESS;
projects / openldap / blobdiff