August 2012 - ngIRCd GIT Updates

Alexander Barton : New function MatchCaseInsensitiveList() to check list of patterns
by alex＠arthur.barton.de 26 Aug '12

26 Aug '12

Module: ngircd.git Branch: master Commit: ab1fcebeff1593bf50bd091706a9b2f447db88cf URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=ab1fcebe… Author: Alexander Barton <alex(a)barton.de> Date: Sun Aug 26 13:11:45 2012 +0200 New function MatchCaseInsensitiveList() to check list of patterns --- src/ngircd/match.c | 49 +++++++++++++++++++++++++++++++++++++++---------- src/ngircd/match.h | 12 +++++++++--- 2 files changed, 48 insertions(+), 13 deletions(-) diff --git a/src/ngircd/match.c b/src/ngircd/match.c index 79699ea..75bf435 100644 --- a/src/ngircd/match.c +++ b/src/ngircd/match.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001,2002 by Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2012 Alexander Barton (alex(a)barton.de) and Contributors. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -48,9 +48,9 @@ static int Matche_After_Star PARAMS(( const char *p, const char *t )); /** * Match string with pattern. * - * @param Pattern Pattern to match with - * @param String Input string - * @return true if pattern matches + * @param Pattern Pattern to match with + * @param String Input string + * @return true if pattern matches */ GLOBAL bool Match( const char *Pattern, const char *String ) @@ -64,17 +64,46 @@ Match( const char *Pattern, const char *String ) /** * Match string with pattern case-insensitive. * - * @param pattern Pattern to match with - * @param searchme Input string, at most COMMAND_LEN-1 characters long - * @return true if pattern matches + * @param Pattern Pattern to match with + * @param String Input string, at most COMMAND_LEN-1 characters long + * @return true if pattern matches */ GLOBAL bool -MatchCaseInsensitive(const char *pattern, const char *searchme) +MatchCaseInsensitive(const char *Pattern, const char *String) { char haystack[COMMAND_LEN]; - strlcpy(haystack, searchme, sizeof(haystack)); - return Match(pattern, ngt_LowerStr(haystack)); + strlcpy(haystack, String, sizeof(haystack)); + return Match(Pattern, ngt_LowerStr(haystack)); +} /* MatchCaseInsensitive */ + + +/** + * Match string with pattern case-insensitive. + * + * @param pattern Pattern to match with + * @param String Input string, at most COMMAND_LEN-1 characters long + * @param Separator Character separating the individual patterns in the list + * @return true if pattern matches + */ +GLOBAL bool +MatchCaseInsensitiveList(const char *Pattern, const char *String, + const char *Separator) +{ + char tmp_pattern[COMMAND_LEN], haystack[COMMAND_LEN], *ptr; + + strlcpy(tmp_pattern, Pattern, sizeof(tmp_pattern)); + strlcpy(haystack, String, sizeof(haystack)); + ngt_LowerStr(haystack); + + ptr = strtok(tmp_pattern, Separator); + while (ptr) { + ngt_TrimStr(ptr); + if (Match(ptr, haystack)) + return true; + ptr = strtok(NULL, Separator); + } + return false; } /* MatchCaseInsensitive */ diff --git a/src/ngircd/match.h b/src/ngircd/match.h index 2efe3f5..d4107fb 100644 --- a/src/ngircd/match.h +++ b/src/ngircd/match.h @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001,2002 by Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2012 Alexander Barton (alex(a)barton.de) and Contributors. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,8 +17,14 @@ * Wildcard pattern matching (header) */ -GLOBAL bool Match PARAMS(( const char *Pattern, const char *String )); -GLOBAL bool MatchCaseInsensitive PARAMS(( const char *Pattern, const char *searchme )); +GLOBAL bool Match PARAMS((const char *Pattern, const char *String)); + +GLOBAL bool MatchCaseInsensitive PARAMS((const char *Pattern, + const char *String)); + +GLOBAL bool MatchCaseInsensitiveList PARAMS((const char *Pattern, + const char *String, + const char *Separator)); #endif

1 0

Alexander Barton : Block nicknames that are reserved for services
by alex＠arthur.barton.de 26 Aug '12

26 Aug '12

Module: ngircd.git Branch: master Commit: a6dd2e33c2c9e60bbd286bb07a7a6273566dec7d URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a6dd2e33… Author: Alexander Barton <alex(a)barton.de> Date: Sun Aug 26 12:33:21 2012 +0200 Block nicknames that are reserved for services This patch introduces the new function Conf_NickIsBlocked() which checks if a given nick name matches with the "service mask" of a configured server. And Client_CheckNick() uses this information to deny such names for regular IRC users. So nick names intended for IRC services are more protected and can't be used by regular users even when the "services pseudo-server" isn't connected to the network. But please note: Up to now, there can be only one "ServiceMask" pattern per server, which most probably blocks much more nick names than really required ... So "ServiceMask" should allow more than one pattern which can be more specific, and most probably it should be possible to block nick names in the global server configuration as well. Nick names introduced by other servers/services are never restricted. --- src/ngircd/client.c | 10 ++++++++++ src/ngircd/conf.c | 21 +++++++++++++++++++++ src/ngircd/conf.h | 3 ++- src/ngircd/messages.h | 1 + 4 files changed, 34 insertions(+), 1 deletion(-) diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 2466c71..f163f72 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -905,6 +905,16 @@ Client_CheckNick(CLIENT *Client, char *Nick) return false; } + if (Client_Type(Client) != CLIENT_SERVER + && Client_Type(Client) != CLIENT_SERVICE) { + /* Make sure that this isn't a restricted/forbidden nick name */ + if (Conf_NickIsBlocked(Nick)) { + IRC_WriteStrClient(Client, ERR_FORBIDDENNICKNAME_MSG, + Client_ID(Client), Nick); + return false; + } + } + /* Nickname already registered? */ if (Client_Search(Nick)) { IRC_WriteStrClient(Client, ERR_NICKNAMEINUSE_MSG, diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 16ad98c..41b5469 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -652,6 +652,27 @@ Conf_NickIsService(int ConfServer, const char *Nick) } /** + * Check if the given nick name is blocked for "normal client" use. + * + * @param ConfServer The server index or NONE to check all configured servers. + * @param Nick The nick name to check. + * @returns true if the given nick name belongs to an "IRC service". + */ +GLOBAL bool +Conf_NickIsBlocked(const char *Nick) +{ + int i; + + for(i = 0; i < MAX_SERVERS; i++) { + if (!Conf_Server[i].name[0]) + continue; + if (Conf_NickIsService(i, Nick)) + return true; + } + return false; +} + +/** * Initialize configuration settings with their default values. */ static void diff --git a/src/ngircd/conf.h b/src/ngircd/conf.h index 72c8039..8e66c07 100644 --- a/src/ngircd/conf.h +++ b/src/ngircd/conf.h @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2011 Alexander Barton (alex(a)barton.de) and Contributors. + * Copyright (c)2001-2012 Alexander Barton (alex(a)barton.de) and Contributors. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -245,6 +245,7 @@ GLOBAL bool Conf_DisableServer PARAMS(( const char *Name )); GLOBAL bool Conf_AddServer PARAMS(( const char *Name, UINT16 Port, const char *Host, const char *MyPwd, const char *PeerPwd )); GLOBAL bool Conf_NickIsService PARAMS((int ConfServer, const char *Nick)); +GLOBAL bool Conf_NickIsBlocked PARAMS((const char *Nick)); /* Password required by WEBIRC command */ GLOBAL char Conf_WebircPwd[CLIENT_PASS_LEN]; diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h index 96ff2de..9ad6be1 100644 --- a/src/ngircd/messages.h +++ b/src/ngircd/messages.h @@ -112,6 +112,7 @@ #define ERR_NONICKNAMEGIVEN_MSG "431 %s :No nickname given" #define ERR_ERRONEUSNICKNAME_MSG "432 %s %s :Erroneous nickname" #define ERR_NICKNAMETOOLONG_MSG "432 %s %s :Nickname too long, max. %u characters" +#define ERR_FORBIDDENNICKNAME_MSG "432 %s %s :Nickname is forbidden/blocked" #define ERR_NICKNAMEINUSE_MSG "433 %s %s :Nickname already in use" #define ERR_USERNOTINCHANNEL_MSG "441 %s %s %s :They aren't on that channel" #define ERR_NOTONCHANNEL_MSG "442 %s %s :You are not on that channel"

1 0

Alexander Barton : Rename Conf_IsService() to Conf_NickIsService()
by alex＠arthur.barton.de 26 Aug '12

26 Aug '12

Module: ngircd.git Branch: master Commit: 9d8974d5098e9426f9185f31b2b3853e55513f3e URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=9d8974d5… Author: Alexander Barton <alex(a)barton.de> Date: Sun Aug 26 12:27:51 2012 +0200 Rename Conf_IsService() to Conf_NickIsService() --- src/ngircd/client.c | 4 ++-- src/ngircd/conf.c | 9 +++++++-- src/ngircd/conf.h | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 49e2739..2466c71 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2010 Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2012 Alexander Barton (alex(a)barton.de) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -1175,7 +1175,7 @@ Client_Introduce(CLIENT *From, CLIENT *Client, int Type) Client_SetType(Client, Type); if (From) { - if (Conf_IsService(Conf_GetServer(Client_Conn(From)), + if (Conf_NickIsService(Conf_GetServer(Client_Conn(From)), Client_ID(Client))) Client_SetType(Client, CLIENT_SERVICE); LogDebug("%s \"%s\" (+%s) registered (via %s, on %s, %d hop%s).", diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 923cdc0..16ad98c 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -636,13 +636,18 @@ Conf_AddServer(const char *Name, UINT16 Port, const char *Host, } /** - * Check if the given nick name is an service. + * Check if the given nick name is reserved for services on a particular server. * + * @param ConfServer The server index to check. + * @param Nick The nick name to check. * @returns true if the given nick name belongs to an "IRC service". */ GLOBAL bool -Conf_IsService(int ConfServer, const char *Nick) +Conf_NickIsService(int ConfServer, const char *Nick) { + assert (ConfServer >= 0); + assert (ConfServer < MAX_SERVERS); + return MatchCaseInsensitive(Conf_Server[ConfServer].svs_mask, Nick); } diff --git a/src/ngircd/conf.h b/src/ngircd/conf.h index 4e7e379..72c8039 100644 --- a/src/ngircd/conf.h +++ b/src/ngircd/conf.h @@ -244,7 +244,7 @@ GLOBAL bool Conf_EnablePassiveServer PARAMS((const char *Name)); GLOBAL bool Conf_DisableServer PARAMS(( const char *Name )); GLOBAL bool Conf_AddServer PARAMS(( const char *Name, UINT16 Port, const char *Host, const char *MyPwd, const char *PeerPwd )); -GLOBAL bool Conf_IsService PARAMS((int ConfServer, const char *Nick)); +GLOBAL bool Conf_NickIsService PARAMS((int ConfServer, const char *Nick)); /* Password required by WEBIRC command */ GLOBAL char Conf_WebircPwd[CLIENT_PASS_LEN];

1 0

Alexander Barton : Check_Connections(): code cleanup
by alex＠arthur.barton.de 26 Aug '12

26 Aug '12

Module: ngircd.git Branch: master Commit: 037b4b76df6122f86d8c9536eb761664a5d71e53 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=037b4b76… Author: Alexander Barton <alex(a)barton.de> Date: Sun Aug 26 12:04:40 2012 +0200 Check_Connections(): code cleanup --- src/ngircd/conn.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 06236fd..28a0341 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -1839,10 +1839,10 @@ Check_Connections(void) if (My_Connections[i].lastping < time(NULL) - Conf_PongTimeout) { /* Timeout */ - LogDebug - ("Connection %d: Ping timeout: %d seconds.", - i, Conf_PongTimeout); - snprintf(msg, sizeof(msg), "Ping timeout: %d seconds", Conf_PongTimeout); + snprintf(msg, sizeof(msg), + "Ping timeout: %d seconds", + Conf_PongTimeout); + LogDebug("Connection %d: %s.", i, msg); Conn_Close(i, NULL, msg, true); } } else if (My_Connections[i].lastdata <

1 0

Alexander Barton : Xcode: use certificate of Alex for code signing
by alex＠arthur.barton.de 22 Aug '12

22 Aug '12

Module: ngircd.git Branch: master Commit: 4b0f526006adb30bb127cde29ff67e8bd97352c2 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=4b0f5260… Author: Alexander Barton <alex(a)barton.de> Date: Wed Aug 22 00:46:30 2012 +0200 Xcode: use certificate of Alex for code signing When doing non-debug Xcode builds, use the "Developer ID Application: Alexander Barton" certificate for code signing by default. --- contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj b/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj index 6da1cb3..ac3f623 100644 --- a/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj +++ b/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj @@ -787,6 +787,7 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + CODE_SIGN_IDENTITY = "Developer ID Application: Alexander Barton"; GCC_VERSION = 4.2; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES;

1 0

Alexander Barton : "make uninstall": remove ngircd.conf if not modified
by alex＠arthur.barton.de 18 Aug '12

18 Aug '12

Module: ngircd.git Branch: master Commit: 4cf65b973c780880047b0ad4e77e95cf7315cb0f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=4cf65b97… Author: Alexander Barton <alex(a)barton.de> Date: Sat Aug 18 23:50:20 2012 +0200 "make uninstall": remove ngircd.conf if not modified Now "make uninstall" removes the installed "ngircd.conf" file, if it is still equal to our "sample-ngircd.conf" file and therefore hasn't been modified by the user. If it has been modified, it isn't removed and a notice is displayed to the user. In addition, "make install" now displays a message when no ngircd.conf file exists and the "sample-ngircd.conf" file will be installed as a starting point. --- doc/Makefile.am | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 92e019b..3bf68fb 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -52,8 +52,8 @@ all: $(generated_docs) install-data-hook: $(static_docs) $(toplevel_docs) $(generated_docs) $(mkinstalldirs) $(DESTDIR)$(sysconfdir) - if [ ! -f $(DESTDIR)$(sysconfdir)/ngircd.conf ]; then \ - $(INSTALL) -m 600 -c sample-ngircd.conf $(DESTDIR)$(sysconfdir)/ngircd.conf; \ + @if [ ! -f $(DESTDIR)$(sysconfdir)/ngircd.conf ]; then \ + make install-config; \ fi $(mkinstalldirs) $(DESTDIR)$(docdir) for f in $(static_docs) $(toplevel_docs); do \ @@ -63,10 +63,30 @@ install-data-hook: $(static_docs) $(toplevel_docs) $(generated_docs) $(INSTALL) -m 644 -c $$f $(DESTDIR)$(docdir)/; \ done +install-config: + $(INSTALL) -m 600 -c sample-ngircd.conf $(DESTDIR)$(sysconfdir)/ngircd.conf + @echo; \ + echo " ** NOTE: Installed sample configuration file:"; \ + echo " ** \"$(DESTDIR)$(sysconfdir)/ngircd.conf\""; \ + echo + uninstall-hook: rm -rf $(DESTDIR)$(docdir) + @if cmp --silent sample-ngircd.conf $(DESTDIR)$(sysconfdir)/ngircd.conf; then \ + make uninstall-config; \ + else \ + echo; \ + echo " ** NOTE: Not uninstalling changed configuration file:"; \ + echo " ** \"$(DESTDIR)$(sysconfdir)/ngircd.conf\""; \ + echo; \ + fi + +uninstall-config: + rm -f $(DESTDIR)$(sysconfdir)/ngircd.conf srcdoc: make -C src srcdoc +.PHONY: install-config uninstall-config srcdoc + # -eof-

1 0

Alexander Barton : contrib/ngircd.service: systemd service file for ngircd
by alex＠arthur.barton.de 18 Aug '12

18 Aug '12

Module: ngircd.git Branch: master Commit: 160f728530806385dbeee398a20fe5eac7318c5a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=160f7285… Author: Alexander Barton <alex(a)barton.de> Date: Sat Aug 18 15:51:28 2012 +0200 contrib/ngircd.service: systemd service file for ngircd Thanks to Kyle Keen <keenerd(a)gmail.com>: Date: Sat, 18 Aug 2012 08:28:22 -0400 Message-ID: <CAAKTTKNNmrB=8XtxcV6w1Q-RQ6J_xTTDGD4MHQFaDy6V3=B19Q(a)mail.gmail.com> From: keenerd <keenerd(a)gmail.com> To: ngircd-ml(a)ngircd.barton.de Subject: [ngIRCd-ML] systemd service Hello all. Linked is a service file for ngircd. Please add this to your source tree so other people don't have to learn to write service files ;-) https://projects.archlinux.org/svntogit/community.git/plain/trunk/ngircd.se… -Kyle Keen Arch Linux TU http://kmkeen.com --- contrib/Makefile.am | 11 +++++++++-- contrib/ngircd.service | 11 +++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 36ba245..73611fd 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -11,8 +11,15 @@ SUBDIRS = Anope Debian MacOSX -EXTRA_DIST = README ngircd.spec systrace.policy ngindent ngircd-bsd.sh \ - ngIRCd-Logo.gif ngircd-redhat.init platformtest.sh +EXTRA_DIST = README \ + ngindent \ + ngircd-bsd.sh \ + ngIRCd-Logo.gif \ + ngircd-redhat.init \ + ngircd.service + ngircd.spec \ + platformtest.sh \ + systrace.policy maintainer-clean-local: rm -f Makefile Makefile.in diff --git a/contrib/ngircd.service b/contrib/ngircd.service new file mode 100644 index 0000000..b5bab06 --- /dev/null +++ b/contrib/ngircd.service @@ -0,0 +1,11 @@ +[Unit] +Description=Next Generation IRC Daemon +After=network.target + +[Service] +# don't daemonize to simplify stuff +ExecStart=/usr/sbin/ngircd -n +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target

1 0

Alexander Barton : ngt_RandomStr(): Add implicit cast to "unsigned".
by alex＠arthur.barton.de 18 Aug '12

18 Aug '12

Module: ngircd.git Branch: master Commit: 922540306e968b3c64150e771d0773273535b661 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=92254030… Author: Alexander Barton <alex(a)barton.de> Date: Sat Aug 18 12:34:11 2012 +0200 ngt_RandomStr(): Add implicit cast to "unsigned". This fixes the following warning of Xcode 4.5: src/tool/tool.c:150:19: Implicit conversion loses integer precision: 'long' to 'unsigned int' --- src/tool/tool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tool/tool.c b/src/tool/tool.c index 31c6fb4..df10918 100644 --- a/src/tool/tool.c +++ b/src/tool/tool.c @@ -147,7 +147,7 @@ ngt_RandomStr( char *String, const size_t len) struct timeval t; gettimeofday(&t, NULL); - srand(t.tv_usec * t.tv_sec); + srand((unsigned)(t.tv_usec * t.tv_sec)); for (size_t i = 0; i < len; ++i) { String[i] = chars[rand() % (sizeof(chars) - 1)];

1 0

Alexander Barton : ngt_RandomStr(): Add implicit cast to "unsigned".
by alex＠arthur.barton.de 18 Aug '12

18 Aug '12

Module: ngircd.git Branch: master Commit: 99aef1d0b93e3499dd9a4babdf8cd51358ba8827 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=99aef1d0… Author: Alexander Barton <alex(a)barton.de> Date: Sat Aug 18 12:31:01 2012 +0200 ngt_RandomStr(): Add implicit cast to "unsigned". This fixes the following warning of Xcode 4.5: src/tool/tool.c:150:19: Implicit conversion loses integer precision: 'long' to 'unsigned int' --- src/tool/tool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tool/tool.c b/src/tool/tool.c index 31c6fb4..a6b4723 100644 --- a/src/tool/tool.c +++ b/src/tool/tool.c @@ -147,7 +147,7 @@ ngt_RandomStr( char *String, const size_t len) struct timeval t; gettimeofday(&t, NULL); - srand(t.tv_usec * t.tv_sec); + srand((t.tv_usec * t.tv_sec)); for (size_t i = 0; i < len; ++i) { String[i] = chars[rand() % (sizeof(chars) - 1)];

1 0

Alexander Barton : Fix a buffer overflow when initializing the random salt for "+x"
by alex＠arthur.barton.de 16 Aug '12

16 Aug '12

Module: ngircd.git Branch: master Commit: d48e440a722cb56fd3c2996d2d3c87ce7f471042 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=d48e440a… Author: Alexander Barton <alex(a)barton.de> Date: Thu Aug 16 23:51:28 2012 +0200 Fix a buffer overflow when initializing the random salt for "+x" This "off by one" buffer overflow has been introduced in commit 49385a98, "Implemented hashed cloaked hostnames for +x". --- src/ngircd/conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index b091137..923cdc0 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -653,7 +653,7 @@ static void Set_Defaults(bool InitServers) { int i; - char random[RANDOM_SALT_LEN]; + char random[RANDOM_SALT_LEN + 1]; /* Global */ strcpy(Conf_ServerName, "");

1 0