]> git.sur5r.net Git - openldap/commitdiff
Add more password file support
authorKurt Zeilenga <kurt@openldap.org>
Mon, 31 Mar 2003 18:48:16 +0000 (18:48 +0000)
committerKurt Zeilenga <kurt@openldap.org>
Mon, 31 Mar 2003 18:48:16 +0000 (18:48 +0000)
Update cache shell routines
Misc cleanup

CHANGES
clients/tools/common.c
clients/tools/ldappasswd.c
doc/devel/args
doc/man/man1/ldappasswd.1
doc/man/man8/slappasswd.8
libraries/libldap/cache.c
servers/slapd/Makefile.in
servers/slapd/back-bdb/Makefile.in
servers/slapd/back-bdb/psearch.c [deleted file]
servers/slapd/tools/slappasswd.c

diff --git a/CHANGES b/CHANGES
index 21aeef970e5ec67f80b1301e493727a7cb1db0a3..4d1e62f9acf81484e84b29bd68220676b8659265 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -12,9 +12,12 @@ OpenLDAP 2.1.17 Engineering
        Fixed slurpd core dump on exit (ITS#2363)
        Fixed slapadd oidm destory bug (ITS#2409)
        Fixed clients critical argument handling
+       Updated clients password file support
+       Added slappasswd password file support
        Removed lint (ITS#2382)
        Build Environment
                Updated versioning system
+               Added LDAP cache shell-only routines
        Documentation
                Updated slurpd(8) -u usage
                Misc man page updates
index 880a6b8381b1be63b472806f66f5bb6f5803de34..d39b3d9bd8f9fe11067d5be1d58dfd509a41082a 100644 (file)
@@ -84,11 +84,11 @@ tool_common_usage( void )
 "  -U authcid SASL authentication identity\n",
 "  -v         run in verbose mode (diagnostics to standard output)\n",
 "  -V         print version info (-VV only)\n",
-"  -w passwd  bind passwd (for simple authentication)\n",
-"  -W         prompt for bind passwd\n",
+"  -w passwd  bind password (for simple authentication)\n",
+"  -W         prompt for bind password\n",
 "  -x         Simple authentication\n",
 "  -X authzid SASL authorization identity (\"dn:<dn>\" or \"u:<user>\")\n",
-"  -y file    Read passwd from file\n",
+"  -y file    Read password from file\n",
 "  -Y mech    SASL mechanism\n",
 "  -Z         Start TLS request (-ZZ to require successful response)\n",
 NULL
index a0265f4ebdc5fa9b8e7dbc0b48898c7fe9c20d0a..85ef979468d08218b322fac05e3586d6d8e36472 100644 (file)
 #include "common.h"
 
 
-static char    *newpw = NULL;
-static char    *oldpw = NULL;
+static struct berval newpw = { 0, NULL };
+static struct berval oldpw = { 0, NULL };
+
 static int   want_newpw = 0;
 static int   want_oldpw = 0;
 
+static char *oldpwfile = NULL;
+static char *newpwfile = NULL;
 
 void
 usage( void )
@@ -40,25 +43,27 @@ usage( void )
 "Password change options:\n"
 "  -a secret  old password\n"
 "  -A         prompt for old password\n"
+"  -t file    read file for old password\n"
 "  -s secret  new password\n"
 "  -S         prompt for new password\n"
+"  -T file    read file for new password\n"
                , prog );
        tool_common_usage();
        exit( EXIT_FAILURE );
 }
 
 
-const char options[] = "a:As:S"
-       "Cd:D:e:h:H:InO:p:QR:U:vVw:WxX:Y:Z";
+const char options[] = "a:As:St:T:"
+       "Cd:D:e:h:H:InO:p:QR:U:vVw:WxX:y:Y:Z";
 
 int
 handle_private_option( int i )
 {
        switch ( i ) {
 #if 0
+       case 'E': /* passwd controls */ {
                int             crit;
                char    *control, *cvalue;
-       case 'E': /* passwd controls */
                if( protocol == LDAP_VERSION2 ) {
                        fprintf( stderr, "%s: -E incompatible with LDAPv%d\n",
                                 prog, protocol );
@@ -80,19 +85,21 @@ handle_private_option( int i )
                if ( (cvalue = strchr( control, '=' )) != NULL ) {
                        *cvalue++ = '\0';
                }
+
                fprintf( stderr, "Invalid passwd control name: %s\n", control );
                usage();
+               }
 #endif
 
        case 'a':       /* old password (secret) */
-               oldpw = strdup (optarg);
-
+               oldpw.bv_val = strdup( optarg );
                {
                        char* p;
                        for( p = optarg; *p != '\0'; p++ ) {
                                *p = '\0';
                        }
                }
+               oldpw.bv_len = strlen( oldpw.bv_val );
                break;
 
        case 'A':       /* prompt for old password */
@@ -100,19 +107,28 @@ handle_private_option( int i )
                break;
 
        case 's':       /* new password (secret) */
-               newpw = strdup (optarg);
+               newpw.bv_val = strdup (optarg);
                {
                        char* p;
                        for( p = optarg; *p != '\0'; p++ ) {
                                *p = '\0';
                        }
                }
+               newpw.bv_len = strlen( newpw.bv_val );
                break;
 
        case 'S':       /* prompt for user password */
                want_newpw++;
                break;
 
+       case 't':
+               oldpwfile = optarg;
+               break;
+
+       case 'T':
+               newpwfile = optarg;
+               break;
+
        default:
                return 0;
        }
@@ -151,35 +167,49 @@ main( int argc, char *argv[] )
                user = NULL;
        }
 
-       if( want_oldpw && oldpw == NULL ) {
+       if( oldpwfile ) {
+               rc = lutil_get_filed_password( prog, &oldpw );
+               if( rc ) return EXIT_FAILURE;
+       }
+
+       if( want_oldpw && oldpw.bv_val == NULL ) {
                /* prompt for old password */
                char *ckoldpw;
-               oldpw = strdup(getpassphrase("Old password: "));
+               oldpw.bv_val = strdup(getpassphrase("Old password: "));
                ckoldpw = getpassphrase("Re-enter old password: ");
 
-               if( oldpw== NULL || ckoldpw == NULL ||
-                       strcmp( oldpw, ckoldpw ))
+               if( oldpw.bv_val == NULL || ckoldpw == NULL ||
+                       strcmp( oldpw.bv_val, ckoldpw ))
                {
                        fprintf( stderr, "passwords do not match\n" );
                        return EXIT_FAILURE;
                }
+
+               oldpw.bv_len = strlen( oldpw.bv_val );
+       }
+
+       if( newpwfile ) {
+               rc = lutil_get_filed_password( prog, &newpw );
+               if( rc ) return EXIT_FAILURE;
        }
 
-       if( want_newpw && newpw == NULL ) {
+       if( want_newpw && newpw.bv_val == NULL ) {
                /* prompt for new password */
                char *cknewpw;
-               newpw = strdup(getpassphrase("New password: "));
+               newpw.bv_val = strdup(getpassphrase("New password: "));
                cknewpw = getpassphrase("Re-enter new password: ");
 
-               if( newpw== NULL || cknewpw == NULL ||
-                       strcmp( newpw, cknewpw ))
+               if( newpw.bv_val == NULL || cknewpw == NULL ||
+                       strcmp( newpw.bv_val, cknewpw ))
                {
                        fprintf( stderr, "passwords do not match\n" );
                        return EXIT_FAILURE;
                }
+
+               newpw.bv_len = strlen( newpw.bv_val );
        }
 
-       if (want_bindpw && passwd.bv_val == NULL ) {
+       ifwant_bindpw && passwd.bv_val == NULL ) {
                /* handle bind password */
                passwd.bv_val = strdup( getpassphrase("Enter bind password: "));
                passwd.bv_len = passwd.bv_val ? strlen( passwd.bv_val ) : 0;
@@ -192,7 +222,7 @@ main( int argc, char *argv[] )
        if ( authzid || manageDSAit || noop )
                tool_server_controls( ld, NULL, 0 );
 
-       if( user != NULL || oldpw != NULL || newpw != NULL ) {
+       if( user != NULL || oldpw.bv_val != NULL || newpw.bv_val != NULL ) {
                /* build change password control */
                ber = ber_alloc_t( LBER_USE_DER );
 
@@ -210,16 +240,16 @@ main( int argc, char *argv[] )
                        free(user);
                }
 
-               if( oldpw != NULL ) {
-                       ber_printf( ber, "ts",
-                               LDAP_TAG_EXOP_MODIFY_PASSWD_OLD, oldpw );
-                       free(oldpw);
+               if( oldpw.bv_val != NULL ) {
+                       ber_printf( ber, "tO",
+                               LDAP_TAG_EXOP_MODIFY_PASSWD_OLD, &oldpw );
+                       free(oldpw.bv_val);
                }
 
-               if( newpw != NULL ) {
-                       ber_printf( ber, "ts",
-                               LDAP_TAG_EXOP_MODIFY_PASSWD_NEW, newpw );
-                       free(newpw);
+               if( newpw.bv_val != NULL ) {
+                       ber_printf( ber, "tO",
+                               LDAP_TAG_EXOP_MODIFY_PASSWD_NEW, &newpw );
+                       free(newpw.bv_val);
                }
 
                ber_printf( ber, /*{*/ "N}" );
@@ -256,7 +286,8 @@ main( int argc, char *argv[] )
                return rc;
        }
 
-       rc = ldap_parse_result( ld, res, &code, &matcheddn, &text, &refs, NULL, 0 );
+       rc = ldap_parse_result( ld, res,
+               &code, &matcheddn, &text, &refs, NULL, 0 );
 
        if( rc != LDAP_SUCCESS ) {
                ldap_perror( ld, "ldap_parse_result" );
index 233540d2a18fe43455c792bbcb479664e078bd91..276fccb1d2def8526227f63fa4ccfe647034a4d3 100644 (file)
@@ -1,21 +1,22 @@
 Tools           ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-ldapcompare             * DE *HI*K M*OPQR  UVWXYZ   de *h**k *n*p*    vwx z
-ldapdelete       *CDE *HI*K M*OPQR  UVWXYZ  cdef*h**k *n*p*    vwxy
-ldapmodify       *CDEF*HI*K M*OPQRS UVWXYZabcdef*h**k *n*p*r t vwxy
-ldapmodrdn       *CDE *HI*K M*OPQR  UVWXYZ  cdef*h**k *n*p*rs  vwxy
-ldappasswd      A*CDE *HI*   *O QRS UVWXYZa  de *h**  * * * s  vwxy  
-ldapsearch      A*CDE *HI*KLM*OPQRSTUVWXYZab*def*h**kl*n*p* stuvwxyz
-ldapwhoami              * DE *HI*   *O QR  UVWXYZ   def*h**  *n*p*    vwx  
+ldapcompare             * DE**HI*K M*OPQR  UVWXYZ   de *h**k *n*p*    vwxyz
+ldapdelete       *CDE**HI*K M*OPQR  UVWXYZ  cdef*h**k *n*p*    vwxy
+ldapmodify       *CDE**HI*K M*OPQRS UVWXYZabcde *h**k *n*p*r t vwxy
+ldapmodrdn       *CDE**HI*K M*OPQR  UVWXYZ  cdef*h**k *n*p*rs  vwxy
+ldappasswd      A*CDE**HI*   *O QRS UVWXYZa  def*h**  * * * s  vwxy  
+ldapsearch      A*CDE**HI*KLM*OPQRSTUVWXYZab*def*h**kl*n*p* stuvwxyz
+ldapwhoami              * DE**HI*   *O QR  UVWXYZ   def*h**  *n*p*    vwxy 
 
 
 * reserved
-       GJNgijmoqy01235789
+       BFGJNgijmoq01235789
 
 * General flags:
        -C Chase Referrals
        -D Bind DN
-       -E CommandSpecific Extensions   (e.g., -E <[!]oid[=options]>*)
-       -e General Extensions                   (e.g., -e <[!]oid[=options]>*)
+       -E Tool-specific Extensions     (e.g., -E <[!]oid[=options]>*)
+       -e General Extensions           (e.g., -e <[!]oid[=options]>*)
+       -f file
        -H URI
        -P protocol version
        -V version information
index 3e03a03f4859092e396d350110dda9fee22e2c01..54433ddb1419f66718f191f2e823ba623c5d2622 100644 (file)
@@ -11,6 +11,8 @@ ldappasswd \- change the password of an LDAP entry
 [\c
 .BI \-a \ oldPasswd\fR]
 [\c
+.BI \-t \ oldpasswdfile\fR]
+[\c
 .BI \-D \ binddn\fR]
 [\c
 .BI \-d \ debuglevel\fR]
@@ -27,12 +29,16 @@ ldappasswd \- change the password of an LDAP entry
 [\c
 .BI \-s \ newPasswd\fR]
 [\c
+.BI \-T \ newpasswdfile\fR]
+[\c
 .BR \-v ]
 [\c
 .BR \-W ]
 [\c
 .BI \-w \ passwd\fR]
 [\c
+.BI \-y \ passwdfile\fR]
+[\c
 .BR \-O \ security-properties ]
 [\c
 .BR \-I ]
@@ -82,6 +88,9 @@ This is used instead of specifying the password on the command line.
 .BI \-a \ oldPasswd
 Set the old password to \fIoldPasswd\fP.
 .TP
+.BI \-t \ oldPasswdFile
+Set the old password to the contents of \fIoldPasswdFile\fP.
+.TP
 .B \-x 
 Use simple authentication instead of SASL.
 .TP
@@ -116,6 +125,9 @@ This is used instead of specifying the password on the command line.
 .BI \-s \ newPasswd
 Set the new password to \fInewPasswd\fP.
 .TP
+.BI \-T \ newPasswdFile
+Set the new password to the contents of \fInewPasswdFile\fP.
+.TP
 .B \-v
 Increase the verbosity of output.  Can be specified multiple times.
 .TP
@@ -126,6 +138,10 @@ This is used instead of specifying the password on the command line.
 .BI \-w \ passwd
 Use \fIpasswd\fP as the password to bind with.
 .TP
+.BI \-y \ passwdfile
+Use complete contents of \fIpasswdfile\fP as the password for
+simple authentication.
+.TP
 .BI \-O \ security-properties
 Specify SASL security properties.
 .TP
index 41fd51e277a8c4f744cfc9135b744af29a959df1..737689fbc13cd427d38c60984d6f049a60d6de9d 100644 (file)
@@ -8,7 +8,7 @@ slappasswd \- OpenLDAP password utility
 .B SBINDIR/slappasswd
 .B [\-v]
 .B [\-u]
-.B [\-s secret]
+.B [\-s secret|\-T file]
 .B [\-h hash]
 .B [\-c salt-format]
 .B 
@@ -34,8 +34,24 @@ versions of this program may generate alternative syntaxes
 by default.  This option is provided for forward compatibility.
 .TP
 .BI \-s " secret"
-The secret to hash.  If not provided, the user will be prompted
-for the secret to hash.
+The secret to hash.
+If this and
+.B \-T
+are absent, the user will be prompted for the secret to hash.
+.B \-s
+and
+.B \-T
+and mutually exclusive flags.
+.TP
+.BI \-T " file"
+Hash the contents of the file.
+If this and
+.B \-s
+are absent, the user will be prompted for the secret to hash.
+.B \-s
+and
+.B \-T
+and mutually exclusive flags.
 .TP
 .BI \-h " scheme"
 If -h is specified, one of the following RFC 2307 schemes may
index 61bf998ff476170b109bdad624d5d609c59f3031..46ef2bc3f7e20131a3ad59589d93262c4874d91c 100644 (file)
@@ -31,7 +31,7 @@ ldap_enable_cache( LDAP *ld, long timeout, ber_len_t maxmem )
        assert( LDAP_VALID( ld ) );
 
        if (!(called++)) {
-               fprintf( stderr, "ldap_enable_cache: function is obsoleted."
+               fprintf( stderr, "ldap_enable_cache: routine is obsoleted.\n");
        }
 
        return -1;
index 98c2015e0c7f18cc10d79ad5de63f2bd73a8f6c5..534ce7639e4669d411eeaa7d75ff00d5957d5ddc 100644 (file)
@@ -348,6 +348,11 @@ all-cffiles: slapd $(SLAPD_DYNAMIC_BACKENDS) tools
 
 install-schema: FORCE
        @-$(MKDIR) $(DESTDIR)$(schemadir)
+       i="$(srcdir)/schema/README" ; \
+       SF=`basename $$i` ; \
+       SD="$(DESTDIR)$(schemadir)/$$SF" ; \
+       echo $(INSTALL) $(INSTALLFLAGS) -m 444 $$i $$SD ; \
+       $(INSTALL) $(INSTALLFLAGS) -m 444 $$i $$SD
        for i in $(srcdir)/schema/*.schema ; do \
                SF=`basename $$i` ; \
                SD="$(DESTDIR)$(schemadir)/$$SF" ; \
index ccee12cdc363e7a2381aa80bfae4dc56c80b6ae0..e7ecee86916d4eeda8064b037575b8f9935067ef 100644 (file)
@@ -4,12 +4,12 @@ SRCS = init.c tools.c config.c \
        add.c bind.c compare.c delete.c modify.c modrdn.c search.c \
        extended.c passwd.c referral.c attribute.c group.c operational.c \
        attr.c index.c key.c dbcache.c filterindex.c \
-       dn2entry.c dn2id.c error.c id2entry.c idl.c nextid.c cache.c psearch.c
+       dn2entry.c dn2id.c error.c id2entry.c idl.c nextid.c cache.c
 OBJS = init.lo tools.lo config.lo \
        add.lo bind.lo compare.lo delete.lo modify.lo modrdn.lo search.lo \
        extended.lo passwd.lo referral.lo attribute.lo group.lo operational.lo \
        attr.lo index.lo key.lo dbcache.lo filterindex.lo \
-       dn2entry.lo dn2id.lo error.lo id2entry.lo idl.lo nextid.lo cache.lo psearch.lo
+       dn2entry.lo dn2id.lo error.lo id2entry.lo idl.lo nextid.lo cache.lo
 
 LDAP_INCDIR= ../../../include       
 LDAP_LIBDIR= ../../../libraries
diff --git a/servers/slapd/back-bdb/psearch.c b/servers/slapd/back-bdb/psearch.c
deleted file mode 100644 (file)
index e62c8ec..0000000
+++ /dev/null
@@ -1,1082 +0,0 @@
-/* psearch.c - psearch operations */
-/* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
- */
-
-#include "portable.h"
-
-#include <stdio.h>
-
-#include "back-bdb.h"
-#include "idl.h"
-#include "external.h"
-
-#if defined(LDAP_CLIENT_UPDATE) || defined(LDAP_SYNC)
-
-#define IS_BDB_REPLACE (( psearch_type == LDAP_PSEARCH_BY_DELETE ) || \
-                      ( psearch_type == LDAP_PSEARCH_BY_SCOPEOUT ))
-#define IS_BDB_LCUP_REPLACE (( protocol == LDAP_CLIENT_UPDATE ) && IS_BDB_REPLACE )
-
-static int psearch_base_candidate(
-       BackendDB       *be,
-       Entry           *e,
-       ID              *ids );
-
-static int psearch_candidates(
-       BackendDB       *be,
-       Operation       *op,
-       Entry           *e,
-       Filter          *filter,
-       int             scope,
-       int             deref,
-       ID              *ids );
-
-int
-bdb_abandon(
-       BackendDB       *be,
-       Connection      *conn,
-       Operation       *op,
-       ber_int_t       id )
-{
-       Operation       *ps_list;
-       struct bdb_info *bdb = (struct bdb_info *) be->be_private;
-
-       LDAP_LIST_FOREACH ( ps_list, &bdb->psearch_list, link ) {
-               if ( ps_list->o_connid == conn->c_connid ) {
-                       if ( ps_list->o_msgid == id ) {
-                               ps_list->o_abandon = 1;
-                               LDAP_LIST_REMOVE( ps_list, link );
-                               slap_op_free ( ps_list );
-                               return LDAP_SUCCESS;
-                       }
-               }
-       }
-       return LDAP_UNAVAILABLE;
-}
-
-int
-bdb_cancel(
-       BackendDB       *be,
-       Connection      *conn,
-       Operation       *op,
-       ber_int_t       id )
-{
-       Operation       *ps_list;
-       struct bdb_info *bdb = (struct bdb_info *) be->be_private;
-
-       LDAP_LIST_FOREACH ( ps_list, &bdb->psearch_list, link ) {
-               if ( ps_list->o_connid == conn->c_connid ) {
-                       if ( ps_list->o_msgid == id ) {
-                               ps_list->o_cancel = SLAP_CANCEL_DONE;
-                               LDAP_LIST_REMOVE( ps_list, link );
-
-#if 0
-                               bdb_build_sync_done_ctrl( conn, ps_list, ps_list->ctrls, 1, &latest_entrycsn_bv );
-                               send_search_result( conn, ps_list, LDAP_CANCELLED,
-                                               NULL, NULL, NULL, ps_list->ctrls, ps_list->nentries);
-#endif
-                               send_search_result( conn, ps_list, LDAP_CANCELLED,
-                                               NULL, NULL, NULL, NULL, 0);
-
-
-
-                               slap_op_free ( ps_list );
-                               return LDAP_SUCCESS;
-                       }
-               }
-       }
-       return LDAP_UNAVAILABLE;
-}
-
-int
-bdb_add_psearch_spec(
-       BackendDB       *be,
-       Connection      *conn,
-       Operation       *op,
-       struct berval   *base,
-       struct berval   *nbase,
-       int             scope,
-       int             deref,
-       int             slimit,
-       int             tlimit,
-       Filter          *filter,
-       struct berval   *fstr,
-       AttributeName   *attrs,
-       int             attrsonly,
-       int             protocol        )
-{
-       struct bdb_info *bdb = (struct bdb_info *) be->be_private;
-
-       LDAP_LIST_FIRST( &op->psearch_spec ) = (struct ldap_psearch_spec *)
-               calloc ( 1, sizeof ( struct ldap_psearch_spec ) );
-
-       LDAP_LIST_FIRST( &op->psearch_spec )->op = op;
-
-       LDAP_LIST_FIRST( &op->psearch_spec )->base = ber_dupbv(NULL, base);
-       LDAP_LIST_FIRST( &op->psearch_spec )->nbase = ber_dupbv(NULL, nbase);
-
-       LDAP_LIST_FIRST( &op->psearch_spec )->scope = scope;
-       LDAP_LIST_FIRST( &op->psearch_spec )->deref = deref;
-       LDAP_LIST_FIRST( &op->psearch_spec )->slimit = slimit;
-       LDAP_LIST_FIRST( &op->psearch_spec )->tlimit = tlimit;
-
-       LDAP_LIST_FIRST( &op->psearch_spec )->filter = filter;
-       LDAP_LIST_FIRST( &op->psearch_spec )->filterstr = ber_dupbv(NULL, fstr);
-       LDAP_LIST_FIRST( &op->psearch_spec )->attrs = attrs;
-
-       LDAP_LIST_FIRST( &op->psearch_spec )->attrsonly = attrsonly;
-
-       LDAP_LIST_FIRST( &op->psearch_spec )->entry_count = 0;
-
-       LDAP_LIST_FIRST( &op->psearch_spec )->protocol = protocol;
-
-       LDAP_LIST_INSERT_HEAD( &bdb->psearch_list, op, link );
-}
-
-int
-bdb_psearch(
-       BackendDB       *be,
-       Connection      *conn,
-       Operation       *op,
-       Operation       *ps_op,
-       Entry           *entry,
-       int             psearch_type    )
-{
-       struct bdb_info *bdb = (struct bdb_info *) be->be_private;
-       int             rc;
-       const char      *text = NULL;
-       time_t          stoptime;
-       unsigned        cursor;
-       ID              id;
-       ID              candidates[BDB_IDL_UM_SIZE];
-       Entry           *e = NULL;
-       BerVarray       v2refs = NULL;
-       Entry           *matched = NULL;
-       struct berval   realbase = { 0, NULL };
-       int             nentries = 0;
-       int             manageDSAit;
-
-       Filter          cookief, csnfnot, csnfeq, csnfand, csnfge;
-       AttributeAssertion      aa_ge, aa_eq;
-       struct berval   entrycsn_bv = { 0, NULL };
-       struct berval   latest_entrycsn_bv = { 0, NULL };
-
-        LDAPControl     *ctrls[SLAP_SEARCH_MAX_CTRLS];
-        int             num_ctrls = 0;
-
-       struct slap_limits_set *limit = NULL;
-       int isroot = 0;
-       int scopeok = 0;
-
-       u_int32_t       locker;
-       DB_LOCK         lock;
-
-       Connection      *ps_conn   = ps_op->o_conn;
-       struct berval   *base      = LDAP_LIST_FIRST( &ps_op->psearch_spec )->base;
-       struct berval   *nbase     = LDAP_LIST_FIRST( &ps_op->psearch_spec )->nbase;
-       int             scope      = LDAP_LIST_FIRST( &ps_op->psearch_spec )->scope;
-       int             deref      = LDAP_LIST_FIRST( &ps_op->psearch_spec )->deref;
-       int             slimit     = LDAP_LIST_FIRST( &ps_op->psearch_spec )->slimit;
-       int             tlimit     = LDAP_LIST_FIRST( &ps_op->psearch_spec )->tlimit;
-       Filter          *filter    = LDAP_LIST_FIRST( &ps_op->psearch_spec )->filter;
-       struct berval   *filterstr = LDAP_LIST_FIRST( &ps_op->psearch_spec )->filterstr;
-       int             attrsonly  = LDAP_LIST_FIRST( &ps_op->psearch_spec )->attrsonly;
-       int             protocol   = LDAP_LIST_FIRST( &ps_op->psearch_spec )->protocol;
-       AttributeName   uuid_attr[2];
-       AttributeName   *attrs;
-
-#ifdef NEW_LOGGING
-       LDAP_LOG ( OPERATION, ENTRY, "bdb_back_search\n", 0, 0, 0 );
-#else
-       Debug( LDAP_DEBUG_TRACE, "=> bdb_back_search\n",
-               0, 0, 0);
-#endif
-
-       manageDSAit = get_manageDSAit( ps_op );
-
-       rc = LOCK_ID (bdb->bi_dbenv, &locker );
-       switch(rc) {
-       case 0:
-               break;
-       default:
-               send_ldap_result( ps_conn, ps_op, rc=LDAP_OTHER,
-                       NULL, "internal error", NULL, NULL );
-               return rc;
-       }       
-
-        for ( num_ctrls = 0; num_ctrls < SLAP_SEARCH_MAX_CTRLS; num_ctrls++ )
-                ctrls[num_ctrls] = NULL;
-        num_ctrls = 0;
-
-       if ( !IS_BDB_REPLACE ) {
-               attrs = LDAP_LIST_FIRST(&ps_op->psearch_spec)->attrs;
-       } else {
-#ifdef LDAP_CLIENT_UPDATE
-               if ( protocol == LDAP_CLIENT_UPDATE ) {
-                       attrs = uuid_attr;
-                       attrs[0].an_desc = slap_schema.si_ad_entryUUID;
-                       attrs[0].an_oc = NULL;
-                       ber_dupbv( &attrs[0].an_name, &attrs[0].an_desc->ad_cname );
-                       attrs[1].an_desc = NULL;
-                       attrs[1].an_oc = NULL;
-                       attrs[1].an_name.bv_len = 0;
-                       attrs[1].an_name.bv_val = NULL;
-               } else
-#endif
-#ifdef LDAP_SYNC
-               if (protocol == LDAP_SYNC ) {
-                       attrs = uuid_attr;
-                       attrs[0].an_desc = NULL;
-                       attrs[0].an_oc = NULL;
-                       attrs[0].an_name.bv_len = 0;
-                       attrs[0].an_name.bv_val = NULL;
-               } else
-#endif
-               {
-                       rc = 1;
-                       goto done;
-               }
-       }
-
-       if ( nbase->bv_len == 0 ) {
-               /* DIT root special case */
-               e = (Entry *) &slap_entry_root;
-               rc = 0;
-       } else                                          
-#ifdef BDB_ALIASES
-       /* get entry with reader lock */
-       if ( deref & LDAP_DEREF_FINDING ) {
-               e = deref_dn_r( be, nbase-, &err, &matched, &text );
-
-       } else
-#endif
-       {
-dn2entry_retry:
-               rc = bdb_dn2entry_r( be, NULL, nbase, &e, &matched, 0, locker, &lock );
-       }
-
-       switch(rc) {
-       case DB_NOTFOUND:
-       case 0:
-               break;
-       case LDAP_BUSY:
-               if (e != NULL) {
-                       bdb_cache_return_entry_r(bdb->bi_dbenv, &bdb->bi_cache,
-                               e, &lock);
-               }
-               if (matched != NULL) {
-                       bdb_cache_return_entry_r(bdb->bi_dbenv, &bdb->bi_cache,
-                               matched, &lock);
-               }
-               send_ldap_result( ps_conn, ps_op, LDAP_BUSY,
-                       NULL, "ldap server busy", NULL, NULL );
-               LOCK_ID_FREE( bdb->bi_dbenv, locker );
-#ifdef LDAP_CLIENT_UPDATE
-               if ( IS_BDB_LCUP_REPLACE )
-                       ch_free( attrs[0].an_name.bv_val );
-#endif
-               return LDAP_BUSY;
-       case DB_LOCK_DEADLOCK:
-       case DB_LOCK_NOTGRANTED:
-               goto dn2entry_retry;
-       default:
-               if (e != NULL) {
-                       bdb_cache_return_entry_r(bdb->bi_dbenv, &bdb->bi_cache,
-                               e, &lock);
-               }
-               if (matched != NULL) {
-                       bdb_cache_return_entry_r(bdb->bi_dbenv, &bdb->bi_cache,
-                               matched, &lock);
-               }
-               send_ldap_result( ps_conn, ps_op, rc=LDAP_OTHER,
-                       NULL, "internal error", NULL, NULL );
-               LOCK_ID_FREE( bdb->bi_dbenv, locker );
-#ifdef LDAP_CLIENT_UPDATE
-               if ( IS_BDB_LCUP_REPLACE )
-                       ch_free( attrs[0].an_name.bv_val );
-#endif
-               return rc;
-       }
-
-       if ( e == NULL ) {
-               struct berval matched_dn = { 0, NULL };
-               BerVarray refs = NULL;
-
-               if ( matched != NULL ) {
-                       BerVarray erefs;
-                       ber_dupbv( &matched_dn, &matched->e_name );
-
-                       erefs = is_entry_referral( matched )
-                               ? get_entry_referrals( be, ps_conn, ps_op, matched )
-                               : NULL;
-
-                       bdb_cache_return_entry_r(bdb->bi_dbenv, &bdb->bi_cache,
-                               matched, &lock);
-                       matched = NULL;
-
-                       if( erefs ) {
-                               refs = referral_rewrite( erefs, &matched_dn,
-                                       base, scope );
-                               ber_bvarray_free( erefs );
-                       }
-
-               } else {
-                       refs = referral_rewrite( default_referral,
-                               NULL, base, scope );
-               }
-
-               send_ldap_result( ps_conn, ps_op,       rc=LDAP_REFERRAL ,
-                       matched_dn.bv_val, text, refs, NULL );
-
-               LOCK_ID_FREE( bdb->bi_dbenv, locker );
-               if ( refs ) ber_bvarray_free( refs );
-               if ( matched_dn.bv_val ) ber_memfree( matched_dn.bv_val );
-#ifdef LDAP_CLIENT_UPDATE
-               if ( IS_BDB_LCUP_REPLACE )
-                       ch_free( attrs[0].an_name.bv_val );
-#endif
-               return rc;
-       }
-
-       if (!manageDSAit && e != &slap_entry_root && is_entry_referral( e ) ) {
-               /* entry is a referral, don't allow add */
-               struct berval matched_dn;
-               BerVarray erefs, refs;
-               
-               ber_dupbv( &matched_dn, &e->e_name );
-               erefs = get_entry_referrals( be, ps_conn, ps_op, e );
-               refs = NULL;
-
-               bdb_cache_return_entry_r( bdb->bi_dbenv, &bdb->bi_cache, e, &lock );
-               e = NULL;
-
-               if( erefs ) {
-                       refs = referral_rewrite( erefs, &matched_dn,
-                               base, scope );
-                       ber_bvarray_free( erefs );
-               }
-
-#ifdef NEW_LOGGING
-               LDAP_LOG( OPERATION, RESULTS, 
-                       "bdb_search: entry is referral\n", 0, 0, 0 );
-#else
-               Debug( LDAP_DEBUG_TRACE, "bdb_search: entry is referral\n",
-                       0, 0, 0 );
-#endif
-
-               send_ldap_result( ps_conn, ps_op, LDAP_REFERRAL,
-                       matched_dn.bv_val,
-                       refs ? NULL : "bad referral object",
-                       refs, NULL );
-
-               LOCK_ID_FREE( bdb->bi_dbenv, locker );
-               ber_bvarray_free( refs );
-               ber_memfree( matched_dn.bv_val );
-#ifdef LDAP_CLIENT_UPDATE
-               if ( IS_BDB_LCUP_REPLACE )
-                       ch_free( attrs[0].an_name.bv_val );
-#endif
-               return 1;
-       }
-
-       /* if not root, get appropriate limits */
-       if ( be_isroot( be, &ps_op->o_ndn ) ) {
-               isroot = 1;
-       } else {
-               ( void ) get_limits( be, &ps_op->o_ndn, &limit );
-       }
-
-       /* The time/size limits come first because they require very little
-        * effort, so there's no chance the candidates are selected and then 
-        * the request is not honored only because of time/size constraints */
-
-       /* if no time limit requested, use soft limit (unless root!) */
-       if ( isroot ) {
-               if ( tlimit == 0 ) {
-                       tlimit = -1;    /* allow root to set no limit */
-               }
-
-               if ( slimit == 0 ) {
-                       slimit = -1;
-               }
-
-       } else {
-               /* if no limit is required, use soft limit */
-               if ( tlimit <= 0 ) {
-                       tlimit = limit->lms_t_soft;
-
-               /* 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 ) {
-                               tlimit = limit->lms_t_soft;
-
-                       /* positive hard limit means abort */
-                       } else if ( limit->lms_t_hard > 0 ) {
-                               send_search_result( ps_conn, ps_op, 
-                                               LDAP_UNWILLING_TO_PERFORM,
-                                               NULL, NULL, NULL, NULL, 0 );
-                               rc = 0;
-                               goto done;
-                       }
-               
-                       /* negative hard limit means no limit */
-               }
-               
-               /* if no limit is required, use soft limit */
-               if ( slimit <= 0 ) {
-                       slimit = limit->lms_s_soft;
-
-               /* 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 ) {
-                               slimit = limit->lms_s_soft;
-
-                       /* positive hard limit means abort */
-                       } else if ( limit->lms_s_hard > 0 ) {
-                               send_search_result( ps_conn, ps_op, 
-                                               LDAP_UNWILLING_TO_PERFORM,
-                                               NULL, NULL, NULL, NULL, 0 );
-                               rc = 0; 
-                               goto done;
-                       }
-                       
-                       /* negative hard limit means no limit */
-               }
-       }
-
-       /* compute it anyway; root does not use it */
-       stoptime = ps_op->o_time + tlimit;
-
-       /* select candidates */
-       if ( scope == LDAP_SCOPE_BASE ) {
-               rc = psearch_base_candidate( be, e, candidates );
-       } else {
-               BDB_IDL_ALL( bdb, candidates );
-               rc = psearch_candidates( be, op, e, filter,
-                       scope, deref, candidates );
-       }
-
-       if ( !BDB_IDL_IS_RANGE( candidates ) ) {
-               cursor = bdb_idl_search( candidates, entry->e_id );
-               if ( candidates[cursor] != entry->e_id ) {
-                       goto test_done;
-               }
-       } else {
-               if ( entry->e_id < BDB_IDL_RANGE_FIRST(candidates) &&
-                    entry->e_id > BDB_IDL_RANGE_LAST(candidates) )
-               {
-                       goto test_done;
-               }
-       }
-
-       /* candidates = { e } */
-       candidates[0] = 1;
-       candidates[1] = entry->e_id;
-
-       /* need normalized dn below */
-       ber_dupbv( &realbase, &e->e_nname );
-
-       if ( e != &slap_entry_root ) {
-               bdb_cache_return_entry_r(bdb->bi_dbenv, &bdb->bi_cache, e, &lock);
-       }
-       e = NULL;
-
-       if ( candidates[0] == 0 ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG ( OPERATION, RESULTS,
-                       "bdb_search: no candidates\n", 0, 0, 0 );
-#else
-               Debug( LDAP_DEBUG_TRACE, "bdb_search: no candidates\n",
-                       0, 0, 0 );
-#endif
-
-               send_search_result( ps_conn, ps_op,
-                       LDAP_SUCCESS,
-                       NULL, NULL, NULL, NULL, 0 );
-
-               rc = 1;
-               goto done;
-       }
-
-       /* if not root and candidates exceed to-be-checked entries, abort */
-       if ( !isroot && limit->lms_s_unchecked != -1 ) {
-               if ( BDB_IDL_N(candidates) > (unsigned) limit->lms_s_unchecked ) {
-                       send_search_result( ps_conn, ps_op, LDAP_ADMINLIMIT_EXCEEDED,
-                               NULL, NULL, NULL, NULL, 0 );
-                       rc = 1;
-                       goto done;
-               }
-       }
-
-#ifdef LDAP_CLIENT_UPDATE
-       if ( protocol == LDAP_CLIENT_UPDATE ) {
-               cookief.f_choice = LDAP_FILTER_AND;
-               cookief.f_and = &csnfnot;
-               cookief.f_next = NULL;
-       
-               csnfnot.f_choice = LDAP_FILTER_NOT;
-               csnfnot.f_not = &csnfeq;
-               csnfnot.f_next = &csnfand;
-
-               csnfeq.f_choice = LDAP_FILTER_EQUALITY;
-               csnfeq.f_ava = &aa_eq;
-               csnfeq.f_av_desc = slap_schema.si_ad_entryCSN;
-               ber_dupbv( &csnfeq.f_av_value, &ps_op->o_clientupdate_state );
-
-               csnfand.f_choice = LDAP_FILTER_AND;
-               csnfand.f_and = &csnfge;
-               csnfand.f_next = NULL;
-       
-               csnfge.f_choice = LDAP_FILTER_GE;
-               csnfge.f_ava = &aa_ge;
-               csnfge.f_av_desc = slap_schema.si_ad_entryCSN;
-               ber_dupbv( &csnfge.f_av_value, &ps_op->o_clientupdate_state );
-               csnfge.f_next = filter;
-       }
-#endif
-#if defined(LDAP_CLIENT_UPDATE) && defined(LDAP_SYNC)
-       else
-#endif
-#ifdef LDAP_SYNC
-       if ( protocol == LDAP_SYNC ) {
-               cookief.f_choice = LDAP_FILTER_AND;
-               cookief.f_and = &csnfnot;
-               cookief.f_next = NULL;
-       
-               csnfnot.f_choice = LDAP_FILTER_NOT;
-               csnfnot.f_not = &csnfeq;
-               csnfnot.f_next = &csnfand;
-
-               csnfeq.f_choice = LDAP_FILTER_EQUALITY;
-               csnfeq.f_ava = &aa_eq;
-               csnfeq.f_av_desc = slap_schema.si_ad_entryCSN;
-               ber_dupbv( &csnfeq.f_av_value, &ps_op->o_sync_state );
-
-               csnfand.f_choice = LDAP_FILTER_AND;
-               csnfand.f_and = &csnfge;
-               csnfand.f_next = NULL;
-       
-               csnfge.f_choice = LDAP_FILTER_GE;
-               csnfge.f_ava = &aa_ge;
-               csnfge.f_av_desc = slap_schema.si_ad_entryCSN;
-               ber_dupbv( &csnfge.f_av_value, &ps_op->o_sync_state );
-               csnfge.f_next = filter;
-       }
-#endif
-
-       id = entry->e_id;
-
-       /* check for abandon */
-       if ( ps_op->o_abandon ) {
-               rc = 0;
-               goto done;
-       }
-
-       /* check time limit */
-       if ( tlimit != -1 && slap_get_time() > stoptime ) {
-               send_search_result( ps_conn, ps_op, rc = LDAP_TIMELIMIT_EXCEEDED,
-                       NULL, NULL, v2refs, NULL, nentries );
-               goto done;
-       }
-
-       e = entry;
-
-#ifdef BDB_SUBENTRIES
-       if ( is_entry_subentry( e ) ) {
-               if( scope != LDAP_SCOPE_BASE ) {
-                       if(!get_subentries_visibility( ps_op )) {
-                               /* only subentries are visible */
-                               goto test_done;
-                       }
-
-               } else if ( get_subentries( ps_op ) &&
-                       !get_subentries_visibility( ps_op ))
-               {
-                       /* only subentries are visible */
-                       goto test_done;
-               }
-
-       } else if ( get_subentries_visibility( ps_op )) {
-               /* only subentries are visible */
-               goto test_done;
-       }
-#endif
-
-#ifdef BDB_ALIASES
-       if ( deref & LDAP_DEREF_SEARCHING && is_entry_alias( e ) ) {
-               Entry *matched;
-               int err;
-               const char *text;
-               
-               e = deref_entry_r( be, e, &err, &matched, &text );
-
-               if( e == NULL ) {
-                       e = matched;
-                       goto test_done;
-               }
-
-               if( e->e_id == id ) {
-                       /* circular loop */
-                       goto test_done;
-               }
-
-               /* need to skip alias which deref into scope */
-               if( scope & LDAP_SCOPE_ONELEVEL ) {
-                       struct berval   pdn;
-                       
-                       dnParent( &e->e_nname, &pdn ):
-                       if ( ber_bvcmp( pdn, &realbase ) ) {
-                               goto test_done;
-                       }
-
-               } else if ( dnIsSuffix( &e->e_nname, &realbase ) ) {
-                       /* alias is within scope */
-#ifdef NEW_LOGGING
-                       LDAP_LOG ( OPERATION, RESULTS,
-                               "bdb_search: \"%s\" in subtree\n", e->edn, 0, 0);
-#else
-                       Debug( LDAP_DEBUG_TRACE,
-                               "bdb_search: \"%s\" in subtree\n",
-                               e->e_dn, 0, 0 );
-#endif
-                       goto test_done;
-               }
-
-               scopeok = 1;
-       }
-#endif
-
-       /*
-        * if it's a referral, add it to the list of referrals. only do
-        * this for non-base searches, and don't check the filter
-        * explicitly here since it's only a candidate anyway.
-        */
-       if ( !manageDSAit && scope != LDAP_SCOPE_BASE &&
-               is_entry_referral( e ) )
-       {
-               struct berval   dn;
-
-               /* check scope */
-               if ( !scopeok && scope == LDAP_SCOPE_ONELEVEL ) {
-                       if ( !be_issuffix( be, &e->e_nname ) ) {
-                               dnParent( &e->e_nname, &dn );
-                               scopeok = dn_match( &dn, &realbase );
-                       } else {
-                               scopeok = (realbase.bv_len == 0);
-                       }
-
-               } else if ( !scopeok && scope == LDAP_SCOPE_SUBTREE ) {
-                       scopeok = dnIsSuffix( &e->e_nname, &realbase );
-
-               } else {
-                       scopeok = 1;
-               }
-
-               if( scopeok ) {
-                       BerVarray erefs = get_entry_referrals(
-                               be, ps_conn, ps_op, e );
-                       BerVarray refs = referral_rewrite( erefs,
-                               &e->e_name, NULL,
-                               scope == LDAP_SCOPE_SUBTREE
-                                       ? LDAP_SCOPE_SUBTREE
-                                       : LDAP_SCOPE_BASE );
-
-                       send_search_reference( be, ps_conn, ps_op,
-                               e, refs, NULL, &v2refs );
-
-                       ber_bvarray_free( refs );
-
-               } else {
-#ifdef NEW_LOGGING
-                       LDAP_LOG(OPERATION, DETAIL2, 
-                               "bdb_search: candidate referral %ld scope not okay\n",
-                               id, 0, 0 );
-#else
-                       Debug( LDAP_DEBUG_TRACE,
-                               "bdb_search: candidate referral %ld scope not okay\n",
-                               id, 0, 0 );
-#endif
-               }
-
-               goto test_done;
-       }
-
-       if ( psearch_type != LDAP_PSEARCH_BY_SCOPEOUT ) {
-               rc = test_filter( be, ps_conn, ps_op, e, &cookief );
-       } else {
-               rc = LDAP_COMPARE_TRUE;
-       }
-
-       if ( rc == LDAP_COMPARE_TRUE ) {
-               struct berval   dn;
-
-               /* check scope */
-               if ( !scopeok && scope == LDAP_SCOPE_ONELEVEL ) {
-                       if ( be_issuffix( be, &e->e_nname ) ) {
-                               scopeok = (realbase.bv_len == 0);
-                       } else {
-                               dnParent( &e->e_nname, &dn );
-                               scopeok = dn_match( &dn, &realbase );
-                       }
-
-               } else if ( !scopeok && scope == LDAP_SCOPE_SUBTREE ) {
-                       scopeok = dnIsSuffix( &e->e_nname, &realbase );
-
-               } else {
-                       scopeok = 1;
-               }
-
-               if ( scopeok ) {
-                       /* check size limit */
-                       if ( --slimit == -1 ) {
-                               send_search_result( ps_conn, ps_op,
-                                       rc = LDAP_SIZELIMIT_EXCEEDED, NULL, NULL,
-                                       v2refs, NULL, nentries );
-                               goto done;
-                       }
-
-                       if (e) {
-                               int result;
-                               
-#if 0  /* noop is masked SLAP_CTRL_UPDATE */
-                               if( ps_op->o_noop ) {
-                                       result = 0;
-                               } else
-#endif
-                               {
-#ifdef LDAP_SYNC
-                                               int premodify_found = 0;
-                                               int entry_sync_state;
-#endif
-
-                                       if ( psearch_type == LDAP_PSEARCH_BY_ADD ||
-                                            psearch_type == LDAP_PSEARCH_BY_DELETE ||
-                                            psearch_type == LDAP_PSEARCH_BY_MODIFY ||
-                                            psearch_type == LDAP_PSEARCH_BY_SCOPEOUT )
-                                       {
-                                               if ( psearch_type == LDAP_PSEARCH_BY_MODIFY ) {
-                                                       struct psid_entry* psid_e;
-                                                       LDAP_LIST_FOREACH( psid_e, &op->premodify_list, link)
-                                                       {
-                                                               if( psid_e->ps == LDAP_LIST_FIRST(&ps_op->psearch_spec))
-                                                               {
-#ifdef LDAP_SYNC
-                                                                       premodify_found = 1;
-#endif
-                                                                       LDAP_LIST_REMOVE(psid_e, link);
-                                                                       break;
-                                                               }
-                                                       }
-                                                       if (psid_e != NULL) free (psid_e);
-                                               }
-#ifdef LDAP_SYNC
-                                               if ( psearch_type == LDAP_PSEARCH_BY_ADD )
-                                                       entry_sync_state = LDAP_SYNC_ADD;
-                                               else if ( psearch_type == LDAP_PSEARCH_BY_DELETE )
-                                                       entry_sync_state = LDAP_SYNC_DELETE;
-                                               else if ( psearch_type == LDAP_PSEARCH_BY_MODIFY ) {
-                                                       if ( premodify_found )
-                                                               entry_sync_state = LDAP_SYNC_MODIFY;
-                                                       else
-                                                               entry_sync_state = LDAP_SYNC_ADD;
-                                               } else if ( psearch_type == LDAP_PSEARCH_BY_SCOPEOUT )
-                                                       entry_sync_state = LDAP_SYNC_DELETE;
-                                               else {
-                                                       rc = 1;
-                                                       goto done;
-                                               }
-#endif
-
-#ifdef LDAP_CLIENT_UPDATE
-                                               if ( protocol == LDAP_CLIENT_UPDATE ) {
-                                                       int entry_count = ++(LDAP_LIST_FIRST(&ps_op->psearch_spec)->entry_count);
-                                                       if ( IS_BDB_REPLACE ) {
-                                                               rc = bdb_build_lcup_update_ctrl( ps_conn, ps_op, e, entry_count, ctrls,
-                                                                               num_ctrls++, &latest_entrycsn_bv, SLAP_LCUP_ENTRY_DELETED_TRUE );
-                                                       } else {
-                                                               rc = bdb_build_lcup_update_ctrl( ps_conn, ps_op, e, entry_count, ctrls,
-                                                                               num_ctrls++, &latest_entrycsn_bv, SLAP_LCUP_ENTRY_DELETED_FALSE );
-                                                       }
-                                                       if ( rc != LDAP_SUCCESS )
-                                                               goto done;
-                                                       result = send_search_entry( be, ps_conn, ps_op, e, attrs, attrsonly, ctrls );
-                                                       if ( ctrls[num_ctrls-1]->ldctl_value.bv_val != NULL )
-                                                               ch_free( ctrls[num_ctrls-1]->ldctl_value.bv_val );
-                                                       ch_free( ctrls[--num_ctrls] );
-                                                       ctrls[num_ctrls] = NULL;
-                                               } else
-#endif
-#ifdef LDAP_SYNC
-                                               if ( protocol == LDAP_SYNC ) {
-                                                       rc = bdb_build_sync_state_ctrl( ps_conn, ps_op, e, entry_sync_state, ctrls,
-                                                                                       num_ctrls++, 1, &latest_entrycsn_bv );
-                                                       if ( rc != LDAP_SUCCESS )
-                                                               goto done;
-                                                       result = send_search_entry( be, ps_conn, ps_op, e, attrs, attrsonly, ctrls );
-                                                       if ( ctrls[num_ctrls-1]->ldctl_value.bv_val != NULL )
-                                                               ch_free( ctrls[num_ctrls-1]->ldctl_value.bv_val );
-                                                       ch_free( ctrls[--num_ctrls] );
-                                                       ctrls[num_ctrls] = NULL;
-                                               } else
-#endif
-                                               {
-                                                       rc = 1;
-                                                       goto done;
-                                               }
-
-                                       } else if ( psearch_type == LDAP_PSEARCH_BY_PREMODIFY ) {
-                                               struct psid_entry* psid_e;
-                                               psid_e = (struct psid_entry *) calloc (1,
-                                                       sizeof(struct psid_entry));
-                                               psid_e->ps = LDAP_LIST_FIRST(&ps_op->psearch_spec);
-                                               LDAP_LIST_INSERT_HEAD( &op->premodify_list,
-                                                       psid_e, link );
-
-                                       } else {
-                                               printf("Error !\n");
-                                       }
-                               }
-
-                               switch (result) {
-                               case 0:         /* entry sent ok */
-                                       nentries++;
-                                       break;
-                               case 1:         /* entry not sent */
-                                       break;
-                               case -1:        /* connection closed */
-                                       rc = LDAP_OTHER;
-                                       goto done;
-                               }
-                       }
-               } else {
-#ifdef NEW_LOGGING
-                       LDAP_LOG ( OPERATION, RESULTS,
-                               "bdb_search: %ld scope not okay\n", (long) id, 0, 0);
-#else
-                       Debug( LDAP_DEBUG_TRACE,
-                               "bdb_search: %ld scope not okay\n", (long) id, 0, 0 );
-#endif
-               }
-       } else {
-#ifdef NEW_LOGGING
-               LDAP_LOG ( OPERATION, RESULTS,
-                       "bdb_search: %ld does match filter\n", (long) id, 0, 0);
-#else
-               Debug( LDAP_DEBUG_TRACE,
-                       "bdb_search: %ld does match filter\n",
-                       (long) id, 0, 0 );
-#endif
-       }
-
-test_done:
-       rc = LDAP_SUCCESS;
-
-done:
-       if ( csnfeq.f_ava != NULL && csnfeq.f_av_value.bv_val != NULL ) {
-               ch_free( csnfeq.f_av_value.bv_val );
-       }
-
-       if ( csnfge.f_ava != NULL && csnfge.f_av_value.bv_val != NULL ) {
-               ch_free( csnfge.f_av_value.bv_val );
-       }
-
-       LOCK_ID_FREE( bdb->bi_dbenv, locker );
-
-       if( v2refs ) ber_bvarray_free( v2refs );
-       if( realbase.bv_val ) ch_free( realbase.bv_val );
-#ifdef LDAP_CLIENT_UPDATE
-       if ( IS_BDB_LCUP_REPLACE )
-               ch_free( attrs[0].an_name.bv_val );
-#endif
-
-       return rc;
-}
-
-static int psearch_base_candidate(
-       BackendDB       *be,
-       Entry   *e,
-       ID              *ids )
-{
-#ifdef NEW_LOGGING
-       LDAP_LOG ( OPERATION, ENTRY,
-               "psearch_base_candidate: base: \"%s\" (0x%08lx)\n", e->e_dn, (long) e->e_id, 0);
-#else
-       Debug(LDAP_DEBUG_ARGS, "psearch_base_candidates: base: \"%s\" (0x%08lx)\n",
-               e->e_dn, (long) e->e_id, 0);
-#endif
-
-       ids[0] = 1;
-       ids[1] = e->e_id;
-       return 0;
-}
-
-/* Look for "objectClass Present" in this filter.
- * Also count depth of filter tree while we're at it.
- */
-static int psearch_oc_filter(
-       Filter *f,
-       int cur,
-       int *max
-)
-{
-       int rc = 0;
-
-       if( cur > *max ) *max = cur;
-
-       switch(f->f_choice) {
-       case LDAP_FILTER_PRESENT:
-               if (f->f_desc == slap_schema.si_ad_objectClass) {
-                       rc = 1;
-               }
-               break;
-
-       case LDAP_FILTER_AND:
-       case LDAP_FILTER_OR:
-               cur++;
-               for (f=f->f_and; f; f=f->f_next) {
-                       (void) psearch_oc_filter(f, cur, max);
-               }
-               break;
-
-       default:
-               break;
-       }
-       return rc;
-}
-
-static int psearch_candidates(
-       BackendDB *be,
-       Operation *op,
-       Entry *e,
-       Filter *filter,
-       int scope,
-       int deref,
-       ID      *ids )
-{
-       int rc, depth = 1;
-       Filter          f, scopef, rf, xf;
-       ID              *stack;
-       AttributeAssertion aa_ref;
-#ifdef BDB_SUBENTRIES
-       Filter  sf;
-       AttributeAssertion aa_subentry;
-#endif
-#ifdef BDB_ALIASES
-       Filter  af;
-       AttributeAssertion aa_alias;
-#endif
-
-       /*
-        * This routine takes as input a filter (user-filter)
-        * and rewrites it as follows:
-        *      (&(scope=DN)[(objectClass=subentry)]
-        *              (|[(objectClass=referral)(objectClass=alias)](user-filter))
-        */
-
-#ifdef NEW_LOGGING
-       LDAP_LOG ( OPERATION, ENTRY,
-               "psearch_candidates: base=\"%s\" (0x%08lx) scope=%d\n", 
-               e->e_dn, (long) e->e_id, scope);
-#else
-       Debug(LDAP_DEBUG_TRACE,
-               "psearch_candidates: base=\"%s\" (0x%08lx) scope=%d\n",
-               e->e_dn, (long) e->e_id, scope );
-#endif
-
-       xf.f_or = filter;
-       xf.f_choice = LDAP_FILTER_OR;
-       xf.f_next = NULL;
-
-       /* If the user's filter uses objectClass=*,
-        * these clauses are redundant.
-        */
-       if (!psearch_oc_filter(filter, 1, &depth) && !get_subentries_visibility(op) ) {
-               if( !get_manageDSAit(op) ) { /* match referrals */
-                       struct berval bv_ref = { sizeof("REFERRAL")-1, "REFERRAL" };
-                       rf.f_choice = LDAP_FILTER_EQUALITY;
-                       rf.f_ava = &aa_ref;
-                       rf.f_av_desc = slap_schema.si_ad_objectClass;
-                       rf.f_av_value = bv_ref;
-                       rf.f_next = xf.f_or;
-                       xf.f_or = &rf;
-               }
-
-#ifdef BDB_ALIASES
-               if( deref & LDAP_DEREF_SEARCHING ) { /* match aliases */
-                       struct berval bv_alias = { sizeof("ALIAS")-1, "ALIAS" };
-                       af.f_choice = LDAP_FILTER_EQUALITY;
-                       af.f_ava = &aa_alias;
-                       af.f_av_desc = slap_schema.si_ad_objectClass;
-                       af.f_av_value = bv_alias;
-                       af.f_next = xf.f_or;
-                       xf.f_or = &af;
-               }
-#endif
-               /* We added one of these clauses, filter depth increased */
-               if( xf.f_or != filter ) depth++;
-       }
-
-       f.f_next = NULL;
-       f.f_choice = LDAP_FILTER_AND;
-       f.f_and = &scopef;
-       scopef.f_choice = scope == LDAP_SCOPE_SUBTREE
-               ? SLAPD_FILTER_DN_SUBTREE
-               : SLAPD_FILTER_DN_ONE;
-       scopef.f_dn = &e->e_nname;
-       scopef.f_next = xf.f_or == filter ? filter : &xf ;
-       /* Filter depth increased again, adding scope clause */
-       depth++;
-
-#ifdef BDB_SUBENTRIES
-       if( get_subentries_visibility( op ) ) {
-               struct berval bv_subentry = { sizeof("SUBENTRY")-1, "SUBENTRY" };
-               sf.f_choice = LDAP_FILTER_EQUALITY;
-               sf.f_ava = &aa_subentry;
-               sf.f_av_desc = slap_schema.si_ad_objectClass;
-               sf.f_av_value = bv_subentry;
-               sf.f_next = scopef.f_next;
-               scopef.f_next = &sf;
-       }
-#endif
-
-       /* Allocate IDL stack, plus 1 more for former tmp */
-       stack = ch_malloc( (depth + 1) * BDB_IDL_UM_SIZE * sizeof( ID ) );
-
-       rc = bdb_filter_candidates( be, &f, ids, stack, stack+BDB_IDL_UM_SIZE );
-
-       ch_free( stack );
-
-       if( rc ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG ( OPERATION, DETAIL1,
-                       "bdb_psearch_candidates: failed (rc=%d)\n", rc, 0, 0  );
-#else
-               Debug(LDAP_DEBUG_TRACE,
-                       "bdb_psearch_candidates: failed (rc=%d)\n",
-                       rc, NULL, NULL );
-#endif
-
-       } else {
-#ifdef NEW_LOGGING
-               LDAP_LOG ( OPERATION, DETAIL1,
-                       "bdb_psearch_candidates: id=%ld first=%ld last=%ld\n",
-                       (long) ids[0], (long) BDB_IDL_FIRST(ids), 
-                       (long) BDB_IDL_LAST(ids));
-#else
-               Debug(LDAP_DEBUG_TRACE,
-                       "bdb_psearch_candidates: id=%ld first=%ld last=%ld\n",
-                       (long) ids[0],
-                       (long) BDB_IDL_FIRST(ids),
-                       (long) BDB_IDL_LAST(ids) );
-#endif
-       }
-
-       return rc;
-}
-
-
-#endif
index d6b9bc1b131270f25de3daef389774222d393686..c183068b3034aa9545531304e2b0bf4849702c6a 100644 (file)
@@ -34,6 +34,7 @@ usage(const char *s)
                "  -c format\tcrypt(3) salt format\n"
                "  -u\t\tgenerate RFC2307 values (default)\n"
                "  -v\t\tincrease verbosity\n"
+               "  -T file\tread password from verbosity\n"
                , s );
 
        exit( EXIT_FAILURE );
@@ -44,13 +45,14 @@ main( int argc, char *argv[] )
 {
        char    *scheme = "{SSHA}";
        char    *newpw = NULL;
+       char    *pwfile = NULL;
 
        int             i;
        struct berval passwd;
        struct berval *hash = NULL;
 
        while( (i = getopt( argc, argv,
-               "c:d:h:s:vu" )) != EOF )
+               "c:d:h:s:T:vu" )) != EOF )
        {
                switch (i) {
                case 'c':       /* crypt salt format */
@@ -70,9 +72,12 @@ main( int argc, char *argv[] )
                                for( p = optarg; *p != '\0'; p++ ) {
                                        *p = '\0';
                                }
-
                        } break;
 
+               case 'T':       /* password file */
+                       pwfile = optarg;
+                       break;
+
                case 'u':       /* RFC2307 userPassword */
                        break;
 
@@ -89,20 +94,26 @@ main( int argc, char *argv[] )
                usage( argv[0] );
        } 
 
-       if( newpw == NULL ) {
-               /* prompt for new password */
-               char *cknewpw;
-               newpw = strdup(getpassphrase("New password: "));
-               cknewpw = getpassphrase("Re-enter new password: ");
-
-               if( strcmp( newpw, cknewpw )) {
-                       fprintf( stderr, "Password values do not match\n" );
+       if( pwfile != NULL ) {
+               if( lutil_get_filed_password( pwfile, &passwd )) {
                        return EXIT_FAILURE;
                }
-       }
+       } else {
+               if( newpw == NULL ) {
+                       /* prompt for new password */
+                       char *cknewpw;
+                       newpw = strdup(getpassphrase("New password: "));
+                       cknewpw = getpassphrase("Re-enter new password: ");
+       
+                       if( strcmp( newpw, cknewpw )) {
+                               fprintf( stderr, "Password values do not match\n" );
+                               return EXIT_FAILURE;
+                       }
+               }
 
-       passwd.bv_val = newpw;
-       passwd.bv_len = strlen(passwd.bv_val);
+               passwd.bv_val = newpw;
+               passwd.bv_len = strlen(passwd.bv_val);
+       }
 
        hash = lutil_passwd_hash( &passwd, scheme );