diff options
-rw-r--r-- | GNUmakefile | 2 | ||||
-rw-r--r-- | NEWS | 6 | ||||
-rw-r--r-- | README | 12 | ||||
-rwxr-xr-x | bootstrap | 4 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | git2clog.pl | 2 | ||||
-rw-r--r-- | mimetypes/Makefile.am | 2 | ||||
-rw-r--r-- | mimetypes/err.c | 2 | ||||
-rw-r--r-- | mimetypes/eval.c | 2 | ||||
-rw-r--r-- | mimetypes/grammar.y | 2 | ||||
-rw-r--r-- | mimetypes/ident.c | 2 | ||||
-rw-r--r-- | mimetypes/lexer.l | 4 | ||||
-rw-r--r-- | mimetypes/linetrack.c | 2 | ||||
-rw-r--r-- | mimetypes/locus.c | 2 | ||||
-rw-r--r-- | mimetypes/locus.h | 2 | ||||
-rw-r--r-- | mimetypes/mimetypes.h | 2 | ||||
-rw-r--r-- | mimetypes/mtint.h | 2 | ||||
-rw-r--r-- | mimetypes/prloc.c | 2 | ||||
-rw-r--r-- | mimetypes/yyloc.h | 2 | ||||
-rw-r--r-- | src/catfile.c | 2 | ||||
-rw-r--r-- | src/config.c | 2 | ||||
-rw-r--r-- | src/dirls.c | 2 | ||||
-rw-r--r-- | src/dirls.h | 2 | ||||
-rw-r--r-- | src/fileserv.8 | 16 | ||||
-rw-r--r-- | src/fileserv.c | 9 | ||||
-rw-r--r-- | src/fileserv.h | 2 | ||||
-rw-r--r-- | src/ftoc.sed | 2 | ||||
-rw-r--r-- | src/httperr.c | 2 | ||||
-rw-r--r-- | src/icon.c | 2 | ||||
-rw-r--r-- | src/idx.c | 2 | ||||
-rw-r--r-- | src/lang.c | 2 | ||||
-rw-r--r-- | src/logger.c | 2 | ||||
-rw-r--r-- | src/mem.c | 2 | ||||
-rw-r--r-- | src/pidfile.c | 2 | ||||
-rw-r--r-- | src/remoteip.c | 4 | ||||
-rw-r--r-- | src/runas.c | 2 | ||||
-rw-r--r-- | src/wrapacl.c | 2 |
37 files changed, 68 insertions, 49 deletions
diff --git a/GNUmakefile b/GNUmakefile index b109490..a8ba3eb 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -1,8 +1,8 @@ # Maintainer's makefile for fileserv -# Copyright (C) 2019 Sergey Poznyakoff +# Copyright (C) 2019-2023 Sergey Poznyakoff # Distributed under the terms of the GNU General Public License, either # version 3, or (at your option) any later version. See file COPYING # for the text of the license. ifneq (,$(wildcard Makefile)) include Makefile @@ -1,11 +1,15 @@ fileserv -- history of user-visible changes. 2019-07-25 See the end of file for copying conditions. Please send fileserv bug reports to <gray+fileserv@gnu.org.ua> +Version 0.4.90 (git) + +Bugfixes + Version 0.4, 2019-07-25 * Bugfixes and organizational changes Version 0.3, 2018-04-21 @@ -32,13 +36,13 @@ Version 0.2, 2017-10-26 Initial release. ========================================================================= Copyright information: -Copyright (C) 2017-2019 Sergey Poznyakoff +Copyright (C) 2017-2023 Sergey Poznyakoff Permission is granted to anyone to make or distribute verbatim copies of this document as received, in any medium, provided that the copyright notice and this permission notice are preserved, thus giving the recipient permission to redistribute in turn. @@ -72,13 +72,13 @@ When building from source package, usual incantations apply: make make install If you are building from a clone of the Git repository, you will need GNU autotools to bootstrap the package first. Run - autoreconf -f -i -s + ./bootstrap in the top level source directory. This will create the configure script and populate the directory with the missing files. Then proceed as described above. * Documentation @@ -89,20 +89,24 @@ man fileserv. * Bug reporting. Send bug reports to <gray+fileserv@gnu.org.ua>. * References -[1] Pound - http://www.apsis.ch/pound -[2] Haproxy - http://www.haproxy.org +[1] Pound - https://github.com/graygnuorg/pound + As a matter of fact, pound now provides the built-in functionality + for serving ACME challenges (see the ACME statement in + https://www.gnu.org.ua/software/pound/pound.html#HTTP_Listener). + It appeared long after fileserv had been released. +[2] Haproxy - https://www.haproxy.org [3] GNU Libmicrohttpd - https://www.gnu.org/software/libmicrohttpd * Copyright information: -Copyright (C) 2017-2019 Sergey Poznyakoff +Copyright (C) 2017-2023 Sergey Poznyakoff Permission is granted to anyone to make or distribute verbatim copies of this document as received, in any medium, provided that the copyright notice and this permission notice are preserved, thus giving the recipient permission to redistribute in turn. diff --git a/bootstrap b/bootstrap new file mode 100755 index 0000000..494dfa0 --- /dev/null +++ b/bootstrap @@ -0,0 +1,4 @@ +#! /bin/sh +set -e +git submodule update --init --recursive +autoreconf -f -i -s diff --git a/configure.ac b/configure.ac index 3939325..f146962 100644 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,9 @@ # -*- Autoconf -*- # This file is part of fileserv. -# Copyright (C) 2017-2019 Sergey Poznyakoff +# Copyright (C) 2017-2023 Sergey Poznyakoff # # Fileserv is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3, or (at your option) # any later version. # @@ -12,13 +12,13 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with fileserv. If not, see <http://www.gnu.org/licenses/>. -AC_INIT([fileserv], 0.4, [gray+fileserv@gnu.org.ua]) +AC_INIT([fileserv], 0.4.90, [gray+fileserv@gnu.org.ua]) AC_CONFIG_SRCDIR([src/fileserv.c]) AM_INIT_AUTOMAKE([1.15 foreign tar-ustar dist-xz silent-rules]) # Enable silent rules by default: AM_SILENT_RULES([yes]) # Checks for programs. AC_PROG_CC diff --git a/git2clog.pl b/git2clog.pl index de93e3d..cee907a 100644 --- a/git2clog.pl +++ b/git2clog.pl @@ -1,8 +1,8 @@ # Pretty simple ChangeLog generator -*-perl-*- -# Copyright (C) 2019 Sergey Poznyakoff +# Copyright (C) 2019-2023 Sergey Poznyakoff # Distributed under the terms of the GNU General Public License, either # version 3, or (at your option) any later version. See file COPYING # for the text of the license. use strict; use warnings; diff --git a/mimetypes/Makefile.am b/mimetypes/Makefile.am index 8b68baa..87b9af7 100644 --- a/mimetypes/Makefile.am +++ b/mimetypes/Makefile.am @@ -1,8 +1,8 @@ # This file is part of fileserv. -# Copyright (C) 2017-2019 Sergey Poznyakoff +# Copyright (C) 2017-2023 Sergey Poznyakoff # # Fileserv is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3, or (at your option) # any later version. # diff --git a/mimetypes/err.c b/mimetypes/err.c index 89e4cd8..c2085ad 100644 --- a/mimetypes/err.c +++ b/mimetypes/err.c @@ -1,8 +1,8 @@ /* This file is part of fileserv. - Copyright (C) 2017, 2019 Sergey Poznyakoff + Copyright (C) 2017-2023 Sergey Poznyakoff Fileserv is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version. diff --git a/mimetypes/eval.c b/mimetypes/eval.c index 03ed761..0978780 100644 --- a/mimetypes/eval.c +++ b/mimetypes/eval.c @@ -1,8 +1,8 @@ /* This file is part of fileserv. - Copyright (C) 2017, 2019 Sergey Poznyakoff + Copyright (C) 2017-2023 Sergey Poznyakoff Fileserv is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version. diff --git a/mimetypes/grammar.y b/mimetypes/grammar.y index 45c21c5..d8321ae 100644 --- a/mimetypes/grammar.y +++ b/mimetypes/grammar.y @@ -1,9 +1,9 @@ %{ /* This file is part of fileserv. - Copyright (C) 2017-2019 Sergey Poznyakoff + Copyright (C) 2017-2023 Sergey Poznyakoff Fileserv is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version. diff --git a/mimetypes/ident.c b/mimetypes/ident.c index 2438393..81390a0 100644 --- a/mimetypes/ident.c +++ b/mimetypes/ident.c @@ -1,8 +1,8 @@ /* This file is part of fileserv. - Copyright (C) 2017-2019 Sergey Poznyakoff + Copyright (C) 2017-2023 Sergey Poznyakoff Fileserv is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version. diff --git a/mimetypes/lexer.l b/mimetypes/lexer.l index dbe3bde..060879e 100644 --- a/mimetypes/lexer.l +++ b/mimetypes/lexer.l @@ -1,9 +1,9 @@ %top { /* This file is part of fileserv. - Copyright (C) 2017-2019 Sergey Poznyakoff + Copyright (C) 2017-2023 Sergey Poznyakoff Fileserv is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version. @@ -356,13 +356,13 @@ lex_next_rule (void) if (yy_flex_debug) { YY_LOCATION_PRINT (stderr, yylloc); fprintf (stderr, ": started error recovery\n"); } - while ((c = input ()) != EOF) + while ((c = input ()) != EOF && c != 0) { char ch = c; if (!isspace (c) && linetrack_at_bol (trk)) { unput (c); break; diff --git a/mimetypes/linetrack.c b/mimetypes/linetrack.c index e020782..a160f5d 100644 --- a/mimetypes/linetrack.c +++ b/mimetypes/linetrack.c @@ -1,8 +1,8 @@ /* This file is part of fileserv. - Copyright (C) 2017-2019 Sergey Poznyakoff + Copyright (C) 2017-2023 Sergey Poznyakoff Fileserv is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version. diff --git a/mimetypes/locus.c b/mimetypes/locus.c index c383770..d2d2870 100644 --- a/mimetypes/locus.c +++ b/mimetypes/locus.c @@ -1,8 +1,8 @@ /* This file is part of fileserv. - Copyright (C) 2017-2019 Sergey Poznyakoff + Copyright (C) 2017-2023 Sergey Poznyakoff Fileserv is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version. diff --git a/mimetypes/locus.h b/mimetypes/locus.h index 08154ce..7ba1038 100644 --- a/mimetypes/locus.h +++ b/mimetypes/locus.h @@ -1,8 +1,8 @@ /* This file is part of fileserv. - Copyright (C) 2017-2019 Sergey Poznyakoff + Copyright (C) 2017-2023 Sergey Poznyakoff Fileserv is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version. diff --git a/mimetypes/mimetypes.h b/mimetypes/mimetypes.h index 0cf2688..b86004a 100644 --- a/mimetypes/mimetypes.h +++ b/mimetypes/mimetypes.h @@ -1,3 +1,3 @@ -void (*mimetypes_error_printer) (char const *); +extern void (*mimetypes_error_printer) (char const *); int mimetypes_parse (const char *name); const char *get_file_type (char const *filename); diff --git a/mimetypes/mtint.h b/mimetypes/mtint.h index 9ca7b50..2b778c5 100644 --- a/mimetypes/mtint.h +++ b/mimetypes/mtint.h @@ -1,8 +1,8 @@ /* This file is part of fileserv. - Copyright (C) 2017-2019 Sergey Poznyakoff + Copyright (C) 2017-2023 Sergey Poznyakoff Fileserv is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version. diff --git a/mimetypes/prloc.c b/mimetypes/prloc.c index 8eab11a..018de9d 100644 --- a/mimetypes/prloc.c +++ b/mimetypes/prloc.c @@ -1,8 +1,8 @@ /* This file is part of fileserv. - Copyright (C) 2017-2019 Sergey Poznyakoff + Copyright (C) 2017-2023 Sergey Poznyakoff Fileserv is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version. diff --git a/mimetypes/yyloc.h b/mimetypes/yyloc.h index bb76d60..87af6ed 100644 --- a/mimetypes/yyloc.h +++ b/mimetypes/yyloc.h @@ -1,8 +1,8 @@ /* This file is part of fileserv. - Copyright (C) 2017, 2018 Sergey Poznyakoff + Copyright (C) 2017-2023 Sergey Poznyakoff Fileserv is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version. diff --git a/src/catfile.c b/src/catfile.c index 922b3d9..65785f6 100644 --- a/src/catfile.c +++ b/src/catfile.c @@ -1,8 +1,8 @@ /* This file is part of fileserv. - Copyright (C) 2017, 2019 Sergey Poznyakoff + Copyright (C) 2017-2023 Sergey Poznyakoff Fileserv is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version. diff --git a/src/config.c b/src/config.c index 0636a7c..c0f3d42 100644 --- a/src/config.c +++ b/src/config.c @@ -1,8 +1,8 @@ /* This file is part of fileserv. - Copyright (C) 2017, 2019 Sergey Poznyakoff + Copyright (C) 2017-2023 Sergey Poznyakoff Fileserv is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version. diff --git a/src/dirls.c b/src/dirls.c index e9a6439..88a4c77 100644 --- a/src/dirls.c +++ b/src/dirls.c @@ -1,8 +1,8 @@ /* This file is part of fileserv. - Copyright (C) 2017, 2019 Sergey Poznyakoff + Copyright (C) 2017-2023 Sergey Poznyakoff Fileserv is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version. diff --git a/src/dirls.h b/src/dirls.h index aef4194..33514cf 100644 --- a/src/dirls.h +++ b/src/dirls.h @@ -1,8 +1,8 @@ /* This file is part of fileserv. - Copyright (C) 2017, 2019 Sergey Poznyakoff + Copyright (C) 2017-2023 Sergey Poznyakoff Fileserv is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version. diff --git a/src/fileserv.8 b/src/fileserv.8 index 500e153..8dbf6ad 100644 --- a/src/fileserv.8 +++ b/src/fileserv.8 @@ -1,8 +1,8 @@ .\" This file is part of fileserv -*- nroff -*- -.\" Copyright (C) 2017, 2018 Sergey Poznyakoff +.\" Copyright (C) 2017-2023 Sergey Poznyakoff .\" .\" Fileserv is free software; you can redistribute it and/or modify .\" it under the terms of the GNU General Public License as published by .\" the Free Software Foundation; either version 3, or (at your option) .\" any later version. .\" @@ -10,13 +10,13 @@ .\" but WITHOUT ANY WARRANTY; without even the implied warranty of .\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .\" GNU General Public License for more details. .\" .\" You should have received a copy of the GNU General Public License .\" along with fileserv. If not, see <http://www.gnu.org/licenses/>. -.TH FILESERV 8 "April 23, 2018" "FILESERV" "User Commands" +.TH FILESERV 8 "February 16, 2023" "FILESERV" "User Commands" .SH NAME fileserv \- simple http server for static files .SH SYNOPSIS \fBfileserv\fR\ [\fB\-fhsv\fR]\ [\fB\-a\fR [\fIIP\fR][\fB:\fIPORT\fR]]\ @@ -174,13 +174,13 @@ Store temporary files in \fIDIR\fR. Default is \fB/tmp\fR. \fBsyslog\fR \fINAME\fR Syslog facility name to use for reporting. Valid values for \fINAME\fR are: .BR auth , .BR authpriv , .BR cron , -.BR daemon "(default), " +.BR daemon " (default), " .BR ftp , .BR kern , .BR lpr , .BR mail , .BR news , .BR security , @@ -493,14 +493,22 @@ This function is useful to create listing ordering menu, e.g.: <a href="?C=M&O={% $(sortorder M) %}">Last modified</a> </th> <th> <a href="?C=S&O={% $(sortorder S) %}">Size</a> </th> .EE +.\" The MANCGI variable is set by man.cgi script on Ulysses. +.\" The download.inc file contains the default DOWNLOAD section +.\" for man-based doc pages. +.if "\V[MANCGI]"WEBDOC" \{\ +. ds package fileserv +. ds version 0.4 +. so download.inc +\} .SH COPYRIGHT -Copyright \(co 2017, 2018 Sergey Poznyakoff +Copyright \(co 2017--2019 Sergey Poznyakoff .br .na License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> .br .ad This is free software: you are free to change and redistribute it. diff --git a/src/fileserv.c b/src/fileserv.c index 42de1a4..00521bd 100644 --- a/src/fileserv.c +++ b/src/fileserv.c @@ -1,8 +1,8 @@ /* This file is part of fileserv. - Copyright (C) 2017, 2019 Sergey Poznyakoff + Copyright (C) 2017-2023 Sergey Poznyakoff Fileserv is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version. @@ -59,13 +59,13 @@ usage(void) printf(" -u USER run with this user privileges\n"); printf(" -v increase verbosity\n"); printf(" -V show program version\n"); printf("\n"); } -const char version_copyright[] = "Copyright (C) 2017-2018 Sergey Poznyakoff"; +const char version_copyright[] = "Copyright (C) 2017-2023 Sergey Poznyakoff"; const char gplv3[] = "\ License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n\ This is free software: you are free to change and redistribute it.\n\ There is NO WARRANTY, to the extent permitted by law.\ "; @@ -585,17 +585,16 @@ fileserv_handler(void *cls, if (strcmp(method, MHD_HTTP_METHOD_GET) && strcmp(method, MHD_HTTP_METHOD_HEAD)) return http_error(conn, method, url, MHD_HTTP_METHOD_NOT_ALLOWED); - if (&aptr != *con_cls) { + if (*con_cls == NULL) { *con_cls = &aptr; return MHD_YES; } - *con_cls = NULL; status = get_file_resp(conn, url, &resp); switch (status) { case MHD_HTTP_OK: break; case MHD_HTTP_MOVED_PERMANENTLY: @@ -658,15 +657,15 @@ http_server(int fd, struct sockaddr *server_addr) MHD_set_panic_func(fileserv_panic, NULL); mhd = MHD_start_daemon(MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG, 0, fileserv_acl, server_addr, fileserv_handler, NULL, - MHD_OPTION_LISTEN_SOCKET, fd, MHD_OPTION_EXTERNAL_LOGGER, fileserv_logger, NULL, + MHD_OPTION_LISTEN_SOCKET, fd, MHD_OPTION_END); /* Unblock only the fatal signals */ sigdelset(&sigs, SIGPIPE); pthread_sigmask(SIG_UNBLOCK, &sigs, NULL); /* Wait for signal to arrive */ sigwait(&sigs, &i); diff --git a/src/fileserv.h b/src/fileserv.h index 063bc76..47ce8f6 100644 --- a/src/fileserv.h +++ b/src/fileserv.h @@ -1,8 +1,8 @@ /* This file is part of fileserv. - Copyright (C) 2017-2019 Sergey Poznyakoff + Copyright (C) 2017-2023 Sergey Poznyakoff Fileserv is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version. diff --git a/src/ftoc.sed b/src/ftoc.sed index e32349e..ac5b9ed 100644 --- a/src/ftoc.sed +++ b/src/ftoc.sed @@ -1,8 +1,8 @@ # This file is part of fileserv -# Copyright (C) 2009-2019 Sergey Poznyakoff +# Copyright (C) 2009-2023 Sergey Poznyakoff # Distributed under the terms of the GNU General Public License, either # version 3, or (at your option) any later version. See file COPYING # for the text of the license. # Provide leading comment and quote 1i\ diff --git a/src/httperr.c b/src/httperr.c index 8e37523..2f28166 100644 --- a/src/httperr.c +++ b/src/httperr.c @@ -1,8 +1,8 @@ /* This file is part of fileserv. - Copyright (C) 2017, 2019 Sergey Poznyakoff + Copyright (C) 2017-2023 Sergey Poznyakoff Fileserv is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version. @@ -1,8 +1,8 @@ /* This file is part of fileserv. - Copyright (C) 2017, 2019 Sergey Poznyakoff + Copyright (C) 2017-2023 Sergey Poznyakoff Fileserv is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version. @@ -1,8 +1,8 @@ /* This file is part of fileserv. - Copyright (C) 2017, 2019 Sergey Poznyakoff + Copyright (C) 2017-2023 Sergey Poznyakoff Fileserv is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version. @@ -1,8 +1,8 @@ /* This file is part of fileserv. - Copyright (C) 2017, 2019 Sergey Poznyakoff + Copyright (C) 2017-2023 Sergey Poznyakoff Fileserv is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version. diff --git a/src/logger.c b/src/logger.c index 50217c6..02a85cc 100644 --- a/src/logger.c +++ b/src/logger.c @@ -1,8 +1,8 @@ /* This file is part of fileserv. - Copyright (C) 2017-2019 Sergey Poznyakoff + Copyright (C) 2017-2023 Sergey Poznyakoff Fileserv is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version. @@ -1,8 +1,8 @@ /* This file is part of fileserv. - Copyright (C) 2017, 2019 Sergey Poznyakoff + Copyright (C) 2017-2023 Sergey Poznyakoff Fileserv is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version. diff --git a/src/pidfile.c b/src/pidfile.c index 2a18033..2afd821 100644 --- a/src/pidfile.c +++ b/src/pidfile.c @@ -1,8 +1,8 @@ /* This file is part of fileserv. - Copyright (C) 2017 Sergey Poznyakoff + Copyright (C) 2017-2023 Sergey Poznyakoff Fileserv is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version. diff --git a/src/remoteip.c b/src/remoteip.c index 5aa509d..1d5dc79 100644 --- a/src/remoteip.c +++ b/src/remoteip.c @@ -1,8 +1,8 @@ /* This file is part of fileserv. - Copyright (C) 2017, 2019 Sergey Poznyakoff + Copyright (C) 2017-2023 Sergey Poznyakoff Fileserv is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version. @@ -205,13 +205,13 @@ str_to_cidr(char const *str, struct cidr *cidr) p++; masklen = strtoul(p, &end, 10); if (*end == 0) masklen_to_netmask(cidr->netmask, cidr->len, masklen); else if ((cidr->family == AF_INET && str_is_ipv4(p)) - || (cidr->family == AF_INET6 && str_is_ipv6(ipbuf))) { + || (cidr->family == AF_INET6 && str_is_ipv6(p))) { rc = inet_pton(cidr->family, p, &inaddr); if (rc != 1) { error("bad netmask: %s", p); return -1; } inaddr_to_bytes(cidr->family, &inaddr, cidr->netmask); diff --git a/src/runas.c b/src/runas.c index dd918c9..dafaba8 100644 --- a/src/runas.c +++ b/src/runas.c @@ -1,8 +1,8 @@ /* This file is part of fileserv. - Copyright (C) 2017, 2019 Sergey Poznyakoff + Copyright (C) 2017-2023 Sergey Poznyakoff Fileserv is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version. diff --git a/src/wrapacl.c b/src/wrapacl.c index b515c13..be48d0f 100644 --- a/src/wrapacl.c +++ b/src/wrapacl.c @@ -1,8 +1,8 @@ /* This file is part of fileserv. - Copyright (C) 2017 Sergey Poznyakoff + Copyright (C) 2017-2023 Sergey Poznyakoff Fileserv is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version. |