r19832: better prototypes for the linearization functions:

- ldb_dn_get_linearized
  returns a const string

- ldb_dn_alloc_linearized
  allocs astring with the linearized dn
(This used to be commit 3929c086d5d0b3f08b1c4f2f3f9602c3f4a9a4bd)

2 files changed, 22 insertions, 22 deletions

diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c
index e68b0d6235..ed98699804 100644
--- a/source4/libnet/libnet_join.c
+++ b/source4/libnet/libnet_join.c
@@ -324,7 +324,7 @@ static NTSTATUS libnet_JoinADSDomain(struct libnet_context *ctx, struct libnet_J
 			r->out.error_string
 				= talloc_asprintf(r, 
 						  "Failed to replace entries on %s", 
-						  ldb_dn_linearize(tmp_ctx, msg->dn));
+						  ldb_dn_get_linearized(msg->dn));
 			talloc_free(tmp_ctx);
 			return NT_STATUS_INTERNAL_DB_CORRUPTION;
 		}
@@ -1148,7 +1148,7 @@ static NTSTATUS libnet_Join_primary_domain(struct libnet_context *ctx,
 	ret = samdb_add(ldb, tmp_mem, msg);
 	if (ret != 0) {
 		r->out.error_string = talloc_asprintf(mem_ctx, "Failed to create secret record %s", 
-						      ldb_dn_linearize(ldb, msg->dn));
+						      ldb_dn_get_linearized(msg->dn));
 		talloc_free(tmp_mem);
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
 	}
@@ -1163,7 +1163,7 @@ static NTSTATUS libnet_Join_primary_domain(struct libnet_context *ctx,
 			return NT_STATUS_NO_MEMORY;
 		}
 		cli_credentials_set_conf(creds);
-		filter = talloc_asprintf(mem_ctx, "dn=%s", ldb_dn_linearize(mem_ctx, msg->dn));
+		filter = talloc_asprintf(mem_ctx, "dn=%s", ldb_dn_get_linearized(msg->dn));
 		status = cli_credentials_set_secrets(creds, NULL, filter);
 		if (!NT_STATUS_IS_OK(status)) {
 			r->out.error_string = talloc_asprintf(mem_ctx, "Failed to read secrets for keytab update for %s", 
diff --git a/source4/libnet/libnet_samsync_ldb.c b/source4/libnet/libnet_samsync_ldb.c
index 3c34aca944..3b4ba304e4 100644
--- a/source4/libnet/libnet_samsync_ldb.c
+++ b/source4/libnet/libnet_samsync_ldb.c
@@ -79,7 +79,7 @@ static NTSTATUS samsync_ldb_add_foreignSecurityPrincipal(TALLOC_CTX *mem_ctx,
 		*error_string = talloc_asprintf(mem_ctx, 
 						"Failed to find DN for "
 						"ForeignSecurityPrincipal container under %s",
-						ldb_dn_linearize(mem_ctx, state->base_dn[SAM_DATABASE_DOMAIN]));
+						ldb_dn_get_linearized(state->base_dn[SAM_DATABASE_DOMAIN]));
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
 	}
 	
@@ -104,7 +104,7 @@ static NTSTATUS samsync_ldb_add_foreignSecurityPrincipal(TALLOC_CTX *mem_ctx,
 	if (ret != 0) {
 		*error_string = talloc_asprintf(mem_ctx, "Failed to create foreignSecurityPrincipal "
 						"record %s: %s",
-						ldb_dn_linearize(mem_ctx, msg->dn),
+						ldb_dn_get_linearized(msg->dn),
 						ldb_errstring(state->sam_ldb));
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
 	}
@@ -298,7 +298,7 @@ static NTSTATUS samsync_ldb_handle_user(TALLOC_CTX *mem_ctx,
 			return NT_STATUS_INTERNAL_DB_CORRUPTION;
 		} else if (ret == 0) {
 			*error_string = talloc_asprintf(mem_ctx, "User exists in samsync but not in remote LDAP domain! (base: %s, SID: %s)", 
-							ldb_dn_linearize(mem_ctx, state->base_dn[database]),
+							ldb_dn_get_linearized(state->base_dn[database]),
 							dom_sid_string(mem_ctx, user_sid));
 			return NT_STATUS_NO_SUCH_USER;
 		} else if (ret > 1) {
@@ -436,8 +436,8 @@ static NTSTATUS samsync_ldb_handle_user(TALLOC_CTX *mem_ctx,
 			ret = samdb_add(state->sam_ldb, mem_ctx, msg);
 			if (ret != 0) {
 				*error_string = talloc_asprintf(mem_ctx, "Failed to create user record.  Tried both %s and %s: %s",
-								ldb_dn_linearize(mem_ctx, first_try_dn),
-								ldb_dn_linearize(mem_ctx, msg->dn),
+								ldb_dn_get_linearized(first_try_dn),
+								ldb_dn_get_linearized(msg->dn),
 								ldb_errstring(state->sam_ldb));
 				return NT_STATUS_INTERNAL_DB_CORRUPTION;
 			}
@@ -446,7 +446,7 @@ static NTSTATUS samsync_ldb_handle_user(TALLOC_CTX *mem_ctx,
 		ret = samdb_replace(state->sam_ldb, mem_ctx, msg);
 		if (ret != 0) {
 			*error_string = talloc_asprintf(mem_ctx, "Failed to modify user record %s: %s",
-							ldb_dn_linearize(mem_ctx, msg->dn),
+							ldb_dn_get_linearized(msg->dn),
 							ldb_errstring(state->sam_ldb));
 			return NT_STATUS_INTERNAL_DB_CORRUPTION;
 		}
@@ -488,7 +488,7 @@ static NTSTATUS samsync_ldb_delete_user(TALLOC_CTX *mem_ctx,
 	ret = samdb_delete(state->sam_ldb, mem_ctx, msgs[0]->dn);
 	if (ret != 0) {
 		*error_string = talloc_asprintf(mem_ctx, "Failed to delete user record %s: %s",
-						ldb_dn_linearize(mem_ctx, msgs[0]->dn),
+						ldb_dn_get_linearized(msgs[0]->dn),
 						ldb_errstring(state->sam_ldb));
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
 	}
@@ -577,7 +577,7 @@ static NTSTATUS samsync_ldb_handle_group(TALLOC_CTX *mem_ctx,
 		ret = samdb_add(state->sam_ldb, mem_ctx, msg);
 		if (ret != 0) {
 			*error_string = talloc_asprintf(mem_ctx, "Failed to create group record %s: %s",
-							ldb_dn_linearize(mem_ctx, msg->dn),
+							ldb_dn_get_linearized(msg->dn),
 							ldb_errstring(state->sam_ldb));
 			return NT_STATUS_INTERNAL_DB_CORRUPTION;
 		}
@@ -585,7 +585,7 @@ static NTSTATUS samsync_ldb_handle_group(TALLOC_CTX *mem_ctx,
 		ret = samdb_replace(state->sam_ldb, mem_ctx, msg);
 		if (ret != 0) {
 			*error_string = talloc_asprintf(mem_ctx, "Failed to modify group record %s: %s",
-							ldb_dn_linearize(mem_ctx, msg->dn),
+							ldb_dn_get_linearized(msg->dn),
 							ldb_errstring(state->sam_ldb));
 			return NT_STATUS_INTERNAL_DB_CORRUPTION;
 		}
@@ -627,7 +627,7 @@ static NTSTATUS samsync_ldb_delete_group(TALLOC_CTX *mem_ctx,
 	ret = samdb_delete(state->sam_ldb, mem_ctx, msgs[0]->dn);
 	if (ret != 0) {
 		*error_string = talloc_asprintf(mem_ctx, "Failed to delete group record %s: %s",
-						ldb_dn_linearize(mem_ctx, msgs[0]->dn),
+						ldb_dn_get_linearized(msgs[0]->dn),
 						ldb_errstring(state->sam_ldb));
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
 	}
@@ -691,7 +691,7 @@ static NTSTATUS samsync_ldb_handle_group_member(TALLOC_CTX *mem_ctx,
 		} else if (ret > 1) {
 			return NT_STATUS_INTERNAL_DB_CORRUPTION;
 		} else {
-			samdb_msg_add_string(state->sam_ldb, mem_ctx, msg, "member", ldb_dn_linearize(mem_ctx, msgs[0]->dn));
+			samdb_msg_add_string(state->sam_ldb, mem_ctx, msg, "member", ldb_dn_alloc_linearized(mem_ctx, msgs[0]->dn));
 		}
 		
 		talloc_free(msgs);
@@ -700,7 +700,7 @@ static NTSTATUS samsync_ldb_handle_group_member(TALLOC_CTX *mem_ctx,
 	ret = samdb_replace(state->sam_ldb, mem_ctx, msg);
 	if (ret != 0) {
 		*error_string = talloc_asprintf(mem_ctx, "Failed to modify group record %s: %s",
-						ldb_dn_linearize(mem_ctx, msg->dn),
+						ldb_dn_get_linearized(msg->dn),
 						ldb_errstring(state->sam_ldb));
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
 	}
@@ -791,7 +791,7 @@ static NTSTATUS samsync_ldb_handle_alias(TALLOC_CTX *mem_ctx,
 		ret = samdb_add(state->sam_ldb, mem_ctx, msg);
 		if (ret != 0) {
 			*error_string = talloc_asprintf(mem_ctx, "Failed to create alias record %s: %s",
-							ldb_dn_linearize(mem_ctx, msg->dn),
+							ldb_dn_get_linearized(msg->dn),
 							ldb_errstring(state->sam_ldb));
 			return NT_STATUS_INTERNAL_DB_CORRUPTION;
 		}
@@ -799,7 +799,7 @@ static NTSTATUS samsync_ldb_handle_alias(TALLOC_CTX *mem_ctx,
 		ret = samdb_replace(state->sam_ldb, mem_ctx, msg);
 		if (ret != 0) {
 			*error_string = talloc_asprintf(mem_ctx, "Failed to modify alias record %s: %s",
-							ldb_dn_linearize(mem_ctx, msg->dn),
+							ldb_dn_get_linearized(msg->dn),
 							ldb_errstring(state->sam_ldb));
 			return NT_STATUS_INTERNAL_DB_CORRUPTION;
 		}
@@ -836,7 +836,7 @@ static NTSTATUS samsync_ldb_delete_alias(TALLOC_CTX *mem_ctx,
 	ret = samdb_delete(state->sam_ldb, mem_ctx, msgs[0]->dn);
 	if (ret != 0) {
 		*error_string = talloc_asprintf(mem_ctx, "Failed to delete alias record %s: %s",
-						ldb_dn_linearize(mem_ctx, msgs[0]->dn),
+						ldb_dn_get_linearized(msgs[0]->dn),
 						ldb_errstring(state->sam_ldb));
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
 	}
@@ -910,7 +910,7 @@ static NTSTATUS samsync_ldb_handle_alias_member(TALLOC_CTX *mem_ctx,
 		} else {
 			alias_member_dn = msgs[0]->dn;
 		}
-		samdb_msg_add_string(state->sam_ldb, mem_ctx, msg, "member", ldb_dn_linearize(mem_ctx, alias_member_dn));
+		samdb_msg_add_string(state->sam_ldb, mem_ctx, msg, "member", ldb_dn_alloc_linearized(mem_ctx, alias_member_dn));
 	
 		talloc_free(msgs);
 	}
@@ -918,7 +918,7 @@ static NTSTATUS samsync_ldb_handle_alias_member(TALLOC_CTX *mem_ctx,
 	ret = samdb_replace(state->sam_ldb, mem_ctx, msg);
 	if (ret != 0) {
 		*error_string = talloc_asprintf(mem_ctx, "Failed to modify group record %s: %s",
-						ldb_dn_linearize(mem_ctx, msg->dn),
+						ldb_dn_get_linearized(msg->dn),
 						ldb_errstring(state->sam_ldb));
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
 	}
@@ -982,7 +982,7 @@ static NTSTATUS samsync_ldb_handle_account(TALLOC_CTX *mem_ctx,
 	ret = samdb_replace(state->sam_ldb, mem_ctx, msg);
 	if (ret != 0) {
 		*error_string = talloc_asprintf(mem_ctx, "Failed to modify privilege record %s",
-						ldb_dn_linearize(mem_ctx, msg->dn));
+						ldb_dn_get_linearized(msg->dn));
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
 	}
 
@@ -1031,7 +1031,7 @@ static NTSTATUS samsync_ldb_delete_account(TALLOC_CTX *mem_ctx,
 	ret = samdb_replace(state->sam_ldb, mem_ctx, msg);
 	if (ret != 0) {
 		*error_string = talloc_asprintf(mem_ctx, "Failed to modify privilege record %s",
-						ldb_dn_linearize(mem_ctx, msg->dn));
+						ldb_dn_get_linearized(msg->dn));
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
 	}