From 4bbf5277732fa742742873440254d745692e18cc Mon Sep 17 00:00:00 2001 From: des Date: Tue, 5 Feb 2002 06:08:26 +0000 Subject: #include cleanup. Sponsored by: DARPA, NAI Labs --- lib/libpam/modules/pam_deny/pam_deny.c | 3 ++- lib/libpam/modules/pam_ftp/pam_ftp.c | 4 +++- lib/libpam/modules/pam_kerberosIV/pam_kerberosIV.c | 4 ++-- lib/libpam/modules/pam_krb5/pam_krb5.c | 3 +-- lib/libpam/modules/pam_lastlog/pam_lastlog.c | 3 ++- lib/libpam/modules/pam_login_access/pam_login_access.c | 3 ++- lib/libpam/modules/pam_nologin/pam_nologin.c | 4 ++-- lib/libpam/modules/pam_opie/pam_opie.c | 3 ++- lib/libpam/modules/pam_opieaccess/pam_opieaccess.c | 3 ++- lib/libpam/modules/pam_permit/pam_permit.c | 4 ++-- lib/libpam/modules/pam_radius/pam_radius.c | 4 ++-- lib/libpam/modules/pam_rootok/pam_rootok.c | 3 ++- lib/libpam/modules/pam_securetty/pam_securetty.c | 3 ++- lib/libpam/modules/pam_self/pam_self.c | 3 ++- lib/libpam/modules/pam_ssh/pam_ssh.c | 1 + lib/libpam/modules/pam_tacplus/pam_tacplus.c | 4 ++-- lib/libpam/modules/pam_unix/pam_unix.c | 4 ++-- lib/libpam/modules/pam_wheel/pam_wheel.c | 3 ++- 18 files changed, 35 insertions(+), 24 deletions(-) (limited to 'lib') diff --git a/lib/libpam/modules/pam_deny/pam_deny.c b/lib/libpam/modules/pam_deny/pam_deny.c index e3e7e2d4..7abf963 100644 --- a/lib/libpam/modules/pam_deny/pam_deny.c +++ b/lib/libpam/modules/pam_deny/pam_deny.c @@ -32,8 +32,9 @@ __FBSDID("$FreeBSD$"); #define PAM_SM_SESSION #define PAM_SM_PASSWORD +#include #include -#include "pam_mod_misc.h" +#include PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, int argc, const char **argv) diff --git a/lib/libpam/modules/pam_ftp/pam_ftp.c b/lib/libpam/modules/pam_ftp/pam_ftp.c index 287ac30..75dc62b 100644 --- a/lib/libpam/modules/pam_ftp/pam_ftp.c +++ b/lib/libpam/modules/pam_ftp/pam_ftp.c @@ -52,8 +52,9 @@ __FBSDID("$FreeBSD$"); #define PAM_SM_SESSION #define PAM_SM_PASSWORD +#include #include -#include +#include #include @@ -163,6 +164,7 @@ pam_sm_authenticate(pam_handle_t * pamh, int flags __unused, int argc, const cha pam_set_item(pamh, PAM_RUSER, p); PAM_LOG("Got ruser: %s", p); if (retval == PAM_SUCCESS) { + /* XXX XXX XXX */ p = strtok_r(NULL, "@", &context); if (p != NULL) { pam_set_item(pamh, PAM_RHOST, p); diff --git a/lib/libpam/modules/pam_kerberosIV/pam_kerberosIV.c b/lib/libpam/modules/pam_kerberosIV/pam_kerberosIV.c index ac6ac24..71e22c3 100644 --- a/lib/libpam/modules/pam_kerberosIV/pam_kerberosIV.c +++ b/lib/libpam/modules/pam_kerberosIV/pam_kerberosIV.c @@ -34,9 +34,9 @@ __FBSDID("$FreeBSD$"); #include #define PAM_SM_AUTH +#include #include - -#include "pam_mod_misc.h" +#include #define PASSWORD_PROMPT "Password:" diff --git a/lib/libpam/modules/pam_krb5/pam_krb5.c b/lib/libpam/modules/pam_krb5/pam_krb5.c index afd13dd..2e0a44d 100644 --- a/lib/libpam/modules/pam_krb5/pam_krb5.c +++ b/lib/libpam/modules/pam_krb5/pam_krb5.c @@ -214,8 +214,7 @@ __FBSDID("$FreeBSD$"); #include #include - -#include "pam_mod_misc.h" +#include #define COMPAT_HEIMDAL /* #define COMPAT_MIT */ diff --git a/lib/libpam/modules/pam_lastlog/pam_lastlog.c b/lib/libpam/modules/pam_lastlog/pam_lastlog.c index 0c6af69..4a7c3df 100644 --- a/lib/libpam/modules/pam_lastlog/pam_lastlog.c +++ b/lib/libpam/modules/pam_lastlog/pam_lastlog.c @@ -62,8 +62,9 @@ __FBSDID("$FreeBSD$"); #define PAM_SM_SESSION #define PAM_SM_PASSWORD +#include #include -#include +#include extern int login_access(const char *, const char *); diff --git a/lib/libpam/modules/pam_login_access/pam_login_access.c b/lib/libpam/modules/pam_login_access/pam_login_access.c index 47def65..92bcf5f 100644 --- a/lib/libpam/modules/pam_login_access/pam_login_access.c +++ b/lib/libpam/modules/pam_login_access/pam_login_access.c @@ -49,8 +49,9 @@ __FBSDID("$FreeBSD$"); #define PAM_SM_SESSION #define PAM_SM_PASSWORD +#include #include -#include +#include #include "pam_login_access.h" diff --git a/lib/libpam/modules/pam_nologin/pam_nologin.c b/lib/libpam/modules/pam_nologin/pam_nologin.c index 395c337..dbc02dd 100644 --- a/lib/libpam/modules/pam_nologin/pam_nologin.c +++ b/lib/libpam/modules/pam_nologin/pam_nologin.c @@ -51,9 +51,9 @@ __FBSDID("$FreeBSD$"); #define PAM_SM_SESSION #define PAM_SM_PASSWORD -#include +#include #include -#include "pam_mod_misc.h" +#include #define NOLOGIN "/var/run/nologin" diff --git a/lib/libpam/modules/pam_opie/pam_opie.c b/lib/libpam/modules/pam_opie/pam_opie.c index 327d109..cee5985 100644 --- a/lib/libpam/modules/pam_opie/pam_opie.c +++ b/lib/libpam/modules/pam_opie/pam_opie.c @@ -52,8 +52,9 @@ __FBSDID("$FreeBSD$"); #define PAM_SM_SESSION #define PAM_SM_PASSWORD +#include #include -#include "pam_mod_misc.h" +#include enum { PAM_OPT_AUTH_AS_SELF = PAM_OPT_STD_MAX, diff --git a/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c b/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c index 723333a..0d31dfd 100644 --- a/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c +++ b/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c @@ -49,8 +49,9 @@ __FBSDID("$FreeBSD$"); #define PAM_SM_SESSION #define PAM_SM_PASSWORD +#include #include -#include +#include PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, int argc, const char **argv) diff --git a/lib/libpam/modules/pam_permit/pam_permit.c b/lib/libpam/modules/pam_permit/pam_permit.c index 7bfa40f..f0b5de3 100644 --- a/lib/libpam/modules/pam_permit/pam_permit.c +++ b/lib/libpam/modules/pam_permit/pam_permit.c @@ -32,9 +32,9 @@ __FBSDID("$FreeBSD$"); #define PAM_SM_SESSION #define PAM_SM_PASSWORD +#include #include -#include -#include "pam_mod_misc.h" +#include #define NOBODY "nobody" diff --git a/lib/libpam/modules/pam_radius/pam_radius.c b/lib/libpam/modules/pam_radius/pam_radius.c index 88a7f08..bf23854 100644 --- a/lib/libpam/modules/pam_radius/pam_radius.c +++ b/lib/libpam/modules/pam_radius/pam_radius.c @@ -50,9 +50,9 @@ __FBSDID("$FreeBSD$"); #define PAM_SM_SESSION #define PAM_SM_PASSWORD +#include #include - -#include "pam_mod_misc.h" +#include enum { PAM_OPT_CONF=PAM_OPT_STD_MAX, PAM_OPT_TEMPLATE_USER }; diff --git a/lib/libpam/modules/pam_rootok/pam_rootok.c b/lib/libpam/modules/pam_rootok/pam_rootok.c index b608a18..2ae5eeb 100644 --- a/lib/libpam/modules/pam_rootok/pam_rootok.c +++ b/lib/libpam/modules/pam_rootok/pam_rootok.c @@ -47,8 +47,9 @@ __FBSDID("$FreeBSD$"); #define PAM_SM_SESSION #define PAM_SM_PASSWORD +#include #include -#include +#include PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, int argc, const char **argv) diff --git a/lib/libpam/modules/pam_securetty/pam_securetty.c b/lib/libpam/modules/pam_securetty/pam_securetty.c index c552ccc..b331b1a 100644 --- a/lib/libpam/modules/pam_securetty/pam_securetty.c +++ b/lib/libpam/modules/pam_securetty/pam_securetty.c @@ -48,8 +48,9 @@ __FBSDID("$FreeBSD$"); #define PAM_SM_SESSION #define PAM_SM_PASSWORD +#include #include -#include +#include #define TTY_PREFIX "/dev/" diff --git a/lib/libpam/modules/pam_self/pam_self.c b/lib/libpam/modules/pam_self/pam_self.c index 713e639..a9a4a36 100644 --- a/lib/libpam/modules/pam_self/pam_self.c +++ b/lib/libpam/modules/pam_self/pam_self.c @@ -48,8 +48,9 @@ __FBSDID("$FreeBSD$"); #define PAM_SM_SESSION #define PAM_SM_PASSWORD +#include #include -#include +#include enum { PAM_OPT_EVEN_ROOT = PAM_OPT_STD_MAX, diff --git a/lib/libpam/modules/pam_ssh/pam_ssh.c b/lib/libpam/modules/pam_ssh/pam_ssh.c index f6bf022..e17d164 100644 --- a/lib/libpam/modules/pam_ssh/pam_ssh.c +++ b/lib/libpam/modules/pam_ssh/pam_ssh.c @@ -56,6 +56,7 @@ __FBSDID("$FreeBSD$"); #define PAM_SM_SESSION #define PAM_SM_PASSWORD +#include #include #include diff --git a/lib/libpam/modules/pam_tacplus/pam_tacplus.c b/lib/libpam/modules/pam_tacplus/pam_tacplus.c index 1d88de1..d56aa32 100644 --- a/lib/libpam/modules/pam_tacplus/pam_tacplus.c +++ b/lib/libpam/modules/pam_tacplus/pam_tacplus.c @@ -51,9 +51,9 @@ __FBSDID("$FreeBSD$"); #define PAM_SM_SESSION #define PAM_SM_PASSWORD +#include #include - -#include "pam_mod_misc.h" +#include enum { PAM_OPT_CONF=PAM_OPT_STD_MAX, PAM_OPT_TEMPLATE_USER }; diff --git a/lib/libpam/modules/pam_unix/pam_unix.c b/lib/libpam/modules/pam_unix/pam_unix.c index 6eb4437..11cd425 100644 --- a/lib/libpam/modules/pam_unix/pam_unix.c +++ b/lib/libpam/modules/pam_unix/pam_unix.c @@ -71,9 +71,9 @@ __FBSDID("$FreeBSD$"); #define PAM_SM_SESSION #define PAM_SM_PASSWORD +#include #include - -#include "pam_mod_misc.h" +#include #define USER_PROMPT "Username: " #define PASSWORD_PROMPT "Password:" diff --git a/lib/libpam/modules/pam_wheel/pam_wheel.c b/lib/libpam/modules/pam_wheel/pam_wheel.c index 8cbb062..02ed763 100644 --- a/lib/libpam/modules/pam_wheel/pam_wheel.c +++ b/lib/libpam/modules/pam_wheel/pam_wheel.c @@ -53,8 +53,9 @@ __FBSDID("$FreeBSD$"); #define PAM_SM_SESSION #define PAM_SM_PASSWORD +#include #include -#include +#include enum { PAM_OPT_DENY=PAM_OPT_STD_MAX, PAM_OPT_GROUP, PAM_OPT_TRUST, PAM_OPT_AUTH_AS_SELF, PAM_OPT_NOROOT_OK }; -- cgit v1.1