mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-18 11:05:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Overlay build environment, remove internal proxycache support

Browse Source
This commit is contained in:
Howard Chu 2003-12-06 11:04:39 +00:00
parent 64e337eacf
commit 1762b5b71d
5 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
servers/slapd/Makefile.in
View File

@ -14,7 +14,7 @@
## <http://www.OpenLDAP.org/license.html>. ## <http://www.OpenLDAP.org/license.html>.
PROGRAMS=slapd PROGRAMS=slapd
XPROGRAMS=sslapd libbackends.a .backend XPROGRAMS=sslapd libbackends.a .backend liboverlays.a
XSRCS=version.c XSRCS=version.c
NT_SRCS = nt_svc.c NT_SRCS = nt_svc.c
@ -52,7 +52,7 @@ LDAP_INCDIR= ../../include -I$(srcdir)/slapi
LDAP_LIBDIR= ../../libraries LDAP_LIBDIR= ../../libraries
SLAP_DIR= SLAP_DIR=
SLAPD_STATIC_DEPENDS=@SLAPD_NO_STATIC@ libbackends.a SLAPD_STATIC_DEPENDS=@SLAPD_NO_STATIC@ libbackends.a liboverlays.a
SLAPD_STATIC_BACKENDS=@SLAPD_STATIC_BACKENDS@ SLAPD_STATIC_BACKENDS=@SLAPD_STATIC_BACKENDS@
SLAPD_DYNAMIC_BACKENDS=@SLAPD_DYNAMIC_BACKENDS@ SLAPD_DYNAMIC_BACKENDS=@SLAPD_DYNAMIC_BACKENDS@
@ -297,6 +297,9 @@ libbackends.a: .backend
fi fi
@ls -l libbackends.a; echo "" @ls -l libbackends.a; echo ""
liboverlays.a: FORCE
@cd overlays; $(MAKE) $(MFLAGS) all
version.c: Makefile version.c: Makefile
@-$(RM) $@ @-$(RM) $@
$(MKVERSION) -s -n Versionstr slapd > $@ $(MKVERSION) -s -n Versionstr slapd > $@

9
servers/slapd/add.c
View File

@ -598,20 +598,15 @@ slap_entry2mods(
AttributeDescription *a_new_desc; AttributeDescription *a_new_desc;
int i, count; int i, count;
*text = textbuf;
a_new = e->e_attrs; a_new = e->e_attrs;
while ( a_new != NULL ) { while ( a_new != NULL ) {
a_new_desc = a_new->a_desc; a_new_desc = a_new->a_desc;
mod = (Modifications *) malloc( sizeof( Modifications )); mod = (Modifications *) malloc( sizeof( Modifications ));
if ( a_new_desc != slap_schema.si_ad_queryid ) mod->sml_op = LDAP_MOD_REPLACE;
mod->sml_op = LDAP_MOD_REPLACE;
else
mod->sml_op = LDAP_MOD_ADD;
ber_dupbv( &mod->sml_type, &a_new_desc->ad_cname ); mod->sml_type = a_new_desc->ad_cname;
for ( count = 0; a_new->a_vals[count].bv_val; count++ ); for ( count = 0; a_new->a_vals[count].bv_val; count++ );

4
servers/slapd/main.c
View File

@ -487,6 +487,10 @@ int main( int argc, char **argv )
} }
#endif /* LDAP_SLAPI */ #endif /* LDAP_SLAPI */
if ( overlay_init() ) {
goto destroy;
}
if ( read_config( configfile, 0 ) != 0 ) { if ( read_config( configfile, 0 ) != 0 ) {
rc = 1; rc = 1;
SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 19 ); SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 19 );

11
servers/slapd/schema_prep.c
View File

@ -416,17 +416,6 @@ static struct slap_schema_ad_map {
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
offsetof(struct slap_internal_schema, si_ad_superiorUUID) }, offsetof(struct slap_internal_schema, si_ad_superiorUUID) },
/* LDAP cache specific operational attribute */
{ "queryid", "( 1.3.6.1.4.1.4203.666.1.12 NAME 'queryid' "
"DESC 'list of queries the entry belongs to' "
"EQUALITY octetStringMatch "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.40{64} "
"NO-USER-MODIFICATION USAGE directoryOperation )",
NULL, SLAP_AT_HIDE,
NULL, NULL,
NULL, NULL, NULL, NULL, NULL,
offsetof(struct slap_internal_schema, si_ad_queryid) },
{ "syncreplCookie", "( 1.3.6.1.4.1.4203.666.1.23 " { "syncreplCookie", "( 1.3.6.1.4.1.4203.666.1.23 "
"NAME 'syncreplCookie' " "NAME 'syncreplCookie' "
"DESC 'syncrepl Cookie for shadow copy' " "DESC 'syncrepl Cookie for shadow copy' "

3
servers/slapd/slap.h
View File

@ -764,9 +764,6 @@ struct slap_internal_schema {
AttributeDescription *si_ad_namingCSN; AttributeDescription *si_ad_namingCSN;
AttributeDescription *si_ad_superiorUUID; AttributeDescription *si_ad_superiorUUID;
/* LDAP cache specific operational attribute */
AttributeDescription *si_ad_queryid;
AttributeDescription *si_ad_dseType; AttributeDescription *si_ad_dseType;
AttributeDescription *si_ad_syncreplCookie; AttributeDescription *si_ad_syncreplCookie;
AttributeDescription *si_ad_contextCSN; AttributeDescription *si_ad_contextCSN;