Get rid of flags2.

[solanum.git] / include / s_newconf.h

diff --git a/include/s_newconf.h b/include/s_newconf.h
index 0f1c171ddf36e2a3727a422532b8d95bda67c697..a1858b7f8724b08e11d1d2f24a6723db972480ba 100644 (file)
--- a/include/s_newconf.h
+++ b/include/s_newconf.h
@@ -28,8 +28,6 @@
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
  * 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
@@ -82,24 +80,27 @@ struct remote_conf
 };
 
 /* flags used in shared/cluster */
-#define SHARED_TKLINE  0x0001
-#define SHARED_PKLINE  0x0002
-#define SHARED_UNKLINE 0x0004
-#define SHARED_LOCOPS  0x0008
-#define SHARED_TXLINE  0x0010
-#define SHARED_PXLINE  0x0020
-#define SHARED_UNXLINE 0x0040
-#define SHARED_TRESV   0x0080
-#define SHARED_PRESV   0x0100
-#define SHARED_UNRESV  0x0200
-#define SHARED_REHASH  0x0400
-#define SHARED_TDLINE  0x0800
-#define SHARED_PDLINE  0x1000
-#define SHARED_UNDLINE 0x2000
+#define SHARED_TKLINE  0x00001
+#define SHARED_PKLINE  0x00002
+#define SHARED_UNKLINE 0x00004
+#define SHARED_LOCOPS  0x00008
+#define SHARED_TXLINE  0x00010
+#define SHARED_PXLINE  0x00020
+#define SHARED_UNXLINE 0x00040
+#define SHARED_TRESV   0x00080
+#define SHARED_PRESV   0x00100
+#define SHARED_UNRESV  0x00200
+#define SHARED_REHASH  0x00400
+#define SHARED_TDLINE  0x00800
+#define SHARED_PDLINE  0x01000
+#define SHARED_UNDLINE 0x02000
+#define SHARED_GRANT   0x04000
+#define SHARED_DIE     0x08000
+#define SHARED_MODULE  0x10000
 
 #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_GRANT)
 #define CLUSTER_ALL    (SHARED_ALL | SHARED_LOCOPS)
 
 /* flags used in hub/leaf */
@@ -130,18 +131,18 @@ struct oper_conf
 extern struct remote_conf *make_remote_conf(void);
 extern void free_remote_conf(struct remote_conf *);
 
-extern int find_shared_conf(const char *username, const char *host,
+extern bool find_shared_conf(const char *username, const char *host,
                        const char *server, int flags);
 extern void propagate_generic(struct Client *source_p, const char *command,
                const char *target, int cap, const char *format, ...);
 extern void cluster_generic(struct Client *, const char *, int cltype,
                        int cap, const char *format, ...);
 
-#define OPER_ENCRYPTED 0x00001
-#define OPER_NEEDSSL    0x80000
-/* 0x400000 and above are in client.h */
+/* Other client flags are in client.h */
+#define OPER_ENCRYPTED 0x10000000
+#define OPER_NEEDSSL   0x20000000
 
-#define OPER_FLAGS     0 /* no oper privs in Client.flags2/oper_conf.flags currently */
+#define OPER_FLAGS     0        /* no oper privs in Client.flags/oper_conf.flags currently */
 
 #define IsOperConfEncrypted(x) ((x)->flags & OPER_ENCRYPTED)
 #define IsOperConfNeedSSL(x)   ((x)->flags & OPER_NEEDSSL)