r19832: better prototypes for the linearization functions:

[amitay/samba.git] / source4 / dsdb / samdb / ldb_modules / extended_dn.c

diff --git a/source4/dsdb/samdb/ldb_modules/extended_dn.c b/source4/dsdb/samdb/ldb_modules/extended_dn.c
index 012ac74514dc1b3ec3900da6719f5cf12ca1c093..a571857bbbeddc3ae94ddeb323e414f0c8f60439 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/extended_dn.c
+++ b/source4/dsdb/samdb/ldb_modules/extended_dn.c
@@ -107,11 +107,7 @@ static BOOL inject_extended_dn(struct ldb_message *msg,
        struct dom_sid *sid;
        char *object_guid;
        char *object_sid;
-       char *new_dn, *dn;
-
-       dn = ldb_dn_linearize(msg, msg->dn);
-       if (!dn)
-               return False;
+       char *new_dn;
 
        /* retrieve object_guid */
        guid = samdb_result_guid(msg, "objectGUID");
@@ -140,10 +136,12 @@ static BOOL inject_extended_dn(struct ldb_message *msg,
                case 1:
                        if (object_sid) {
                                new_dn = talloc_asprintf(msg, "<GUID=%s>;<SID=%s>;%s",
-                                                        object_guid, object_sid, dn);
+                                                        object_guid, object_sid,
+                                                        ldb_dn_get_linearized(msg->dn));
                        } else {
                                new_dn = talloc_asprintf(msg, "<GUID=%s>;%s",
-                                                        object_guid, dn);
+                                                        object_guid,
+                                                        ldb_dn_get_linearized(msg->dn));
                        }
                        break;
                default: