Move cmode +N to cmode +d, so that extensions/m_roleplay can retain cmode +N and...

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

diff --git a/include/s_newconf.h b/include/s_newconf.h
index e55d8ec76b9b1fc79979d0a408721ef26bd2c334..1bf40cb7854dbdafa214a44380c999db73aa4b06 100644 (file)
--- a/include/s_newconf.h
+++ b/include/s_newconf.h
@@ -29,7 +29,6 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: s_newconf.h 1747 2006-07-25 21:22:45Z jilles $
  */
 
 #ifndef INCLUDED_s_newconf_h
@@ -96,10 +95,12 @@ struct remote_conf
 #define SHARED_TDLINE  0x0800
 #define SHARED_PDLINE  0x1000
 #define SHARED_UNDLINE 0x2000
+#define SHARED_DIE      0x4000
+#define SHARED_MODULE  0x8000
 
 #define SHARED_ALL     (SHARED_TKLINE | SHARED_PKLINE | SHARED_UNKLINE |\
                        SHARED_PXLINE | SHARED_TXLINE | SHARED_UNXLINE |\
-                       SHARED_TRESV | SHARED_PRESV | SHARED_UNRESV)
+                       SHARED_TRESV | SHARED_PRESV | SHARED_UNRESV | SHARED_REHASH)
 #define CLUSTER_ALL    (SHARED_ALL | SHARED_LOCOPS)
 
 /* flags used in hub/leaf */
@@ -119,6 +120,10 @@ struct oper_conf
 
        unsigned int snomask;
 
+       char *vhost;
+       char *swhois;
+       char *operstring;
+
        struct PrivilegeSet *privset;
 
 #ifdef HAVE_LIBCRYPTO
@@ -162,9 +167,9 @@ extern void cluster_generic(struct Client *, const char *, int cltype,
 #define IsOperAdmin(x)          (HasPrivilege((x), "oper:admin") || HasPrivilege((x), "oper:hidden_admin"))
 #define IsOperOperwall(x)       (HasPrivilege((x), "oper:operwall"))
 #define IsOperSpy(x)            (HasPrivilege((x), "oper:spy"))
+#define IsOperOverride(x)       (HasPrivilege((x), "oper:override"))
 #define IsOperInvis(x)          (HasPrivilege((x), "oper:hidden"))
 #define IsOperRemoteBan(x)     (HasPrivilege((x), "oper:remoteban"))
-#define IsOperOverride(x)       HasPrivilege(x, "oper:override")
 #define IsOperMassNotice(x)    (HasPrivilege((x), "oper:mass_notice"))
 
 extern struct oper_conf *make_oper_conf(void);
@@ -176,20 +181,6 @@ extern struct oper_conf *find_oper_conf(const char *username, const char *host,
 
 extern const char *get_oper_privs(int flags);
 
-struct mode_table
-{
-   const char *name;
-   int mode;
-};
-
-struct oper_flags
-{
-   int flag;
-   const char *name;
-   char has;
-   char hasnt;
-};
-
 struct server_conf
 {
        char *name;