X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-dnssrv%2Fbind.c;h=c78b7a613b51807f794643c1bd1ed27785dfebf2;hb=329bd66d6ab650e052929af9ccc35bb7416bd87d;hp=2332b24997ee035721bb4e408b91816f5cd858e5;hpb=c249b1667934f974ba66564d4772fb3fbd336f51;p=openldap
diff --git a/servers/slapd/back-dnssrv/bind.c b/servers/slapd/back-dnssrv/bind.c
index 2332b24997..c78b7a613b 100644
--- a/servers/slapd/back-dnssrv/bind.c
+++ b/servers/slapd/back-dnssrv/bind.c
@@ -1,8 +1,22 @@
/* bind.c - DNS SRV backend bind function */
/* $OpenLDAP$ */
-/*
- * Copyright 2000 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 2000-2003 The OpenLDAP Foundation.
+ * Portions Copyright 2000-2003 Kurt D. Zeilenga.
+ * 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
+ * .
+ */
+/* ACKNOWLEDGEMENTS:
+ * This work was originally developed by Kurt D. Zeilenga for inclusion
+ * in OpenLDAP Software.
*/
@@ -18,40 +32,32 @@
int
dnssrv_back_bind(
- Backend *be,
- Connection *conn,
Operation *op,
- const char *dn,
- const char *ndn,
- int method,
- struct berval *cred,
- char **edn )
+ SlapReply *rs )
{
Debug( LDAP_DEBUG_TRACE, "DNSSRV: bind %s (%d)\n",
- dn == NULL ? "" : dn,
- method, NULL );
+ op->o_req_dn.bv_val == NULL ? "" : op->o_req_dn.bv_val,
+ op->oq_bind.rb_method, NULL );
- if( method == LDAP_AUTH_SIMPLE && cred != NULL && cred->bv_len ) {
+ if( op->oq_bind.rb_method == LDAP_AUTH_SIMPLE && op->oq_bind.rb_cred.bv_val != NULL && op->oq_bind.rb_cred.bv_len ) {
Statslog( LDAP_DEBUG_STATS,
- "conn=%ld op=%d DNSSRV BIND dn=\"%s\" provided passwd\n",
+ "conn=%lu op=%lu DNSSRV BIND dn=\"%s\" provided passwd\n",
op->o_connid, op->o_opid,
- dn == NULL ? "" : dn , 0, 0 );
+ op->o_req_dn.bv_val == NULL ? "" : op->o_req_dn.bv_val , 0, 0 );
Debug( LDAP_DEBUG_TRACE,
"DNSSRV: BIND dn=\"%s\" provided cleartext password\n",
- dn == NULL ? "" : dn, 0, 0 );
+ op->o_req_dn.bv_val == NULL ? "" : op->o_req_dn.bv_val, 0, 0 );
- send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM,
- NULL, "you shouldn\'t send strangers your password",
- NULL, NULL );
+ send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
+ "you shouldn\'t send strangers your password" );
} else {
Debug( LDAP_DEBUG_TRACE, "DNSSRV: BIND dn=\"%s\"\n",
- dn == NULL ? "" : dn, 0, 0 );
+ op->o_req_dn.bv_val == NULL ? "" : op->o_req_dn.bv_val, 0, 0 );
- send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM,
- NULL, "anonymous bind expected",
- NULL, NULL );
+ send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
+ "anonymous bind expected" );
}
return 1;