dsdb/common: dsdb_dn_construct_internal() more strict checking

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source4/dsdb/common/dsdb_dn.c b/source4/dsdb/common/dsdb_dn.c
index 856b3048771a963476f79b7599bf20c1bad86f50..e348ab6aa949c7a5f12df248c66d032b0a759527 100644 (file)
--- a/source4/dsdb/common/dsdb_dn.c
+++ b/source4/dsdb/common/dsdb_dn.c
@@ -47,18 +47,32 @@ static struct dsdb_dn *dsdb_dn_construct_internal(TALLOC_CTX *mem_ctx,
                                                  enum dsdb_dn_format dn_format, 
                                                  const char *oid) 
 {
-       struct dsdb_dn *dsdb_dn = talloc(mem_ctx, struct dsdb_dn);
+       struct dsdb_dn *dsdb_dn = NULL;
+
+       switch (dn_format) {
+       case DSDB_BINARY_DN:
+       case DSDB_STRING_DN:
+               break;
+       case DSDB_NORMAL_DN:
+               if (extra_part.length != 0) {
+                       errno = EINVAL;
+                       return NULL;
+               }
+               break;
+       case DSDB_INVALID_DN:
+       default:
+               errno = EINVAL;
+               return NULL;
+       }
+
+       dsdb_dn = talloc(mem_ctx, struct dsdb_dn);
        if (!dsdb_dn) {
+               errno = ENOMEM;
                return NULL;
        }
        dsdb_dn->dn = talloc_steal(dsdb_dn, dn);
        dsdb_dn->extra_part = extra_part;
        dsdb_dn->dn_format = dn_format;
-       /* Look to see if this attributeSyntax is a DN */
-       if (dsdb_dn->dn_format == DSDB_INVALID_DN) {
-               talloc_free(dsdb_dn);
-               return NULL;
-       }
 
        dsdb_dn->oid = oid;
        talloc_steal(dsdb_dn, extra_part.data);