Attachment 3266 Details for Bug 5406 – proposed fix

[patch] proposed fix

0001-fix-alignment-bug-hitting-Solaris-with-reset-in-zer.patch (text/plain), 1.41 KB, created by Björn Jacke on 2008-04-21 06:44:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Björn Jacke

Created: 2008-04-21 06:44:14 UTC

Size: 1.41 KB

patch

obsolete

>From c8143b751d67e1291b4570ab19faa8eae71bd3f3 Mon Sep 17 00:00:00 2001
>From: =?utf-8?q?Bj=C3=B6rn=20Jacke?= <bj@sernet.de>
>Date: Mon, 21 Apr 2008 12:44:13 +0200
>Subject: [PATCH] fix alignment bug hitting Solaris with "reset in zero vc" activated
>
>---
> source/smbd/sesssetup.c |   13 ++++++++-----
> 1 files changed, 8 insertions(+), 5 deletions(-)
>
>diff --git a/source/smbd/sesssetup.c b/source/smbd/sesssetup.c
>index 378d8aa..0257cfa 100644
>--- a/source/smbd/sesssetup.c
>+++ b/source/smbd/sesssetup.c
>@@ -1184,22 +1184,25 @@ static int reply_sesssetup_and_X_spnego(connection_struct *conn, char *inbuf,
> static int shutdown_other_smbds(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf,
> 				void *p)
> {
>-	struct sessionid *sessionid = (struct sessionid *)dbuf.dptr;
>+	struct sessionid sessionid;
> 	const char *ip = (const char *)p;
> 
>-	if (!process_exists(pid_to_procid(sessionid->pid))) {
>+	SMB_ASSERT(dbuf.dsize == sizeof(sessionid));
>+	memcpy(&sessionid, dbuf.dptr, sizeof(sessionid));
>+
>+	if (!process_exists(pid_to_procid(sessionid.pid))) {
> 		return 0;
> 	}
> 
>-	if (sessionid->pid == sys_getpid()) {
>+	if (sessionid.pid == sys_getpid()) {
> 		return 0;
> 	}
> 
>-	if (strcmp(ip, sessionid->ip_addr) != 0) {
>+	if (strcmp(ip, sessionid.ip_addr) != 0) {
> 		return 0;
> 	}
> 
>-	message_send_pid(pid_to_procid(sessionid->pid), MSG_SHUTDOWN,
>+	message_send_pid(pid_to_procid(sessionid.pid), MSG_SHUTDOWN,
> 			 NULL, 0, True);
> 	return 0;
> }
>-- 
>1.5.4.4
>

Actions: View

Attachments on bug 5406: 3266