diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.in | 1 | ||||
| -rw-r--r-- | src/compat.c | 2 | ||||
| -rw-r--r-- | src/compat.h | 2 | ||||
| -rw-r--r-- | src/config-lexer.c | 2 | ||||
| -rw-r--r-- | src/config-lexer.l | 2 | ||||
| -rw-r--r-- | src/config-parser.y | 2 | ||||
| -rw-r--r-- | src/config.c | 7 | ||||
| -rw-r--r-- | src/config.h | 2 | ||||
| -rw-r--r-- | src/dnsbl.c | 6 | ||||
| -rw-r--r-- | src/dnsbl.h | 2 | ||||
| -rw-r--r-- | src/irc.c | 26 | ||||
| -rw-r--r-- | src/irc.h | 2 | ||||
| -rw-r--r-- | src/libopm/Makefile.in | 1 | ||||
| -rw-r--r-- | src/libopm/src/Makefile.in | 1 | ||||
| -rw-r--r-- | src/libopm/src/list.c | 2 | ||||
| -rw-r--r-- | src/libopm/src/list.h | 2 | ||||
| -rw-r--r-- | src/libopm/src/memory.c | 2 | ||||
| -rw-r--r-- | src/libopm/src/memory.h | 2 | ||||
| -rw-r--r-- | src/list.c | 2 | ||||
| -rw-r--r-- | src/list.h | 2 | ||||
| -rw-r--r-- | src/log.c | 2 | ||||
| -rw-r--r-- | src/log.h | 2 | ||||
| -rw-r--r-- | src/main.c | 20 | ||||
| -rw-r--r-- | src/main.h | 2 | ||||
| -rw-r--r-- | src/match.c | 2 | ||||
| -rw-r--r-- | src/match.h | 2 | ||||
| -rw-r--r-- | src/memory.c | 2 | ||||
| -rw-r--r-- | src/memory.h | 2 | ||||
| -rw-r--r-- | src/misc.c | 2 | ||||
| -rw-r--r-- | src/misc.h | 2 | ||||
| -rw-r--r-- | src/negcache.c | 2 | ||||
| -rw-r--r-- | src/negcache.h | 2 | ||||
| -rw-r--r-- | src/opercmd.c | 2 | ||||
| -rw-r--r-- | src/opercmd.h | 2 | ||||
| -rw-r--r-- | src/patchlevel.h | 2 | ||||
| -rw-r--r-- | src/scan.c | 2 | ||||
| -rw-r--r-- | src/scan.h | 2 | ||||
| -rw-r--r-- | src/stats.c | 2 | ||||
| -rw-r--r-- | src/stats.h | 2 |
39 files changed, 68 insertions, 58 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 5916cca..e0bb65e 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -374,6 +374,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/src/compat.c b/src/compat.c index c48ee77..51e30fa 100644 --- a/src/compat.c +++ b/src/compat.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2002 Andy Smith - * Copyright (c) 2014-2019 ircd-hybrid development team + * Copyright (c) 2014-2020 ircd-hybrid development team * * 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 diff --git a/src/compat.h b/src/compat.h index f9a549e..519e681 100644 --- a/src/compat.h +++ b/src/compat.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2002 Andy Smith - * Copyright (c) 2014-2019 ircd-hybrid development team + * Copyright (c) 2014-2020 ircd-hybrid development team * * 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 diff --git a/src/config-lexer.c b/src/config-lexer.c index 576db24..451d6f7 100644 --- a/src/config-lexer.c +++ b/src/config-lexer.c @@ -817,7 +817,7 @@ char *yytext; #line 1 "config-lexer.l" /* * Copyright (c) 2002 Erik Fears - * Copyright (c) 2014-2019 ircd-hybrid development team + * Copyright (c) 2014-2020 ircd-hybrid development team * * 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 diff --git a/src/config-lexer.l b/src/config-lexer.l index ad1ed61..a49dbd8 100644 --- a/src/config-lexer.l +++ b/src/config-lexer.l @@ -1,6 +1,6 @@ /* * Copyright (c) 2002 Erik Fears - * Copyright (c) 2014-2019 ircd-hybrid development team + * Copyright (c) 2014-2020 ircd-hybrid development team * * 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 diff --git a/src/config-parser.y b/src/config-parser.y index 3f98e62..bb31843 100644 --- a/src/config-parser.y +++ b/src/config-parser.y @@ -1,6 +1,6 @@ /* * Copyright (c) 2002-2003 Erik Fears - * Copyright (c) 2014-2019 ircd-hybrid development team + * Copyright (c) 2014-2020 ircd-hybrid development team * * 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 diff --git a/src/config.c b/src/config.c index 7eb9b18..99e7d67 100644 --- a/src/config.c +++ b/src/config.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2002 Erik Fears - * Copyright (c) 2014-2019 ircd-hybrid development team + * Copyright (c) 2014-2020 ircd-hybrid development team * * 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 @@ -68,7 +68,7 @@ config_setup(void) OptionsItem.command_queue_size = 64; OptionsItem.command_interval = 10; OptionsItem.command_timeout = 180; - OptionsItem.negcache = 0; /* 0 disabled negcache */ + OptionsItem.negcache = 0; /* 0 disabled negcache */ OptionsItem.negcache_rebuild = 43200; OptionsItem.pidfile = xstrdup("hopm.pid"); OptionsItem.dns_fdlimit = 50; @@ -85,7 +85,8 @@ config_load(const char *filename) strlcpy(conffilebuf, filename, sizeof(conffilebuf)); - if ((conf_file = fopen(filename, "r")) == NULL) + conf_file = fopen(filename, "r"); + if (conf_file == NULL) { log_printf("CONFIG -> Error opening %s: %s", filename, strerror(errno)); exit(EXIT_FAILURE); diff --git a/src/config.h b/src/config.h index 23caef6..e1d3214 100644 --- a/src/config.h +++ b/src/config.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2002 Erik Fears - * Copyright (c) 2014-2019 ircd-hybrid development team + * Copyright (c) 2014-2020 ircd-hybrid development team * * 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 diff --git a/src/dnsbl.c b/src/dnsbl.c index 07812d7..9082d7a 100644 --- a/src/dnsbl.c +++ b/src/dnsbl.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2002-2003 Erik Fears - * Copyright (c) 2014-2019 ircd-hybrid development team + * Copyright (c) 2014-2020 ircd-hybrid development team * * 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 @@ -260,7 +260,6 @@ void dnsbl_report(const struct scan_struct *ss) { char buf[2048], cmdbuf[256]; - FILE *fp; assert(ss->ip); @@ -281,7 +280,8 @@ dnsbl_report(const struct scan_struct *ss) if (OPT_DEBUG >= 3) log_printf("DNSBL -> Sending following email:\n%s\n", buf); - if ((fp = popen(cmdbuf, "w")) == NULL) + FILE *fp = popen(cmdbuf, "w"); + if (fp == NULL) { log_printf("DNSBL -> Failed to create pipe to '%s' for email report!", cmdbuf); irc_send_channels("I was trying to create a pipe to '%s' to send a DNSBL " diff --git a/src/dnsbl.h b/src/dnsbl.h index 341d250..746e4af 100644 --- a/src/dnsbl.h +++ b/src/dnsbl.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2002-2003 Erik Fears - * Copyright (c) 2014-2019 ircd-hybrid development team + * Copyright (c) 2014-2020 ircd-hybrid development team * * 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 @@ -1,6 +1,6 @@ /* * Copyright (c) 2002-2003 Erik Fears - * Copyright (c) 2014-2019 ircd-hybrid development team + * Copyright (c) 2014-2020 ircd-hybrid development team * * 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 @@ -178,14 +178,13 @@ m_ping(char *parv[], unsigned int parc, const char *msg, const char *source_p) static void m_invite(char *parv[], unsigned int parc, const char *msg, const char *source_p) { - const struct ChannelConf *channel = NULL; - if (parc < 4) return; log_printf("IRC -> Invited to %s by %s", parv[3], parv[0]); - if ((channel = get_channel(parv[3])) == NULL) + const struct ChannelConf *channel = get_channel(parv[3]); + if (channel == NULL) return; irc_send("JOIN %s %s", channel->name, channel->key); @@ -221,8 +220,6 @@ m_ctcp(char *parv[], unsigned int parc, const char *msg, const char *source_p) static void m_privmsg(char *parv[], unsigned int parc, const char *msg, const char *source_p) { - const struct ChannelConf *channel = NULL; - if (source_p == NULL) return; @@ -241,7 +238,8 @@ m_privmsg(char *parv[], unsigned int parc, const char *msg, const char *source_p return; /* Get a target */ - if ((channel = get_channel(parv[2])) == NULL) + const struct ChannelConf *channel = get_channel(parv[2]); + if (channel == NULL) return; int hit = strncasecmp(parv[3], "!all ", 5) == 0; @@ -377,13 +375,12 @@ m_userhost(char *parv[], unsigned int parc, const char *msg, const char *source_ static void m_cannot_join(char *parv[], unsigned int parc, const char *msg, const char *source_p) { - const struct ChannelConf *channel = NULL; - if (parc < 5) return; /* Is it one of our channels? */ - if ((channel = get_channel(parv[3])) == NULL) + const struct ChannelConf *channel = get_channel(parv[3]); + if (channel == NULL) return; if (EmptyString(channel->invite)) @@ -461,7 +458,7 @@ userinfo_create(const char *source) static void irc_init(void) { - const void *address = NULL; + const void *address; assert(IRC_FD == -1); @@ -506,7 +503,6 @@ irc_init(void) if (!EmptyString(IRCItem.vhost)) { struct addrinfo hints, *res; - int n; memset(&hints, 0, sizeof(hints)); @@ -514,7 +510,8 @@ irc_init(void) hints.ai_socktype = SOCK_STREAM; hints.ai_flags = AI_NUMERICHOST; - if ((n = getaddrinfo(IRCItem.vhost, NULL, &hints, &res))) + int n = getaddrinfo(IRCItem.vhost, NULL, &hints, &res); + if (n) { log_printf("IRC -> error binding to %s: %s", IRCItem.vhost, gai_strerror(n)); exit(EXIT_FAILURE); @@ -824,10 +821,9 @@ irc_send(const char *data, ...) { va_list arglist; char buf[MSGLENMAX]; - size_t len = 0; va_start(arglist, data); - len = vsnprintf(buf, sizeof(buf), data, arglist); + size_t len = vsnprintf(buf, sizeof(buf), data, arglist); va_end(arglist); if (OPT_DEBUG >= 2) @@ -1,6 +1,6 @@ /* * Copyright (c) 2002-2003 Erik Fears - * Copyright (c) 2014-2019 ircd-hybrid development team + * Copyright (c) 2014-2020 ircd-hybrid development team * * 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 diff --git a/src/libopm/Makefile.in b/src/libopm/Makefile.in index 8cd7cee..4af2c99 100644 --- a/src/libopm/Makefile.in +++ b/src/libopm/Makefile.in @@ -305,6 +305,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/src/libopm/src/Makefile.in b/src/libopm/src/Makefile.in index 448f383..99bd4d1 100644 --- a/src/libopm/src/Makefile.in +++ b/src/libopm/src/Makefile.in @@ -297,6 +297,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/src/libopm/src/list.c b/src/libopm/src/list.c index ac1a601..eb237bc 100644 --- a/src/libopm/src/list.c +++ b/src/libopm/src/list.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2002-2003 Erik Fears - * Copyright (c) 2014-2019 ircd-hybrid development team + * Copyright (c) 2014-2020 ircd-hybrid development team * * 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 diff --git a/src/libopm/src/list.h b/src/libopm/src/list.h index 97de670..20dbef2 100644 --- a/src/libopm/src/list.h +++ b/src/libopm/src/list.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2002-2003 Erik Fears - * Copyright (c) 2014-2019 ircd-hybrid development team + * Copyright (c) 2014-2020 ircd-hybrid development team * * 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 diff --git a/src/libopm/src/memory.c b/src/libopm/src/memory.c index 5c68589..abde66b 100644 --- a/src/libopm/src/memory.c +++ b/src/libopm/src/memory.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2002 Erik Fears - * Copyright (c) 2014-2019 ircd-hybrid development team + * Copyright (c) 2014-2020 ircd-hybrid development team * * 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 diff --git a/src/libopm/src/memory.h b/src/libopm/src/memory.h index 3c9a5d7..268be66 100644 --- a/src/libopm/src/memory.h +++ b/src/libopm/src/memory.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2002 Erik Fears - * Copyright (c) 2014-2019 ircd-hybrid development team + * Copyright (c) 2014-2020 ircd-hybrid development team * * 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 @@ -1,6 +1,6 @@ /* * Copyright (c) 2002-2003 Erik Fears - * Copyright (c) 2014-2019 ircd-hybrid development team + * Copyright (c) 2014-2020 ircd-hybrid development team * * 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 @@ -1,6 +1,6 @@ /* * Copyright (c) 2002-2003 Erik Fears - * Copyright (c) 2014-2019 ircd-hybrid development team + * Copyright (c) 2014-2020 ircd-hybrid development team * * 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 @@ -1,6 +1,6 @@ /* * Copyright (c) 2002 Erik Fears - * Copyright (c) 2014-2019 ircd-hybrid development team + * Copyright (c) 2014-2020 ircd-hybrid development team * * 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 @@ -1,6 +1,6 @@ /* * Copyright (c) 2002 Erik Fears - * Copyright (c) 2014-2019 ircd-hybrid development team + * Copyright (c) 2014-2020 ircd-hybrid development team * * 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 @@ -1,6 +1,6 @@ /* * Copyright (c) 2002-2003 Erik Fears - * Copyright (c) 2014-2019 ircd-hybrid development team + * Copyright (c) 2014-2020 ircd-hybrid development team * * 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 @@ -157,10 +157,20 @@ main(int argc, char *argv[]) /* Reset file mode. */ umask(077); /* umask 077: u=rwx,g=,o= */ - /* Close file descriptors. */ - close(STDIN_FILENO); - close(STDOUT_FILENO); - close(STDERR_FILENO); + /* Connect stdin, stdout, and stderr to /dev/null */ + int fd = open("/dev/null", O_RDWR); + if (fd < 0) + { + perror("open()"); + exit(EXIT_FAILURE); + } + + dup2(fd, STDIN_FILENO); + dup2(fd, STDOUT_FILENO); + dup2(fd, STDERR_FILENO); + + if (fd > STDERR_FILENO) + close(fd); log_open(LOGFILE); } @@ -1,6 +1,6 @@ /* * Copyright (c) 2002-2003 Erik Fears - * Copyright (c) 2014-2019 ircd-hybrid development team + * Copyright (c) 2014-2020 ircd-hybrid development team * * 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 diff --git a/src/match.c b/src/match.c index 4a0ecdf..7d00da3 100644 --- a/src/match.c +++ b/src/match.c @@ -1,7 +1,7 @@ /* * ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd) * - * Copyright (c) 1997-2019 ircd-hybrid development team + * Copyright (c) 1997-2020 ircd-hybrid development team * * 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 diff --git a/src/match.h b/src/match.h index 07b5220..5ca4b0d 100644 --- a/src/match.h +++ b/src/match.h @@ -1,7 +1,7 @@ /* * ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd) * - * Copyright (c) 1997-2019 ircd-hybrid development team + * Copyright (c) 1997-2020 ircd-hybrid development team * * 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 diff --git a/src/memory.c b/src/memory.c index fd7c796..8e9178d 100644 --- a/src/memory.c +++ b/src/memory.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2002 Erik Fears - * Copyright (c) 2014-2019 ircd-hybrid development team + * Copyright (c) 2014-2020 ircd-hybrid development team * * 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 diff --git a/src/memory.h b/src/memory.h index 1bcd112..a3970fa 100644 --- a/src/memory.h +++ b/src/memory.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2002 Erik Fears - * Copyright (c) 2014-2019 ircd-hybrid development team + * Copyright (c) 2014-2020 ircd-hybrid development team * * 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 @@ -1,6 +1,6 @@ /* * Copyright (c) 2002 Erik Fears - * Copyright (c) 2014-2019 ircd-hybrid development team + * Copyright (c) 2014-2020 ircd-hybrid development team * * 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 @@ -1,6 +1,6 @@ /* * Copyright (c) 2002 Erik Fears - * Copyright (c) 2014-2019 ircd-hybrid development team + * Copyright (c) 2014-2020 ircd-hybrid development team * * 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 diff --git a/src/negcache.c b/src/negcache.c index 6223824..4a36b2a 100644 --- a/src/negcache.c +++ b/src/negcache.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2002-2003 Andy Smith - * Copyright (c) 2014-2019 ircd-hybrid development team + * Copyright (c) 2014-2020 ircd-hybrid development team * * 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 diff --git a/src/negcache.h b/src/negcache.h index bcceddb..625dcd0 100644 --- a/src/negcache.h +++ b/src/negcache.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2002-2003 Andy Smith - * Copyright (c) 2014-2019 ircd-hybrid development team + * Copyright (c) 2014-2020 ircd-hybrid development team * * 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 diff --git a/src/opercmd.c b/src/opercmd.c index d609f0e..8cc6bf7 100644 --- a/src/opercmd.c +++ b/src/opercmd.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2002 Erik Fears - * Copyright (c) 2014-2019 ircd-hybrid development team + * Copyright (c) 2014-2020 ircd-hybrid development team * * 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 diff --git a/src/opercmd.h b/src/opercmd.h index 6ded982..1a77c07 100644 --- a/src/opercmd.h +++ b/src/opercmd.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2002 Erik Fears - * Copyright (c) 2014-2019 ircd-hybrid development team + * Copyright (c) 2014-2020 ircd-hybrid development team * * 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 diff --git a/src/patchlevel.h b/src/patchlevel.h index db582bb..381d6fa 100644 --- a/src/patchlevel.h +++ b/src/patchlevel.h @@ -4,5 +4,5 @@ */ #ifndef PATCHLEVEL -#define PATCHLEVEL "hopm-1.1.6" +#define PATCHLEVEL "hopm-1.1.7" #endif @@ -1,6 +1,6 @@ /* * Copyright (c) 2002 Erik Fears - * Copyright (c) 2014-2019 ircd-hybrid development team + * Copyright (c) 2014-2020 ircd-hybrid development team * * 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 @@ -1,6 +1,6 @@ /* * Copyright (c) 2002 Erik Fears - * Copyright (c) 2014-2019 ircd-hybrid development team + * Copyright (c) 2014-2020 ircd-hybrid development team * * 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 diff --git a/src/stats.c b/src/stats.c index 1a5dc6e..dd0ac8c 100644 --- a/src/stats.c +++ b/src/stats.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2002 Erik Fears - * Copyright (c) 2014-2019 ircd-hybrid development team + * Copyright (c) 2014-2020 ircd-hybrid development team * * 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 diff --git a/src/stats.h b/src/stats.h index 4412057..fba780c 100644 --- a/src/stats.h +++ b/src/stats.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2002 Erik Fears - * Copyright (c) 2014-2019 ircd-hybrid development team + * Copyright (c) 2014-2020 ircd-hybrid development team * * 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 |