Remove various obsolete ConfItem statuses (types) and flags.

[irc/rqf/shadowircd.git] / src / hostmask.c

diff --git a/src/hostmask.c b/src/hostmask.c
index d45dc112e384e1ba6fdb2a00903262345593d40b..90208e018c76c1b865fe73768e7da9ea8b339436 100644 (file)
--- a/src/hostmask.c
+++ b/src/hostmask.c
@@ -432,8 +432,7 @@ find_dline(struct sockaddr *addr, int aftype)
        return find_conf_by_address(NULL, NULL, NULL, addr, CONF_DLINE | 1, aftype, NULL);
 }
 
-/* void find_exact_conf_by_address(const char*, int, const char *,
- *         struct ConfItem *aconf)
+/* void find_exact_conf_by_address(const char*, int, const char *)
  * Input: 
  * Output: ConfItem if found
  * Side-effects: None
@@ -471,7 +470,7 @@ find_exact_conf_by_address(const char *address, int type, const char *username)
        {
                if (arec->type == type &&
                                arec->masktype == masktype &&
-                               !irccmp(arec->username, username))
+                               (arec->username == NULL || username == NULL ? arec->username == username : !irccmp(arec->username, username)))
                {
                        if (masktype == HM_HOST)
                        {
@@ -679,14 +678,8 @@ show_iline_prefix(struct Client *sptr, struct ConfItem *aconf, char *name)
        prefix_ptr = prefix_of_host;
        if(IsNoTilde(aconf))
                *prefix_ptr++ = '-';
-       if(IsLimitIp(aconf))
-               *prefix_ptr++ = '!';
        if(IsNeedIdentd(aconf))
                *prefix_ptr++ = '+';
-       if(IsPassIdentd(aconf))
-               *prefix_ptr++ = '$';
-       if(IsNoMatchIp(aconf))
-               *prefix_ptr++ = '%';
        if(IsConfDoSpoofIp(aconf))
                *prefix_ptr++ = '=';
        if(MyOper(sptr) && IsConfExemptKline(aconf))