Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package oidentd for openSUSE:Factory checked in at 2023-03-17 17:04:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/oidentd (Old) and /work/SRC/openSUSE:Factory/.oidentd.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "oidentd" Fri Mar 17 17:04:55 2023 rev:29 rq:1072552 version:3.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/oidentd/oidentd.changes 2022-10-21 16:20:15.422252691 +0200 +++ /work/SRC/openSUSE:Factory/.oidentd.new.31432/oidentd.changes 2023-03-17 17:05:21.418026392 +0100 @@ -1,0 +2,8 @@ +Thu Mar 16 15:34:07 UTC 2023 - Andrea Manzini <[email protected]> + +- Update to version 3.1.0 + * Allow using masquerading without IPv6 support on Linux. + * Remove `-S` (`--nosyslog`) from systemd unit files. + * Warn about missing logs if forking with NOSYSLOG set. + +------------------------------------------------------------------- Old: ---- oidentd-3.0.0.tar.xz oidentd-3.0.0.tar.xz.asc New: ---- oidentd-3.1.0.tar.xz oidentd-3.1.0.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ oidentd.spec ++++++ --- /var/tmp/diff_new_pack.sKC1ig/_old 2023-03-17 17:05:22.194030481 +0100 +++ /var/tmp/diff_new_pack.sKC1ig/_new 2023-03-17 17:05:22.198030502 +0100 @@ -1,7 +1,7 @@ # # spec file for package oidentd # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,13 +20,9 @@ %if ! %{defined _fillupdir} %define _fillupdir %{_localstatedir}/adm/fillup-templates %endif -%if 0%{?suse_version} > 1230 %bcond_without systemd -%else -%bcond_with systemd -%endif Name: oidentd -Version: 3.0.0 +Version: 3.1.0 Release: 0 Summary: Configurable IDENT Server That Supports NAT/IP Masquerading License: GPL-2.0-or-later @@ -82,7 +78,7 @@ CFLAGS="%{optflags} -fgnu89-inline" autoreconf --install --force %configure -make %{?_smp_mflags} all +%make_build all %install %make_install ++++++ oidentd-3.0.0-configure_zstd.patch ++++++ --- /var/tmp/diff_new_pack.sKC1ig/_old 2023-03-17 17:05:22.226030650 +0100 +++ /var/tmp/diff_new_pack.sKC1ig/_new 2023-03-17 17:05:22.230030671 +0100 @@ -1,5 +1,5 @@ ---- oidentd-3.0.0.orig/configure.ac 2022-10-20 15:53:17.101986806 +0200 -+++ oidentd-3.0.0/configure.ac 2022-10-20 15:53:49.706277762 +0200 +--- oidentd-3.1.0.orig/configure.ac 2022-10-20 15:53:17.101986806 +0200 ++++ oidentd-3.1.0/configure.ac 2022-10-20 15:53:49.706277762 +0200 @@ -16,7 +16,7 @@ dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++++++ oidentd-3.0.0.tar.xz -> oidentd-3.1.0.tar.xz ++++++ ++++ 14680 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oidentd-3.0.0/ChangeLog new/oidentd-3.1.0/ChangeLog --- old/oidentd-3.0.0/ChangeLog 2021-08-16 11:33:45.000000000 +0200 +++ new/oidentd-3.1.0/ChangeLog 2023-03-11 11:22:22.000000000 +0100 @@ -1,3 +1,16 @@ +2023-03-11 Janik Rabe <[email protected]> + + * Released as version 3.1.0. + +2023-03-09 Janik Rabe <[email protected]> + + * Remove `-S` (`--nosyslog`) from systemd unit files + * Warn about missing logs if forking with NOSYSLOG set + +2021-08-17 Janik Rabe <[email protected]> + + * Allow using masquerading without IPv6 support on Linux. + 2021-08-16 Janik Rabe <[email protected]> * Released as version 3.0.0. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oidentd-3.0.0/NEWS new/oidentd-3.1.0/NEWS --- old/oidentd-3.0.0/NEWS 2021-08-16 11:31:48.000000000 +0200 +++ new/oidentd-3.1.0/NEWS 2023-03-11 11:24:12.000000000 +0100 @@ -1,3 +1,9 @@ +Changes in version 3.1.0 + + * Allow using masquerading without IPv6 support on Linux. + * Remove `-S` (`--nosyslog`) from systemd unit files. + * Warn about missing logs if forking with NOSYSLOG set. + Changes in version 3.0.0 * Support for '--debug' is now included by default. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oidentd-3.0.0/README new/oidentd-3.1.0/README --- old/oidentd-3.0.0/README 2021-08-16 11:27:59.000000000 +0200 +++ new/oidentd-3.1.0/README 2023-03-11 11:37:51.000000000 +0100 @@ -1,14 +1,14 @@ oidentd ======= -Version 3.0.0 +Version 3.1.0 Flexible, RFC 1413 compliant Ident daemon with NAT support. -oidentd is a flexible ident daemon for Linux, FreeBSD, OpenBSD, NetBSD, and +oidentd is a flexible Ident daemon for Linux, FreeBSD, OpenBSD, NetBSD, and DragonFly BSD. It is highly configurable, allowing the system administator to define custom responses based on host and port pairs. The administrator can -also grant capabilities to individual users to allow them to change their ident +also grant capabilities to individual users to allow them to change their Ident replies, generate random replies, or hide their connections. oidentd supports lookups for NAT connections and is able to forward queries to other servers. Detailed descriptions of all features are available in the manual pages. @@ -22,7 +22,7 @@ originally written by Ryan McCabe <[email protected]>. The most recent version of oidentd is available from -<https://files.janikrabe.com/pub/oidentd/releases/latest/>. +<https://oidentd.janikrabe.com/download>. Please mail any feedback, questions, suggestions, patches, or bug reports to Janik Rabe <[email protected]>. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oidentd-3.0.0/ar-lib new/oidentd-3.1.0/ar-lib --- old/oidentd-3.0.0/ar-lib 2021-08-16 12:02:10.000000000 +0200 +++ new/oidentd-3.1.0/ar-lib 2023-03-11 11:42:43.000000000 +0100 @@ -4,7 +4,7 @@ me=ar-lib scriptversion=2019-07-04.01; # UTC -# Copyright (C) 2010-2021 Free Software Foundation, Inc. +# Copyright (C) 2010-2020 Free Software Foundation, Inc. # Written by Peter Rosin <[email protected]>. # # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oidentd-3.0.0/compile new/oidentd-3.1.0/compile --- old/oidentd-3.0.0/compile 2021-08-16 12:02:10.000000000 +0200 +++ new/oidentd-3.1.0/compile 2023-03-11 11:42:43.000000000 +0100 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2021 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # Written by Tom Tromey <[email protected]>. # # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oidentd-3.0.0/config.h.in new/oidentd-3.1.0/config.h.in --- old/oidentd-3.0.0/config.h.in 2021-08-16 12:02:09.000000000 +0200 +++ new/oidentd-3.1.0/config.h.in 2023-03-11 11:42:43.000000000 +0100 @@ -58,6 +58,9 @@ /* Define to 1 if you have the `memcmp' function. */ #undef HAVE_MEMCMP +/* Define to 1 if you have the <memory.h> header file. */ +#undef HAVE_MEMORY_H + /* Define to 1 if you have the <netinet6/in6_pcb.h> header file. */ #undef HAVE_NETINET6_IN6_PCB_H @@ -85,9 +88,6 @@ /* Define to 1 if you have the <stdint.h> header file. */ #undef HAVE_STDINT_H -/* Define to 1 if you have the <stdio.h> header file. */ -#undef HAVE_STDIO_H - /* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H @@ -205,9 +205,7 @@ /* Size of the 'void *' type */ #undef SIZEOF_VOID_P -/* Define to 1 if all of the C90 standard headers exist (not just the ones - required in a freestanding environment). This macro is provided for - backward compatibility; new code need not use it. */ +/* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS /* Define to 1 if your <sys/time.h> declares `struct tm'. */ @@ -244,7 +242,7 @@ #undef inline #endif -/* Define as a signed integer type capable of holding a process identifier. */ +/* Define to `int' if <sys/types.h> does not define. */ #undef pid_t /* Define to `unsigned int' if <sys/types.h> does not define. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oidentd-3.0.0/configure.ac new/oidentd-3.1.0/configure.ac --- old/oidentd-3.0.0/configure.ac 2021-08-16 11:27:53.000000000 +0200 +++ new/oidentd-3.1.0/configure.ac 2023-03-11 11:37:47.000000000 +0100 @@ -1,4 +1,4 @@ -dnl configure.ac - oidentd ident (RFC 1413) implementation. +dnl configure.ac - oidentd Ident (RFC 1413) implementation. dnl Copyright (c) 2006 Ryan McCabe <[email protected]> dnl Copyright (c) 2018-2019 Janik Rabe <[email protected]> dnl @@ -15,7 +15,7 @@ dnl along with this program; if not, write to the Free Software dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -AC_INIT([oidentd],[3.0.0],[[email protected]],[],[https://janikrabe.com/projects/oidentd/]) +AC_INIT([oidentd],[3.1.0],[[email protected]],[],[https://oidentd.janikrabe.com]) AM_INIT_AUTOMAKE([dist-bzip2 dist-xz dist-zip dist-zstd]) AC_DEFINE(PACKAGE_AUTHOR, ["Janik Rabe"], [maintainer]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oidentd-3.0.0/contrib/systemd/oidentd.service new/oidentd-3.1.0/contrib/systemd/oidentd.service --- old/oidentd-3.0.0/contrib/systemd/oidentd.service 2020-12-25 00:56:47.000000000 +0100 +++ new/oidentd-3.1.0/contrib/systemd/oidentd.service 2023-03-09 19:57:56.000000000 +0100 @@ -1,10 +1,10 @@ [Unit] -Description=RFC 1413 compliant ident daemon +Description=RFC 1413 compliant Ident daemon Documentation=man:oidentd(8) man:oidentd.conf(5) man:oidentd_masq.conf(5) After=network.target [Service] -ExecStart=/usr/sbin/oidentd -S +ExecStart=/usr/sbin/oidentd ExecReload=/bin/kill -HUP $MAINPID PrivateDevices=true Restart=on-failure diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oidentd-3.0.0/contrib/systemd/oidentd.socket new/oidentd-3.1.0/contrib/systemd/oidentd.socket --- old/oidentd-3.0.0/contrib/systemd/oidentd.socket 2020-12-25 00:56:47.000000000 +0100 +++ new/oidentd-3.1.0/contrib/systemd/oidentd.socket 2021-10-30 20:58:38.000000000 +0200 @@ -1,6 +1,6 @@ [Unit] Conflicts=oidentd.service -Description=RFC 1413 compliant ident socket +Description=RFC 1413 compliant Ident socket Documentation=man:oidentd(8) man:oidentd.conf(5) man:oidentd_masq.conf(5) [Socket] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oidentd-3.0.0/contrib/systemd/[email protected] new/oidentd-3.1.0/contrib/systemd/[email protected] --- old/oidentd-3.0.0/contrib/systemd/[email protected] 2020-12-25 00:56:47.000000000 +0100 +++ new/oidentd-3.1.0/contrib/systemd/[email protected] 2023-03-09 19:57:52.000000000 +0100 @@ -1,9 +1,9 @@ [Unit] -Description=RFC 1413 compliant per-connection ident server +Description=RFC 1413 compliant per-connection Ident server Documentation=man:oidentd(8) man:oidentd.conf(5) man:oidentd_masq.conf(5) [Service] -ExecStart=/usr/sbin/oidentd -IS +ExecStart=/usr/sbin/oidentd -I PrivateDevices=true StandardInput=socket StandardError=syslog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oidentd-3.0.0/doc/book/book.toml new/oidentd-3.1.0/doc/book/book.toml --- old/oidentd-3.0.0/doc/book/book.toml 2021-08-16 11:28:01.000000000 +0200 +++ new/oidentd-3.1.0/doc/book/book.toml 2023-03-11 11:37:49.000000000 +0100 @@ -3,4 +3,4 @@ language = "en" multilingual = false src = "src" -title = "oidentd 3.0.0" +title = "oidentd 3.1.0" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oidentd-3.0.0/doc/book/src/SUMMARY.md new/oidentd-3.1.0/doc/book/src/SUMMARY.md --- old/oidentd-3.0.0/doc/book/src/SUMMARY.md 2021-08-06 10:53:45.000000000 +0200 +++ new/oidentd-3.1.0/doc/book/src/SUMMARY.md 2023-03-05 19:28:03.000000000 +0100 @@ -9,7 +9,6 @@ --> [About oidentd](index.md) - [Download](download.md) - [Getting Started](getting-started/index.md) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oidentd-3.0.0/doc/book/src/download.md new/oidentd-3.1.0/doc/book/src/download.md --- old/oidentd-3.0.0/doc/book/src/download.md 2021-08-06 10:53:45.000000000 +0200 +++ new/oidentd-3.1.0/doc/book/src/download.md 2023-03-05 20:12:26.000000000 +0100 @@ -1,5 +1,5 @@ <!-- -Copyright (c) 2018-2020 Janik Rabe +Copyright (c) 2023 Janik Rabe Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 @@ -10,19 +10,26 @@ # Download -You can download [the latest version][files-releases-latest] (or [any other -version][files-releases]) of oidentd from [files.janikrabe.com][files]. +## Package Managers -The [source code][code] is currently hosted on GitHub. -Contributions are welcome. +Many popular Linux and BSD distributions provide an `oidentd` package that can +be installed with the package manager. +On distributions that package the latest version of oidentd, this is normally +the recommended approach. +Beware that some distributions ship severely outdated versions. -To check for updates automatically, please use [latest.txt][]. Other methods -are not supported; please [contact the project maintainer][contact-maint] if -this file doesn't work for you. - -[files]: https://files.janikrabe.com/ -[files-releases]: https://files.janikrabe.com/pub/oidentd/releases/ -[files-releases-latest]: https://files.janikrabe.com/pub/oidentd/releases/latest/ -[code]: https://github.com/janikrabe/oidentd -[latest.txt]: https://files.janikrabe.com/pub/oidentd/releases/latest.txt -[contact-maint]: https://janikrabe.com/ +## Releases + +[Releases can be downloaded from files.janikrabe.com][releases]. +For oidentd, these are source releases (not compiled executables). +See the `INSTALL` file for instructions on how to compile and install oidentd. + +[releases]: https://files.janikrabe.com/pub/oidentd/releases/ + +## Source Code + +[The source code can be found on GitHub][github]. This is useful if you want to +contribute to the project, or if you want to run the latest (unreleased) code. +See the `HACKING` file for information on how to work with the source code. + +[github]: https://github.com/janikrabe/oidentd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oidentd-3.0.0/doc/book/src/index.md new/oidentd-3.1.0/doc/book/src/index.md --- old/oidentd-3.0.0/doc/book/src/index.md 2021-08-06 10:53:45.000000000 +0200 +++ new/oidentd-3.1.0/doc/book/src/index.md 2023-03-05 19:11:15.000000000 +0100 @@ -1,5 +1,5 @@ <!-- -Copyright (c) 2018-2020 Janik Rabe +Copyright (c) 2018-2023 Janik Rabe Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 @@ -12,9 +12,19 @@ _Flexible, RFC 1413 compliant Ident daemon with NAT support._ -oidentd is a configurable, <abbr title="Request for Comments">RFC</abbr> 1413 +oidentd is a flexible, <abbr title="Request for Comments">RFC</abbr> 1413 compliant Ident server. It runs on Linux, FreeBSD, OpenBSD, NetBSD, and DragonFly BSD. +It is highly configurable, allowing the system administrator to define custom +responses based on host and port pairs. +The administrator can also grant capabilities to individual users to allow them +to change their Ident replies, generate random replies, or hide their +connections. +oidentd supports lookups for NAT connections and is able to forward queries to +other servers. + +oidentd was originally written by Ryan McCabe in 1998. Since January 2018, it +is maintained by Janik Rabe, with contributions from several other volunteers. The Ident Protocol is used primarily on <abbr title="Internet Relay Chat">IRC</abbr> to detect and prevent abuse and to diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oidentd-3.0.0/doc/oidentd.8 new/oidentd-3.1.0/doc/oidentd.8 --- old/oidentd-3.0.0/doc/oidentd.8 2021-08-16 12:02:18.000000000 +0200 +++ new/oidentd-3.1.0/doc/oidentd.8 2023-03-11 11:43:00.000000000 +0100 @@ -1,12 +1,12 @@ '\" t .\" Title: oidentd .\" Author: [see the "AUTHOR(S)" section] -.\" Generator: Asciidoctor 2.0.16 +.\" Generator: Asciidoctor 2.0.12 .\" Manual: oidentd User Manual -.\" Source: oidentd 3.0.0 +.\" Source: oidentd 3.1.0 .\" Language: English .\" -.TH "OIDENTD" "8" "" "oidentd 3.0.0" "oidentd User Manual" +.TH "OIDENTD" "8" "" "oidentd 3.1.0" "oidentd User Manual" .ie \n(.g .ds Aq \(aq .el .ds Aq ' .ss \n[.ss] 0 @@ -27,7 +27,7 @@ . LINKSTYLE blue R < > .\} .SH "NAME" -oidentd \- flexible, RFC 1413 compliant ident daemon with NAT support +oidentd \- flexible, RFC 1413 compliant Ident daemon with NAT support .SH "SYNOPSIS" .sp \fBoidentd\fP [\fIOPTIONS\fP] @@ -49,7 +49,7 @@ .sp \fB\-c, \-\-charset\fP=\fICHARSET\fP .RS 4 -Inform clients that ident replies use the specified character set as defined +Inform clients that Ident replies use the specified character set as defined in RFC 1340 or its successors. The default is not to send a character set to clients. .RE @@ -72,7 +72,7 @@ .RS 4 Hide error messages, returning \fBUNKNOWN\-ERROR\fP for all errors. This includes the \fBNO\-USER\fP, \fBHIDDEN\-USER\fP and \fBINVALID\-PORT\fP errors. This option may be -used to conceal the fact that \fBoidentd\fP is hiding ident responses for a user. +used to conceal the fact that \fBoidentd\fP is hiding Ident responses for a user. .RE .sp \fB\-f, \-\-forward\fP=[\fIPORT\fP] @@ -80,8 +80,8 @@ Forward requests for hosts masquerading through the server \fBoidentd\fP is running on to the host that established the corresponding connection. The target host must be running \fBoidentd\fP with the \fB\-\-proxy\fP option, or some -ident server returning static responses regardless of the query. If no port -is specified, the default ident port (113) is used. If forwarding fails, +Ident server returning static responses regardless of the query. If no port +is specified, the default Ident port (113) is used. If forwarding fails, \fBoidentd\fP falls back to the response specified in \fBoidentd_masq.conf\fP(5). This option implies \fB\-\-masquerade\fP. The \fB\-\-masquerade\-first\fP option can be used to forward queries only if no response was specified in @@ -110,7 +110,7 @@ .sp \fB\-I, \-\-stdio\fP .RS 4 -Read a single ident query from standard input, write the response to standard +Read a single Ident query from standard input, write the response to standard output, then exit. This option may be useful for debugging, or when running \fBoidentd\fP from a listener daemon such as \fBxinetd\fP(8). .RE @@ -144,7 +144,7 @@ .sp \fB\-o, \-\-other\fP=[\fIOS\fP] .RS 4 -Set an alternative operating system string to send alongside ident responses. +Set an alternative operating system string to send alongside Ident responses. Note that some clients may interpret queries as having failed when an unknown operating system is returned. If this option is not specified, the value \fBUNIX\fP is used. If this option is specified without an argument, \fBOTHER\fP is @@ -170,7 +170,7 @@ .sp \fB\-r, \-\-reply\fP=\fIREPLY\fP .RS 4 -When a lookup fails, send the specified ident response as if it had +When a lookup fails, send the specified Ident response as if it had succeeded. .RE .sp @@ -191,7 +191,7 @@ .sp \fB\-t, \-\-timeout\fP=\fISECONDS\fP .RS 4 -Close connections if no ident query is received within the specified number +Close connections if no Ident query is received within the specified number of seconds. By default, connections are closed after 30 seconds. .RE .sp @@ -227,7 +227,7 @@ .sp .MTO "info\(atjanikrabe.com" "Janik Rabe" "" .RS 4 -.URL "https://janikrabe.com/projects/oidentd/"; "" "" +.URL "https://janikrabe.com"; "" "" .RE .sp Originally written by Ryan McCabe. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oidentd-3.0.0/doc/oidentd.8.adoc new/oidentd-3.1.0/doc/oidentd.8.adoc --- old/oidentd-3.0.0/doc/oidentd.8.adoc 2021-08-16 11:29:18.000000000 +0200 +++ new/oidentd-3.1.0/doc/oidentd.8.adoc 2023-03-11 11:38:38.000000000 +0100 @@ -14,14 +14,14 @@ :man manual: oidentd User Manual :man source: oidentd :reproducible: yes -:revdate: 2021-08-16 +:revdate: 2023-03-11 :sysconfdir: /etc NAME ---- -oidentd - flexible, RFC 1413 compliant ident daemon with NAT support +oidentd - flexible, RFC 1413 compliant Ident daemon with NAT support SYNOPSIS @@ -49,7 +49,7 @@ multiple addresses. *-c, --charset*='CHARSET':: - Inform clients that ident replies use the specified character set as defined + Inform clients that Ident replies use the specified character set as defined in RFC 1340 or its successors. The default is not to send a character set to clients. @@ -66,14 +66,14 @@ *-e, --error*:: Hide error messages, returning *UNKNOWN-ERROR* for all errors. This includes the *NO-USER*, *HIDDEN-USER* and *INVALID-PORT* errors. This option may be - used to conceal the fact that *oidentd* is hiding ident responses for a user. + used to conceal the fact that *oidentd* is hiding Ident responses for a user. *-f, --forward*=['PORT']:: Forward requests for hosts masquerading through the server *oidentd* is running on to the host that established the corresponding connection. The target host must be running *oidentd* with the *--proxy* option, or some - ident server returning static responses regardless of the query. If no port - is specified, the default ident port (113) is used. If forwarding fails, + Ident server returning static responses regardless of the query. If no port + is specified, the default Ident port (113) is used. If forwarding fails, *oidentd* falls back to the response specified in *oidentd_masq.conf*(5). This option implies *--masquerade*. The *--masquerade-first* option can be used to forward queries only if no response was specified in @@ -94,7 +94,7 @@ *Type=simple*. *-I, --stdio*:: - Read a single ident query from standard input, write the response to standard + Read a single Ident query from standard input, write the response to standard output, then exit. This option may be useful for debugging, or when running *oidentd* from a listener daemon such as *xinetd*(8). @@ -120,7 +120,7 @@ *--masquerade*. *-o, --other*=['OS']:: - Set an alternative operating system string to send alongside ident responses. + Set an alternative operating system string to send alongside Ident responses. Note that some clients may interpret queries as having failed when an unknown operating system is returned. If this option is not specified, the value *UNIX* is used. If this option is specified without an argument, *OTHER* is @@ -138,7 +138,7 @@ Suppress normal logging, showing only critical messages. *-r, --reply*='REPLY':: - When a lookup fails, send the specified ident response as if it had + When a lookup fails, send the specified Ident response as if it had succeeded. *-R, --reply-all*='REPLY':: @@ -153,7 +153,7 @@ standard error is a terminal, messages are written to it by default. *-t, --timeout*='SECONDS':: - Close connections if no ident query is received within the specified number + Close connections if no Ident query is received within the specified number of seconds. By default, connections are closed after 30 seconds. *-u, --user*='USER|UID':: @@ -183,7 +183,7 @@ ------ mailto:[email protected][Janik Rabe]:: - https://janikrabe.com/projects/oidentd/ + https://janikrabe.com Originally written by Ryan McCabe. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oidentd-3.0.0/doc/oidentd.conf.5 new/oidentd-3.1.0/doc/oidentd.conf.5 --- old/oidentd-3.0.0/doc/oidentd.conf.5 2021-08-16 12:02:19.000000000 +0200 +++ new/oidentd-3.1.0/doc/oidentd.conf.5 2023-03-11 11:43:00.000000000 +0100 @@ -1,12 +1,12 @@ '\" t .\" Title: oidentd.conf .\" Author: [see the "AUTHOR(S)" section] -.\" Generator: Asciidoctor 2.0.16 +.\" Generator: Asciidoctor 2.0.12 .\" Manual: oidentd User Manual -.\" Source: oidentd 3.0.0 +.\" Source: oidentd 3.1.0 .\" Language: English .\" -.TH "OIDENTD.CONF" "5" "" "oidentd 3.0.0" "oidentd User Manual" +.TH "OIDENTD.CONF" "5" "" "oidentd 3.1.0" "oidentd User Manual" .ie \n(.g .ds Aq \(aq .el .ds Aq ' .ss \n[.ss] 0 @@ -39,7 +39,7 @@ must respond with their real username. .sp The user configuration files \fB~/.config/oidentd.conf\fP allow users to send -custom ident responses or to hide their identities, provided that they have +custom Ident responses or to hide their identities, provided that they have been granted the necessary capabilities through the system\-wide configuration file. If this file does not exist or \fBoidentd\fP was compiled without XDG Base Directory support, the file \fB~/.oidentd.conf\fP is used instead. @@ -50,7 +50,7 @@ The system\-wide configuration file is used to grant capabilities to users or force users to use a certain capability. The default behavior is not to grant any privileges, which means that all users must send their real usernames in -response to ident queries. The system\-wide configuration file may be empty or +response to Ident queries. The system\-wide configuration file may be empty or missing, in which case this default applies. Changes to this file take effect only after \fBoidentd\fP is reloaded (which occurs when a SIGHUP signal is received) or restarted. @@ -252,7 +252,7 @@ .fi .if n .RE .sp -The \fBspoof\fP capability allows users to send custom ident replies. Note that +The \fBspoof\fP capability allows users to send custom Ident replies. Note that this does not include replying with the name of another user or spoofing replies for connections to privileged foreign ports. .sp @@ -292,7 +292,7 @@ .fi .if n .RE .sp -Forward received queries to another ident server. The target server must +Forward received queries to another Ident server. The target server must support forwarding (like \fBoidentd\fP with the \fB\-\-proxy\fP option). .sp Additional capabilities may be required for forwarding to succeed. For example, @@ -315,8 +315,8 @@ .fi .if n .RE .sp -Hide ident replies from clients. When this capability is used, \fBoidentd\fP -reports a "HIDDEN\-USER" error to ident clients instead of sending an ident +Hide Ident replies from clients. When this capability is used, \fBoidentd\fP +reports a "HIDDEN\-USER" error to Ident clients instead of sending an Ident reply. .sp .if n .RS 4 @@ -337,8 +337,8 @@ .fi .if n .RE .sp -Send randomly generated, alphanumeric ident replies. A new reply is generated -for each ident lookup. Replies are logged, allowing the system administrator +Send randomly generated, alphanumeric Ident replies. A new reply is generated +for each Ident lookup. Replies are logged, allowing the system administrator to identify which user sent a particular reply. .sp .if n .RS 4 @@ -349,9 +349,9 @@ .fi .if n .RE .sp -Send randomly generated, numeric ident replies between 0 (inclusive) and +Send randomly generated, numeric Ident replies between 0 (inclusive) and 100,000 (exclusive), prefixed with "user". A new reply is generated for each -ident lookup. Replies are logged, allowing the system administrator to +Ident lookup. Replies are logged, allowing the system administrator to identify which user sent a particular reply. .sp .if n .RS 4 @@ -362,7 +362,7 @@ .fi .if n .RE .sp -Send an ident reply chosen at random from the given list of quoted replies. +Send an Ident reply chosen at random from the given list of quoted replies. When used in a user configuration file, at most 20 replies may be specified. In the system\-wide configuration file, up to 255 replies may be specified. Replies are logged, allowing the system administrator to identify which user @@ -387,8 +387,8 @@ .fi .if n .RE .sp -Allow all users to spoof ident replies, except on connections to port 6667. -Only on connections to port 6667, allow users to hide their ident replies. +Allow all users to spoof Ident replies, except on connections to port 6667. +Only on connections to port 6667, allow users to hide their Ident replies. .sp .if n .RS 4 .nf @@ -430,7 +430,7 @@ .fi .if n .RE .sp -Reply with "paul" to all ident queries. +Reply with "paul" to all Ident queries. .sp .if n .RS 4 .nf @@ -442,7 +442,7 @@ .fi .if n .RE .sp -Hide ident replies for connections to irc.example.net on port 6667. +Hide Ident replies for connections to irc.example.net on port 6667. .SH "STRING FORMATTING" .sp Strings may be enclosed in double quotes. This is useful for strings containing @@ -485,7 +485,7 @@ .sp .MTO "info\(atjanikrabe.com" "Janik Rabe" "" .RS 4 -.URL "https://janikrabe.com/projects/oidentd/"; "" "" +.URL "https://janikrabe.com"; "" "" .RE .sp Originally written by Ryan McCabe. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oidentd-3.0.0/doc/oidentd.conf.5.adoc new/oidentd-3.1.0/doc/oidentd.conf.5.adoc --- old/oidentd-3.0.0/doc/oidentd.conf.5.adoc 2021-08-16 11:29:21.000000000 +0200 +++ new/oidentd-3.1.0/doc/oidentd.conf.5.adoc 2023-03-11 11:38:41.000000000 +0100 @@ -14,7 +14,7 @@ :man manual: oidentd User Manual :man source: oidentd :reproducible: yes -:revdate: 2021-08-16 +:revdate: 2023-03-11 :sysconfdir: /etc @@ -36,7 +36,7 @@ must respond with their real username. The user configuration files *~/.config/oidentd.conf* allow users to send -custom ident responses or to hide their identities, provided that they have +custom Ident responses or to hide their identities, provided that they have been granted the necessary capabilities through the system-wide configuration file. If this file does not exist or *oidentd* was compiled without XDG Base Directory support, the file *~/.oidentd.conf* is used instead. @@ -50,7 +50,7 @@ The system-wide configuration file is used to grant capabilities to users or force users to use a certain capability. The default behavior is not to grant any privileges, which means that all users must send their real usernames in -response to ident queries. The system-wide configuration file may be empty or +response to Ident queries. The system-wide configuration file may be empty or missing, in which case this default applies. Changes to this file take effect only after *oidentd* is reloaded (which occurs when a SIGHUP signal is received) or restarted. @@ -230,7 +230,7 @@ **spoof** .... -The *spoof* capability allows users to send custom ident replies. Note that +The *spoof* capability allows users to send custom Ident replies. Note that this does not include replying with the name of another user or spoofing replies for connections to privileged foreign ports. @@ -264,7 +264,7 @@ **forward** __host__ __port__ .... -Forward received queries to another ident server. The target server must +Forward received queries to another Ident server. The target server must support forwarding (like *oidentd* with the *--proxy* option). Additional capabilities may be required for forwarding to succeed. For example, @@ -284,8 +284,8 @@ **hide** .... -Hide ident replies from clients. When this capability is used, *oidentd* -reports a "HIDDEN-USER" error to ident clients instead of sending an ident +Hide Ident replies from clients. When this capability is used, *oidentd* +reports a "HIDDEN-USER" error to Ident clients instead of sending an Ident reply. [subs="quotes"] @@ -300,8 +300,8 @@ **random** .... -Send randomly generated, alphanumeric ident replies. A new reply is generated -for each ident lookup. Replies are logged, allowing the system administrator +Send randomly generated, alphanumeric Ident replies. A new reply is generated +for each Ident lookup. Replies are logged, allowing the system administrator to identify which user sent a particular reply. [subs="quotes"] @@ -309,9 +309,9 @@ **random_numeric** .... -Send randomly generated, numeric ident replies between 0 (inclusive) and +Send randomly generated, numeric Ident replies between 0 (inclusive) and 100,000 (exclusive), prefixed with "user". A new reply is generated for each -ident lookup. Replies are logged, allowing the system administrator to +Ident lookup. Replies are logged, allowing the system administrator to identify which user sent a particular reply. [subs="quotes"] @@ -319,7 +319,7 @@ **reply** __reply1__ [__reply2__ ...] .... -Send an ident reply chosen at random from the given list of quoted replies. +Send an Ident reply chosen at random from the given list of quoted replies. When used in a user configuration file, at most 20 replies may be specified. In the system-wide configuration file, up to 255 replies may be specified. Replies are logged, allowing the system administrator to identify which user @@ -345,8 +345,8 @@ } .... -Allow all users to spoof ident replies, except on connections to port 6667. -Only on connections to port 6667, allow users to hide their ident replies. +Allow all users to spoof Ident replies, except on connections to port 6667. +Only on connections to port 6667, allow users to hide their Ident replies. [subs="quotes"] .... @@ -381,7 +381,7 @@ } .... -Reply with "paul" to all ident queries. +Reply with "paul" to all Ident queries. [subs="quotes"] .... @@ -390,7 +390,7 @@ } .... -Hide ident replies for connections to irc.example.net on port 6667. +Hide Ident replies for connections to irc.example.net on port 6667. STRING FORMATTING @@ -435,7 +435,7 @@ ------ mailto:[email protected][Janik Rabe]:: - https://janikrabe.com/projects/oidentd/ + https://janikrabe.com Originally written by Ryan McCabe. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oidentd-3.0.0/doc/oidentd_masq.conf.5 new/oidentd-3.1.0/doc/oidentd_masq.conf.5 --- old/oidentd-3.0.0/doc/oidentd_masq.conf.5 2021-08-16 12:02:19.000000000 +0200 +++ new/oidentd-3.1.0/doc/oidentd_masq.conf.5 2023-03-11 11:43:00.000000000 +0100 @@ -1,12 +1,12 @@ '\" t .\" Title: oidentd_masq.conf .\" Author: [see the "AUTHOR(S)" section] -.\" Generator: Asciidoctor 2.0.16 +.\" Generator: Asciidoctor 2.0.12 .\" Manual: oidentd User Manual -.\" Source: oidentd 3.0.0 +.\" Source: oidentd 3.1.0 .\" Language: English .\" -.TH "OIDENTD_MASQ.CONF" "5" "" "oidentd 3.0.0" "oidentd User Manual" +.TH "OIDENTD_MASQ.CONF" "5" "" "oidentd 3.1.0" "oidentd User Manual" .ie \n(.g .ds Aq \(aq .el .ds Aq ' .ss \n[.ss] 0 @@ -31,8 +31,8 @@ .SH "DESCRIPTION" .sp If NAT support is enabled with the \fB\-\-masquerade\fP option, \fBoidentd\fP reads the -\fB/usr/local/etc/oidentd_masq.conf\fP file to determine ident responses to queries -intended for other machines. It is also possible to forward queries to ident +\fB/usr/local/etc/oidentd_masq.conf\fP file to determine Ident responses to queries +intended for other machines. It is also possible to forward queries to Ident servers on the hosts connecting through the machine \fBoidentd\fP runs on. For more information on forwarding, please see the \fB\-\-forward\fP option in \fBoidentd\fP(8). .sp @@ -52,7 +52,7 @@ .if n .RE .sp The \fIhost\fP field specifies the hostname or IP address of the host that owns the -connection for which an ident query was received. This host must be connecting +connection for which an Ident query was received. This host must be connecting through the machine \fBoidentd\fP runs on. The host may be specified as either an IP address or a hostname. .sp @@ -64,7 +64,7 @@ for the specified host or subnetwork. .sp The \fIsystem\-type\fP field specifies the operating system to send alongside the -ident response. See the \fB\-\-other\fP option in \fBoidentd\fP(8) for more information. +Ident response. See the \fB\-\-other\fP option in \fBoidentd\fP(8) for more information. .SH "EXAMPLES" .sp .if n .RS 4 @@ -87,7 +87,7 @@ .sp .MTO "info\(atjanikrabe.com" "Janik Rabe" "" .RS 4 -.URL "https://janikrabe.com/projects/oidentd/"; "" "" +.URL "https://janikrabe.com"; "" "" .RE .sp Originally written by Ryan McCabe. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oidentd-3.0.0/doc/oidentd_masq.conf.5.adoc new/oidentd-3.1.0/doc/oidentd_masq.conf.5.adoc --- old/oidentd-3.0.0/doc/oidentd_masq.conf.5.adoc 2021-08-16 11:29:26.000000000 +0200 +++ new/oidentd-3.1.0/doc/oidentd_masq.conf.5.adoc 2023-03-11 11:38:42.000000000 +0100 @@ -14,7 +14,7 @@ :man manual: oidentd User Manual :man source: oidentd :reproducible: yes -:revdate: 2021-08-16 +:revdate: 2023-03-11 :sysconfdir: /etc @@ -28,8 +28,8 @@ ----------- If NAT support is enabled with the *--masquerade* option, *oidentd* reads the -*{sysconfdir}/oidentd_masq.conf* file to determine ident responses to queries -intended for other machines. It is also possible to forward queries to ident +*{sysconfdir}/oidentd_masq.conf* file to determine Ident responses to queries +intended for other machines. It is also possible to forward queries to Ident servers on the hosts connecting through the machine *oidentd* runs on. For more information on forwarding, please see the *--forward* option in *oidentd*(8). @@ -49,7 +49,7 @@ .... The _host_ field specifies the hostname or IP address of the host that owns the -connection for which an ident query was received. This host must be connecting +connection for which an Ident query was received. This host must be connecting through the machine *oidentd* runs on. The host may be specified as either an IP address or a hostname. @@ -61,7 +61,7 @@ for the specified host or subnetwork. The _system-type_ field specifies the operating system to send alongside the -ident response. See the *--other* option in *oidentd*(8) for more information. +Ident response. See the *--other* option in *oidentd*(8) for more information. EXAMPLES @@ -86,7 +86,7 @@ ------ mailto:[email protected][Janik Rabe]:: - https://janikrabe.com/projects/oidentd/ + https://janikrabe.com Originally written by Ryan McCabe. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oidentd-3.0.0/missing new/oidentd-3.1.0/missing --- old/oidentd-3.0.0/missing 2021-08-16 12:02:10.000000000 +0200 +++ new/oidentd-3.1.0/missing 2023-03-11 11:42:43.000000000 +0100 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2021 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oidentd-3.0.0/oidentd_masq.conf new/oidentd-3.1.0/oidentd_masq.conf --- old/oidentd-3.0.0/oidentd_masq.conf 2020-12-25 14:20:00.000000000 +0100 +++ new/oidentd-3.1.0/oidentd_masq.conf 2021-10-30 20:58:38.000000000 +0200 @@ -1,7 +1,7 @@ # This is the NAT configuration file for oidentd. # If you enable NAT support with the '-m' option, # this file is read to determine the appropriate -# ident responses to queries intended for hosts +# Ident responses to queries intended for hosts # masquerading through this server. # # See oidentd_masq.conf(5) for more information. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oidentd-3.0.0/src/cfg_parse.c new/oidentd-3.1.0/src/cfg_parse.c --- old/oidentd-3.0.0/src/cfg_parse.c 2021-08-16 12:02:18.000000000 +0200 +++ new/oidentd-3.1.0/src/cfg_parse.c 2023-03-11 11:42:59.000000000 +0100 @@ -1,4 +1,4 @@ -/* A Bison parser, made by GNU Bison 3.7.6. */ +/* A Bison parser, made by GNU Bison 3.7.5. */ /* Bison implementation for Yacc-like parsers in C @@ -16,7 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see <https://www.gnu.org/licenses/>. */ + along with this program. If not, see <http://www.gnu.org/licenses/>. */ /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work @@ -46,10 +46,10 @@ USER NAME SPACE" below. */ /* Identify Bison output, and Bison version. */ -#define YYBISON 30706 +#define YYBISON 30705 /* Bison version string. */ -#define YYBISON_VERSION "3.7.6" +#define YYBISON_VERSION "3.7.5" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oidentd-3.0.0/src/cfg_parse.h new/oidentd-3.1.0/src/cfg_parse.h --- old/oidentd-3.0.0/src/cfg_parse.h 2021-08-16 12:02:18.000000000 +0200 +++ new/oidentd-3.1.0/src/cfg_parse.h 2023-03-11 11:42:59.000000000 +0100 @@ -1,4 +1,4 @@ -/* A Bison parser, made by GNU Bison 3.7.6. */ +/* A Bison parser, made by GNU Bison 3.7.5. */ /* Bison interface for Yacc-like parsers in C @@ -16,7 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see <https://www.gnu.org/licenses/>. */ + along with this program. If not, see <http://www.gnu.org/licenses/>. */ /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oidentd-3.0.0/src/cfg_scan.c new/oidentd-3.1.0/src/cfg_scan.c --- old/oidentd-3.0.0/src/cfg_scan.c 2021-08-16 12:02:18.000000000 +0200 +++ new/oidentd-3.1.0/src/cfg_scan.c 2023-03-11 11:42:59.000000000 +0100 @@ -1,5 +1,5 @@ -#line 2 "cfg_scan.c" +#line 3 "cfg_scan.c" #define YY_INT_ALIGNED short int @@ -626,9 +626,9 @@ u_int32_t current_line; -#line 629 "cfg_scan.c" +#line 630 "cfg_scan.c" -#line 631 "cfg_scan.c" +#line 632 "cfg_scan.c" #define INITIAL 0 #define state_comment 1 @@ -848,7 +848,7 @@ #line 86 "cfg_scan.l" -#line 851 "cfg_scan.c" +#line 852 "cfg_scan.c" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -1238,7 +1238,7 @@ #line 307 "cfg_scan.l" ECHO; YY_BREAK -#line 1241 "cfg_scan.c" +#line 1242 "cfg_scan.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(state_comment): case YY_STATE_EOF(state_string): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oidentd-3.0.0/src/forward.c new/oidentd-3.1.0/src/forward.c --- old/oidentd-3.0.0/src/forward.c 2021-08-06 10:53:45.000000000 +0200 +++ new/oidentd-3.1.0/src/forward.c 2021-10-30 20:58:38.000000000 +0200 @@ -47,7 +47,7 @@ static void fwd_alarm(int sig) __noreturn; /* -** Make an ident request to another machine and return its response, +** Make an Ident request to another machine and return its response, ** if the request was successful. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oidentd-3.0.0/src/kernel/linux.c new/oidentd-3.1.0/src/kernel/linux.c --- old/oidentd-3.0.0/src/kernel/linux.c 2021-08-06 10:53:45.000000000 +0200 +++ new/oidentd-3.1.0/src/kernel/linux.c 2021-10-30 20:58:38.000000000 +0200 @@ -462,10 +462,12 @@ in_addr_t remotem4; in_addr_t localn4; in_addr_t remoten4; +#if WANT_IPV6 struct in6_addr localm6; struct in6_addr remotem6; struct in6_addr localn6; struct in6_addr remoten6; +#endif u_int32_t nport_temp; u_int32_t mport_temp; u_int32_t masq_lport_temp; @@ -511,6 +513,8 @@ sin_setv4(remoten4, &remoten_ss); break; + +#if WANT_IPV6 case AF_INET6: if (strcasecmp(family, "ipv6")) return 1; @@ -527,9 +531,11 @@ sin_setv6(&remoten6, &remoten_ss); break; +#endif + default: debug("masq_ct_line: bad address family %d", faddr->ss_family); - return -1; + return 1; } masq_lport = (in_port_t) masq_lport_temp; @@ -561,8 +567,10 @@ if (con_uid == MISSING_UID && faddr->ss_family == AF_INET) con_uid = get_user4(htons(masq_lport), htons(masq_fport), laddr, &remotem_ss); +#if WANT_IPV6 if (con_uid == MISSING_UID && faddr->ss_family == AF_INET6) con_uid = get_user6(htons(masq_lport), htons(masq_fport), laddr, &remotem_ss); +#endif if (con_uid == MISSING_UID) return -1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oidentd-3.0.0/src/masq.c new/oidentd-3.1.0/src/masq.c --- old/oidentd-3.0.0/src/masq.c 2021-08-06 10:53:45.000000000 +0200 +++ new/oidentd-3.1.0/src/masq.c 2021-10-30 20:58:38.000000000 +0200 @@ -205,7 +205,7 @@ } /* -** Forward an ident request to another machine, return the response to the +** Forward an Ident request to another machine, return the response to the ** client that has connected to us and requested it. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oidentd-3.0.0/src/oidentd.c new/oidentd-3.1.0/src/oidentd.c --- old/oidentd-3.0.0/src/oidentd.c 2021-08-06 10:53:45.000000000 +0200 +++ new/oidentd-3.1.0/src/oidentd.c 2023-03-09 20:17:27.000000000 +0100 @@ -1,5 +1,5 @@ /* -** oidentd.c - oidentd ident (RFC 1413) implementation. +** oidentd.c - oidentd Ident (RFC 1413) implementation. ** Copyright (c) 1998-2006 Ryan McCabe <[email protected]> ** Copyright (c) 2018-2019 Janik Rabe <[email protected]> ** @@ -104,9 +104,16 @@ } } - if (!opt_enabled(FOREGROUND) && go_background() == -1) { - o_log(LOG_CRIT, "Fatal: Error creating daemon process"); - exit(EXIT_FAILURE); + if (!opt_enabled(FOREGROUND)) { + if (opt_enabled(NOSYSLOG)) { + o_log(LOG_CRIT, "Warning: Running in background with --nosyslog set;" + " logs will be discarded"); + } + + if (go_background() == -1) { + o_log(LOG_CRIT, "Fatal: Error creating daemon process"); + exit(EXIT_FAILURE); + } } if (!replyall && k_open() != 0) { @@ -192,7 +199,7 @@ } /* -** Handle the client's request: read the client data and send the ident reply. +** Handle the client's request: read the client data and send the Ident reply. */ static int service_request(int insock, int outsock) { @@ -300,7 +307,7 @@ #if WANT_IPV6 /* * Check for IPv6-mapped IPv4 addresses. This ensures that the correct - * ident response is returned for connections to a mapped address. + * Ident response is returned for connections to a mapped address. */ if (con_uid == MISSING_UID && laddr.ss_family == AF_INET) { struct sockaddr_storage laddr_m6, faddr_m6; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oidentd-3.0.0/src/oidentd.h new/oidentd-3.1.0/src/oidentd.h --- old/oidentd-3.0.0/src/oidentd.h 2021-08-06 10:53:45.000000000 +0200 +++ new/oidentd-3.1.0/src/oidentd.h 2021-10-30 20:58:38.000000000 +0200 @@ -1,5 +1,5 @@ /* -** oidentd.h - oidentd ident (RFC 1413) implementation. +** oidentd.h - oidentd Ident (RFC 1413) implementation. ** Copyright (c) 1998-2006 Ryan McCabe <[email protected]> ** Copyright (c) 2018-2019 Janik Rabe <[email protected]> ** @@ -25,7 +25,7 @@ #endif /* -** File containing the ident replies to be used for hosts that +** File containing the Ident replies to be used for hosts that ** masquerade through us. */ @@ -56,7 +56,7 @@ #define USER_CONF ".oidentd.conf" /* -** Maximum length of ident replies. +** Maximum length of Ident replies. */ #define MAX_ULEN 512 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oidentd-3.0.0/src/os.c new/oidentd-3.1.0/src/os.c --- old/oidentd-3.0.0/src/os.c 2021-08-16 12:02:17.000000000 +0200 +++ new/oidentd-3.1.0/src/os.c 2023-03-11 11:42:58.000000000 +0100 @@ -462,10 +462,12 @@ in_addr_t remotem4; in_addr_t localn4; in_addr_t remoten4; +#if WANT_IPV6 struct in6_addr localm6; struct in6_addr remotem6; struct in6_addr localn6; struct in6_addr remoten6; +#endif u_int32_t nport_temp; u_int32_t mport_temp; u_int32_t masq_lport_temp; @@ -511,6 +513,8 @@ sin_setv4(remoten4, &remoten_ss); break; + +#if WANT_IPV6 case AF_INET6: if (strcasecmp(family, "ipv6")) return 1; @@ -527,9 +531,11 @@ sin_setv6(&remoten6, &remoten_ss); break; +#endif + default: debug("masq_ct_line: bad address family %d", faddr->ss_family); - return -1; + return 1; } masq_lport = (in_port_t) masq_lport_temp; @@ -561,8 +567,10 @@ if (con_uid == MISSING_UID && faddr->ss_family == AF_INET) con_uid = get_user4(htons(masq_lport), htons(masq_fport), laddr, &remotem_ss); +#if WANT_IPV6 if (con_uid == MISSING_UID && faddr->ss_family == AF_INET6) con_uid = get_user6(htons(masq_lport), htons(masq_fport), laddr, &remotem_ss); +#endif if (con_uid == MISSING_UID) return -1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oidentd-3.0.0/src/user_db.c new/oidentd-3.1.0/src/user_db.c --- old/oidentd-3.0.0/src/user_db.c 2021-08-06 10:53:45.000000000 +0200 +++ new/oidentd-3.1.0/src/user_db.c 2021-10-30 20:58:38.000000000 +0200 @@ -78,7 +78,7 @@ struct sockaddr_storage *faddr); /* -** Generate a pseudo-random ident response consisting of a string of "len" +** Generate a pseudo-random Ident response consisting of a string of "len" ** characters of the set "valid" */ @@ -102,7 +102,7 @@ } /* -** Use a user's UID as the ident reply. +** Use a user's UID as the Ident reply. */ static inline void numeric_ident(uid_t con_uid, char *buf, size_t len) { @@ -110,7 +110,7 @@ } /* -** Generates an ident response of the form UPREFIXxxxxx, +** Generates an Ident response of the form UPREFIXxxxxx, ** where xxxxx is a pseudo-random number between 1 and 99999 */ @@ -129,7 +129,7 @@ } /* -** Stores the appropriate ident reply in "reply." +** Stores the appropriate Ident reply in "reply." ** Returns 0 if user is not hidden, -1 if the user is hidden. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oidentd-3.0.0/ylwrap new/oidentd-3.1.0/ylwrap --- old/oidentd-3.0.0/ylwrap 2021-08-16 12:02:10.000000000 +0200 +++ new/oidentd-3.1.0/ylwrap 2023-03-11 11:42:43.000000000 +0100 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2021 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # # Written by Tom Tromey <[email protected]>. #
