X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/79edef09180726e37dc5fa615c05e0b2e95b9f31..e6a489940b6b36203567a62b07d8df34301b0d0e:/include/s_conf.h

diff --git a/include/s_conf.h b/include/s_conf.h
index c44d1ff..5b91748 100644
--- a/include/s_conf.h
+++ b/include/s_conf.h
@@ -54,22 +54,26 @@ struct ip_value
 extern FILE *conf_fbfile_in;
 extern char conf_line_in[256];
 
-struct ConfItem
-{
-	struct ConfItem *next;	/* list node pointer */
-	unsigned int status;	/* If CONF_ILLEGAL, delete when no clients */
-	unsigned int flags;
-	int clients;		/* Number of *LOCAL* clients using this */
-	char *name;		/* IRC name, nick, server name, or original u@h */
-	char *host;		/* host part of user@host */
-	char *passwd;		/* doubles as kline reason *ugh* */
-	char *spasswd;		/* Password to send. */
-	char *user;		/* user part of user@host */
-	int port;
-	time_t hold;		/* Hold action until this time (calendar time) */
-	char *className;	/* Name of class */
-	struct Class *c_class;	/* Class of connection */
-	rb_patricia_node_t *pnode;	/* Our patricia node */
+struct ConfItem
+{
+	unsigned int status;	/* If CONF_ILLEGAL, delete when no clients */
+	unsigned int flags;
+	int clients;		/* Number of *LOCAL* clients using this */
+
+	union
+	{
+		char *name;		/* IRC name, nick, server name, or original u@h */
+		const char *oper;
+	} info;
+
+	char *host;		/* host part of user@host */
+	char *passwd;		/* doubles as kline reason *ugh* */
+	char *spasswd;		/* Password to send. */
+	char *user;		/* user part of user@host */
+	int port;
+	time_t hold;		/* Hold action until this time (calendar time) */
+	struct Class *c_class;	/* Class of connection */
+	rb_patricia_node_t *pnode;
 };
 
 #define CONF_ILLEGAL            0x80000000
@@ -337,8 +341,8 @@ extern struct ConfItem *find_tkline(const char *, const char *, struct sockaddr
 extern char *show_iline_prefix(struct Client *, struct ConfItem *, char *);
 extern void get_printable_conf(struct ConfItem *,
 			       char **, char **, char **, char **, int *, char **);
-extern void get_printable_kline(struct Client *, struct ConfItem *,
-				char **, char **, char **, char **);
+void get_printable_kline(struct Client *, struct ConfItem *,
+				const char **, const char **, const char **, const char **);
 
 extern void yyerror(const char *);
 extern int conf_yy_fatal_error(const char *);