Search limit updates and other misc cleanup

diff --git a/servers/slapd/back-ldap/search.c b/servers/slapd/back-ldap/search.c
index e2990e81d87ee05876cdc6c0ddef43623dc965b9..fe25fdc8dce32a8bb906665e1ebcb5f0c4ac27cc 100644 (file)
--- a/servers/slapd/back-ldap/search.c
+++ b/servers/slapd/back-ldap/search.c
@@ -110,12 +110,14 @@ ldap_back_search(
        /* if requested limit higher than hard limit, abort */
        if ( !isroot && tlimit > limit->lms_t_hard ) {
                /* no hard limit means use soft instead */
-               if ( limit->lms_t_hard == 0 && tlimit > limit->lms_t_soft ) {
+               if ( limit->lms_t_hard == 0
+                               && limit->lms_t_soft > -1
+                               && tlimit > limit->lms_t_soft ) {
                        tlimit = limit->lms_t_soft;
                        
                /* positive hard limit means abort */
                } else if ( limit->lms_t_hard > 0 ) {
-                       send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM,
+                       send_ldap_result( conn, op, LDAP_ADMINLIMIT_EXCEEDED,
                                        NULL, NULL, NULL, NULL );
                        rc = 0;
                        goto finish;
@@ -128,12 +130,14 @@ ldap_back_search(
        /* if requested limit higher than hard limit, abort */
        if ( !isroot && slimit > limit->lms_s_hard ) {
                /* no hard limit means use soft instead */
-               if ( limit->lms_s_hard == 0 && slimit > limit->lms_s_soft ) {
+               if ( limit->lms_s_hard == 0
+                               && limit->lms_s_soft > -1
+                               && slimit > limit->lms_s_soft ) {
                        slimit = limit->lms_s_soft;
                        
                /* positive hard limit means abort */
                } else if ( limit->lms_s_hard > 0 ) {
-                       send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM,
+                       send_ldap_result( conn, op, LDAP_ADMINLIMIT_EXCEEDED,
                                        NULL, NULL, NULL, NULL );
                        rc = 0;
                        goto finish;

diff --git a/servers/slapd/back-ldbm/init.c b/servers/slapd/back-ldbm/init.c
index 327b0b79a99b1612b29fcc178405d6d200c0de87..e6c6e21cb77a7fc3034f8556e33d6c247fd4bb04 100644 (file)
--- a/servers/slapd/back-ldbm/init.c
+++ b/servers/slapd/back-ldbm/init.c
@@ -131,7 +131,9 @@ ldbm_back_db_init(
        struct ldbminfo *li;
 
        /* indicate system schema supported */
-       be->be_flags |= SLAP_BFLAG_ALIASES|SLAP_BFLAG_REFERRALS;
+       be->be_flags |= 
+               SLAP_BFLAG_ALIASES |
+               SLAP_BFLAG_REFERRALS;
 
        /* allocate backend-database-specific stuff */
        li = (struct ldbminfo *) ch_calloc( 1, sizeof(struct ldbminfo) );

diff --git a/servers/slapd/back-ldbm/search.c b/servers/slapd/back-ldbm/search.c
index 875b6e99f695208aeb9c87e1d51e686ca6fd0a6e..765e79a54325302bc6c76667e5df7aa0c58e18c2 100644 (file)
--- a/servers/slapd/back-ldbm/search.c
+++ b/servers/slapd/back-ldbm/search.c
@@ -247,13 +247,15 @@ searchit:
                /* if requested limit higher than hard limit, abort */
                } else if ( tlimit > limit->lms_t_hard ) {
                        /* no hard limit means use soft instead */
-                       if ( limit->lms_t_hard == 0 && tlimit > limit->lms_t_soft ) {
+                       if ( limit->lms_t_hard == 0
+                                       && limit->lms_t_soft > -1
+                                       && tlimit > limit->lms_t_soft ) {
                                tlimit = limit->lms_t_soft;
                        
                        /* positive hard limit means abort */
                        } else if ( limit->lms_t_hard > 0 ) {
                                send_search_result( conn, op, 
-                                               LDAP_UNWILLING_TO_PERFORM,
+                                               LDAP_ADMINLIMIT_EXCEEDED,
                                                NULL, NULL, NULL, NULL, 0 );
                                rc = 0; 
                                goto done;
@@ -269,13 +271,15 @@ searchit:
                /* if requested limit higher than hard limit, abort */
                } else if ( slimit > limit->lms_s_hard ) {
                        /* no hard limit means use soft instead */
-                       if ( limit->lms_s_hard == 0 && slimit > limit->lms_s_soft ) {
+                       if ( limit->lms_s_hard == 0
+                                       && limit->lms_s_soft > -1
+                                       && slimit > limit->lms_s_soft ) {
                                slimit = limit->lms_s_soft;
 
                        /* positive hard limit means abort */
                        } else if ( limit->lms_s_hard > 0 ) {
                                send_search_result( conn, op,
-                                               LDAP_UNWILLING_TO_PERFORM,
+                                               LDAP_ADMINLIMIT_EXCEEDED,
                                                NULL, NULL, NULL, NULL, 0 );
                                rc = 0;
                                goto done;

diff --git a/servers/slapd/back-meta/search.c b/servers/slapd/back-meta/search.c
index 35b0aae92deb6ac8be79a3da0b704052e8e2ba4f..0a2e04a07fb3d1dc36831fefd2b7cea9040ea40a 100644 (file)
--- a/servers/slapd/back-meta/search.c
+++ b/servers/slapd/back-meta/search.c
@@ -167,12 +167,14 @@ meta_back_search(
        /* if requested limit higher than hard limit, abort */
        if ( !isroot && tlimit > limit->lms_t_hard ) {
                /* no hard limit means use soft instead */
-               if ( limit->lms_t_hard == 0 && tlimit > limit->lms_t_soft ) {
+               if ( limit->lms_t_hard == 0
+                               && limit->lms_t_soft > -1
+                               && tlimit > limit->lms_t_soft ) {
                        tlimit = limit->lms_t_soft;
                        
                /* positive hard limit means abort */
                } else if ( limit->lms_t_hard > 0 ) {
-                       send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM,
+                       send_ldap_result( conn, op, LDAP_ADMINLIMIT_EXCEEDED,
                                        NULL, NULL, NULL, NULL );
                        rc = 0;
                        goto finish;
@@ -185,12 +187,14 @@ meta_back_search(
        /* if requested limit higher than hard limit, abort */
        if ( !isroot && slimit > limit->lms_s_hard ) {
                /* no hard limit means use soft instead */
-               if ( limit->lms_s_hard == 0 && slimit > limit->lms_s_soft ) {
+               if ( limit->lms_s_hard == 0
+                               && limit->lms_s_soft > -1
+                               && slimit > limit->lms_s_soft ) {
                        slimit = limit->lms_s_soft;
                        
                /* positive hard limit means abort */
                } else if ( limit->lms_s_hard > 0 ) {
-                       send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM,
+                       send_ldap_result( conn, op, LDAP_ADMINLIMIT_EXCEEDED,
                                        NULL, NULL, NULL, NULL );
                        rc = 0;
                        goto finish;

diff --git a/servers/slapd/back-monitor/backend.c b/servers/slapd/back-monitor/backend.c
index d147929abe6027f6682651a4d5ecf0da48f743a0..987c2b348be1188eb1699d9efebdb51df5382ffd 100644 (file)
--- a/servers/slapd/back-monitor/backend.c
+++ b/servers/slapd/back-monitor/backend.c
@@ -112,6 +112,16 @@ monitor_subsys_backend_init(
 
                attr_merge( e, monitor_ad_desc, bv );
                attr_merge( e_backend, monitor_ad_desc, bv );
+
+               if ( bi->bi_controls ) {
+                       int j;
+
+                       for ( j = 0; bi->bi_controls[ j ]; j++ ) {
+                               bv[0].bv_val = bi->bi_controls[ j ];
+                               bv[0].bv_len = strlen( bv[0].bv_val );
+                               attr_merge( e, slap_schema.si_ad_supportedControl, bv );
+                       }
+               }
                
                mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
                e->e_private = ( void * )mp;

diff --git a/servers/slapd/back-sql/search.c b/servers/slapd/back-sql/search.c
index 411468e6af8d76f962bc8bb7b7e6e2ad116cc52d..b5fefff7ff210bf6023bfacb77c01f773ca2cb5f 100644 (file)
--- a/servers/slapd/back-sql/search.c
+++ b/servers/slapd/back-sql/search.c
@@ -1074,13 +1074,15 @@ backsql_search(
                /* if requested limit higher than hard limit, abort */
                } else if ( tlimit > limit->lms_t_hard ) {
                        /* no hard limit means use soft instead */
-                       if ( limit->lms_t_hard == 0 && tlimit > limit->lms_t_soft ) {
+                       if ( limit->lms_t_hard == 0
+                                       && limit->lms_t_soft > -1
+                                       && tlimit > limit->lms_t_soft ) {
                                tlimit = limit->lms_t_soft;
 
                        /* positive hard limit means abort */
                        } else if ( limit->lms_t_hard > 0 ) {
                                send_search_result( conn, op, 
-                                               LDAP_UNWILLING_TO_PERFORM,
+                                               LDAP_ADMINLIMIT_EXCEEDED,
                                                NULL, NULL, NULL, NULL, 0 );
                                return 0;
                        }
@@ -1095,13 +1097,15 @@ backsql_search(
                /* if requested limit higher than hard limit, abort */
                } else if ( slimit > limit->lms_s_hard ) {
                        /* no hard limit means use soft instead */
-                       if ( limit->lms_s_hard == 0 && slimit > limit->lms_s_soft ) {
+                       if ( limit->lms_s_hard == 0
+                                       && limit->lms_s_soft > -1
+                                       && slimit > limit->lms_s_soft ) {
                                slimit = limit->lms_s_soft;
 
                        /* positive hard limit means abort */
                        } else if ( limit->lms_s_hard > 0 ) {
                                send_search_result( conn, op, 
-                                               LDAP_UNWILLING_TO_PERFORM,
+                                               LDAP_ADMINLIMIT_EXCEEDED,
                                                NULL, NULL, NULL, NULL, 0 );
                                return 0;
                        }