Sync with HEAD

diff --git a/CHANGES b/CHANGES
index a4a330742abe2327a29929790bd3bc5258caf7a1..14986ff9e1ec6436635eed841a76dd553b00b6fd 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,7 @@ OpenLDAP 2.2.7 Engineering
        Fixed slapd erroneous illegal filter handling (ITS#2977)
        Fixed slapd syncrepl bugs (multiple)
        Fixed slapd value regex ACL bug (ITS#3008)
+       Fixed slapd SASL dnauthz bug (ITS#2961)
        Fixed slapcat tools bug (ITS#2974)
        Fixed back-monitor crash when used with overlays (ITS#3023)
        Fixed back-ldap massaged base free (ITS#2999)
@@ -22,7 +23,7 @@ OpenLDAP 2.2.7 Engineering
                Fixed overlay module build issue (ITS#2978)
                Fixed libldap T_SRV portability bug (ITS#2990)
                Fixed AIX portability issues (ITS#2997,2998)
-               Fixed shared library soname versioning
+               Fixed shared library soname versioning (ITS#3016)
                  Requires changes in link practices of dependent apps
                Updated MS win32 port (ITS#2992)
        Documentation

diff --git a/doc/man/man5/slapd-sql.5 b/doc/man/man5/slapd-sql.5
index b59eefa11dfe0deb70a988538821bbe0cb0ad5f5..f43d45735a56e9d5cc9e64a80923699aac20c304 100644 (file)
--- a/doc/man/man5/slapd-sql.5
+++ b/doc/man/man5/slapd-sql.5
@@ -461,11 +461,6 @@ If you need to find all the leaf entries, please use
 \fB(hasSubordinates=FALSE)\fP
 instead.
 .LP
-\fBAttribute\fP and \fBObjectClass\fP inheritance is honored neither
-in filters nor in search results.
-So you may search for \fB(givenName=Mitya)\fP in the examples, 
-but not for \fB(name=Mitya)\fP.
-.LP
 .SH EXAMPLES
 There are example SQL modules in the slapd/back-sql/rdbms_depend/
 directory in the OpenLDAP source tree.

diff --git a/servers/slapd/back-sql/schema-map.c b/servers/slapd/back-sql/schema-map.c
index 12598772f317562055e67fe8ca742f13aba30553..092a0750f9b5a16c565fb050931d53b7f8509a9b 100644 (file)
--- a/servers/slapd/back-sql/schema-map.c
+++ b/servers/slapd/back-sql/schema-map.c
@@ -216,7 +216,7 @@ backsql_load_schema_map( backsql_info *si, SQLHDBC dbh )
        backsql_oc_map_rec      *oc_map;
        backsql_at_map_rec      *at_map;
 
-       Debug( LDAP_DEBUG_TRACE, "==>load_schema_map()\n", 0, 0, 0 );
+       Debug( LDAP_DEBUG_TRACE, "==>backsql_load_schema_map()\n", 0, 0, 0 );
 
        /* 
         * TimesTen : See if the ldap_entries.dn_ru field exists in the schema
@@ -240,18 +240,18 @@ backsql_load_schema_map( backsql_info *si, SQLHDBC dbh )
 
        rc = backsql_Prepare( dbh, &oc_sth, si->oc_query, 0 );
        if ( rc != SQL_SUCCESS ) {
-               Debug( LDAP_DEBUG_TRACE, "load_schema_map(): "
+               Debug( LDAP_DEBUG_TRACE, "backsql_load_schema_map(): "
                        "error preparing oc_query: '%s'\n", 
                        si->oc_query, 0, 0 );
                backsql_PrintErrors( si->db_env, dbh, oc_sth, rc );
                return LDAP_OTHER;
        }
-       Debug( LDAP_DEBUG_TRACE, "load_schema_map(): at_query '%s'\n", 
+       Debug( LDAP_DEBUG_TRACE, "backsql_load_schema_map(): at_query '%s'\n", 
                        si->at_query, 0, 0 );
 
        rc = backsql_Prepare( dbh, &at_sth, si->at_query, 0 );
        if ( rc != SQL_SUCCESS ) {
-               Debug( LDAP_DEBUG_TRACE, "load_schema_map(): "
+               Debug( LDAP_DEBUG_TRACE, "backsql_load_schema_map(): "
                        "error preparing at_query: '%s'\n", 
                        si->at_query, 0, 0 );
                backsql_PrintErrors( si->db_env, dbh, at_sth, rc );
@@ -260,7 +260,7 @@ backsql_load_schema_map( backsql_info *si, SQLHDBC dbh )
 
        rc = backsql_BindParamID( at_sth, 1, &oc_id );
        if ( rc != SQL_SUCCESS ) {
-               Debug( LDAP_DEBUG_TRACE, "load_schema_map(): "
+               Debug( LDAP_DEBUG_TRACE, "backsql_load_schema_map(): "
                        "error binding param for at_query: \n", 0, 0, 0 );
                backsql_PrintErrors( si->db_env, dbh, at_sth, rc );
                return LDAP_OTHER;
@@ -268,7 +268,7 @@ backsql_load_schema_map( backsql_info *si, SQLHDBC dbh )
 
        rc = SQLExecute( oc_sth );
        if ( rc != SQL_SUCCESS ) {
-               Debug( LDAP_DEBUG_TRACE, "load_schema_map(): "
+               Debug( LDAP_DEBUG_TRACE, "backsql_load_schema_map(): "
                        "error executing oc_query: \n", 0, 0, 0 );
                backsql_PrintErrors( si->db_env, dbh, oc_sth, rc );
                return LDAP_OTHER;
@@ -286,7 +286,7 @@ backsql_load_schema_map( backsql_info *si, SQLHDBC dbh )
 
                oc_map->bom_oc = oc_find( oc_row.cols[ 1 ] );
                if ( oc_map->bom_oc == NULL ) {
-                       Debug( LDAP_DEBUG_TRACE, "load_schema_map(): "
+                       Debug( LDAP_DEBUG_TRACE, "backsql_load_schema_map(): "
                                "objectClass '%s' is not defined in schema\n", 
                                oc_row.cols[ 1 ], 0, 0 );
                        return LDAP_OTHER;      /* undefined objectClass ? */
@@ -327,7 +327,7 @@ backsql_load_schema_map( backsql_info *si, SQLHDBC dbh )
                        return LDAP_OTHER;
                }
                oc_id = oc_map->bom_id;
-               Debug( LDAP_DEBUG_TRACE, "load_schema_map(): "
+               Debug( LDAP_DEBUG_TRACE, "backsql_load_schema_map(): "
                        "objectClass '%s': keytbl='%s' keycol='%s'\n",
                        BACKSQL_OC_NAME( oc_map ),
                        oc_map->bom_keytbl.bv_val, oc_map->bom_keycol.bv_val );
@@ -348,13 +348,13 @@ backsql_load_schema_map( backsql_info *si, SQLHDBC dbh )
                        BACKSQL_IS_ADD( oc_map->bom_expect_return ), 
                        BACKSQL_IS_DEL( oc_map->bom_expect_return ), 0 );
 
-               Debug( LDAP_DEBUG_TRACE, "load_schema_map(): "
+               Debug( LDAP_DEBUG_TRACE, "backsql_load_schema_map(): "
                        "autoadding 'objectClass' and 'ref' mappings\n",
                        0, 0, 0 );
                backsql_add_sysmaps( oc_map );
                rc = SQLExecute( at_sth );
                if ( rc != SQL_SUCCESS ) {
-                       Debug( LDAP_DEBUG_TRACE, "load_schema_map(): "
+                       Debug( LDAP_DEBUG_TRACE, "backsql_load_schema_map(): "
                                "error executing at_query: \n", 0, 0, 0 );
                        backsql_PrintErrors( SQL_NULL_HENV, dbh, at_sth, rc );
                        return LDAP_OTHER;
@@ -367,26 +367,28 @@ backsql_load_schema_map( backsql_info *si, SQLHDBC dbh )
                        struct berval   bv;
                        struct berbuf   bb = BB_NULL;
 
-                       Debug( LDAP_DEBUG_TRACE, "********'%s'\n",
-                               at_row.cols[ 0 ], 0, 0 );
                        Debug( LDAP_DEBUG_TRACE, 
-                               "name='%s',sel_expr='%s' from='%s'",
+                               "attributeType:\n"
+                               "\tname='%s'\n"
+                               "\tsel_expr='%s'\n"
+                               "\tfrom='%s'\n",
                                at_row.cols[ 0 ], at_row.cols[ 1 ],
                                at_row.cols[ 2 ] );
                        Debug( LDAP_DEBUG_TRACE, 
-                               "join_where='%s',add_proc='%s'",
-                               at_row.cols[ 3 ], at_row.cols[ 4 ], 0 );
-                       Debug( LDAP_DEBUG_TRACE, "delete_proc='%s'\n",
-                                       at_row.cols[ 5 ], 0, 0 );
+                               "\tjoin_where='%s'\n"
+                               "\tadd_proc='%s'\n"
+                               "\tdelete_proc='%s'\n",
+                               at_row.cols[ 3 ], at_row.cols[ 4 ],
+                               at_row.cols[ 5 ]);
                        /* TimesTen */
-                       Debug( LDAP_DEBUG_TRACE, "sel_expr_u='%s'\n",
+                       Debug( LDAP_DEBUG_TRACE, "\tsel_expr_u='%s'\n",
                                        at_row.cols[ 8 ], 0, 0 );
                        at_map = (backsql_at_map_rec *)ch_calloc( 1,
                                        sizeof( backsql_at_map_rec ) );
                        rc = slap_str2ad( at_row.cols[ 0 ], 
                                        &at_map->bam_ad, &text );
                        if ( rc != LDAP_SUCCESS ) {
-                               Debug( LDAP_DEBUG_TRACE, "load_schema_map(): "
+                               Debug( LDAP_DEBUG_TRACE, "backsql_load_schema_map(): "
                                        "attribute '%s' for objectClass '%s' "
                                        "is not defined in schema: %s\n", 
                                        at_row.cols[ 0 ],
@@ -426,7 +428,7 @@ backsql_load_schema_map( backsql_info *si, SQLHDBC dbh )
                        at_map->bam_expect_return = strtol( at_row.cols[ 7 ],
                                        NULL, 0 );
                        backsql_make_attr_query( oc_map, at_map );
-                       Debug( LDAP_DEBUG_TRACE, "load_schema_map(): "
+                       Debug( LDAP_DEBUG_TRACE, "backsql_load_schema_map(): "
                                "preconstructed query '%s'\n",
                                at_map->bam_query, 0, 0 );
                        at_map->bam_next = NULL;
@@ -456,7 +458,7 @@ backsql_load_schema_map( backsql_info *si, SQLHDBC dbh )
        SQLFreeStmt( at_sth, SQL_DROP );
        SQLFreeStmt( oc_sth, SQL_DROP );
        si->bsql_flags |= BSQLF_SCHEMA_LOADED;
-       Debug( LDAP_DEBUG_TRACE, "<==load_schema_map()\n", 0, 0, 0 );
+       Debug( LDAP_DEBUG_TRACE, "<==backsql_load_schema_map()\n", 0, 0, 0 );
        return LDAP_SUCCESS;
 }
 

diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index 8ee7c5172828e59b055d59f616a6442b29c74c5b..0b3de6e82a33ff7ab8e5b6dbd1f2b4da36293980 100644 (file)
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -2889,21 +2889,23 @@ char *objectIdentifierFirstComponentMatchSyntaxes[] = {
 /*
  * Other matching rules in X.520 that we do not use (yet):
  *
- * 2.5.13.9            numericStringOrderingMatch
+ * 2.5.13.9*   numericStringOrderingMatch
  * 2.5.13.25   uTCTimeMatch
  * 2.5.13.26   uTCTimeOrderingMatch
- * 2.5.13.31   directoryStringFirstComponentMatch
- * 2.5.13.32   wordMatch
- * 2.5.13.33   keywordMatch
+ * 2.5.13.31*  directoryStringFirstComponentMatch
+ * 2.5.13.32*  wordMatch
+ * 2.5.13.33*  keywordMatch
  * 2.5.13.36   certificatePairExactMatch
  * 2.5.13.37   certificatePairMatch
  * 2.5.13.38   certificateListExactMatch
  * 2.5.13.39   certificateListMatch
  * 2.5.13.40   algorithmIdentifierMatch
- * 2.5.13.41   storedPrefixMatch
+ * 2.5.13.41*  storedPrefixMatch
  * 2.5.13.42   attributeCertificateMatch
  * 2.5.13.43   readerAndKeyIDMatch
  * 2.5.13.44   attributeIntegrityMatch
+ *
+ * (*) described in RFC 3698 (LDAP: Additional Matching Rules)
  */
 static slap_mrule_defs_rec mrule_defs[] = {
        /*