diff --git a/include/client.h b/include/client.h index 7307d2c6..3b8c7485 100644 --- a/include/client.h +++ b/include/client.h @@ -417,7 +417,6 @@ struct exit_client_hook #define FLAGS_SENTUSER 0x0008 /* Client sent a USER command. */ #define FLAGS_CLOSING 0x0020 /* set when closing to suppress errors */ #define FLAGS_GOTID 0x0080 /* successful ident lookup achieved */ -#define FLAGS_NEEDID 0x0100 /* I-lines say must use ident return */ #define FLAGS_NORMALEX 0x0400 /* Client exited normally */ #define FLAGS_SENDQEX 0x0800 /* Sendq exceeded */ #define FLAGS_SERVLINK 0x10000 /* servlink has servlink process */ @@ -470,8 +469,6 @@ struct exit_client_hook UMODE_WALLOP | UMODE_LOCOPS) #define DEFAULT_OPER_SNOMASK SNO_GENERAL -#define FLAGS_ID (FLAGS_NEEDID | FLAGS_GOTID) - #define CLICAP_MULTI_PREFIX 0x0001 #define CLICAP_SASL 0x0002 @@ -540,9 +537,6 @@ struct exit_client_hook #define IsNoForward(x) ((x)->umodes & UMODE_NOFORWARD) #define IsSetRegOnlyMsg(x) ((x)->umodes & UMODE_REGONLYMSG) -#define SetNeedId(x) ((x)->flags |= FLAGS_NEEDID) -#define IsNeedId(x) (((x)->flags & FLAGS_NEEDID) != 0) - #define SetGotId(x) ((x)->flags |= FLAGS_GOTID) #define IsGotId(x) (((x)->flags & FLAGS_GOTID) != 0) diff --git a/include/s_conf.h b/include/s_conf.h index a89c4b6e..99bddfda 100644 --- a/include/s_conf.h +++ b/include/s_conf.h @@ -96,7 +96,6 @@ struct ConfItem /* Generic flags... */ /* access flags... */ -#define CONF_FLAGS_DO_IDENTD 0x00000001 #define CONF_FLAGS_LIMIT_IP 0x00000002 #define CONF_FLAGS_NO_TILDE 0x00000004 #define CONF_FLAGS_NEED_IDENTD 0x00000008 @@ -141,7 +140,6 @@ struct ConfItem #define IsConfExemptJupe(x) ((x)->flags & CONF_FLAGS_EXEMPTJUPE) #define IsConfExemptResv(x) ((x)->flags & CONF_FLAGS_EXEMPTRESV) #define IsConfIdlelined(x) ((x)->flags & CONF_FLAGS_IDLE_LINED) -#define IsConfDoIdentd(x) ((x)->flags & CONF_FLAGS_DO_IDENTD) #define IsConfDoSpoofIp(x) ((x)->flags & CONF_FLAGS_SPOOF_IP) #define IsConfSpoofNotice(x) ((x)->flags & CONF_FLAGS_SPOOF_NOTICE) #define IsConfEncrypted(x) ((x)->flags & CONF_FLAGS_ENCRYPTED) diff --git a/src/s_conf.c b/src/s_conf.c index eceec142..22575fe0 100644 --- a/src/s_conf.c +++ b/src/s_conf.c @@ -339,10 +339,6 @@ verify_access(struct Client *client_p, const char *username) return (NOT_AUTHORISED); } - - if(IsConfDoIdentd(aconf)) - SetNeedId(client_p); - /* Thanks for spoof idea amm */ if(IsConfDoSpoofIp(aconf)) {