Attachment 6934 Details for Bug 8482 – Patch for this issue

[patch] Patch for this issue

0001-s4-winbind-Don-t-drop-workgroup-name-for-getpw.patch (text/plain), 2.72 KB, created by Kai Blin on 2011-09-24 19:20:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kai Blin

Created: 2011-09-24 19:20:27 UTC

Size: 2.72 KB

patch

obsolete

>From 772cfd88598b3c176c88f81e8541c2626ea7e34d Mon Sep 17 00:00:00 2001
>From: Kai Blin <kai@samba.org>
>Date: Sat, 24 Sep 2011 10:45:59 -0700
>Subject: [PATCH] s4 winbind: Don't drop workgroup name for getpw*
>
>---
> source4/winbind/wb_cmd_getpwnam.c |    9 ++++++++-
> source4/winbind/wb_cmd_getpwuid.c |    9 ++++++++-
> 2 files changed, 16 insertions(+), 2 deletions(-)
>
>diff --git a/source4/winbind/wb_cmd_getpwnam.c b/source4/winbind/wb_cmd_getpwnam.c
>index ac72359..0ba4cb6 100644
>--- a/source4/winbind/wb_cmd_getpwnam.c
>+++ b/source4/winbind/wb_cmd_getpwnam.c
>@@ -108,6 +108,7 @@ static void cmd_getpwnam_recv_user_info(struct composite_context *ctx)
> 			ctx->async.private_data, struct cmd_getpwnam_state);
> 	struct libnet_UserInfo *user_info;
> 	struct winbindd_pw *pw;
>+	char *username_with_domain;
> 
> 	DEBUG(5, ("cmd_getpwnam_recv_user_info called\n"));
> 
>@@ -120,7 +121,13 @@ static void cmd_getpwnam_recv_user_info(struct composite_context *ctx)
> 	state->ctx->status = libnet_UserInfo_recv(ctx, state, user_info);
> 	if(!composite_is_ok(state->ctx)) return;
> 
>-	WBSRV_SAMBA3_SET_STRING(pw->pw_name, user_info->out.account_name);
>+	username_with_domain = talloc_asprintf(pw, "%s%s%s",
>+		state->workgroup_name,
>+		lpcfg_winbind_separator(state->service->task->lp_ctx),
>+		user_info->out.account_name);
>+	if(composite_nomem(username_with_domain, state->ctx)) return;
>+
>+	WBSRV_SAMBA3_SET_STRING(pw->pw_name, username_with_domain);
> 	WBSRV_SAMBA3_SET_STRING(pw->pw_passwd, "*");
> 	WBSRV_SAMBA3_SET_STRING(pw->pw_gecos, user_info->out.full_name);
> 	WBSRV_SAMBA3_SET_STRING(pw->pw_dir, 
>diff --git a/source4/winbind/wb_cmd_getpwuid.c b/source4/winbind/wb_cmd_getpwuid.c
>index f6f3cb2..73bbb59 100644
>--- a/source4/winbind/wb_cmd_getpwuid.c
>+++ b/source4/winbind/wb_cmd_getpwuid.c
>@@ -129,6 +129,7 @@ static void cmd_getpwuid_recv_user_info(struct composite_context *ctx)
> 				struct cmd_getpwuid_state);
> 	struct libnet_UserInfo *user_info;
> 	struct winbindd_pw *pw;
>+	char *username_with_domain;
> 
> 	DEBUG(5, ("cmd_getpwuid_recv_user_info called\n"));
> 
>@@ -141,7 +142,13 @@ static void cmd_getpwuid_recv_user_info(struct composite_context *ctx)
> 	state->ctx->status = libnet_UserInfo_recv(ctx, state, user_info);
> 	if (!composite_is_ok(state->ctx)) return;
> 
>-	WBSRV_SAMBA3_SET_STRING(pw->pw_name, user_info->out.account_name);
>+	username_with_domain = talloc_asprintf(pw, "%s%s%s",
>+		state->workgroup,
>+		lpcfg_winbind_separator(state->service->task->lp_ctx),
>+		user_info->out.account_name);
>+	if(composite_nomem(username_with_domain, state->ctx)) return;
>+
>+	WBSRV_SAMBA3_SET_STRING(pw->pw_name, username_with_domain);
> 	WBSRV_SAMBA3_SET_STRING(pw->pw_passwd, "*");
> 	WBSRV_SAMBA3_SET_STRING(pw->pw_gecos, user_info->out.full_name);
> 	WBSRV_SAMBA3_SET_STRING(pw->pw_dir, 
>-- 
>1.7.0.4
>

Actions: View

Attachments on bug 8482: 6934