Merge branch 'unrealircd:unreal60_dev' into piss60

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for unrealircd 6.0.2.
+# Generated by GNU Autoconf 2.69 for unrealircd 6.0.3-git.
 #
 # Report bugs to <https://bugs.unrealircd.org/>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='unrealircd'
 PACKAGE_TARNAME='unrealircd'
-PACKAGE_VERSION='6.0.2'
-PACKAGE_STRING='unrealircd 6.0.2'
+PACKAGE_VERSION='6.0.3-git'
+PACKAGE_STRING='unrealircd 6.0.3-git'
 PACKAGE_BUGREPORT='https://bugs.unrealircd.org/'
 PACKAGE_URL='https://unrealircd.org/'
 
@@ -1347,7 +1347,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures unrealircd 6.0.2 to adapt to many kinds of systems.
+\`configure' configures unrealircd 6.0.3-git to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1413,7 +1413,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of unrealircd 6.0.2:";;
+     short | recursive ) echo "Configuration of unrealircd 6.0.3-git:";;
    esac
   cat <<\_ACEOF
 
@@ -1589,7 +1589,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-unrealircd configure 6.0.2
+unrealircd configure 6.0.3-git
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1958,7 +1958,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by unrealircd $as_me 6.0.2, which was
+It was created by unrealircd $as_me 6.0.3-git, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2366,7 +2366,7 @@ _ACEOF
 
 
 # Minor version number (e.g.: Z in X.Y.Z)
-UNREAL_VERSION_MINOR="2"
+UNREAL_VERSION_MINOR="3"
 
 cat >>confdefs.h <<_ACEOF
 #define UNREAL_VERSION_MINOR $UNREAL_VERSION_MINOR
@@ -2376,7 +2376,7 @@ _ACEOF
 # The version suffix such as a beta marker or release candidate
 # marker. (e.g.: -rcX for unrealircd-3.2.9-rcX). This macro is a
 # string instead of an integer because it contains arbitrary data.
-UNREAL_VERSION_SUFFIX=""
+UNREAL_VERSION_SUFFIX="-git"
 
 cat >>confdefs.h <<_ACEOF
 #define UNREAL_VERSION_SUFFIX "$UNREAL_VERSION_SUFFIX"
@@ -9414,7 +9414,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by unrealircd $as_me 6.0.2, which was
+This file was extended by unrealircd $as_me 6.0.3-git, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -9477,7 +9477,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-unrealircd config.status 6.0.2
+unrealircd config.status 6.0.3-git
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -7,7 +7,7 @@ dnl src/windows/unrealinst.iss
 dnl doc/Config.header
 dnl src/version.c.SH
 
-AC_INIT([unrealircd], [6.0.2], [https://bugs.unrealircd.org/], [], [https://unrealircd.org/])
+AC_INIT([unrealircd], [6.0.3-git], [https://bugs.unrealircd.org/], [], [https://unrealircd.org/])
 AC_CONFIG_SRCDIR([src/ircd.c])
 AC_CONFIG_HEADER([include/setup.h])
 AC_CONFIG_AUX_DIR([autoconf])
@@ -34,13 +34,13 @@ UNREAL_VERSION_MAJOR=["0"]
 AC_DEFINE_UNQUOTED([UNREAL_VERSION_MAJOR], [$UNREAL_VERSION_MAJOR], [Major version number (e.g.: Y for X.Y.Z)])
 
 # Minor version number (e.g.: Z in X.Y.Z)
-UNREAL_VERSION_MINOR=["2"]
+UNREAL_VERSION_MINOR=["3"]
 AC_DEFINE_UNQUOTED([UNREAL_VERSION_MINOR], [$UNREAL_VERSION_MINOR], [Minor version number (e.g.: Z for X.Y.Z)])
 
 # The version suffix such as a beta marker or release candidate
 # marker. (e.g.: -rcX for unrealircd-3.2.9-rcX). This macro is a
 # string instead of an integer because it contains arbitrary data.
-UNREAL_VERSION_SUFFIX=[""]
+UNREAL_VERSION_SUFFIX=["-git"]
 AC_DEFINE_UNQUOTED([UNREAL_VERSION_SUFFIX], ["$UNREAL_VERSION_SUFFIX"], [Version suffix such as a beta marker or release candidate marker. (e.g.: -rcX for unrealircd-3.2.9-rcX)])
 
 AC_PATH_PROG(RM,rm)

doc/Config.header

@@ -7,7 +7,7 @@
  \___/|_| |_|_|  \___|\__,_|_|\___/\_| \_| \____/\__,_|
 
                                Configuration Program
-                                for UnrealIRCd 6.0.2
+                                for UnrealIRCd 6.0.3-git
                                     
 This program will help you to compile your IRC server, and ask you
 questions regarding the compile-time settings of it during the process. 

doc/RELEASE-NOTES.md

@@ -1,13 +1,33 @@
+UnrealIRCd 6.0.3-git
+=====================
+
+This is work in progress!
+
+If you are already running UnrealIRCd 6 then read below. Otherwise, jump
+straight to the [summary about UnrealIRCd 6](#Summary) to learn more
+about UnrealIRCd 6.
+
+Fixes:
+* A `REHASH` with certain remote includes setups could cause a crash or
+  other weird and confusing problems such as complaining about unable
+  to open an ipv6-database or missing snomask configuration.
+  This only affected some people with remote includes, not all.
+
+Enhancements:
+* The default text log format on disk changed. It now includes the server
+  name where the event was generated. Without this, it is sometimes
+  difficult to trace problems since previously it sometimes looked like
+  there was a problem on your server when it was actually another server
+  on the network.
+  * Old log format: `[DATE TIME] subsystem.EVENT_ID loglevel: ........`
+  * New log format: `[DATE TIME] servername subsystem.EVENT_ID loglevel: ........`
+
 UnrealIRCd 6.0.2
-=================
+-----------------
 UnrealIRCd 6.0.2 comes with several nice feature enhancements along with
 some fixes. It also includes a fix for a crash bug that can be triggered
 by ordinary users.
 
-If you are already running UnrealIRCd 6 then read below on the fixes
-and nice new features in 6.0.2. Otherwise, jump straight to the
-[summary about UnrealIRCd 6](#Summary) to learn more about UnrealIRCd 6.
-
 Fixes:
 * Fix crash that can be triggered by regular users if you have any `deny dcc`
   blocks in the config or any spamfilters with the `d` (DCC) target.

extras/doxygen/Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = "UnrealIRCd"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 6.0.2
+PROJECT_NUMBER         = 6.0.3-git
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

include/h.h

@@ -518,6 +518,7 @@ extern int  channel_canjoin(Client *client, const char *name);
 extern char *collapse(char *pattern);
 extern void dcc_sync(Client *client);
 extern void request_rehash(Client *client);
+extern int rehash_internal(Client *client);
 extern void s_die();
 extern int match_simple(const char *mask, const char *name);
 extern int match_esc(const char *mask, const char *name);

include/windows/setup.h

@@ -62,10 +62,10 @@
 #define UNREAL_VERSION_MAJOR 0
 
 /* Minor version number (e.g.: 1 for Unreal3.2.1) */
-#define UNREAL_VERSION_MINOR 2
+#define UNREAL_VERSION_MINOR 3
 
 /* Version suffix such as a beta marker or release candidate marker. (e.g.:
    -rcX for unrealircd-3.2.9-rcX) */
-#define UNREAL_VERSION_SUFFIX ""
+#define UNREAL_VERSION_SUFFIX "-git"
 
 #endif

src/conf.c

@@ -10638,13 +10638,6 @@ void resource_download_complete(const char *url, const char *file, const char *e
 				safe_strdup(wce->ce->value, rs->file); // now information of url is lost, hm!!
 		}
 	}
-
-	/* If rehashing, check if we are done.
-	 * If booting (not rehashing), this is done from the
-	 * startup loop where it also checks is_config_read_finished().
-	 */
-	if (loop.rehashing && is_config_read_finished())
-		rehash_internal(loop.rehash_save_client);
 }
 
 /** Request to REHASH the configuration file.

src/ircd.c

@@ -914,6 +914,9 @@ void SocketLoop(void *dummy)
 			reinit_tls();
 			doreloadcert = 0;
 		}
+		/* If rehashing, check if we are done. */
+		if (loop.rehashing && is_config_read_finished())
+			rehash_internal(loop.rehash_save_client);
 	}
 }
 

src/log.c

@@ -1191,7 +1191,7 @@ literal:
 }
 
 /** Do the actual writing to log files */
-void do_unreal_log_disk(LogLevel loglevel, const char *subsystem, const char *event_id, MultiLine *msg, const char *json_serialized)
+void do_unreal_log_disk(LogLevel loglevel, const char *subsystem, const char *event_id, MultiLine *msg, const char *json_serialized, Client *from_server)
 {
 	static int last_log_file_warning = 0;
 	Log *l;
@@ -1343,13 +1343,9 @@ void do_unreal_log_disk(LogLevel loglevel, const char *subsystem, const char *ev
 			for (m = msg; m; m = m->next)
 			{
 				char text_buf[8192];
-				snprintf(text_buf, sizeof(text_buf), "%s.%s%s %s: %s\n", subsystem, event_id, m->next?"+":"", log_level_valtostring(loglevel), m->line);
-				// FIXME: don't write in 2 stages, waste of slow system calls
-				if (write(l->logfd, timebuf, strlen(timebuf)) < 0)
-				{
-					/* Let's ignore any write errors for this one. Next write() will catch it... */
-					;
-				}
+				snprintf(text_buf, sizeof(text_buf), "%s%s %s.%s%s %s: %s\n",
+					timebuf, from_server->name,
+					subsystem, event_id, m->next?"+":"", log_level_valtostring(loglevel), m->line);
 				n = write(l->logfd, text_buf, strlen(text_buf));
 				if (n < strlen(text_buf))
 				{
@@ -1824,16 +1820,17 @@ void do_unreal_log_internal(LogLevel loglevel, const char *subsystem, const char
 	/* Convert the message buffer to MultiLine */
 	mmsg = line2multiline(msgbuf);
 
-	/* Now call the disk loggers */
-	do_unreal_log_disk(loglevel, subsystem, event_id, mmsg, json_serialized);
-
-	/* And the ircops stuff */
+	/* Parse the "from server" info, if any */
 	t = json_object_get(j_details, "from_server_name");
 	if (t && (str = json_get_value(t)))
 		from_server = find_server(str, NULL);
 	if (from_server == NULL)
 		from_server = &me;
 
+	/* Now call all the loggers: */
+
+	do_unreal_log_disk(loglevel, subsystem, event_id, mmsg, json_serialized, from_server);
+
 	if ((loop.rehashing == 2) || !strcmp(subsystem, "config"))
 		do_unreal_log_control(loglevel, subsystem, event_id, mmsg, json_serialized, from_server);
 
@@ -1860,7 +1857,7 @@ void do_unreal_log_internal_from_remote(LogLevel loglevel, const char *subsystem
 	unreal_log_recursion_trap = 1;
 
 	/* Call the disk loggers */
-	do_unreal_log_disk(loglevel, subsystem, event_id, msg, json_serialized);
+	do_unreal_log_disk(loglevel, subsystem, event_id, msg, json_serialized, from_server);
 
 	/* And to IRC */
 	do_unreal_log_opers(loglevel, subsystem, event_id, msg, json_serialized, from_server);

src/misc.c

@@ -2480,6 +2480,7 @@ void server_reboot(const char *mesg)
 		(void)close(2);
 	(void)close(1);
 	(void)close(0);
+	close_std_descriptors();
 	(void)execv(MYNAME, myargv);
 #else
 	close_connections();

src/version.c.SH

@@ -7,7 +7,7 @@ echo "Extracting src/version.c..."
 if [ -d ../.git ]; then
 	SUFFIX="-$(git rev-parse --short HEAD)"
 fi
-id="6.0.2$SUFFIX"
+id="6.0.3-git$SUFFIX"
 echo "$id"
 
 if test -r version.c

src/windows/UnrealIRCd.exe.manifest

@@ -3,7 +3,7 @@
 <assemblyIdentity
     processorArchitecture="amd64"
     name="UnrealIRCd.UnrealIRCd.6"
-    version="6.0.2.0"
+    version="6.0.3.0"
     type="win32"
 />
 <description>Internet Relay Chat Daemon</description>

src/windows/unrealinst.iss

@@ -6,7 +6,7 @@
 
 [Setup]
 AppName=UnrealIRCd 6
-AppVerName=UnrealIRCd 6.0.2
+AppVerName=UnrealIRCd 6.0.3-git
 AppPublisher=UnrealIRCd Team
 AppPublisherURL=https://www.unrealircd.org
 AppSupportURL=https://www.unrealircd.org