<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/16ec61962a9d0fc9bdbce3216bcd609fc981a842">https://github.com/macports/macports-ports/commit/16ec61962a9d0fc9bdbce3216bcd609fc981a842</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 16ec61962a9 oath-toolkit: update to 2.6.7; prune lib deps - Also switch to using 'configure.pkg_config_path' - See: https://github.com/macports/macports-ports/commit/162b897fa738da4e7c5980eb9e1402a58758c43b#r111885408 Fixes: https://trac.macports.org/ticket/67233
</span>16ec61962a9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 16ec61962a9d0fc9bdbce3216bcd609fc981a842
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Fri May 5 14:16:44 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> oath-toolkit: update to 2.6.7; prune lib deps
</span><span style='display:block; white-space:pre;color:#404040;'> - Also switch to using 'configure.pkg_config_path'
</span><span style='display:block; white-space:pre;color:#404040;'> - See: https://github.com/macports/macports-ports/commit/162b897fa738da4e7c5980eb9e1402a58758c43b#r111885408
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/67233
</span>---
security/oath-toolkit/Portfile | 42 +++--
.../patch-2.6.7-pam_oath-pam_modutil_getmwnam.diff | 186 +++++++++++++++++++++
2 files changed, 210 insertions(+), 18 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/oath-toolkit/Portfile b/security/oath-toolkit/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c7b34612cab..4dd24f3e73f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/oath-toolkit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/oath-toolkit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,8 @@ PortSystem 1.0
</span> PortGroup conflicts_build 1.0
name oath-toolkit
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.6.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.6.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories security devel
platforms darwin
maintainers {alum.wpi.edu:arno+macports @fracai} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,30 +24,36 @@ long_description The OATH Toolkit contains a shared library, command line \
</span> homepage http://oath-toolkit.nongnu.org/
master_sites savannah
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 0089d93a2a67da8f9159fb5de96040fe21efb884 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 fd68b315c71ba1db47bcc6e67f598568db4131afc33abd23ed682170e3cb946c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 5571980
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 3e7715b6e90c2ac274de6c3bcbca132c9c6e93c9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 36eddfce8f2f36347fb257dbf878ba0303a2eaafe24eaa071d5cd302261046a9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5625279
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args -p1
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:icu \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libiconv \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libtool \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libxml2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libxslt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xmlsec-1.2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Fix for 2.6.7-specific issue on macOS, related to lack of 'pam_modutil.h'; details in patch.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Merged into upstream master, and will be included in next release.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-2.6.7-pam_oath-pam_modutil_getmwnam.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Need to regenerate autotools scripts, due to previous patch; not needed for next release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+autoreconf.args -fvi
</span>
# This version of 'oath-toolkit' requires 'xmlsec-1.2'.
# Once upstream releases support for xmlsec 1.3+, none of this will be needed.
conflicts_build-append \
xmlsec
set xmlsec_lib ${prefix}/lib/xmlsec-1.2/lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PKG_CONFIG_PATH=${xmlsec_lib}/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.pkg_config_path-prepend \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${xmlsec_lib}/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gtk-doc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libtool \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libxml2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libxslt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xmlsec-1.2
</span>
configure.args-append \
--disable-silent-rules
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/oath-toolkit/files/patch-2.6.7-pam_oath-pam_modutil_getmwnam.diff b/security/oath-toolkit/files/patch-2.6.7-pam_oath-pam_modutil_getmwnam.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9df827edd8b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/oath-toolkit/files/patch-2.6.7-pam_oath-pam_modutil_getmwnam.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,186 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#==================================================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Release 2.6.7: Fix for macOS-specific build issue, due to missing 'pam_modutil.h', etc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Merged into upstream master, and will be included in next release.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Issue: https://gitlab.com/oath-toolkit/oath-toolkit/-/issues/26
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# MR: https://gitlab.com/oath-toolkit/oath-toolkit/-/merge_requests/19
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#==================================================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# From ff7f814c5f4fce00917cf60bafea0e9591fab3ed Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# From: Nick Gaya <nicholasgaya+github@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Date: Thu, 17 Jun 2021 10:21:42 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Subject: [PATCH] pam_oath: Provide fallback pam_modutil_getpwnam implementation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Closes #26
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# ---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# pam_oath/Makefile.am | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# pam_oath/configure.ac | 3 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# pam_oath/pam_modutil.c | 82 ++++++++++++++++++++++++++++++++++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# pam_oath/pam_modutil.h | 17 +++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# pam_oath/pam_oath.c | 4 +--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# 5 files changed, 102 insertions(+), 6 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# create mode 100644 pam_oath/pam_modutil.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# create mode 100644 pam_oath/pam_modutil.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#==================================================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/pam_oath/Makefile.am b/pam_oath/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 53a4cf7..16bd790 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/pam_oath/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/pam_oath/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,7 +24,7 @@ EXTRA_DIST = README
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pammoddir = $(PAMDIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pammod_LTLIBRARIES = pam_oath.la
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-pam_oath_la_SOURCES = pam_oath.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++pam_oath_la_SOURCES = pam_oath.c pam_modutil.c pam_modutil.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # XXX add -Wl,-x too? PAM documentation suggests it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pam_oath_la_LIBADD = ../liboath/liboath.la
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pam_oath_la_LDFLAGS = -module -avoid-version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/pam_oath/configure.ac b/pam_oath/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b3c198c..50c0c74 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/pam_oath/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/pam_oath/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,8 +29,7 @@ LT_INIT([disable-static])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CHECK_HEADERS([security/pam_appl.h], [],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [AC_MSG_ERROR([[PAM header files not found, install libpam-dev.]])])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-AC_CHECK_HEADERS([security/pam_modutil.h], [],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [AC_MSG_ERROR([[PAM header files not found, install libpam-dev.]])])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_CHECK_HEADERS([security/pam_modutil.h], [], [])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CHECK_HEADERS([security/pam_modules.h security/_pam_macros.h], [], [],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [#include <security/pam_appl.h>])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/pam_oath/pam_modutil.c b/pam_oath/pam_modutil.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+new file mode 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0000000..6bc2949
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/pam_oath/pam_modutil.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -0,0 +1,82 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <config.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef HAVE_SECURITY_PAM_MODUTIL_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "pam_modutil.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef HAVE_SECURITY_PAM_APPL_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <security/pam_appl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef HAVE_SECURITY_PAM_MODULES_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <security/pam_modules.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <errno.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <pwd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stddef.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define PWD_INITIAL_LENGTH 0x400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define PWD_ABSURD_PWD_LENGTH 0x4000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void _pam_modutil_cleanup(pam_handle_t *pamh, void *data, int error_status) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (data) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (void) free(data);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++struct passwd *pam_modutil_getpwnam(pam_handle_t *pamh, const char *user) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ void *buffer = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ size_t length = PWD_INITIAL_LENGTH;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ long sc_init_length = sysconf(_SC_GETPW_R_SIZE_MAX);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (sc_init_length != -1 && sc_init_length < PWD_ABSURD_PWD_LENGTH) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ length = (size_t) sc_init_length;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ do {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int status;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ void *new_buffer;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ struct passwd *result = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ new_buffer = realloc(buffer, sizeof(struct passwd) + length);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (new_buffer == NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // out of memory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (buffer) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ free(buffer);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ buffer = new_buffer;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ status = getpwnam_r(user, buffer,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sizeof(struct passwd) + (char *) buffer,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ length, &result);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!status && result) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ status = pam_set_data(pamh, "_pammodutil_getpwnam", result,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _pam_modutil_cleanup);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (status == PAM_SUCCESS) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // unable to set data item
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ free(buffer);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (status != ERANGE) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // no matching record found (if status == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // or getpwnam_r encountered an error
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ free(buffer);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ length <<= 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } while (length < PWD_ABSURD_PWD_LENGTH);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // exceeded maximum buffer size
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ free(buffer);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef int make_iso_compilers_happy;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif /* HAVE_SECURITY_PAM_MODUTIL_H */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/pam_oath/pam_modutil.h b/pam_oath/pam_modutil.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+new file mode 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0000000..c5d5647
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/pam_oath/pam_modutil.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -0,0 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef PAM_MODUTIL_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define PAM_MODUTIL_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef HAVE_SECURITY_PAM_MODUTIL_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <security/pam_modutil.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef HAVE_SECURITY_PAM_MODULES_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <security/pam_modules.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <pwd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++struct passwd *pam_modutil_getpwnam(pam_handle_t *pamh, const char *user);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/pam_oath/pam_oath.c b/pam_oath/pam_oath.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3e72edc..79bc912 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/pam_oath/pam_oath.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/pam_oath/pam_oath.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,6 +21,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <config.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "oath.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "pam_modutil.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -43,9 +44,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_SECURITY_PAM_APPL_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <security/pam_appl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef HAVE_SECURITY_PAM_MODUTIL_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <security/pam_modutil.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_SECURITY_PAM_MODULES_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <security/pam_modules.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+GitLab
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>