From e7ede84c331b112efa5232d0f7dcc6732b95aebe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnther=20Deschner?= Date: Mon, 18 Sep 2006 09:54:44 +0000 Subject: [PATCH] r18609: error_string should not contain newlines. Guenther (This used to be commit 556666756418ad50c533199c736fe3696a7e20cb) --- source4/libnet/libnet_join.c | 28 +++++++++---------- source4/libnet/libnet_passwd.c | 48 ++++++++++++++++----------------- source4/libnet/libnet_samdump.c | 2 +- source4/libnet/libnet_share.c | 14 +++++----- source4/libnet/libnet_time.c | 6 ++--- source4/libnet/libnet_vampire.c | 3 +-- 6 files changed, 50 insertions(+), 51 deletions(-) diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c index 50f60123b89..14e3e5b719d 100644 --- a/source4/libnet/libnet_join.c +++ b/source4/libnet/libnet_join.c @@ -248,7 +248,7 @@ static NTSTATUS libnet_JoinADSDomain(struct libnet_context *ctx, struct libnet_J ret = ldb_search(remote_ldb, account_dn, LDB_SCOPE_BASE, NULL, attrs, &res); if (ret != LDB_SUCCESS || res->count != 1) { - r->out.error_string = talloc_asprintf(r, "ldb_search for %s failed - %s\n", + r->out.error_string = talloc_asprintf(r, "ldb_search for %s failed - %s", account_dn_str, ldb_errstring(remote_ldb)); talloc_free(tmp_ctx); return NT_STATUS_UNSUCCESSFUL; @@ -313,7 +313,7 @@ static NTSTATUS libnet_JoinADSDomain(struct libnet_context *ctx, struct libnet_J if (rtn != 0) { r->out.error_string = talloc_asprintf(r, - "Failed to replace entries on %s\n", + "Failed to replace entries on %s", ldb_dn_linearize(tmp_ctx, msg->dn)); talloc_free(tmp_ctx); return NT_STATUS_INTERNAL_DB_CORRUPTION; @@ -335,7 +335,7 @@ static NTSTATUS libnet_JoinADSDomain(struct libnet_context *ctx, struct libnet_J if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) { r->out.error_string = talloc_asprintf(r, - "dcerpc_drsuapi_DsCrackNames for [%s] failed - %s\n", + "dcerpc_drsuapi_DsCrackNames for [%s] failed - %s", r->in.domain_name, dcerpc_errstr(tmp_ctx, drsuapi_pipe->last_fault_code)); talloc_free(tmp_ctx); @@ -343,7 +343,7 @@ static NTSTATUS libnet_JoinADSDomain(struct libnet_context *ctx, struct libnet_J } else { r->out.error_string = talloc_asprintf(r, - "dcerpc_drsuapi_DsCrackNames for [%s] failed - %s\n", + "dcerpc_drsuapi_DsCrackNames for [%s] failed - %s", r->in.domain_name, nt_errstr(status)); talloc_free(tmp_ctx); @@ -602,7 +602,7 @@ NTSTATUS libnet_JoinDomain(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, stru /* check if we got one RID for the user */ if (ln.out.rids.count != 1) { r->out.error_string = talloc_asprintf(mem_ctx, - "samr_LookupNames for [%s] returns %d RIDs\n", + "samr_LookupNames for [%s] returns %d RIDs", r->in.account_name, ln.out.rids.count); talloc_free(tmp_ctx); return NT_STATUS_INVALID_PARAMETER; @@ -647,7 +647,7 @@ NTSTATUS libnet_JoinDomain(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, stru status = dcerpc_samr_CreateUser2(samr_pipe, tmp_ctx, &cu); if (!NT_STATUS_IS_OK(status)) { r->out.error_string = talloc_asprintf(mem_ctx, - "samr_CreateUser2 (recreate) for [%s] failed: %s\n", + "samr_CreateUser2 (recreate) for [%s] failed: %s", r->in.account_name, nt_errstr(status)); talloc_free(tmp_ctx); return status; @@ -655,7 +655,7 @@ NTSTATUS libnet_JoinDomain(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, stru } } else if (!NT_STATUS_IS_OK(status)) { r->out.error_string = talloc_asprintf(mem_ctx, - "samr_CreateUser2 for [%s] failed: %s\n", + "samr_CreateUser2 for [%s] failed: %s", r->in.account_name, nt_errstr(status)); talloc_free(tmp_ctx); return status; @@ -679,7 +679,7 @@ NTSTATUS libnet_JoinDomain(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, stru status = NT_STATUS_INVALID_PARAMETER; r->out.error_string = talloc_asprintf(mem_ctx, - "samr_QueryUserInfo failed to return qui.out.info for [%s]: %s\n", + "samr_QueryUserInfo failed to return qui.out.info for [%s]: %s", r->in.account_name, nt_errstr(status)); talloc_free(tmp_ctx); return status; @@ -723,7 +723,7 @@ NTSTATUS libnet_JoinDomain(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, stru = talloc_asprintf(mem_ctx, "We asked to create a new machine account (%s) of type %s, " "but we got an account of type %s. This is unexpected. " - "Perhaps delete the account and try again.\n", + "Perhaps delete the account and try again.", r->in.account_name, new_account_type, old_account_type); talloc_free(tmp_ctx); return NT_STATUS_INVALID_PARAMETER; @@ -735,7 +735,7 @@ NTSTATUS libnet_JoinDomain(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, stru = talloc_asprintf(mem_ctx, "The machine account (%s) already exists in the domain %s, " "but is a %s. You asked to join as a %s. Please delete " - "the account and try again.\n", + "the account and try again.", r->in.account_name, connect_with_info->out.domain_name, old_account_type, new_account_type); talloc_free(tmp_ctx); return NT_STATUS_USER_EXISTS; @@ -910,7 +910,7 @@ static NTSTATUS libnet_Join_primary_domain(struct libnet_context *ctx, if (!ldb) { r->out.error_string = talloc_asprintf(mem_ctx, - "Could not open secrets database\n"); + "Could not open secrets database"); talloc_free(tmp_mem); return NT_STATUS_CANT_ACCESS_DOMAIN_INFO; } @@ -1135,7 +1135,7 @@ static NTSTATUS libnet_Join_primary_domain(struct libnet_context *ctx, /* create the secret */ ret = samdb_add(ldb, tmp_mem, msg); if (ret != 0) { - r->out.error_string = talloc_asprintf(mem_ctx, "Failed to create secret record %s\n", + r->out.error_string = talloc_asprintf(mem_ctx, "Failed to create secret record %s", ldb_dn_linearize(ldb, msg->dn)); talloc_free(tmp_mem); return NT_STATUS_INTERNAL_DB_CORRUPTION; @@ -1154,14 +1154,14 @@ static NTSTATUS libnet_Join_primary_domain(struct libnet_context *ctx, filter = talloc_asprintf(mem_ctx, "dn=%s", ldb_dn_linearize(mem_ctx, 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\n", + r->out.error_string = talloc_asprintf(mem_ctx, "Failed to read secrets for keytab update for %s", filter); talloc_free(tmp_mem); return status; } ret = cli_credentials_update_keytab(creds); if (ret != 0) { - r->out.error_string = talloc_asprintf(mem_ctx, "Failed to update keytab for %s\n", + r->out.error_string = talloc_asprintf(mem_ctx, "Failed to update keytab for %s", filter); talloc_free(tmp_mem); return NT_STATUS_UNSUCCESSFUL; diff --git a/source4/libnet/libnet_passwd.c b/source4/libnet/libnet_passwd.c index 08e4e604d2f..050299f68a2 100644 --- a/source4/libnet/libnet_passwd.c +++ b/source4/libnet/libnet_passwd.c @@ -61,7 +61,7 @@ static NTSTATUS libnet_ChangePassword_samr(struct libnet_context *ctx, TALLOC_CT status = libnet_RpcConnect(ctx, mem_ctx, &c); if (!NT_STATUS_IS_OK(status)) { r->samr.out.error_string = talloc_asprintf(mem_ctx, - "Connection to SAMR pipe of PDC of domain '%s' failed: %s\n", + "Connection to SAMR pipe of PDC of domain '%s' failed: %s", r->samr.in.domain_name, nt_errstr(status)); return status; } @@ -98,7 +98,7 @@ static NTSTATUS libnet_ChangePassword_samr(struct libnet_context *ctx, TALLOC_CT status = dcerpc_samr_ChangePasswordUser3(c.out.dcerpc_pipe, mem_ctx, &pw3); if (!NT_STATUS_IS_OK(status)) { r->samr.out.error_string = talloc_asprintf(mem_ctx, - "samr_ChangePasswordUser3 failed: %s\n", + "samr_ChangePasswordUser3 failed: %s", nt_errstr(status)); goto ChangePasswordUser2; } @@ -106,7 +106,7 @@ static NTSTATUS libnet_ChangePassword_samr(struct libnet_context *ctx, TALLOC_CT /* check result of samr_ChangePasswordUser3 */ if (!NT_STATUS_IS_OK(pw3.out.result)) { r->samr.out.error_string = talloc_asprintf(mem_ctx, - "samr_ChangePasswordUser3 for '%s\\%s' failed: %s\n", + "samr_ChangePasswordUser3 for '%s\\%s' failed: %s", r->samr.in.domain_name, r->samr.in.account_name, nt_errstr(pw3.out.result)); /* TODO: give the reason of the reject */ @@ -141,7 +141,7 @@ ChangePasswordUser2: status = dcerpc_samr_ChangePasswordUser2(c.out.dcerpc_pipe, mem_ctx, &pw2); if (!NT_STATUS_IS_OK(status)) { r->samr.out.error_string = talloc_asprintf(mem_ctx, - "samr_ChangePasswordUser2 failed: %s\n", + "samr_ChangePasswordUser2 failed: %s", nt_errstr(status)); goto OemChangePasswordUser2; } @@ -149,7 +149,7 @@ ChangePasswordUser2: /* check result of samr_ChangePasswordUser2 */ if (!NT_STATUS_IS_OK(pw2.out.result)) { r->samr.out.error_string = talloc_asprintf(mem_ctx, - "samr_ChangePasswordUser2 for '%s\\%s' failed: %s\n", + "samr_ChangePasswordUser2 for '%s\\%s' failed: %s", r->samr.in.domain_name, r->samr.in.account_name, nt_errstr(pw2.out.result)); if (NT_STATUS_EQUAL(pw2.out.result, NT_STATUS_PASSWORD_RESTRICTION)) { @@ -179,7 +179,7 @@ OemChangePasswordUser2: status = dcerpc_samr_OemChangePasswordUser2(c.out.dcerpc_pipe, mem_ctx, &oe2); if (!NT_STATUS_IS_OK(status)) { r->samr.out.error_string = talloc_asprintf(mem_ctx, - "samr_OemChangePasswordUser2 failed: %s\n", + "samr_OemChangePasswordUser2 failed: %s", nt_errstr(status)); goto ChangePasswordUser; } @@ -187,7 +187,7 @@ OemChangePasswordUser2: /* check result of samr_OemChangePasswordUser2 */ if (!NT_STATUS_IS_OK(oe2.out.result)) { r->samr.out.error_string = talloc_asprintf(mem_ctx, - "samr_OemChangePasswordUser2 for '%s\\%s' failed: %s\n", + "samr_OemChangePasswordUser2 for '%s\\%s' failed: %s", r->samr.in.domain_name, r->samr.in.account_name, nt_errstr(oe2.out.result)); if (NT_STATUS_EQUAL(oe2.out.result, NT_STATUS_PASSWORD_RESTRICTION)) { @@ -226,7 +226,7 @@ ChangePasswordUser: status = dcerpc_samr_ChangePasswordUser(c.pdc.out.dcerpc_pipe, mem_ctx, &pw); if (!NT_STATUS_IS_OK(status)) { r->samr.out.error_string = talloc_asprintf(mem_ctx, - "samr_ChangePasswordUser failed: %s\n", + "samr_ChangePasswordUser failed: %s", nt_errstr(status)); goto disconnect; } @@ -234,7 +234,7 @@ ChangePasswordUser: /* check result of samr_ChangePasswordUser */ if (!NT_STATUS_IS_OK(pw.out.result)) { r->samr.out.error_string = talloc_asprintf(mem_ctx, - "samr_ChangePasswordUser for '%s\\%s' failed: %s\n", + "samr_ChangePasswordUser for '%s\\%s' failed: %s", r->samr.in.domain_name, r->samr.in.account_name, nt_errstr(pw.out.result)); if (NT_STATUS_EQUAL(pw.out.result, NT_STATUS_PASSWORD_RESTRICTION)) { @@ -305,7 +305,7 @@ static NTSTATUS libnet_SetPassword_samr_handle_26(struct libnet_context *ctx, TA status = dcerpc_fetch_session_key(r->samr_handle.in.dcerpc_pipe, &session_key); if (!NT_STATUS_IS_OK(status)) { r->samr_handle.out.error_string = talloc_asprintf(mem_ctx, - "dcerpc_fetch_session_key failed: %s\n", + "dcerpc_fetch_session_key failed: %s", nt_errstr(status)); return status; } @@ -330,7 +330,7 @@ static NTSTATUS libnet_SetPassword_samr_handle_26(struct libnet_context *ctx, TA if (!NT_STATUS_IS_OK(status)) { r->samr_handle.out.error_string = talloc_asprintf(mem_ctx, - "SetUserInfo level 26 for [%s] failed: %s\n", + "SetUserInfo level 26 for [%s] failed: %s", r->samr_handle.in.account_name, nt_errstr(status)); } return status; @@ -354,7 +354,7 @@ static NTSTATUS libnet_SetPassword_samr_handle_25(struct libnet_context *ctx, TA status = dcerpc_fetch_session_key(r->samr_handle.in.dcerpc_pipe, &session_key); if (!NT_STATUS_IS_OK(status)) { r->samr_handle.out.error_string = talloc_asprintf(mem_ctx, - "dcerpc_fetch_session_key failed: %s\n", + "dcerpc_fetch_session_key failed: %s", nt_errstr(status)); return status; } @@ -378,7 +378,7 @@ static NTSTATUS libnet_SetPassword_samr_handle_25(struct libnet_context *ctx, TA if (!NT_STATUS_IS_OK(status)) { r->samr_handle.out.error_string = talloc_asprintf(mem_ctx, - "SetUserInfo level 25 for [%s] failed: %s\n", + "SetUserInfo level 25 for [%s] failed: %s", r->samr_handle.in.account_name, nt_errstr(status)); } return status; @@ -400,7 +400,7 @@ static NTSTATUS libnet_SetPassword_samr_handle_24(struct libnet_context *ctx, TA status = dcerpc_fetch_session_key(r->samr_handle.in.dcerpc_pipe, &session_key); if (!NT_STATUS_IS_OK(status)) { r->samr_handle.out.error_string = talloc_asprintf(mem_ctx, - "dcerpc_fetch_session_key failed: %s\n", + "dcerpc_fetch_session_key failed: %s", nt_errstr(status)); return status; } @@ -416,7 +416,7 @@ static NTSTATUS libnet_SetPassword_samr_handle_24(struct libnet_context *ctx, TA if (!NT_STATUS_IS_OK(status)) { r->samr_handle.out.error_string = talloc_asprintf(mem_ctx, - "SetUserInfo level 24 for [%s] failed: %s\n", + "SetUserInfo level 24 for [%s] failed: %s", r->samr_handle.in.account_name, nt_errstr(status)); } return status; @@ -438,7 +438,7 @@ static NTSTATUS libnet_SetPassword_samr_handle_23(struct libnet_context *ctx, TA if (!NT_STATUS_IS_OK(status)) { r->samr_handle.out.error_string = talloc_asprintf(mem_ctx, - "dcerpc_fetch_session_key failed: %s\n", + "dcerpc_fetch_session_key failed: %s", nt_errstr(status)); return status; } @@ -454,7 +454,7 @@ static NTSTATUS libnet_SetPassword_samr_handle_23(struct libnet_context *ctx, TA if (!NT_STATUS_IS_OK(status)) { r->samr_handle.out.error_string = talloc_asprintf(mem_ctx, - "SetUserInfo level 23 for [%s] failed: %s\n", + "SetUserInfo level 23 for [%s] failed: %s", r->samr_handle.in.account_name, nt_errstr(status)); } return status; @@ -525,7 +525,7 @@ static NTSTATUS libnet_SetPassword_samr(struct libnet_context *ctx, TALLOC_CTX * status = libnet_RpcConnect(ctx, mem_ctx, &c); if (!NT_STATUS_IS_OK(status)) { r->samr.out.error_string = talloc_asprintf(mem_ctx, - "Connection to SAMR pipe of PDC of domain '%s' failed: %s\n", + "Connection to SAMR pipe of PDC of domain '%s' failed: %s", r->samr.in.domain_name, nt_errstr(status)); return status; } @@ -540,7 +540,7 @@ static NTSTATUS libnet_SetPassword_samr(struct libnet_context *ctx, TALLOC_CTX * status = dcerpc_samr_Connect(c.out.dcerpc_pipe, mem_ctx, &sc); if (!NT_STATUS_IS_OK(status)) { r->samr.out.error_string = talloc_asprintf(mem_ctx, - "samr_Connect failed: %s\n", + "samr_Connect failed: %s", nt_errstr(status)); goto disconnect; } @@ -554,7 +554,7 @@ static NTSTATUS libnet_SetPassword_samr(struct libnet_context *ctx, TALLOC_CTX * status = dcerpc_samr_LookupDomain(c.out.dcerpc_pipe, mem_ctx, &ld); if (!NT_STATUS_IS_OK(status)) { r->samr.out.error_string = talloc_asprintf(mem_ctx, - "samr_LookupDomain for [%s] failed: %s\n", + "samr_LookupDomain for [%s] failed: %s", r->samr.in.domain_name, nt_errstr(status)); goto disconnect; } @@ -570,7 +570,7 @@ static NTSTATUS libnet_SetPassword_samr(struct libnet_context *ctx, TALLOC_CTX * status = dcerpc_samr_OpenDomain(c.out.dcerpc_pipe, mem_ctx, &od); if (!NT_STATUS_IS_OK(status)) { r->samr.out.error_string = talloc_asprintf(mem_ctx, - "samr_OpenDomain for [%s] failed: %s\n", + "samr_OpenDomain for [%s] failed: %s", r->samr.in.domain_name, nt_errstr(status)); goto disconnect; } @@ -589,7 +589,7 @@ static NTSTATUS libnet_SetPassword_samr(struct libnet_context *ctx, TALLOC_CTX * status = dcerpc_samr_LookupNames(c.out.dcerpc_pipe, mem_ctx, &ln); if (!NT_STATUS_IS_OK(status)) { r->samr.out.error_string = talloc_asprintf(mem_ctx, - "samr_LookupNames for [%s] failed: %s\n", + "samr_LookupNames for [%s] failed: %s", r->samr.in.account_name, nt_errstr(status)); goto disconnect; } @@ -597,7 +597,7 @@ static NTSTATUS libnet_SetPassword_samr(struct libnet_context *ctx, TALLOC_CTX * /* check if we got one RID for the user */ if (ln.out.rids.count != 1) { r->samr.out.error_string = talloc_asprintf(mem_ctx, - "samr_LookupNames for [%s] returns %d RIDs\n", + "samr_LookupNames for [%s] returns %d RIDs", r->samr.in.account_name, ln.out.rids.count); status = NT_STATUS_INVALID_PARAMETER; goto disconnect; @@ -614,7 +614,7 @@ static NTSTATUS libnet_SetPassword_samr(struct libnet_context *ctx, TALLOC_CTX * status = dcerpc_samr_OpenUser(c.out.dcerpc_pipe, mem_ctx, &ou); if (!NT_STATUS_IS_OK(status)) { r->samr.out.error_string = talloc_asprintf(mem_ctx, - "samr_OpenUser for [%s] failed: %s\n", + "samr_OpenUser for [%s] failed: %s", r->samr.in.account_name, nt_errstr(status)); goto disconnect; } diff --git a/source4/libnet/libnet_samdump.c b/source4/libnet/libnet_samdump.c index a8b5c39f96f..8ece3247417 100644 --- a/source4/libnet/libnet_samdump.c +++ b/source4/libnet/libnet_samdump.c @@ -188,7 +188,7 @@ NTSTATUS libnet_SamDump(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, struct s->secret.data, s->secret.length, (void **)&secret_string) == -1) { r->out.error_string = talloc_asprintf(mem_ctx, - "Could not convert secret for domain %s to a string\n", + "Could not convert secret for domain %s to a string", t->name); talloc_free(samdump_state); return NT_STATUS_INVALID_PARAMETER; diff --git a/source4/libnet/libnet_share.c b/source4/libnet/libnet_share.c index 813407d1f4f..6bcc693bd92 100644 --- a/source4/libnet/libnet_share.c +++ b/source4/libnet/libnet_share.c @@ -46,7 +46,7 @@ NTSTATUS libnet_ListShares(struct libnet_context *ctx, if (!NT_STATUS_IS_OK(status)) { r->out.error_string = talloc_asprintf(mem_ctx, "Connection to SRVSVC pipe of server %s " - "failed: %s\n", + "failed: %s", r->in.server_name, nt_errstr(status)); return status; @@ -76,7 +76,7 @@ NTSTATUS libnet_ListShares(struct libnet_context *ctx, break; default: r->out.error_string = talloc_asprintf(mem_ctx, - "libnet_ListShares: Invalid info level requested: %d\n", + "libnet_ListShares: Invalid info level requested: %d", s.in.level); return NT_STATUS_INVALID_PARAMETER; } @@ -89,7 +89,7 @@ NTSTATUS libnet_ListShares(struct libnet_context *ctx, if (!NT_STATUS_IS_OK(status)) { r->out.error_string = talloc_asprintf(mem_ctx, "srvsvc_NetShareEnumAll on server '%s' failed" - ": %s\n", + ": %s", r->in.server_name, nt_errstr(status)); goto disconnect; } @@ -125,7 +125,7 @@ NTSTATUS libnet_AddShare(struct libnet_context *ctx, if (!NT_STATUS_IS_OK(status)) { r->out.error_string = talloc_asprintf(mem_ctx, "Connection to SRVSVC pipe of server %s " - "failed: %s\n", + "failed: %s", r->in.server_name, nt_errstr(status)); return status; } @@ -139,7 +139,7 @@ NTSTATUS libnet_AddShare(struct libnet_context *ctx, if (!NT_STATUS_IS_OK(status)) { r->out.error_string = talloc_asprintf(mem_ctx, "srvsvc_NetShareAdd on server '%s' failed" - ": %s\n", + ": %s", r->in.server_name, nt_errstr(status)); } @@ -164,7 +164,7 @@ NTSTATUS libnet_DelShare(struct libnet_context *ctx, if (!NT_STATUS_IS_OK(status)) { r->out.error_string = talloc_asprintf(mem_ctx, "Connection to SRVSVC pipe of server %s " - "failed: %s\n", + "failed: %s", r->in.server_name, nt_errstr(status)); return status; } @@ -176,7 +176,7 @@ NTSTATUS libnet_DelShare(struct libnet_context *ctx, if (!NT_STATUS_IS_OK(status)) { r->out.error_string = talloc_asprintf(mem_ctx, "srvsvc_NetShareDel on server '%s' failed" - ": %s\n", + ": %s", r->in.server_name, nt_errstr(status)); } diff --git a/source4/libnet/libnet_time.c b/source4/libnet/libnet_time.c index d1d8298e3c4..810cebedfd4 100644 --- a/source4/libnet/libnet_time.c +++ b/source4/libnet/libnet_time.c @@ -42,7 +42,7 @@ static NTSTATUS libnet_RemoteTOD_srvsvc(struct libnet_context *ctx, TALLOC_CTX * status = libnet_RpcConnect(ctx, mem_ctx, &c); if (!NT_STATUS_IS_OK(status)) { r->srvsvc.out.error_string = talloc_asprintf(mem_ctx, - "Connection to SRVSVC pipe of server '%s' failed: %s\n", + "Connection to SRVSVC pipe of server '%s' failed: %s", r->srvsvc.in.server_name, nt_errstr(status)); return status; } @@ -54,7 +54,7 @@ static NTSTATUS libnet_RemoteTOD_srvsvc(struct libnet_context *ctx, TALLOC_CTX * status = dcerpc_srvsvc_NetRemoteTOD(c.out.dcerpc_pipe, mem_ctx, &tod); if (!NT_STATUS_IS_OK(status)) { r->srvsvc.out.error_string = talloc_asprintf(mem_ctx, - "srvsvc_NetrRemoteTOD on server '%s' failed: %s\n", + "srvsvc_NetrRemoteTOD on server '%s' failed: %n", r->srvsvc.in.server_name, nt_errstr(status)); goto disconnect; } @@ -62,7 +62,7 @@ static NTSTATUS libnet_RemoteTOD_srvsvc(struct libnet_context *ctx, TALLOC_CTX * /* check result of srvsvc_NetrRemoteTOD */ if (!W_ERROR_IS_OK(tod.out.result)) { r->srvsvc.out.error_string = talloc_asprintf(mem_ctx, - "srvsvc_NetrRemoteTOD on server '%s' failed: %s\n", + "srvsvc_NetrRemoteTOD on server '%s' failed: %s", r->srvsvc.in.server_name, win_errstr(tod.out.result)); status = werror_to_ntstatus(tod.out.result); goto disconnect; diff --git a/source4/libnet/libnet_vampire.c b/source4/libnet/libnet_vampire.c index 4becdc3c7d4..7421f8943c5 100644 --- a/source4/libnet/libnet_vampire.c +++ b/source4/libnet/libnet_vampire.c @@ -81,7 +81,7 @@ static NTSTATUS fix_user(TALLOC_CTX *mem_ctx, user->nt_password_present = True; } } else { - *error_string = talloc_asprintf(mem_ctx, "Failed to parse Sensitive Data for %s:\n", username); + *error_string = talloc_asprintf(mem_ctx, "Failed to parse Sensitive Data for %s:", username); dump_data(10, data.data, data.length); return nt_status; } @@ -186,7 +186,6 @@ NTSTATUS libnet_SamSync_netlogon(struct libnet_context *ctx, TALLOC_CTX *mem_ctx r->out.error_string = talloc_asprintf(mem_ctx, "Our join to domain %s is not as a BDC (%d), please rejoin as a BDC", - cli_credentials_get_domain(machine_account), cli_credentials_get_secure_channel_type(machine_account)); talloc_free(samsync_ctx);