-/*
- * Copyright 1999, Dmitry Kovalev <mit@openldap.org>, All rights reserved.
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1999-2004 The OpenLDAP Foundation.
+ * Portions Copyright 1999 Dmitry Kovalev.
+ * All rights reserved.
*
- * 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.
+ * 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"
#include <stdio.h>
#include <sys/types.h>
#include "ac/string.h"
-#include "lber_pvt.h"
-#include "ldap_pvt.h"
+
#include "slap.h"
-#include "back-sql.h"
-#include "sql-wrap.h"
-#include "schema-map.h"
-#include "entry-id.h"
-#include "util.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 )
assert( id );
- next = id->next;
+ next = id->eid_next;
+
+ 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->dn.bv_val != NULL ) {
- free( id->dn.bv_val );
+ if ( id->eid_keyval.bv_val ) {
+ free( id->eid_keyval.bv_val );
+ BER_BVZERO( &id->eid_keyval );
}
+#endif /* BACKSQL_ARBITRARY_KEY */
if ( freeit ) {
free( id );
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 ];
- char *toBind;
+ struct berval tbbDN;
int i, j;
- Debug( LDAP_DEBUG_TRACE, "==>backsql_dn2id(): dn='%s'\n",
- dn->bv_val, 0, 0 );
+ /*
+ * NOTE: id can be NULL; in this case, the function
+ * simply checks whether the DN can be successfully
+ * turned into an ID, returning LDAP_SUCCESS for
+ * positive cases, or the most appropriate error
+ */
- assert( id );
+ Debug( LDAP_DEBUG_TRACE, "==>backsql_dn2id(): dn=\"%s\"%s\n",
+ 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",
+ Debug( LDAP_DEBUG_TRACE, "==>backsql_dn2id(): upperdn=\"%s\"\n",
upperdn, 0, 0 );
- toBind = upperdn;
+ 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",
+ "==>backsql_dn2id(): upperdn=\"%s\"\n",
upperdn, 0, 0 );
- toBind = upperdn;
+ ber_str2bv( upperdn, 0, 0, &tbbDN );
} else {
- toBind = dn->bv_val;
+ tbbDN = *ndn;
}
}
- rc = backsql_BindParamStr( sth, 1, toBind, 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, 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, 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 ) ) {
- id->id = strtol( row.cols[ 0 ], NULL, 0 );
- id->keyval = strtol( row.cols[ 1 ], NULL, 0 );
- id->oc_id = strtol( row.cols[ 2 ], NULL, 0 );
- ber_dupbv( &id->dn, dn );
- id->next = NULL;
+ 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 );
+#else /* ! BACKSQL_ARBITRARY_KEY */
+ id->eid_id = strtol( row.cols[ 0 ], NULL, 0 );
+ id->eid_keyval = strtol( row.cols[ 1 ], NULL, 0 );
+#endif /* ! BACKSQL_ARBITRARY_KEY */
+ id->eid_oc_id = strtol( row.cols[ 2 ], NULL, 0 );
+
+ 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;
+ }
} else {
res = LDAP_NO_SUCH_OBJECT;
+ Debug( LDAP_DEBUG_TRACE, "<==backsql_dn2id(): no match\n",
+ 0, 0, 0 );
}
backsql_FreeRow( &row );
SQLFreeStmt( sth, SQL_DROP );
- if ( res == LDAP_SUCCESS ) {
- Debug( LDAP_DEBUG_TRACE, "<==backsql_dn2id(): id=%ld\n",
- id->id, 0, 0 );
- } else {
- Debug( LDAP_DEBUG_TRACE, "<==backsql_dn2id(): no match\n",
- 0, 0, 0 );
- }
return res;
}
RETCODE rc;
int res = LDAP_SUCCESS;
- Debug( LDAP_DEBUG_TRACE, "==>backsql_count_children(): dn='%s'\n",
+ Debug( LDAP_DEBUG_TRACE, "==>backsql_count_children(): dn=\"%s\"\n",
dn->bv_val, 0, 0 );
if ( dn->bv_len > BACKSQL_MAX_DN_LEN ) {
}
/* 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 );
+ Debug(LDAP_DEBUG_TRACE, "children id query \"%s\"\n",
+ 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;
}
char *end;
*nchildren = strtol( row.cols[ 0 ], &end, 0 );
- if ( end[ 0 ] != '\0' ) {
+ if ( end[ 0 ] != '\0' && end[0] != '.' ) {
+ /* FIXME: braindead RDBMSes return
+ * a fractional number from COUNT!
+ */
res = LDAP_OTHER;
}
{
backsql_at_map_rec *at = v_at;
backsql_srch_info *bsi = v_bsi;
- backsql_info *bi = (backsql_info *)bsi->op->o_bd->be_private;
+ backsql_info *bi = (backsql_info *)bsi->bsi_op->o_bd->be_private;
RETCODE rc;
SQLHSTMT sth;
BACKSQL_ROW_NTS row;
assert( at );
assert( bsi );
-
+
+#ifdef BACKSQL_ARBITRARY_KEY
Debug( LDAP_DEBUG_TRACE, "==>backsql_get_attr_vals(): "
- "oc='%s' attr='%s' keyval=%ld\n",
- BACKSQL_OC_NAME( bsi->oc ), at->ad->ad_cname.bv_val,
- bsi->c_eid->keyval );
+ "oc=\"%s\" attr=\"%s\" keyval=%s\n",
+ BACKSQL_OC_NAME( bsi->bsi_oc ), at->bam_ad->ad_cname.bv_val,
+ bsi->bsi_c_eid->eid_keyval.bv_val );
+#else /* ! BACKSQL_ARBITRARY_KEY */
+ Debug( LDAP_DEBUG_TRACE, "==>backsql_get_attr_vals(): "
+ "oc=\"%s\" attr=\"%s\" keyval=%ld\n",
+ BACKSQL_OC_NAME( bsi->bsi_oc ), at->bam_ad->ad_cname.bv_val,
+ bsi->bsi_c_eid->eid_keyval );
+#endif /* ! BACKSQL_ARBITRARY_KEY */
- rc = backsql_Prepare( bsi->dbh, &sth, at->query, 0 );
+ rc = backsql_Prepare( bsi->bsi_dbh, &sth, at->bam_query, 0 );
if ( rc != SQL_SUCCESS ) {
Debug( LDAP_DEBUG_TRACE, "backsql_get_attr_values(): "
- "error preparing query: %s\n", at->query, 0, 0 );
- backsql_PrintErrors( bi->db_env, bsi->dbh, sth, rc );
+ "error preparing query: %s\n", at->bam_query, 0, 0 );
+ backsql_PrintErrors( bi->sql_db_env, bsi->bsi_dbh, sth, rc );
return 1;
}
- rc = backsql_BindParamID( sth, 1, &bsi->c_eid->keyval );
+ 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->query, 0, 0 );
- backsql_PrintErrors( bi->db_env, bsi->dbh, sth, rc );
+ "error executing attribute query \"%s\"\n",
+ at->bam_query, 0, 0 );
+ backsql_PrintErrors( bi->sql_db_env, bsi->bsi_dbh, sth, rc );
SQLFreeStmt( sth, SQL_DROP );
return 1;
}
*/
bv.bv_len = strlen( row.cols[ i ] );
#endif
- backsql_entry_addattr( bsi->e,
+ backsql_entry_addattr( bsi->bsi_e,
&row.col_names[ i ], &bv,
- bsi->op->o_tmpmemctx );
+ bsi->bsi_op->o_tmpmemctx );
#ifdef BACKSQL_TRACE
Debug( LDAP_DEBUG_TRACE, "prec=%d\n",
(int)row.col_prec[ i ], 0, 0 );
} else {
Debug( LDAP_DEBUG_TRACE, "NULL value "
- "in this row for attribute '%s'\n",
+ "in this row for attribute \"%s\"\n",
row.col_names[ i ].bv_val, 0, 0 );
#endif /* BACKSQL_TRACE */
}
SQLFreeStmt( sth, SQL_DROP );
Debug( LDAP_DEBUG_TRACE, "<==backsql_get_attr_vals()\n", 0, 0, 0 );
+ if ( at->bam_next ) {
+ return backsql_get_attr_vals( at->bam_next, v_bsi );
+ }
+
return 1;
}
-Entry *
-backsql_id2entry( backsql_srch_info *bsi, Entry *e, backsql_entryID *eid )
+int
+backsql_id2entry( backsql_srch_info *bsi, backsql_entryID *eid )
{
+ backsql_info *bi = (backsql_info *)bsi->bsi_op->o_bd->be_private;
int i;
- backsql_at_map_rec *at;
int rc;
AttributeDescription *ad_oc = slap_schema.si_ad_objectClass;
Debug( LDAP_DEBUG_TRACE, "==>backsql_id2entry()\n", 0, 0, 0 );
- rc = dnPrettyNormal( NULL, &eid->dn, &e->e_name, &e->e_nname,
- bsi->op->o_tmpmemctx );
- if ( rc != LDAP_SUCCESS ) {
- return NULL;
+ assert( bsi->bsi_e );
+
+ memset( bsi->bsi_e, 0, sizeof( Entry ) );
+
+ 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;
}
- bsi->oc = backsql_id2oc( bsi->op->o_bd->be_private, eid->oc_id );
- bsi->e = e;
- bsi->c_eid = eid;
- e->e_attrs = NULL;
- e->e_private = NULL;
-
- e->e_id = eid->id;
+ 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;
+
+ bsi->bsi_oc = backsql_id2oc( bsi->bsi_op->o_bd->be_private,
+ eid->eid_oc_id );
+ bsi->bsi_c_eid = eid;
+
+#ifndef BACKSQL_ARBITRARY_KEY
+ bsi->bsi_e->e_id = eid->eid_id;
+#endif /* ! BACKSQL_ARBITRARY_KEY */
- if ( bsi->attrs != NULL ) {
+ rc = attr_merge_normalize_one( bsi->bsi_e, ad_oc,
+ &bsi->bsi_oc->bom_oc->soc_cname,
+ bsi->bsi_op->o_tmpmemctx );
+ if ( rc != LDAP_SUCCESS ) {
+ entry_clean( bsi->bsi_e );
+ return rc;
+ }
+
+ if ( bsi->bsi_attrs != NULL ) {
Debug( LDAP_DEBUG_TRACE, "backsql_id2entry(): "
"custom attribute list\n", 0, 0, 0 );
- for ( i = 0; bsi->attrs[ i ].an_name.bv_val; i++ ) {
- AttributeName *attr = &bsi->attrs[ i ];
+ for ( i = 0; bsi->bsi_attrs[ i ].an_name.bv_val; i++ ) {
+ backsql_at_map_rec **vat;
+ AttributeName *an = &bsi->bsi_attrs[ i ];
+ int j;
+
+ /* if one of the attributes listed here is
+ * a subtype of another, it must be ignored,
+ * because subtypes are already dealt with
+ * by backsql_supad2at()
+ */
+ for ( j = 0; bsi->bsi_attrs[ j ].an_name.bv_val; j++ ) {
+ /* skip self */
+ if ( j == i ) {
+ continue;
+ }
+
+ /* skip subtypes */
+ if ( is_at_subtype( an->an_desc->ad_type,
+ bsi->bsi_attrs[ j ].an_desc->ad_type ) )
+ {
+ goto next;
+ }
+ }
- if ( attr->an_desc == ad_oc ) {
+ rc = backsql_supad2at( bsi->bsi_oc, an->an_desc, &vat );
+ if ( rc != 0 || vat == NULL ) {
+ Debug( LDAP_DEBUG_TRACE, "backsql_id2entry(): "
+ "attribute \"%s\" is not defined "
+ "for objectlass \"%s\"\n",
+ an->an_name.bv_val,
+ BACKSQL_OC_NAME( bsi->bsi_oc ), 0 );
continue;
}
- at = backsql_ad2at( bsi->oc, attr->an_desc );
- if ( at != NULL ) {
- backsql_get_attr_vals( at, bsi );
- } else {
- Debug( LDAP_DEBUG_TRACE, "backsql_id2entry(): "
- "attribute '%s' is not defined "
- "for objectlass '%s'\n",
- attr->an_name.bv_val,
- BACKSQL_OC_NAME( bsi->oc ), 0 );
+ for ( j = 0; vat[j]; j++ ) {
+ backsql_get_attr_vals( vat[j], bsi );
}
+
+ ch_free( vat );
+
+next:;
}
} else {
Debug( LDAP_DEBUG_TRACE, "backsql_id2entry(): "
"retrieving all attributes\n", 0, 0, 0 );
- avl_apply( bsi->oc->attrs, backsql_get_attr_vals,
+ avl_apply( bsi->bsi_oc->bom_attrs, backsql_get_attr_vals,
bsi, 0, AVL_INORDER );
}
- if ( attr_merge_normalize_one( bsi->e, ad_oc, &bsi->oc->oc->soc_cname,
- bsi->op->o_tmpmemctx ) ) {
- entry_free( e );
- return NULL;
- }
-
if ( global_schemacheck ) {
const char *text = NULL;
char textbuf[ 1024 ];
size_t textlen = sizeof( textbuf );
struct berval bv[ 2 ];
struct berval soc;
- AttributeDescription *ad_soc
- = slap_schema.si_ad_structuralObjectClass;
int rc;
- bv[ 0 ] = bsi->oc->oc->soc_cname;
+ bv[ 0 ] = bsi->bsi_oc->bom_oc->soc_cname;
bv[ 1 ].bv_val = NULL;
rc = structural_class( bv, &soc, NULL,
&text, textbuf, textlen );
if ( rc != LDAP_SUCCESS ) {
- entry_free( e );
- return NULL;
+ Debug( LDAP_DEBUG_TRACE, "backsql_id2entry(%s): "
+ "structural_class() failed %d (%s)\n",
+ bsi->bsi_e->e_name.bv_val,
+ rc, text ? text : "" );
+ entry_clean( bsi->bsi_e );
+ return rc;
}
if ( ( bsi->bsi_flags | BSQL_SF_ALL_OPER )
- || an_find( bsi->attrs, &AllOper ) ) {
- rc = attr_merge_normalize_one( bsi->e,
+ || an_find( bsi->bsi_attrs, &AllOper ) ) {
+ rc = attr_merge_normalize_one( bsi->bsi_e,
slap_schema.si_ad_structuralObjectClass,
- &soc, bsi->op->o_tmpmemctx );
+ &soc, bsi->bsi_op->o_tmpmemctx );
if ( rc != LDAP_SUCCESS ) {
- entry_free( e );
- return NULL;
+ entry_clean( bsi->bsi_e );
+ return rc;
}
}
}
+done:;
Debug( LDAP_DEBUG_TRACE, "<==backsql_id2entry()\n", 0, 0, 0 );
- return e;
+ return LDAP_SUCCESS;
}
#endif /* SLAPD_SQL */
projects / openldap / blobdiff