Fix visible matching for fake and +x-hidden hosts.

src/tools.c (user_matches_glob): Use correct test to determine whether
    the user's host is hidden.
git-archimport-id: srvx@srvx.net--2006/srvx--devo--1.3--patch-13

diff --git a/ChangeLog b/ChangeLog
index 4154aa24ba6a468c0c3409c592181393bd4873ae..0ad3c1fa87228c3e10f88501ee69bc2a2f0360d1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,20 @@
 # arch-tag: automatic-ChangeLog--srvx@srvx.net--2006/srvx--devo--1.3
 #
 
+2006-04-29 03:11:35 GMT        Michael Poole <mdpoole@troilus.org>     patch-13
+
+    Summary:
+      Fix visible matching for fake and +x-hidden hosts.
+    Revision:
+      srvx--devo--1.3--patch-13
+
+    src/tools.c (user_matches_glob): Use correct test to determine whether
+        the user's host is hidden.
+
+    modified files:
+     ChangeLog src/tools.c
+
+
 2006-04-07 00:56:38 GMT        Michael Poole <mdpoole@troilus.org>     patch-12
 
     Summary:

diff --git a/src/tools.c b/src/tools.c
index 445006a2fa3b7516b696bbee888e18bdb5f9ced5..0da95dd62006c2273139afd5d1fdc6251c9e3608 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -614,7 +614,8 @@ user_matches_glob(struct userNode *user, const char *orig_glob, int flags)
             return 1;
     }
     /* If only matching the visible hostnames, bail early. */
-    if ((flags & MATCH_VISIBLE) && (IsFakeHost(user) || IsHiddenHost(user)))
+    if ((flags & MATCH_VISIBLE) && IsHiddenHost(user)
+        && (IsFakeHost(user) || (hidden_host_suffix && user->handle_info)))
         return 0;
     /* If it might be an IP glob, test that. */
     if (!glob[strspn(glob, "0123456789./*?")]