Changeset 597 for vendor/current/source3/lib/access.c

Timestamp:

Jul 2, 2011, 4:01:14 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update vendor to version 3.5.9

File:

• vendor/current/source3/lib/access.c (modified) (2 diffs)

vendor/current/source3/lib/access.c

@@ -179 +179 @@
 {
         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;
+        }
 
         /*
@@ -185 +201 @@
          */
 
-        if (string_match(tok, client[ADDR_INDEX])) {
-                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 (string_match(tok_addr, cli_addr)) {
+                return true;
         }