allow backwards compatibility for 'T' option (single char)

[openldap] / servers / slapd / backglue.c

diff --git a/servers/slapd/backglue.c b/servers/slapd/backglue.c
index d8c13e96906d9de82292bd860bb5a66079496866..cd8a63d3546201cd0e65a3230777f0bcfbfab6a4 100644 (file)
--- a/servers/slapd/backglue.c
+++ b/servers/slapd/backglue.c
@@ -281,7 +281,9 @@ glue_back_search ( Operation *op, SlapReply *rs )
 
        case LDAP_SCOPE_ONELEVEL:
        case LDAP_SCOPE_SUBTREE:
+#ifdef LDAP_SCOPE_SUBORDINATE
        case LDAP_SCOPE_SUBORDINATE: /* FIXME */
+#endif
                op->o_callback = &cb;
                rs->sr_err = gs.err = LDAP_UNWILLING_TO_PERFORM;
                scope0 = op->ors_scope;
@@ -560,7 +562,7 @@ glue_sub_init( )
                if (SLAP_GLUE_SUBORDINATE ( b1 ) ) {
                        /* The last database cannot be a subordinate of noone */
                        if (i == nBackendDB - 1) {
-                               b1->be_flags ^= SLAP_BFLAG_GLUE_SUBORDINATE;
+                               SLAP_DBFLAGS(b1) ^= SLAP_DBFLAG_GLUE_SUBORDINATE;
                        }
                        continue;
                }
@@ -579,7 +581,7 @@ glue_sub_init( )
                                continue;
                        }
                        cont--;
-                       be->be_flags |= SLAP_BFLAG_GLUE_LINKED;
+                       SLAP_DBFLAGS(be) |= SLAP_DBFLAG_GLUE_LINKED;
                        if (gi == NULL) {
                                /* We create a copy of the superior's be
                                 * structure, pointing to all of its original
@@ -588,7 +590,7 @@ glue_sub_init( )
                                 * is used whenever we have operations to pass
                                 * down to the real database.
                                 */
-                               b1->be_flags |= SLAP_BFLAG_GLUE_INSTANCE;
+                               SLAP_DBFLAGS(b1) |= SLAP_DBFLAG_GLUE_INSTANCE;
                                gi = (glueinfo *)ch_malloc(sizeof(glueinfo));
                                gi->nodes = 0;
                                gi->bd = *b1;