X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=include%2Fs_conf.h;h=775dcf78daa40b71fc24cc8e4a40acb4052117c8;hb=refs%2Fheads%2Fupstream;hp=377542701c4e076cda91db10018b17e932ed6b17;hpb=a8aaf2a7fbfbff14f3d8cd869fcca8b9c9c459cf;p=ircu2.10.12-pk.git

diff --git a/include/s_conf.h b/include/s_conf.h
index 3775427..775dcf7 100644
--- a/include/s_conf.h
+++ b/include/s_conf.h
@@ -32,6 +32,8 @@ struct Message;
 #define CONF_OPERATOR           0x0020     /**< ConfItem describes an Operator block */
 #define CONF_UWORLD             0x8000     /**< ConfItem describes a Uworld server */
 
+#define CONF_AUTOCONNECT        0x0001     /**< Autoconnect to a server */
+
 /** Indicates ConfItem types that count associated clients. */
 #define CONF_CLIENT_MASK        (CONF_CLIENT | CONF_OPERATOR | CONF_SERVER)
 
@@ -63,8 +65,10 @@ struct ConfItem
   time_t hold;        /**< Earliest time to attempt an outbound
                          connect on this ConfItem. */
   int dns_pending;    /**< A dns request is pending. */
+  int usessl;         /**< establish SSL connection */
+  int flags;          /**< Additional modifiers for item. */
   int addrbits;       /**< Number of bits valid in ConfItem::address. */
-  struct Privs privs; /**< Privileges for opers. */
+  struct Privs privs; /**< Privileges for all users in this class. */
   /** Used to detect if a privilege has been set by this ConfItem. */
   struct Privs privs_dirty;
 };
@@ -80,17 +84,16 @@ struct qline
 /** Local K-line structure. */
 struct DenyConf {
   struct DenyConf*    next;     /**< Next DenyConf in #denyConfList. */
-  char*               hostmask; /**< Mask for realname, IP or hostname. */
+  char*               hostmask; /**< Mask for  IP or hostname. */
   char*               message;  /**< Message to send to denied users. */
   char*               usermask; /**< Mask for client's username. */
+  char*               realmask; /**< Mask for realname. */
   struct irc_in_addr  address;  /**< Address for IP-based denies. */
   unsigned int        flags;    /**< Interpretation flags for the above.  */
   unsigned char       bits;     /**< Number of bits for ipkills */
 };
 
 #define DENY_FLAGS_FILE     0x0001 /**< Comment is a filename */
-#define DENY_FLAGS_IP       0x0002 /**< K-line by IP address */
-#define DENY_FLAGS_REALNAME 0x0004 /**< K-line by real name */
 
 /** Local server configuration. */
 struct LocalConf {
@@ -100,6 +103,10 @@ struct LocalConf {
   char*          location1;   /**< First line of location information. */
   char*          location2;   /**< Second line of location information. */
   char*          contact;     /**< Admin contact information. */
+  
+  char*          sslcertfile; /**< SSL certificate file. */
+  char*          sslkeyfile;  /**< SSL private key file. */
+  char*          sslcafile;   /**< SSL CA file. */
 };
 
 enum {
@@ -184,6 +191,7 @@ extern const char *find_quarantine(const char* chname);
 extern void lookup_confhost(struct ConfItem *aconf);
 extern void conf_parse_userhost(struct ConfItem *aconf, char *host);
 extern struct ConfItem *conf_debug_iline(const char *client);
+extern void free_mapping(struct s_map *smap);
 
 extern void yyerror(const char *msg);