Attachment 4622 Details for Bug 6584 – revised version of that patch (tested and pushed to master)

[patch] revised version of that patch (tested and pushed to master)

bug-6584.patch (text/plain), 2.04 KB, created by Guenther Deschner on 2009-09-02 03:21:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guenther Deschner

Created: 2009-09-02 03:21:09 UTC

Size: 2.04 KB

patch

obsolete

>From aec03eda93d3db8723c79f062c80db0267ac2e59 Mon Sep 17 00:00:00 2001
>From: Simo Sorce <idra@samba.org>
>Date: Sat, 29 Aug 2009 19:31:02 -0400
>Subject: [PATCH] s3-smbpasswd: Fix Bug #6584: allow DOM\user when changing passwords remotely.
>MIME-Version: 1.0
>Content-Type: text/plain; charset=utf-8
>Content-Transfer-Encoding: 8bit
>
>Signed-off-by: GÃ¼nther Deschner <gd@samba.org>
>---
> source3/libsmb/passchange.c |   19 ++++++++++++++++---
> 1 files changed, 16 insertions(+), 3 deletions(-)
>
>diff --git a/source3/libsmb/passchange.c b/source3/libsmb/passchange.c
>index bb70386..c83247a 100644
>--- a/source3/libsmb/passchange.c
>+++ b/source3/libsmb/passchange.c
>@@ -31,10 +31,24 @@ NTSTATUS remote_password_change(const char *remote_machine, const char *user_nam
> 	struct cli_state *cli;
> 	struct rpc_pipe_client *pipe_hnd;
> 	struct sockaddr_storage ss;
>+	char *user, *domain, *p;
> 
> 	NTSTATUS result;
> 	bool pass_must_change = False;
> 
>+	user = talloc_strdup(talloc_tos(), user_name);
>+	SMB_ASSERT(user != NULL);
>+	domain = talloc_strdup(talloc_tos(), "");
>+	SMB_ASSERT(domain != NULL);
>+
>+	/* allow usernames of the form domain\\user or domain/user */
>+	if ((p = strchr_m(user,'\\')) || (p = strchr_m(user,'/')) ||
>+	    (p = strchr_m(user,*lp_winbind_separator()))) {
>+		*p = 0;
>+		domain = user;
>+		user = p+1;
>+	}
>+
> 	*err_str = NULL;
> 
> 	if(!resolve_name( remote_machine, &ss, 0x20, false)) {
>@@ -139,7 +153,7 @@ NTSTATUS remote_password_change(const char *remote_machine, const char *user_nam
> 			return result;
> 		}
> 	} else {
>-		result = cli_init_creds(cli, user_name, "", old_passwd);
>+		result = cli_init_creds(cli, user, domain, old_passwd);
> 		if (!NT_STATUS_IS_OK(result)) {
> 			cli_shutdown(cli);
> 			return result;
>@@ -163,8 +177,7 @@ NTSTATUS remote_password_change(const char *remote_machine, const char *user_nam
> 		result = cli_rpc_pipe_open_ntlmssp(cli,
> 						   &ndr_table_samr.syntax_id,
> 						   PIPE_AUTH_LEVEL_PRIVACY,
>-						   "", /* what domain... ? */
>-						   user_name,
>+						   domain, user,
> 						   old_passwd,
> 						   &pipe_hnd);
> 	} else {
>-- 
>1.6.2.5
>

Actions: View

Attachments on bug 6584: 4613 | 4622