From 1762b5b71df14b68b81b916d5252b325c01ab142 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Sat, 6 Dec 2003 11:04:39 +0000 Subject: [PATCH] Overlay build environment, remove internal proxycache support --- servers/slapd/Makefile.in | 7 +++++-- servers/slapd/add.c | 9 ++------- servers/slapd/main.c | 4 ++++ servers/slapd/schema_prep.c | 11 ----------- servers/slapd/slap.h | 3 --- 5 files changed, 11 insertions(+), 23 deletions(-) diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in index e8a9968b38..429d14d2b6 100644 --- a/servers/slapd/Makefile.in +++ b/servers/slapd/Makefile.in @@ -14,7 +14,7 @@ ## . PROGRAMS=slapd -XPROGRAMS=sslapd libbackends.a .backend +XPROGRAMS=sslapd libbackends.a .backend liboverlays.a XSRCS=version.c NT_SRCS = nt_svc.c @@ -52,7 +52,7 @@ LDAP_INCDIR= ../../include -I$(srcdir)/slapi LDAP_LIBDIR= ../../libraries 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_DYNAMIC_BACKENDS=@SLAPD_DYNAMIC_BACKENDS@ @@ -297,6 +297,9 @@ libbackends.a: .backend fi @ls -l libbackends.a; echo "" +liboverlays.a: FORCE + @cd overlays; $(MAKE) $(MFLAGS) all + version.c: Makefile @-$(RM) $@ $(MKVERSION) -s -n Versionstr slapd > $@ diff --git a/servers/slapd/add.c b/servers/slapd/add.c index ae06f26259..4058b43eba 100644 --- a/servers/slapd/add.c +++ b/servers/slapd/add.c @@ -598,20 +598,15 @@ slap_entry2mods( AttributeDescription *a_new_desc; int i, count; - *text = textbuf; - a_new = e->e_attrs; while ( a_new != NULL ) { a_new_desc = a_new->a_desc; mod = (Modifications *) malloc( sizeof( Modifications )); - if ( a_new_desc != slap_schema.si_ad_queryid ) - mod->sml_op = LDAP_MOD_REPLACE; - else - mod->sml_op = LDAP_MOD_ADD; + mod->sml_op = LDAP_MOD_REPLACE; - 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++ ); diff --git a/servers/slapd/main.c b/servers/slapd/main.c index ce0d07dce7..d656dec7d1 100644 --- a/servers/slapd/main.c +++ b/servers/slapd/main.c @@ -487,6 +487,10 @@ int main( int argc, char **argv ) } #endif /* LDAP_SLAPI */ + if ( overlay_init() ) { + goto destroy; + } + if ( read_config( configfile, 0 ) != 0 ) { rc = 1; SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 19 ); diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c index 46639f50ac..b57d299fb3 100644 --- a/servers/slapd/schema_prep.c +++ b/servers/slapd/schema_prep.c @@ -416,17 +416,6 @@ static struct slap_schema_ad_map { NULL, NULL, NULL, NULL, NULL, 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 " "NAME 'syncreplCookie' " "DESC 'syncrepl Cookie for shadow copy' " diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h index f7b663f027..17aaa4861a 100644 --- a/servers/slapd/slap.h +++ b/servers/slapd/slap.h @@ -764,9 +764,6 @@ struct slap_internal_schema { AttributeDescription *si_ad_namingCSN; AttributeDescription *si_ad_superiorUUID; - /* LDAP cache specific operational attribute */ - AttributeDescription *si_ad_queryid; - AttributeDescription *si_ad_dseType; AttributeDescription *si_ad_syncreplCookie; AttributeDescription *si_ad_contextCSN; -- 2.39.5