Mai 2013 - ngIRCd GIT Updates

Alexander Barton : Merge pull request #3 from Cofyc/master
by alex＠arthur.barton.de 30 Mai '13

30 Mai '13

Module: ngircd.git Branch: master Commit: 9d3800fd15a273f23f51c1f1ab3bc75dacf6c589 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=9d3800fd… Author: Alexander Barton <alex(a)barton.de> Date: Thu May 30 08:55:48 2013 -0700 Merge pull request #3 from Cofyc/master irc-info.c: some commands use LINE_LEN as command buffer len ---

1 0

Yecheng Fu : LINE_LEN -> COMMAND_LEN
by alex＠arthur.barton.de 30 Mai '13

30 Mai '13

Module: ngircd.git Branch: master Commit: 4f525d39d4ca885da69800c396045459af8bb0eb URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=4f525d39… Author: Yecheng Fu <cofyc.jackson(a)gmail.com> Date: Thu May 30 13:53:33 2013 +0800 LINE_LEN -> COMMAND_LEN LINE_LEN is configuration file line length --- src/ngircd/irc-info.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 24d6565..668f5ed 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -298,7 +298,7 @@ IRC_WHO_Mask(CLIENT *Client, char *Mask, bool OnlyOps) static bool IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c) { - char str[LINE_LEN + 1]; + char str[COMMAND_LEN]; CL2CHAN *cl2chan; CHANNEL *chan; @@ -347,7 +347,7 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c) str, sizeof(str)); strlcat(str, Channel_Name(chan), sizeof(str)); - if (strlen(str) > (LINE_LEN - CHANNEL_NAME_LEN - 4)) { + if (strlen(str) > (COMMAND_LEN - CHANNEL_NAME_LEN - 4)) { /* Line becomes too long: send it! */ if (!IRC_WriteStrClient(Client, "%s", str)) return DISCONNECTED; @@ -838,7 +838,7 @@ IRC_NAMES( CLIENT *Client, REQUEST *Req ) strlcat(rpl, " ", sizeof(rpl)); strlcat(rpl, Client_ID(c), sizeof(rpl)); - if (strlen(rpl) > LINE_LEN - CLIENT_NICK_LEN - 4) { + if (strlen(rpl) > COMMAND_LEN - CLIENT_NICK_LEN - 4) { /* Line is gwoing too long, send now */ if (!IRC_WriteStrClient(from, "%s", rpl)) return DISCONNECTED; @@ -1501,7 +1501,7 @@ GLOBAL bool IRC_Send_NAMES(CLIENT * Client, CHANNEL * Chan) { bool is_visible, is_member; - char str[LINE_LEN + 1]; + char str[COMMAND_LEN]; CL2CHAN *cl2chan; CLIENT *cl; @@ -1540,7 +1540,7 @@ IRC_Send_NAMES(CLIENT * Client, CHANNEL * Chan) str, sizeof(str)); strlcat(str, Client_ID(cl), sizeof(str)); - if (strlen(str) > (LINE_LEN - CLIENT_NICK_LEN - 4)) { + if (strlen(str) > (COMMAND_LEN - CLIENT_NICK_LEN - 4)) { if (!IRC_WriteStrClient(Client, "%s", str)) return DISCONNECTED; snprintf(str, sizeof(str), RPL_NAMREPLY_MSG,

1 0

Alexander Barton : IncludeDir: default to "$SYSCONFDIR/ngircd.conf.d"
by alex＠arthur.barton.de 30 Mai '13

30 Mai '13

Module: ngircd.git Branch: master Commit: 7ea3864a9369086024a2d541b053963958b19899 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=7ea3864a… Author: Alexander Barton <alex(a)barton.de> Date: Sat May 25 00:25:38 2013 +0200 IncludeDir: default to "$SYSCONFDIR/ngircd.conf.d" Now "IncludeDir" defaults to "$SYSCONFDIR/ngircd.conf.d" instead of no directory, but a missing directory is only reported as an error if it has explicitely configured in the main configuration file and simply ignored otherwise. Therefore it is now possible not to touch the default (sample) configuration file at all, and set all distribution and/or system specific configuration options in "*.conf" files stored in "$SYSCONFDIF/ngircd.conf.d/". Thanks to "Elmasloco" for the idea! --- src/ngircd/conf.c | 52 ++++++++++++++++++++++----------------- src/ngircd/defines.h | 5 +++- src/testsuite/ngircd-test1.conf | 1 + src/testsuite/ngircd-test2.conf | 1 + 4 files changed, 35 insertions(+), 24 deletions(-) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index c08183d..aad64b3 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -947,33 +947,39 @@ Read_Config(bool TestOnly, bool IsStarting) fclose(fd); if (Conf_IncludeDir[0]) { - /* Include further configuration files, if any */ dh = opendir(Conf_IncludeDir); - if (dh) { - while ((entry = readdir(dh)) != NULL) { - ptr = strrchr(entry->d_name, '.'); - if (!ptr || strcasecmp(ptr, ".conf") != 0) - continue; - snprintf(file, sizeof(file), "%s/%s", - Conf_IncludeDir, entry->d_name); - if (TestOnly) - Config_Error(LOG_INFO, - "Reading configuration from \"%s\" ...", - file); - fd = fopen(file, "r"); - if (fd) { - Read_Config_File(file, fd); - fclose(fd); - } else - Config_Error(LOG_ALERT, - "Can't read configuration \"%s\": %s", - file, strerror(errno)); - } - closedir(dh); - } else + if (!dh) Config_Error(LOG_ALERT, "Can't open include directory \"%s\": %s", Conf_IncludeDir, strerror(errno)); + } else { + strlcpy(Conf_IncludeDir, SYSCONFDIR, sizeof(Conf_IncludeDir)); + strlcat(Conf_IncludeDir, CONFIG_DIR, sizeof(Conf_IncludeDir)); + dh = opendir(Conf_IncludeDir); + } + + /* Include further configuration files, if IncludeDir is available */ + if (dh) { + while ((entry = readdir(dh)) != NULL) { + ptr = strrchr(entry->d_name, '.'); + if (!ptr || strcasecmp(ptr, ".conf") != 0) + continue; + snprintf(file, sizeof(file), "%s/%s", + Conf_IncludeDir, entry->d_name); + if (TestOnly) + Config_Error(LOG_INFO, + "Reading configuration from \"%s\" ...", + file); + fd = fopen(file, "r"); + if (fd) { + Read_Config_File(file, fd); + fclose(fd); + } else + Config_Error(LOG_ALERT, + "Can't read configuration \"%s\": %s", + file, strerror(errno)); + } + closedir(dh); } /* Check if there is still a server to add */ diff --git a/src/ngircd/defines.h b/src/ngircd/defines.h index cffbfad..7784c17 100644 --- a/src/ngircd/defines.h +++ b/src/ngircd/defines.h @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2012 Alexander Barton (alex(a)barton.de) and Contributors. + * Copyright (c)2001-2013 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 @@ -73,6 +73,9 @@ /** Configuration file name. */ #define CONFIG_FILE "/ngircd.conf" +/** Directory containing optional configuration snippets. */ +#define CONFIG_DIR "/ngircd.conf.d" + /** Name of the MOTD file. */ #define MOTD_FILE "/ngircd.motd" diff --git a/src/testsuite/ngircd-test1.conf b/src/testsuite/ngircd-test1.conf index 1e40fd3..0d0cccc 100644 --- a/src/testsuite/ngircd-test1.conf +++ b/src/testsuite/ngircd-test1.conf @@ -16,6 +16,7 @@ [Options] OperCanUseMode = yes Ident = no + IncludeDir = /var/empty PAM = no [Operator] diff --git a/src/testsuite/ngircd-test2.conf b/src/testsuite/ngircd-test2.conf index e3f8867..c9d7f6c 100644 --- a/src/testsuite/ngircd-test2.conf +++ b/src/testsuite/ngircd-test2.conf @@ -16,6 +16,7 @@ [Options] OperCanUseMode = yes Ident = no + IncludeDir = /var/empty PAM = no [Operator]

1 0

Alexander Barton : "IncludeDir" can't be overwritten by included files
by alex＠arthur.barton.de 30 Mai '13

30 Mai '13

Module: ngircd.git Branch: master Commit: 891dbd2acc59a6d9ff6dd8a5b12e91f5a8fa20ed URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=891dbd2a… Author: Alexander Barton <alex(a)barton.de> Date: Fri May 24 22:40:23 2013 +0200 "IncludeDir" can't be overwritten by included files --- src/ngircd/conf.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index d7e1a15..c08183d 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -1684,6 +1684,12 @@ Handle_OPTIONS(const char *File, int Line, char *Var, char *Arg) return; } if (strcasecmp(Var, "IncludeDir") == 0) { + if (Conf_IncludeDir[0]) { + Config_Error(LOG_ERR, + "%s, line %d: Can't overwrite value of \"IncludeDir\" variable!", + File, Line); + return; + } len = strlcpy(Conf_IncludeDir, Arg, sizeof(Conf_IncludeDir)); if (len >= sizeof(Conf_IncludeDir)) Config_Error_TooLong(File, Line, Var);

1 0

Alexander Barton : Implement new configuration option "IncludeDir"
by alex＠arthur.barton.de 30 Mai '13

30 Mai '13

Module: ngircd.git Branch: master Commit: f206fda8ae14e9c76e3dca6aa67412d5ae9ee9f7 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=f206fda8… Author: Alexander Barton <alex(a)barton.de> Date: Fri May 24 22:29:41 2013 +0200 Implement new configuration option "IncludeDir" The option "IncludeDir" in the [Options] section can be used to specify a directory which can contain further configuration files and configuration file snippets matching the pattern "*.conf" that should be read in after the main configuration file ("ngircd.conf" by default) has been parsed. Closes bug #157. --- doc/sample-ngircd.conf.tmpl | 4 ++++ man/ngircd.conf.5.tmpl | 7 ++++++- src/ngircd/conf.c | 49 +++++++++++++++++++++++++++++++++++++++---- 3 files changed, 55 insertions(+), 5 deletions(-) diff --git a/doc/sample-ngircd.conf.tmpl b/doc/sample-ngircd.conf.tmpl index 822fd5d..31333ec 100644 --- a/doc/sample-ngircd.conf.tmpl +++ b/doc/sample-ngircd.conf.tmpl @@ -167,6 +167,10 @@ # prepended to their user name. ;Ident = yes + # Directory containing configuration snippets (*.conf), that should + # be read in after parsing this configuration file. + ;IncludeDir = :ETCDIR:/conf.d + # Enhance user privacy slightly (useful for IRC server on TOR or I2P) # by censoring some information like idle time, logon time, etc. ;MorePrivacy = no diff --git a/man/ngircd.conf.5.tmpl b/man/ngircd.conf.5.tmpl index e5485db..64acd92 100644 --- a/man/ngircd.conf.5.tmpl +++ b/man/ngircd.conf.5.tmpl @@ -1,7 +1,7 @@ .\" .\" ngircd.conf(5) manual page template .\" -.TH ngircd.conf 5 "Feb 2013" ngIRCd "ngIRCd Manual" +.TH ngircd.conf 5 "May 2013" ngIRCd "ngIRCd Manual" .SH NAME ngircd.conf \- configuration file of ngIRCd .SH SYNOPSIS @@ -265,6 +265,11 @@ Users identified using IDENT are registered without the "~" character prepended to their user name. Default: yes. .TP +.TP +\fBIncludeDir\fR (string) +Directory containing configuration snippets (*.conf), that should be read in +after parsing the current configuration file. +Default: none. \fBMorePrivacy\fR (boolean) This will cause ngIRCd to censor user idle time, logon time as well as the part/quit messages (that are sometimes used to inform everyone about which diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index eee1925..d7e1a15 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -34,7 +34,7 @@ #include <grp.h> #include <sys/types.h> #include <unistd.h> - +#include <dirent.h> #include "array.h" #include "ngircd.h" @@ -55,6 +55,7 @@ static int New_Server_Idx; static char Conf_MotdFile[FNAME_LEN]; static char Conf_HelpFile[FNAME_LEN]; +static char Conf_IncludeDir[FNAME_LEN]; static void Set_Defaults PARAMS(( bool InitServers )); static bool Read_Config PARAMS(( bool TestOnly, bool IsStarting )); @@ -404,6 +405,7 @@ Conf_Test( void ) #ifdef IDENT printf(" Ident = %s\n", yesno_to_str(Conf_Ident)); #endif + printf(" IncludeDir = %s\n", Conf_IncludeDir); printf(" MorePrivacy = %s\n", yesno_to_str(Conf_MorePrivacy)); printf(" NoticeAuth = %s\n", yesno_to_str(Conf_NoticeAuth)); printf(" OperCanUseMode = %s\n", yesno_to_str(Conf_OperCanMode)); @@ -778,6 +780,7 @@ Set_Defaults(bool InitServers) #else Conf_Ident = false; #endif + strcpy(Conf_IncludeDir, ""); Conf_MorePrivacy = false; Conf_NoticeAuth = false; Conf_OperCanMode = false; @@ -876,8 +879,11 @@ static bool Read_Config(bool TestOnly, bool IsStarting) { const UINT16 defaultport = 6667; + char *ptr, file[FNAME_LEN]; + struct dirent *entry; int i, n; FILE *fd; + DIR *dh; /* Open configuration file */ fd = fopen( NGIRCd_ConfFile, "r" ); @@ -938,9 +944,37 @@ Read_Config(bool TestOnly, bool IsStarting) #endif Read_Config_File(NGIRCd_ConfFile, fd); - - /* Close configuration file */ - fclose( fd ); + fclose(fd); + + if (Conf_IncludeDir[0]) { + /* Include further configuration files, if any */ + dh = opendir(Conf_IncludeDir); + if (dh) { + while ((entry = readdir(dh)) != NULL) { + ptr = strrchr(entry->d_name, '.'); + if (!ptr || strcasecmp(ptr, ".conf") != 0) + continue; + snprintf(file, sizeof(file), "%s/%s", + Conf_IncludeDir, entry->d_name); + if (TestOnly) + Config_Error(LOG_INFO, + "Reading configuration from \"%s\" ...", + file); + fd = fopen(file, "r"); + if (fd) { + Read_Config_File(file, fd); + fclose(fd); + } else + Config_Error(LOG_ALERT, + "Can't read configuration \"%s\": %s", + file, strerror(errno)); + } + closedir(dh); + } else + Config_Error(LOG_ALERT, + "Can't open include directory \"%s\": %s", + Conf_IncludeDir, strerror(errno)); + } /* Check if there is still a server to add */ if( New_Server.name[0] ) { @@ -999,6 +1033,7 @@ static void Read_Config_File(const char *File, FILE *fd) size_t count; /* Read configuration file */ + section[0] = '\0'; while (true) { if (!fgets(str, LINE_LEN, fd)) break; @@ -1648,6 +1683,12 @@ Handle_OPTIONS(const char *File, int Line, char *Var, char *Arg) WarnIdent(Line); return; } + if (strcasecmp(Var, "IncludeDir") == 0) { + len = strlcpy(Conf_IncludeDir, Arg, sizeof(Conf_IncludeDir)); + if (len >= sizeof(Conf_IncludeDir)) + Config_Error_TooLong(File, Line, Var); + return; + } if (strcasecmp(Var, "MorePrivacy") == 0) { Conf_MorePrivacy = Check_ArgIsTrue(Arg); return;

1 0

Alexander Barton : conf.c: New function Read_Config_File()
by alex＠arthur.barton.de 30 Mai '13

30 Mai '13

Module: ngircd.git Branch: master Commit: 6beb0fad3ff09ae92a7aea0e4b8ad7b00fe2e26d URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=6beb0fad… Author: Alexander Barton <alex(a)barton.de> Date: Fri May 24 21:57:42 2013 +0200 conf.c: New function Read_Config_File() This function reads in and parses a single configuration file. Adjust all other functions to display the correct name of the file being read in currently. --- src/ngircd/conf.c | 388 +++++++++++++++++++++++++++++------------------------ 1 file changed, 212 insertions(+), 176 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=6beb…

1 0