Commit 6404d592 authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

Sync with HEAD

parents ad5ae407 c9156d79
......@@ -349,11 +349,14 @@ int
ldap_pvt_inet_aton( const char *host, struct in_addr *in)
{
unsigned long u = inet_addr( host );
if ( u != 0xffffffff || u != (unsigned long) -1 ) {
in->s_addr = u;
return 1;
}
return 0;
#ifdef INADDR_NONE
if ( u == INADDR_NONE ) return 0;
#endif
if ( u == 0xffffffffUL || u == (unsigned long) -1L ) return 0;
in->s_addr = u;
return 1;
}
#endif
......
......@@ -313,6 +313,8 @@ libbackends.a: .backend
liboverlays.a: FORCE
@cd overlays; $(MAKE) $(MFLAGS) all
backend.c: backend.h
version.c: Makefile
@-$(RM) $@
$(MKVERSION) -s -n Versionstr slapd > $@
......
......@@ -1002,7 +1002,7 @@ syncprov_matchops( Operation *op, opcookie *opc, int saveit )
done:
if ( op->o_tag != LDAP_REQ_ADD ) {
op->o_bd->bd_info = (BackendInfo *)on->on_info;
be_entry_release_r( op, e );
be_entry_release_rw( op, e, 0 );
op->o_bd->bd_info = (BackendInfo *)on;
}
if ( freefdn ) {
......@@ -1671,7 +1671,7 @@ syncprov_search_response( Operation *op, SlapReply *rs )
if ( e ) {
op->o_bd->bd_info = (BackendInfo *)on->on_info;
be_entry_release_r( op, e );
be_entry_release_rw( op, e, 0 );
op->o_bd->bd_info = (BackendInfo *)on;
}
ch_free( sr );
......@@ -2045,7 +2045,7 @@ syncprov_db_open(
si->si_ctxcsnbuf[si->si_ctxcsn.bv_len] = '\0';
strcpy( ctxcsnbuf, si->si_ctxcsnbuf );
}
be_entry_release_r( op, e );
be_entry_release_rw( op, e, 0 );
op->o_bd->bd_info = (BackendInfo *)on;
op->o_req_dn = be->be_suffix[0];
op->o_req_ndn = be->be_nsuffix[0];
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment