ldb: added ldb_dn_get_extended_comp_num()

this returns the number of extended components. We need this to
validate a DN in the extended_dn_in module

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

diff --git a/source4/lib/ldb/common/ldb_dn.c b/source4/lib/ldb/common/ldb_dn.c
index 180ff41ff4efff6dd7382696cb6bb425101e0ac8..07594551ea1d32a3a95fa6306a64b39956eaceac 100644 (file)
--- a/source4/lib/ldb/common/ldb_dn.c
+++ b/source4/lib/ldb/common/ldb_dn.c
@@ -1787,6 +1787,14 @@ int ldb_dn_get_comp_num(struct ldb_dn *dn)
        return dn->comp_num;
 }
 
+int ldb_dn_get_extended_comp_num(struct ldb_dn *dn)
+{
+       if ( ! ldb_dn_validate(dn)) {
+               return -1;
+       }
+       return dn->ext_comp_num;
+}
+
 const char *ldb_dn_get_component_name(struct ldb_dn *dn, unsigned int num)
 {
        if ( ! ldb_dn_validate(dn)) {

diff --git a/source4/lib/ldb/include/ldb.h b/source4/lib/ldb/include/ldb.h
index 0c3196a286964a089ad087b823974e8d27faddb8..e7f7ebba469cfde59498013e6d0ebbd89d9f28c5 100644 (file)
--- a/source4/lib/ldb/include/ldb.h
+++ b/source4/lib/ldb/include/ldb.h
@@ -1758,6 +1758,7 @@ struct ldb_dn *ldb_dn_get_parent(TALLOC_CTX *mem_ctx, struct ldb_dn *dn);
 char *ldb_dn_canonical_string(TALLOC_CTX *mem_ctx, struct ldb_dn *dn);
 char *ldb_dn_canonical_ex_string(TALLOC_CTX *mem_ctx, struct ldb_dn *dn);
 int ldb_dn_get_comp_num(struct ldb_dn *dn);
+int ldb_dn_get_extended_comp_num(struct ldb_dn *dn);
 const char *ldb_dn_get_component_name(struct ldb_dn *dn, unsigned int num);
 const struct ldb_val *ldb_dn_get_component_val(struct ldb_dn *dn, unsigned int num);
 const char *ldb_dn_get_rdn_name(struct ldb_dn *dn);

diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript
index 54ecc006741d90f3b2b65a702c34148c22bb7ff4..b0635c5d67d6c876844864624c2140627a04737f 100644 (file)
--- a/source4/lib/ldb/wscript
+++ b/source4/lib/ldb/wscript
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 APPNAME = 'ldb'
-VERSION = '0.9.22'
+VERSION = '0.9.23'
 
 blddir = 'bin'