Attachment 6524 Details for Bug 7383 – Patch for v3-5

[patch] Patch for v3-5

tmp.diff (text/plain), 1.97 KB, created by Stefan Metzmacher on 2011-06-06 13:26:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Metzmacher

Created: 2011-06-06 13:26:51 UTC

Size: 1.97 KB

patch

obsolete

>From f823f898bb4ca4a7de60d049aa6f3ab7dc96e3d6 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Sun, 24 Apr 2011 21:20:19 +0200
>Subject: [PATCH] s3:lib/access: normalize IPv4 mapped IPv6 addresses in both directions (bug #7383)
>
>metze
>(cherry picked from commit 4bfe2d5655d97fbc7e65744425b5a098e77f5ba1)
>(cherry picked from commit 62b2083c627abeb8a2fb7e5adc793c630d0d561c)
>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>---
> source3/lib/access.c |   31 +++++++++++++++++--------------
> 1 files changed, 17 insertions(+), 14 deletions(-)
>
>diff --git a/source3/lib/access.c b/source3/lib/access.c
>index 0b09e83..8fd0fbf 100644
>--- a/source3/lib/access.c
>+++ b/source3/lib/access.c
>@@ -178,29 +178,32 @@ static bool string_match(const char *tok,const char *s)
> bool client_match(const char *tok, const void *item)
> {
> 	const char **client = (const char **)item;
>+	const char *tok_addr = tok;
>+	const char *cli_addr = client[ADDR_INDEX];
>+
>+	/*
>+	 * tok and client[ADDR_INDEX] can be an IPv4 mapped to IPv6,
>+	 * we try and match the IPv4 part of address only.
>+	 * Bug #5311 and #7383.
>+	 */
>+
>+	if (strnequal(tok_addr, "::ffff:",7)) {
>+		tok_addr += 7;
>+	}
>+
>+	if (strnequal(cli_addr,"::ffff:",7)) {
>+		cli_addr += 7;
>+	}
> 
> 	/*
> 	 * Try to match the address first. If that fails, try to match the host
> 	 * name if available.
> 	 */
> 
>-	if (string_match(tok, client[ADDR_INDEX])) {
>+	if (string_match(tok_addr, cli_addr)) {
> 		return true;
> 	}
> 
>-	if (strnequal(client[ADDR_INDEX],"::ffff:",7) &&
>-			!strnequal(tok, "::ffff:",7)) {
>-		/* client[ADDR_INDEX] is an IPv4 mapped to IPv6, but
>- 		 * the list item is not. Try and match the IPv4 part of
>- 		 * address only. This will happen a lot on IPv6 enabled
>- 		 * systems with IPv4 allow/deny lists in smb.conf.
>- 		 * Bug #5311. JRA.
>- 		 */
>-		if (string_match(tok, (client[ADDR_INDEX])+7)) {
>-			return true;
>-		}
>-	}
>-
> 	if (client[NAME_INDEX][0] != 0) {
> 		if (string_match(tok, client[NAME_INDEX])) {
> 			return true;
>-- 
>1.7.4.1
>

Flags:

jra: review+

Actions: View

Attachments on bug 7383: 6524