← Back to branch summary

~ubuntu-branches/debian/experimental/389-ds-base/experimental

« back to all changes in this revision

Viewing changes to ldap/servers/slapd/pagedresults.c

  • Committer: Package Import Robot
  • Author(s): Timo Aaltonen
  • Date: 2014-07-08 15:50:11 UTC
  • mfrom: (0.2.2)
  • Revision ID: package-import@ubuntu.com-20140708155011-r66lvtioamqwaype
Tags: 1.3.2.19-1
* New upstream release.
* admin_scripts.diff: Updated to fix more bashisms.
* watch: Update the url.
* Install failedbinds.py and logregex.py scripts.
* init: Use status from init-functions.
* control: Update my email.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ldap/servers/slapd/pagedresults.c
130
130
                }
131
131
            }
132
132
        }
133
 
        if (!conn->c_pagedresults.prl_list[*index].pr_mutex) {
 
133
        if ((*index > -1) && (*index < conn->c_pagedresults.prl_maxlen) &&
 
134
            !conn->c_pagedresults.prl_list[*index].pr_mutex) {
134
135
            conn->c_pagedresults.prl_list[*index].pr_mutex = PR_NewLock();
135
136
        }
136
137
        conn->c_pagedresults.prl_count++;
270
271
                prp->pr_current_be->be_search_results_release &&
271
272
                prp->pr_search_result_set) {
272
273
                prp->pr_current_be->be_search_results_release(&(prp->pr_search_result_set));
 
274
                prp->pr_current_be = NULL;
273
275
            }
274
276
            if (prp->pr_mutex) {
275
277
                /* pr_mutex is reused; back it up and reset it. */
307
309
                        prp->pr_current_be->be_search_results_release &&
308
310
                        prp->pr_search_result_set) {
309
311
                        prp->pr_current_be->be_search_results_release(&(prp->pr_search_result_set));
 
312
                        prp->pr_current_be = NULL;
310
313
                    }
311
314
                    prp->pr_flags |= CONN_FLAG_PAGEDRESULTS_ABANDONED;
312
315
                    prp->pr_flags &= ~CONN_FLAG_PAGEDRESULTS_PROCESSING;
724
727
        if (prp->pr_current_be && prp->pr_search_result_set &&
725
728
            prp->pr_current_be->be_search_results_release) {
726
729
            prp->pr_current_be->be_search_results_release(&(prp->pr_search_result_set));
 
730
            prp->pr_current_be = NULL;
727
731
            rc = 1;
728
732
        }
729
733
        if (prp->pr_mutex) {
771
775
        if (prp->pr_current_be && prp->pr_search_result_set &&
772
776
            prp->pr_current_be->be_search_results_release) {
773
777
            prp->pr_current_be->be_search_results_release(&(prp->pr_search_result_set));
 
778
            prp->pr_current_be = NULL;
774
779
            rc = 1;
775
780
        }
776
781
    }