document option '-F'

[openldap] / servers / slapd / back-bdb / referral.c

diff --git a/servers/slapd/back-bdb/referral.c b/servers/slapd/back-bdb/referral.c
index 382feca3612339e2e314779246a6284905492a72..c79aee60577fc15a5baeeea085567ad6b7a73375 100644 (file)
--- a/servers/slapd/back-bdb/referral.c
+++ b/servers/slapd/back-bdb/referral.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2000-2004 The OpenLDAP Foundation.
+ * Copyright 2000-2005 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -53,7 +53,13 @@ dn2entry_retry:
        /* get entry */
        rc = bdb_dn2entry( op, NULL, &op->o_req_ndn, &ei, 1, locker, &lock );
 
-       e = ei->bei_e;
+       /* bdb_dn2entry() may legally leave ei == NULL
+        * if rc != 0 and rc != DB_NOTFOUND
+        */
+       if ( ei ) {
+               e = ei->bei_e;
+       }
+
        switch(rc) {
        case DB_NOTFOUND:
        case 0:
@@ -103,7 +109,7 @@ dn2entry_retry:
 
                if( rs->sr_ref != NULL ) {
                        /* send referrals */
-                       rs->sr_err = LDAP_REFERRAL;
+                       rc = rs->sr_err = LDAP_REFERRAL;
                        send_ldap_result( op, rs );
                        ber_bvarray_free( rs->sr_ref );
                        rs->sr_ref = NULL;