Attachment 933504 Details for Bug 1136101 – Sample patch prepared for rpmbuild

Sample patch prepared for rpmbuild

samba-3.6.15-fix_force_user_for_guest.patch (text/plain), 2.16 KB, created by Garri on 2014-09-01 19:02:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Garri

Created: 2014-09-01 19:02:43 UTC

Size: 2.16 KB

patch

obsolete

>diff -pruN samba-3.6.9.orig/source3/auth/auth_util.c samba-3.6.9/source3/auth/auth_util.c
>--- samba-3.6.9.orig/source3/auth/auth_util.c	2014-09-01 23:13:48.242092240 +0500
>+++ samba-3.6.9/source3/auth/auth_util.c	2014-09-01 23:18:12.385092003 +0500
>@@ -901,6 +901,7 @@ static NTSTATUS make_new_session_info_sy
> 
> NTSTATUS make_serverinfo_from_username(TALLOC_CTX *mem_ctx,
> 				       const char *username,
>+				       bool use_guest_token,
> 				       bool is_guest,
> 				       struct auth_serversupplied_info **presult)
> {
>@@ -924,7 +925,7 @@ NTSTATUS make_serverinfo_from_username(T
> 	result->nss_token = true;
> 	result->guest = is_guest;
> 
>-	if (is_guest) {
>+	if (use_guest_token) {
> 		status = make_server_info_guest(mem_ctx, &result);
> 	} else {
> 		status = create_local_token(result);
>diff -pruN samba-3.6.9.orig/source3/auth/proto.h samba-3.6.9/source3/auth/proto.h
>--- samba-3.6.9.orig/source3/auth/proto.h	2014-09-01 23:13:48.243092240 +0500
>+++ samba-3.6.9/source3/auth/proto.h	2014-09-01 23:16:05.603092117 +0500
>@@ -149,6 +149,7 @@ NTSTATUS make_server_info_pw(struct auth
> 			     struct passwd *pwd);
> NTSTATUS make_serverinfo_from_username(TALLOC_CTX *mem_ctx,
> 				       const char *username,
>+				       bool use_guest_token,
> 				       bool is_guest,
> 				       struct auth_serversupplied_info **presult);
> struct auth_serversupplied_info *copy_serverinfo(TALLOC_CTX *mem_ctx,
>diff -pruN samba-3.6.9.orig/source3/smbd/service.c samba-3.6.9/source3/smbd/service.c
>--- samba-3.6.9.orig/source3/smbd/service.c	2014-09-01 23:13:48.081092240 +0500
>+++ samba-3.6.9/source3/smbd/service.c	2014-09-01 23:20:04.787091902 +0500
>@@ -656,7 +656,7 @@ static NTSTATUS create_connection_sessio
> 			return NT_STATUS_WRONG_PASSWORD;
>                 }
> 
>-		return make_serverinfo_from_username(mem_ctx, user, guest,
>+		return make_serverinfo_from_username(mem_ctx, user, guest, guest,
> 						     presult);
>         }
> 
>@@ -690,7 +690,7 @@ NTSTATUS set_conn_force_user_group(conne
> 		}
> 
> 		status = make_serverinfo_from_username(
>-			conn, fuser, conn->session_info->guest,
>+			conn, fuser, false, conn->session_info->guest,
> 			&forced_serverinfo);
> 		if (!NT_STATUS_IS_OK(status)) {
> 			return status;

Actions: View

Attachments on bug 1136101: 933504