Merge branch '1.9' of ssh://anope.git.sf.net/gitroot/anope/anope into 1.9

2 files changed, 1 insertions, 28 deletions

diff --git a/src/tools/README b/src/tools/README
deleted file mode 100644
index 0b2b2ec32..000000000
--- a/src/tools/README
+++ /dev/null
@@ -1,27 +0,0 @@
-Anope Bundled Tools
--------------------
-
-1) Anope SMTP Client
-
-    Provided with Anope is a simple SMTP client which can be used instead of
-    programs like SendMail in some cases.
-
-    The SMTP client can be used instead of sendmail for use with Anope's mail
-    options. To use the SMTP client instead of sendmail, find the line in your
-    services configuration file (services.conf) that defines SendMailPath. On
-    that line, change the path to your services installation directory, then
-    followed by "tools/anopesmtp" and the IP address of a valid SMTP server. It
-    should look like this:
-
-        SendMailPath "/home/anope/services/tools/anopesmtp 127.0.0.1"
-
-    If the SMTP client doesn't send mail, or if there's an other problem with
-    it, you can compile it in debug mode. To do this, open smtp.h, and look
-    for "smtp_debug" near the bottom. Change this from 0 to 1 and recompile
-    the code. This should generate a log file of what happened when it tried
-    to connect to the SMTP server.
-
-        Credits:
-    Originally written by  Dominick Meglio    <codemastr@unrealircd.com>
-    Ported to *nix by      Trystan Scott Lee  <trystan@nomadirc.net>
-
diff --git a/src/tools/db-convert.c b/src/tools/db-convert.c
index 20f8718d1..34bb01d8c 100644
--- a/src/tools/db-convert.c
+++ b/src/tools/db-convert.c
@@ -391,7 +391,7 @@ int main(int argc, char *argv[])
 
 			if (nc->accesscount)
 			{
-				for (j = 0, access = nc->access; j < nc->accesscount; j++, access++)
+				for (j = 0, access = nc->access; j < nc->accesscount && *access; j++, access++)
 					fs << "MD ACCESS " << *access << std::endl;
 			}