replacing ssld with servlink

[irc/rqf/shadowircd.git] / include / s_conf.h

diff --git a/include/s_conf.h b/include/s_conf.h
index c44d1ffbf6a64376f8ab2c7d42f33fd1f77e76e3..5b9174816f4e916b5e8f97303ef80f8cd35f706d 100644 (file)
--- 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\r
+{\r
+       unsigned int status;    /* If CONF_ILLEGAL, delete when no clients */\r
+       unsigned int flags;\r
+       int clients;            /* Number of *LOCAL* clients using this */\r
+\r
+       union\r
+       {\r
+               char *name;             /* IRC name, nick, server name, or original u@h */\r
+               const char *oper;\r
+       } info;\r
+\r
+       char *host;             /* host part of user@host */\r
+       char *passwd;           /* doubles as kline reason *ugh* */\r
+       char *spasswd;          /* Password to send. */\r
+       char *user;             /* user part of user@host */\r
+       int port;\r
+       time_t hold;            /* Hold action until this time (calendar time) */\r
+       struct Class *c_class;  /* Class of connection */\r
+       rb_patricia_node_t *pnode;\r
 };
 
 #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 *,\r
+                               const char **, const char **, const char **, const char **);
 
 extern void yyerror(const char *);
 extern int conf_yy_fatal_error(const char *);