[SCM] Samba Shared Repository - branch master updated

[Kamen Mazdrashki]

The branch, master has been updated
       via  71ac92b s4-schema_init: Print more info about syntax we fail to recognize
       via  099b005 asn1_tests.c: Make test data static const
       via  d057ca3 lib/util/asn1.c: comment spelling
      from  0941099 ldb:ldb_index.c - fix some memory leaks

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 71ac92b67391d826b015fc4cffb104918d14594b
Author: Kamen Mazdrashki <kamenim at samba.org>
Date:   Wed Oct 20 13:43:00 2010 +0300

    s4-schema_init: Print more info about syntax we fail to recognize
    
    Autobuild-User: Kamen Mazdrashki <kamenim at samba.org>
    Autobuild-Date: Wed Oct 20 13:54:01 UTC 2010 on sn-devel-104

commit 099b0057bed73c3c7a2cf7d0123c8a1daaf53ed0
Author: Kamen Mazdrashki <kamenim at samba.org>
Date:   Mon Oct 18 03:50:20 2010 +0300

    asn1_tests.c: Make test data static const

commit d057ca3e3fba8190030929cbd41ef9a61440a78c
Author: Kamen Mazdrashki <kamenim at samba.org>
Date:   Mon Oct 18 03:49:21 2010 +0300

    lib/util/asn1.c: comment spelling

-----------------------------------------------------------------------

Summary of changes:
 lib/util/asn1.c                   |    2 +-
 lib/util/tests/asn1_tests.c       |   12 ++++++------
 source4/dsdb/schema/schema_init.c |    6 ++++--
 3 files changed, 11 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/util/asn1.c b/lib/util/asn1.c
index 7635ce2..2a71f2f 100644
--- a/lib/util/asn1.c
+++ b/lib/util/asn1.c
@@ -282,7 +282,7 @@ bool ber_write_partial_OID_String(TALLOC_CTX *mem_ctx, DATA_BLOB *blob, const ch
 		return false;
 	}
 
-	/* Add partially endcoded subidentifier */
+	/* Add partially encoded sub-identifier */
 	if (p) {
 		DATA_BLOB tmp_blob = strhex_to_data_blob(tmp_ctx, p);
 		data_blob_append(mem_ctx, blob, tmp_blob.data, tmp_blob.length);
diff --git a/lib/util/tests/asn1_tests.c b/lib/util/tests/asn1_tests.c
index 25c8222..b11e9d5 100644
--- a/lib/util/tests/asn1_tests.c
+++ b/lib/util/tests/asn1_tests.c
@@ -29,7 +29,7 @@ struct oid_data {
 };
 
 /* Data for successful OIDs conversions */
-struct oid_data oid_data_ok[] = {
+static const struct oid_data oid_data_ok[] = {
 	{
 		.oid = "2.5.4.0",
 		.bin_oid = "550400"
@@ -65,7 +65,7 @@ struct oid_data oid_data_ok[] = {
 };
 
 /* Data for successful Partial OIDs conversions */
-struct oid_data partial_oid_data_ok[] = {
+static const struct oid_data partial_oid_data_ok[] = {
 	{
 		.oid = "2.5.4.130:0x81",
 		.bin_oid = "5504810281"
@@ -100,7 +100,7 @@ static bool test_ber_write_OID_String(struct torture_context *tctx)
 	char *hex_str;
 	DATA_BLOB blob;
 	TALLOC_CTX *mem_ctx;
-	struct oid_data *data = oid_data_ok;
+	const struct oid_data *data = oid_data_ok;
 
 	mem_ctx = talloc_new(tctx);
 
@@ -129,7 +129,7 @@ static bool test_ber_read_OID_String(struct torture_context *tctx)
 	const char *oid;
 	DATA_BLOB oid_blob;
 	TALLOC_CTX *mem_ctx;
-	struct oid_data *data = oid_data_ok;
+	const struct oid_data *data = oid_data_ok;
 
 	mem_ctx = talloc_new(tctx);
 
@@ -157,7 +157,7 @@ static bool test_ber_write_partial_OID_String(struct torture_context *tctx)
 	char *hex_str;
 	DATA_BLOB blob;
 	TALLOC_CTX *mem_ctx;
-	struct oid_data *data = oid_data_ok;
+	const struct oid_data *data = oid_data_ok;
 
 	mem_ctx = talloc_new(tctx);
 
@@ -202,7 +202,7 @@ static bool test_ber_read_partial_OID_String(struct torture_context *tctx)
 	const char *oid;
 	DATA_BLOB oid_blob;
 	TALLOC_CTX *mem_ctx;
-	struct oid_data *data = oid_data_ok;
+	const struct oid_data *data = oid_data_ok;
 
 	mem_ctx = talloc_new(tctx);
 
diff --git a/source4/dsdb/schema/schema_init.c b/source4/dsdb/schema/schema_init.c
index 6dbf9ba..d80f209 100644
--- a/source4/dsdb/schema/schema_init.c
+++ b/source4/dsdb/schema/schema_init.c
@@ -631,8 +631,10 @@ WERROR dsdb_attribute_from_ldb(struct ldb_context *ldb,
 	}
 
 	if (dsdb_schema_setup_ldb_schema_attribute(ldb, attr) != LDB_SUCCESS) {
-		DEBUG(0,(__location__ ": Unknown schema syntax for %s\n",
-			 attr->lDAPDisplayName));
+		DEBUG(0,(__location__ ": Unknown schema syntax for %s - ldb_syntax: %s, ldap_oid: %s\n",
+			 attr->lDAPDisplayName,
+			 attr->syntax->ldb_syntax,
+			 attr->syntax->ldap_oid));
 		return WERR_DS_ATT_SCHEMA_REQ_SYNTAX;
 	}
 


-- 
Samba Shared Repository