#include "slap.h"
#include "back-ldap.h"
+#define PRINT_CONNTREE 0
+
int
ldap_back_bind(
Backend *be,
Connection *conn,
Operation *op,
- const char *dn,
- const char *ndn,
+ struct berval *dn,
+ struct berval *ndn,
int method,
struct berval *cred,
- char **edn
+ struct berval *edn
)
{
struct ldapinfo *li = (struct ldapinfo *) be->be_private;
struct ldapconn *lc;
- char *mdn = NULL;
+ struct berval mdn = { 0, NULL };
int rc = 0;
- *edn = NULL;
-
lc = ldap_back_getconn(li, conn, op);
if ( !lc ) {
return( -1 );
}
- mdn = ldap_back_dn_massage( li, ch_strdup( dn ), 0 );
- if ( mdn == NULL ) {
- return -1;
+ /*
+ * Rewrite the bind dn if needed
+ */
+#ifdef ENABLE_REWRITE
+ switch ( rewrite_session( li->rwinfo, "bindDn", dn->bv_val, conn, &mdn.bv_val ) ) {
+ case REWRITE_REGEXEC_OK:
+ if ( mdn.bv_val == NULL ) {
+ mdn.bv_val = ( char * )dn->bv_val;
+ }
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
+ "[rw] bindDn: \"%s\" -> \"%s\"\n", dn->bv_val, mdn.bv_val ));
+#else /* !NEW_LOGGING */
+ Debug( LDAP_DEBUG_ARGS, "rw> bindDn: \"%s\" -> \"%s\"\n%s",
+ dn->bv_val, mdn.bv_val, "" );
+#endif /* !NEW_LOGGING */
+ break;
+
+ case REWRITE_REGEXEC_UNWILLING:
+ send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM,
+ NULL, "Unwilling to perform", NULL, NULL );
+ return( -1 );
+
+ case REWRITE_REGEXEC_ERR:
+ send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+ NULL, "Operations error", NULL, NULL );
+ return( -1 );
}
+#else /* !ENABLE_REWRITE */
+ ldap_back_dn_massage( li, dn, &mdn, 0, 1 );
+#endif /* !ENABLE_REWRITE */
- if (ldap_bind_s(lc->ld, mdn, cred->bv_val, method) != LDAP_SUCCESS) {
+ rc = ldap_bind_s(lc->ld, mdn.bv_val, cred->bv_val, method);
+ if (rc != LDAP_SUCCESS) {
rc = ldap_back_op_result( lc, op );
} else {
lc->bound = 1;
}
-
- free( mdn );
+
+ if ( mdn.bv_val != dn->bv_val ) {
+ free( mdn.bv_val );
+ }
return( rc );
}
/*
- * conn_cmp
+ * ldap_back_conn_cmp
*
* compares two struct ldapconn based on the value of the conn pointer;
* used by avl stuff
*/
int
-conn_cmp(
+ldap_back_conn_cmp(
const void *c1,
const void *c2
)
}
/*
- * conn_dup
+ * ldap_back_conn_dup
*
* returns -1 in case a duplicate struct ldapconn has been inserted;
* used by avl stuff
*/
int
-conn_dup(
+ldap_back_conn_dup(
void *c1,
void *c2
)
return( ( lc1->conn == lc2->conn ) ? -1 : 0 );
}
+#if PRINT_CONNTREE > 0
static void ravl_print( Avlnode *root, int depth )
{
int i;
for ( i = 0; i < depth; i++ )
printf( " " );
- printf( "c(%d) %d\n", ((struct ldapconn *) root->avl_data)->conn->c_connid, root->avl_bf );
+ printf( "c(%ld) %d\n", ((struct ldapconn *) root->avl_data)->conn->c_connid, root->avl_bf );
ravl_print( root->avl_left, depth+1 );
}
printf( "********\n" );
}
+#endif /* PRINT_CONNTREE */
struct ldapconn *
ldap_back_getconn(struct ldapinfo *li, Connection *conn, Operation *op)
lc_curr.conn = conn;
ldap_pvt_thread_mutex_lock( &li->conn_mutex );
lc = (struct ldapconn *)avl_find( li->conntree,
- (caddr_t)&lc_curr, conn_cmp );
+ (caddr_t)&lc_curr, ldap_back_conn_cmp );
ldap_pvt_thread_mutex_unlock( &li->conn_mutex );
/* Looks like we didn't get a bind. Open a new session... */
lc = (struct ldapconn *)ch_malloc(sizeof(struct ldapconn));
lc->conn = conn;
lc->ld = ld;
+
+#ifdef ENABLE_REWRITE
+ /*
+ * Sets a cookie for the rewrite session
+ */
+ ( void )rewrite_session_init( li->rwinfo, conn );
+#endif /* ENABLE_REWRITE */
+
if ( lc->conn->c_cdn != NULL && lc->conn->c_cdn[0] != '\0' ) {
- lc->bound_dn = ldap_back_dn_massage( li,
- ch_strdup( lc->conn->c_cdn ), 0 );
+
+ /*
+ * Rewrite the bind dn if needed
+ */
+#ifdef ENABLE_REWRITE
+ lc->bound_dn.bv_val = NULL;
+ lc->bound_dn.bv_len = 0;
+ switch ( rewrite_session( li->rwinfo, "bindDn",
+ lc->conn->c_cdn, conn,
+ &lc->bound_dn.bv_val ) ) {
+ case REWRITE_REGEXEC_OK:
+ if ( lc->bound_dn.bv_val == NULL ) {
+ lc->bound_dn.bv_val =
+ ch_strdup( lc->conn->c_cdn );
+ }
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
+ "[rw] bindDn: \"%s\" ->"
+ " \"%s\"\n%s",
+ lc->conn->c_cdn,
+ lc->bound_dn.bv_val ));
+#else /* !NEW_LOGGING */
+ Debug( LDAP_DEBUG_ARGS,
+ "rw> bindDn: \"%s\" ->"
+ " \"%s\"\n%s",
+ lc->conn->c_cdn,
+ lc->bound_dn.bv_val, "" );
+#endif /* !NEW_LOGGING */
+ break;
+
+ case REWRITE_REGEXEC_UNWILLING:
+ send_ldap_result( conn, op,
+ LDAP_UNWILLING_TO_PERFORM,
+ NULL, "Unwilling to perform",
+ NULL, NULL );
+ return( NULL );
+
+ case REWRITE_REGEXEC_ERR:
+ send_ldap_result( conn, op,
+ LDAP_OPERATIONS_ERROR,
+ NULL, "Operations error",
+ NULL, NULL );
+ return( NULL );
+ }
+#else /* !ENABLE_REWRITE */
+ struct berval bv;
+ ber_str2bv( lc->conn->c_cdn, 0, 0, &bv );
+ ldap_back_dn_massage( li, &bv, &lc->bound_dn, 0, 1 );
+#endif /* !ENABLE_REWRITE */
} else {
- lc->bound_dn = NULL;
+ lc->bound_dn.bv_val = NULL;
+ lc->bound_dn.bv_len = 0;
}
lc->bound = 0;
/* Inserts the newly created ldapconn in the avl tree */
ldap_pvt_thread_mutex_lock( &li->conn_mutex );
err = avl_insert( &li->conntree, (caddr_t)lc,
- conn_cmp, conn_dup );
+ ldap_back_conn_cmp, ldap_back_conn_dup );
-#if 1
+#if PRINT_CONNTREE > 0
myprint( li->conntree );
-#endif
+#endif /* PRINT_CONNTREE */
ldap_pvt_thread_mutex_unlock( &li->conn_mutex );
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
+ "ldap_back_getconn: conn %ld inserted\n",
+ lc->conn->c_connid ));
+#else /* !NEW_LOGGING */
Debug( LDAP_DEBUG_TRACE,
- "=>ldap_back_getconn: conn %d inserted\n",
- lc->conn->c_connid, 0, 0 );
+ "=>ldap_back_getconn: conn %ld inserted\n%s%s",
+ lc->conn->c_connid, "", "" );
+#endif /* !NEW_LOGGING */
/* Err could be -1 in case a duplicate ldapconn is inserted */
if ( err != 0 ) {
return( NULL );
}
} else {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
+ "ldap_back_getconn: conn %ld inserted\n",
+ lc->conn->c_connid ));
+#else /* !NEW_LOGGING */
Debug( LDAP_DEBUG_TRACE,
- "=>ldap_back_getconn: conn %d fetched\n",
- lc->conn->c_connid, 0, 0 );
+ "=>ldap_back_getconn: conn %ld fetched%s%s\n",
+ lc->conn->c_connid, "", "" );
+#endif /* !NEW_LOGGING */
}
return( lc );
return( lc->bound );
}
- if (ldap_bind_s(lc->ld, lc->bound_dn, NULL, LDAP_AUTH_SIMPLE) !=
+ if (ldap_bind_s(lc->ld, lc->bound_dn.bv_val, NULL, LDAP_AUTH_SIMPLE) !=
LDAP_SUCCESS) {
ldap_back_op_result(lc, op);
return( 0 );
ldap_get_option(lc->ld, LDAP_OPT_ERROR_STRING, &msg);
ldap_get_option(lc->ld, LDAP_OPT_MATCHED_DN, &match);
err = ldap_back_map_result(err);
+
+#ifdef ENABLE_REWRITE
+
+ /*
+ * need rewrite info; mmmh ...
+ */
+
+#else /* !ENABLE_REWRITE */
+
send_ldap_result( lc->conn, op, err, match, msg, NULL, NULL );
/* better test the pointers before freeing? */
- if ( match ) free( match );
+ if ( match ) {
+ free( match );
+ }
+#endif /* !ENABLE_REWRITE */
+
if ( msg ) free( msg );
return( (err==LDAP_SUCCESS) ? 0 : -1 );
}
+
projects / openldap / blobdiff