From 150bcfcbcb66a930862c10f96551fa97c272bf3e Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Mon, 22 Aug 2005 09:12:21 +0000 Subject: [PATCH] moved to contrib/slapd-overlays/allop --- doc/man/man5/slapd.conf.5 | 1 - doc/man/man5/slapo-allop.5 | 63 ------- servers/slapd/overlays/Makefile.in | 4 - servers/slapd/overlays/allop.c | 254 ----------------------------- servers/slapd/overlays/overlays.c | 6 - 5 files changed, 328 deletions(-) delete mode 100644 doc/man/man5/slapo-allop.5 delete mode 100644 servers/slapd/overlays/allop.c diff --git a/doc/man/man5/slapd.conf.5 b/doc/man/man5/slapd.conf.5 index 671d8d53a4..573d4f1af8 100644 --- a/doc/man/man5/slapd.conf.5 +++ b/doc/man/man5/slapd.conf.5 @@ -1809,7 +1809,6 @@ default slapd configuration file Known overlays are documented in .BR slapo\-accesslog (5), -.BR slapo\-allop (5), .BR slapo\-auditlog (5), .BR slapo\-chain (5), .BR slapo\-dynlist (5), diff --git a/doc/man/man5/slapo-allop.5 b/doc/man/man5/slapo-allop.5 deleted file mode 100644 index 471c80c18d..0000000000 --- a/doc/man/man5/slapo-allop.5 +++ /dev/null @@ -1,63 +0,0 @@ -.TH SLAPO-ALLOP 5 "RELEASEDATE" "OpenLDAP LDVERSION" -.\" Copyright 2005 The OpenLDAP Foundation All Rights Reserved. -.\" Copying restrictions apply. See COPYRIGHT/LICENSE. -.\" $OpenLDAP$ -.SH NAME -slapo-allop \- All Operational Attributes overlay -.SH SYNOPSIS -ETCDIR/slapd.conf -.SH DESCRIPTION -The All Operational Attributes overlay is designed to allow slapd to -interoperate with dumb clients that expect all attributes, including -operational ones, to be returned when "*" or an empty attribute list -is requested, as opposed to RFC2251 and RFC3673. -.SH CONFIGURATION -These -.B slapd.conf -options apply to the All Operational overlay. -They should appear after the -.B overlay -directive and before any subsequent -.B database -directive. -.TP -.B allop-URI -Specify the base and the scope of search operations that trigger the overlay. -By default, it is "ldap:///??base", i.e. it only applies to the rootDSE. -This requires the overlay to be instantited as global. - -.SH EXAMPLES -.LP -default behavior: only affects requests to the rootDSE -.nf - # global - overlay allop -.fi -.LP -affects all requests -.nf - # global - overlay allop - allop-URI "ldap:///??sub" -.fi -.LP -affects only requests directed to the suffix of a database -.nf - # per database - database bdb - suffix "dc=example,dc=com" - # database specific directives ... - overlay allop - allop-URI "ldap:///dc=example,dc=com??base" -.fi - -.SH FILES -.TP -ETCDIR/slapd.conf -default slapd configuration file -.SH SEE ALSO -.BR slapd.conf (5). - -.SH ACKNOWLEDGEMENTS -.P -This module was written in 2005 by Pierangelo Masarati for SysNet s.n.c. diff --git a/servers/slapd/overlays/Makefile.in b/servers/slapd/overlays/Makefile.in index fd248f12a1..8318ad7ae6 100644 --- a/servers/slapd/overlays/Makefile.in +++ b/servers/slapd/overlays/Makefile.in @@ -15,7 +15,6 @@ SRCS = overlays.c \ accesslog.c \ - allop.c \ denyop.c \ dyngroup.c \ dynlist.c \ @@ -55,9 +54,6 @@ dynamic: $(PROGRAMS) accesslog.la : accesslog.lo $(LTLINK_MOD) -module -o $@ accesslog.lo version.lo $(LINK_LIBS) -allop.la : allop.lo - $(LTLINK_MOD) -module -o $@ allop.lo version.lo $(LINK_LIBS) - denyop.la : denyop.lo $(LTLINK_MOD) -module -o $@ denyop.lo version.lo $(LINK_LIBS) diff --git a/servers/slapd/overlays/allop.c b/servers/slapd/overlays/allop.c deleted file mode 100644 index f0397aadfe..0000000000 --- a/servers/slapd/overlays/allop.c +++ /dev/null @@ -1,254 +0,0 @@ -/* allop.c - returns all operational attributes when appropriate */ -/* $OpenLDAP$ */ -/* This work is part of OpenLDAP Software . - * - * Copyright 2005 The OpenLDAP Foundation. - * 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 initially developed by Pierangelo Masarati for inclusion in - * OpenLDAP Software. - */ - -/* - * The intended usage is as a global overlay for use with those clients - * that do not make use of the RFC3673 allOp ("+") in the requested - * attribute list, but expect all operational attributes to be returned. - * Usage: add - * - -overlay allop -allop-URI - - * - * if the allop-URI is not given, the rootDSE, i.e. "ldap:///??base", - * is assumed. - */ - -#include "portable.h" - -#ifdef SLAPD_OVER_ALLOP - -#include -#include - -#include "slap.h" - -typedef struct allop_t { - struct berval ao_ndn; - int ao_scope; -} allop_t; - -static int -allop_db_config( - BackendDB *be, - const char *fname, - int lineno, - int argc, - char **argv ) -{ - slap_overinst *on = (slap_overinst *)be->bd_info; - allop_t *ao = (allop_t *)on->on_bi.bi_private; - - if ( strcasecmp( argv[ 0 ], "allop-uri" ) == 0 ) { - LDAPURLDesc *lud; - struct berval dn, - ndn; - int scope, - rc = LDAP_SUCCESS; - - if ( argc != 2 ) { - fprintf( stderr, "%s line %d: " - "need exactly 1 arg " - "in \"allop-uri \" " - "directive.\n", - fname, lineno ); - return 1; - } - - if ( ldap_url_parse( argv[ 1 ], &lud ) != LDAP_URL_SUCCESS ) { - return -1; - } - - scope = lud->lud_scope; - if ( scope == LDAP_SCOPE_DEFAULT ) { - scope = LDAP_SCOPE_BASE; - } - - if ( lud->lud_dn == NULL || lud->lud_dn[ 0 ] == '\0' ) { - if ( scope == LDAP_SCOPE_BASE ) { - BER_BVZERO( &ndn ); - - } else { - ber_str2bv( "", 0, 1, &ndn ); - } - - } else { - - ber_str2bv( lud->lud_dn, 0, 0, &dn ); - rc = dnNormalize( 0, NULL, NULL, &dn, &ndn, NULL ); - } - - ldap_free_urldesc( lud ); - if ( rc != LDAP_SUCCESS ) { - return -1; - } - - if ( BER_BVISNULL( &ndn ) ) { - /* rootDSE */ - if ( ao != NULL ) { - ch_free( ao->ao_ndn.bv_val ); - ch_free( ao ); - on->on_bi.bi_private = NULL; - } - - } else { - if ( ao == NULL ) { - ao = ch_calloc( 1, sizeof( allop_t ) ); - on->on_bi.bi_private = (void *)ao; - - } else { - ch_free( ao->ao_ndn.bv_val ); - } - - ao->ao_ndn = ndn; - ao->ao_scope = scope; - } - - } else { - return SLAP_CONF_UNKNOWN; - } - - return 0; -} - -static int -allop_db_destroy( BackendDB *be ) -{ - slap_overinst *on = (slap_overinst *)be->bd_info; - allop_t *ao = (allop_t *)on->on_bi.bi_private; - - if ( ao != NULL ) { - assert( !BER_BVISNULL( &ao->ao_ndn ) ); - - ch_free( ao->ao_ndn.bv_val ); - ch_free( ao ); - on->on_bi.bi_private = NULL; - } - - return 0; -} - -static int -allop_op_search( Operation *op, SlapReply *rs ) -{ - slap_overinst *on = (slap_overinst *)op->o_bd->bd_info; - allop_t *ao = (allop_t *)on->on_bi.bi_private; - - slap_mask_t mask; - int i, - add_allUser = 0; - - if ( ao == NULL ) { - if ( !BER_BVISEMPTY( &op->o_req_ndn ) - || op->ors_scope != LDAP_SCOPE_BASE ) - { - return SLAP_CB_CONTINUE; - } - - } else { - if ( !dnIsSuffix( &op->o_req_ndn, &ao->ao_ndn ) ) { - return SLAP_CB_CONTINUE; - } - - switch ( ao->ao_scope ) { - case LDAP_SCOPE_BASE: - if ( op->o_req_ndn.bv_len != ao->ao_ndn.bv_len ) { - return SLAP_CB_CONTINUE; - } - break; - - case LDAP_SCOPE_ONELEVEL: - if ( op->ors_scope == LDAP_SCOPE_BASE ) { - struct berval rdn = op->o_req_ndn; - - rdn.bv_len -= ao->ao_ndn.bv_len + STRLENOF( "," ); - if ( !dnIsOneLevelRDN( &rdn ) ) { - return SLAP_CB_CONTINUE; - } - - break; - } - return SLAP_CB_CONTINUE; - - case LDAP_SCOPE_SUBTREE: - break; - } - } - - mask = slap_attr_flags( op->ors_attrs ); - if ( SLAP_OPATTRS( mask ) ) { - return SLAP_CB_CONTINUE; - } - - if ( !SLAP_USERATTRS( mask ) ) { - return SLAP_CB_CONTINUE; - } - - i = 0; - if ( op->ors_attrs == NULL ) { - add_allUser = 1; - - } else { - for ( ; !BER_BVISNULL( &op->ors_attrs[ i ].an_name ); i++ ) - ; - } - - op->ors_attrs = op->o_tmprealloc( op->ors_attrs, - sizeof( AttributeName ) * ( i + add_allUser + 2 ), - op->o_tmpmemctx ); - - if ( add_allUser ) { - op->ors_attrs[ i ] = slap_anlist_all_user_attributes[ 0 ]; - i++; - } - - op->ors_attrs[ i ] = slap_anlist_all_operational_attributes[ 0 ]; - - BER_BVZERO( &op->ors_attrs[ i + 1 ].an_name ); - - return SLAP_CB_CONTINUE; -} - -static slap_overinst allop; - -int -allop_init() -{ - allop.on_bi.bi_type = "allop"; - - allop.on_bi.bi_db_config = allop_db_config; - allop.on_bi.bi_db_destroy = allop_db_destroy; - - allop.on_bi.bi_op_search = allop_op_search; - - return overlay_register( &allop ); -} - -#if SLAPD_OVER_ALLOP == SLAPD_MOD_DYNAMIC -int -init_module( int argc, char *argv[] ) -{ - return allop_init(); -} -#endif /* SLAPD_OVER_ALLOP == SLAPD_MOD_DYNAMIC */ - -#endif /* defined(SLAPD_OVER_ALLOP) */ diff --git a/servers/slapd/overlays/overlays.c b/servers/slapd/overlays/overlays.c index 73d30c808c..7a2e66c66a 100644 --- a/servers/slapd/overlays/overlays.c +++ b/servers/slapd/overlays/overlays.c @@ -26,9 +26,6 @@ #if SLAPD_OVER_ACCESSLOG == SLAPD_MOD_STATIC extern int accesslog_init(); #endif -#if SLAPD_OVER_ALLOP == SLAPD_MOD_STATIC -extern int allop_init(); -#endif #if SLAPD_OVER_DENYOP == SLAPD_MOD_STATIC extern int denyop_init(); #endif @@ -76,9 +73,6 @@ static struct { #if SLAPD_OVER_ACCESSLOG == SLAPD_MOD_STATIC { "Access Log", accesslog_init }, #endif -#if SLAPD_OVER_ALLOP == SLAPD_MOD_STATIC - { "All Operational", allop_init }, -#endif #if SLAPD_OVER_DENYOP == SLAPD_MOD_STATIC { "Deny Operation", denyop_init }, #endif -- 2.39.5