Add a safety check to bvcasechr

[openldap] / servers / slapd / back-sql / bind.c

diff --git a/servers/slapd/back-sql/bind.c b/servers/slapd/back-sql/bind.c
index d2e05898f661e5448a9a587d8d13a1cc2a5ae899..9105444dd57ff2c2e00499aa25473ebdcd8d71f1 100644 (file)
--- a/servers/slapd/back-sql/bind.c
+++ b/servers/slapd/back-sql/bind.c
@@ -19,12 +19,8 @@
 #include "util.h"
 #include "entry-id.h"
 
-void backsql_init_search(backsql_srch_info *bsi,backsql_info *bi,char *nbase,int scope,
-                int slimit,int tlimit,time_t stoptime,Filter *filter,
-                SQLHDBC dbh,BackendDB *be,Connection *conn,Operation *op,char **attrs);
-
 int backsql_bind(BackendDB *be,Connection *conn,Operation *op,
-       const char *dn,const char *ndn,int method,struct berval *cred,char** edn)
+       struct berval *dn,struct berval *ndn,int method,struct berval *cred,struct berval *edn)
 {
  backsql_info *bi=(backsql_info*)be->be_private;
  backsql_entryID user_id,*res;
@@ -38,12 +34,12 @@ int backsql_bind(BackendDB *be,Connection *conn,Operation *op,
  
  if ( be_isroot_pw( be, conn, ndn, cred ) )
     {
-     *edn=ch_strdup(be_root_dn(be));
+     ber_dupbv(edn, be_root_dn(be));
      Debug(LDAP_DEBUG_TRACE,"<==backsql_bind() root bind\n",0,0,0);
      return LDAP_SUCCESS;
     }
  
- *edn=ch_strdup(ndn);
+ ber_dupbv(edn, ndn);
  
  if (method == LDAP_AUTH_SIMPLE)
   {     
@@ -56,7 +52,7 @@ int backsql_bind(BackendDB *be,Connection *conn,Operation *op,
      return 1;
     }
   
-   res=backsql_dn2id(bi,&user_id,dbh,ndn);
+   res=backsql_dn2id(bi,&user_id,dbh,ndn->bv_val);
    if (res==NULL)
     {
      Debug(LDAP_DEBUG_TRACE,"backsql_bind(): could not retrieve bind dn id - no such entry\n",0,0,0);
@@ -64,7 +60,7 @@ int backsql_bind(BackendDB *be,Connection *conn,Operation *op,
      return 1;
     }
     
-   backsql_init_search(&bsi,bi,(char*)ndn,LDAP_SCOPE_BASE,-1,-1,-1,NULL,dbh,
+   backsql_init_search(&bsi,bi,(char*)ndn->bv_val,LDAP_SCOPE_BASE,-1,-1,-1,NULL,dbh,
                 be,conn,op,NULL);
    e=backsql_id2entry(&bsi,&user_entry,&user_id);
    if (e==NULL)