From: Sami Kerola <kerolasa@iki.fi>
To: util-linux@vger.kernel.org
Cc: Sami Kerola <kerolasa@iki.fi>
Subject: [PATCH 2/9] include: move pamfail.h to auth.c
Date: Mon, 31 Jul 2017 20:55:01 +0100 [thread overview]
Message-ID: <20170731195508.11661-3-kerolasa@iki.fi> (raw)
In-Reply-To: <20170731195508.11661-1-kerolasa@iki.fi>
This removes one small header file, and makes inline function to static to
only file it is used in.
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
include/Makemodule.am | 1 -
include/pamfail.h | 26 --------------------------
login-utils/auth.c | 19 ++++++++++++++++++-
3 files changed, 18 insertions(+), 28 deletions(-)
delete mode 100644 include/pamfail.h
diff --git a/include/Makemodule.am b/include/Makemodule.am
index 237400b05..e9b1e3021 100644
--- a/include/Makemodule.am
+++ b/include/Makemodule.am
@@ -33,7 +33,6 @@ dist_noinst_HEADERS += \
include/nls.h \
include/optutils.h \
include/pager.h \
- include/pamfail.h \
include/partx.h \
include/path.h \
include/pathnames.h \
diff --git a/include/pamfail.h b/include/pamfail.h
deleted file mode 100644
index bb83b9404..000000000
--- a/include/pamfail.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * No copyright is claimed. This code is in the public domain; do with
- * it what you wish.
- *
- * Written by Karel Zak <kzak@redhat.com>
- */
-#ifndef UTIL_LINUX_PAMFAIL_H
-#include <security/pam_appl.h>
-#ifdef HAVE_SECURITY_PAM_MISC_H
-# include <security/pam_misc.h>
-#elif defined(HAVE_SECURITY_OPENPAM_H)
-# include <security/openpam.h>
-#endif
-#include "c.h"
-
-static inline int
-pam_fail_check(pam_handle_t *pamh, int retcode)
-{
- if (retcode == PAM_SUCCESS)
- return 0;
- warnx("%s", pam_strerror(pamh, retcode));
- pam_end(pamh, retcode);
- return 1;
-}
-
-#endif /* UTIL_LINUX_PAMFAIL_H */
diff --git a/login-utils/auth.c b/login-utils/auth.c
index 68d4ea3b0..efbd5e8cb 100644
--- a/login-utils/auth.c
+++ b/login-utils/auth.c
@@ -7,8 +7,25 @@
* there is no warranty.
*
*/
+
+#include <security/pam_appl.h>
+#ifdef HAVE_SECURITY_PAM_MISC_H
+# include <security/pam_misc.h>
+#elif defined(HAVE_SECURITY_OPENPAM_H)
+# include <security/openpam.h>
+#endif
+
+#include "c.h"
#include "ch-common.h"
-#include "pamfail.h"
+
+static int pam_fail_check(pam_handle_t *pamh, int retcode)
+{
+ if (retcode == PAM_SUCCESS)
+ return 0;
+ warnx("%s", pam_strerror(pamh, retcode));
+ pam_end(pamh, retcode);
+ return 1;
+}
int auth_pam(const char *service_name, uid_t uid, const char *username)
{
--
2.13.3
next prev parent reply other threads:[~2017-07-31 19:55 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-31 19:54 [PATCH 0/9] pull: various removals and few fixes Sami Kerola
2017-07-31 19:55 ` [PATCH 1/9] chfn, chsh: merge auth.h, islocal.h and libuser.h to ch-common.h Sami Kerola
2017-08-01 9:27 ` Karel Zak
2017-08-05 16:33 ` Sami Kerola
2017-07-31 19:55 ` Sami Kerola [this message]
2017-07-31 19:55 ` [PATCH 3/9] vipw: use explicit_bzero() to clear buffer after copy Sami Kerola
2017-07-31 19:55 ` [PATCH 4/9] uuidparse: nil uuid have all bits set to zero Sami Kerola
2017-07-31 19:55 ` [PATCH 5/9] libuuid: use access(2) when checking /dev/random availability Sami Kerola
2017-07-31 19:55 ` [PATCH 6/9] bash-completion: look for look completions Sami Kerola
2017-07-31 19:55 ` [PATCH 7/9] agetty: remove dead DO_DEVFS_FIDDLING code segment Sami Kerola
2017-07-31 19:55 ` [PATCH 8/9] agetty: add --compile-time option Sami Kerola
2017-08-01 9:41 ` Karel Zak
2017-08-05 16:44 ` Sami Kerola
2017-07-31 19:55 ` [PATCH 9/9] agetty: fix invalid usage crash Sami Kerola
2017-08-01 9:42 ` Karel Zak
2017-08-05 16:34 ` Sami Kerola
2017-08-07 7:54 ` [PATCH 0/9] pull: various removals and few fixes Karel Zak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170731195508.11661-3-kerolasa@iki.fi \
--to=kerolasa@iki.fi \
--cc=util-linux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox