Updated win32 compile guide, more +I removal

diff --git a/doc/win32-compile-guide b/doc/win32-compile-guide
index b5ffa8a5e334a6592b218863bc75b427fae6410f..bf026650a85f583115b971b8be8f5805939a9bd5 100644 (file)
--- a/doc/win32-compile-guide
+++ b/doc/win32-compile-guide
@@ -8,7 +8,8 @@ as well, but have not been tested.
 2. Copy extras/regex/regex.h to include/
 3. Copy extras/regex/regex.c to src/
 4. Edit include/settings.h to your liking (pretty much change DOMAINNAME)
-5. Execute "nmake makefile.win32"
+5. Unzip src/win32/unrealircd.bmp.gz
+6. Execute "nmake makefile.win32"
 
 Congratulations, you should have a functioning win32 binary.
 

diff --git a/include/struct.h b/include/struct.h
index 85afcb21fbebcf75485b60fb5c1cc03d7d0469ca..ecd8e6694410ed19516be4f5b27aa30091f7506b 100644 (file)
--- a/include/struct.h
+++ b/include/struct.h
@@ -463,7 +463,9 @@ typedef unsigned int u_int32_t;     /* XXX Hope this works! */
 #define OFLAG_AFOUNDER  0x10000000
 #define OFLAG_COFOUND   0x20000000
 #define OFLAG_WMASTER  0x40000000
-#define OFLAG_INVISIBLE 0x80000000
+#ifdef ENABLE_INVISOPER
+  #define OFLAG_INVISIBLE 0x80000000
+#endif
 #define OFLAG_LOCAL    (OFLAG_REHASH|OFLAG_HELPOP|OFLAG_GLOBOP|OFLAG_WALLOP|OFLAG_LOCOP|OFLAG_LROUTE|OFLAG_LKILL|OFLAG_KLINE|OFLAG_UNKLINE|OFLAG_LNOTICE|OFLAG_UMODEC|OFLAG_UMODEF)
 #define OFLAG_GLOBAL   (OFLAG_LOCAL|OFLAG_GROUTE|OFLAG_GKILL|OFLAG_GNOTICE)
 #define OFLAG_ISGLOBAL (OFLAG_GROUTE|OFLAG_GKILL|OFLAG_GNOTICE)

diff --git a/include/win32/settings.h b/include/win32/settings.h
index e49c0206fa639d37bb2fd1239aa2a24011fddff1..6788629a74bb29ea012aaab444ba1c61a44c341f 100644 (file)
--- a/include/win32/settings.h
+++ b/include/win32/settings.h
@@ -1,3 +1,25 @@
-#define SPATH "."
+/*
+ * VERSION: Unreal3.1.4 Meadows
+ * DATE:    Sat Jun 15 13:43:51 EST 2002
+ * OS:      Win-32
+ *
+ */
+
 #define DPATH "."
-#define DOMAINNAME "irc.net"
\ No newline at end of file
+#define SPATH "."
+#define DOMAINNAME "irc.net"
+#define LISTEN_SIZE 5
+#define MAXSENDQLENGTH 3000000
+#define BUFFERPOOL (9 * MAXSENDQLENGTH)
+#define MAXCONNECTIONS 1024
+#define NICKNAMEHISTORYLENGTH 2000
+#undef CRYPT_OPER_PASSWORD
+#undef USE_SSL
+#undef CRYPT_LINK_PASSWORD
+#undef CRYPT_ILINE_PASSWORD
+#undef CRYPT_XLINE_PASSWORD
+#undef ENABLE_INVISOPER
+#define HUB 1
+#define HAVE_REGEX 1
+#define NOSPOOF 1
+#define GLIBC2_x

diff --git a/src/s_conf.c b/src/s_conf.c
index 8d11807475c1b69066277f4f2f163e85b3616c5b..cbbe52b1f06c8b6ab2bfe96e34dd8c5c63b3cd34 100644 (file)
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -1044,9 +1044,15 @@ extern char *getfield();
 
 #define STAR1 OFLAG_SADMIN|OFLAG_ADMIN|OFLAG_NETADMIN|OFLAG_COADMIN
 #define STAR2 OFLAG_ZLINE|OFLAG_HIDE|OFLAG_WHOIS
-#define STAR3 OFLAG_INVISIBLE
+#ifdef ENABLE_INVISOPER
+  #define STAR3 OFLAG_INVISIBLE
+#endif
 static int oper_access[] = {
+#ifdef ENABLE_INVISOPER
        ~(STAR1 | STAR2 | STAR3), '*',
+#else
+       ~(STAR1 | STAR2 ), '*',
+#endif
        OFLAG_LOCAL, 'o',
        OFLAG_GLOBAL, 'O',
        OFLAG_REHASH, 'r',
@@ -1075,7 +1081,9 @@ static int oper_access[] = {
        OFLAG_WHOIS, 'W',
        OFLAG_HIDE, 'H',
 /*        OFLAG_AGENT, 'S',*/
+#ifdef ENABLE_INVISOPER
        OFLAG_INVISIBLE, '^',
+#endif
        0, 0
 };