From 50c04bd94ce573a123a1a92f713646e00bc77b39 Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk Date: Mon, 29 Aug 2005 13:04:37 +0000 Subject: Relevant BUGIDs: none Purpose of commit: cleanup Commit summary: --------------- cleanup the header files, don't include allways all other header files. --- CHANGELOG | 4 ++-- libpam/include/security/_pam_types.h | 34 +++++----------------------------- libpam/include/security/pam_modules.h | 6 ------ libpam/pam_private.h | 3 +-- modules/pam_mkhomedir/pam_mkhomedir.c | 1 + modules/pam_selinux/pam_selinux.c | 1 + modules/pam_umask/pam_umask.c | 1 + modules/pam_unix/pam_unix_auth.c | 1 + modules/pam_unix/support.c | 1 + 9 files changed, 13 insertions(+), 39 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 52d550f8..822bc6de 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -79,8 +79,8 @@ BerliOS Bugs are marked with (BerliOS #XXXX). * Add gettext support * Add translations for cs, de, es, fr, hu, it, ja, nb, pa, pt_BR, pt, zh_CN and zh_TW -* pam_limits: Apply ALT-Linux/OWL patch -* pam_motd: Apply ALT-Linux/OWL patch +* pam_limits: Apply ALT Linux/Owl patch +* pam_motd: Apply ALT Linux/Owl patch * libpam: Cache pam_get_user() failures 0.80: Wed Jul 13 13:23:20 CEST 2005 diff --git a/libpam/include/security/_pam_types.h b/libpam/include/security/_pam_types.h index 366b7e04..116a2916 100644 --- a/libpam/include/security/_pam_types.h +++ b/libpam/include/security/_pam_types.h @@ -14,12 +14,6 @@ #ifndef _SECURITY__PAM_TYPES_H #define _SECURITY__PAM_TYPES_H -/* - * include local definition for POSIX - NULL - */ - -#include - /* This is a blind structure; users aren't allowed to see inside a * pam_handle_t, so we don't define struct pam_handle here. This is * defined in a file private to the PAM library. (i.e., it's private @@ -128,16 +122,17 @@ typedef struct pam_handle pam_handle_t; /* ------------------ The Linux-PAM item types ------------------- */ -/* these defines are used by pam_set_item() and pam_get_item() */ +/* These defines are used by pam_set_item() and pam_get_item(). + Please check the spec which are allowed for use by applications + and which are only allowed for use by modules. */ #define PAM_SERVICE 1 /* The service name */ #define PAM_USER 2 /* The user name */ #define PAM_TTY 3 /* The tty name */ #define PAM_RHOST 4 /* The remote host name */ #define PAM_CONV 5 /* The pam_conv structure */ - -/* missing entries found in for modules only! */ - +#define PAM_AUTHTOK 6 /* The authentication token (password) */ +#define PAM_OLDAUTHTOK 7 /* The old authentication token */ #define PAM_RUSER 8 /* The remote user name */ #define PAM_USER_PROMPT 9 /* the prompt for getting a username */ #define PAM_FAIL_DELAY 10 /* app supplied function to override failure @@ -184,13 +179,6 @@ extern char **pam_getenvlist(pam_handle_t *pamh); #define HAVE_PAM_FAIL_DELAY extern int pam_fail_delay(pam_handle_t *pamh, unsigned int musec_delay); -#include -#ifndef LOG_AUTHPRIV -# ifdef LOG_PRIV -# define LOG_AUTHPRIV LOG_PRIV -# endif /* LOG_PRIV */ -#endif /* !LOG_AUTHPRIV */ - #ifdef MEMORY_DEBUG /* * this defines some macros that keep track of what memory has been @@ -267,18 +255,6 @@ struct pam_conv { void *appdata_ptr; }; -#ifndef LINUX_PAM -/* - * the following few lines represent a hack. They are there to make - * the Linux-PAM headers more compatible with the Sun ones, which have a - * less strictly separated notion of module specific and application - * specific definitions. - */ -#include -#include -#endif - - /* ... adapted from the pam_appl.h file created by Theodore Ts'o and * * Copyright Theodore Ts'o, 1996. All rights reserved. diff --git a/libpam/include/security/pam_modules.h b/libpam/include/security/pam_modules.h index 4182ebd6..f174e316 100644 --- a/libpam/include/security/pam_modules.h +++ b/libpam/include/security/pam_modules.h @@ -10,12 +10,6 @@ #include /* Linux-PAM common defined types */ -/* these defines are used by pam_set_item() and pam_get_item() and are - * in addition to those found in */ - -#define PAM_AUTHTOK 6 /* The authentication token (password) */ -#define PAM_OLDAUTHTOK 7 /* The old authentication token */ - /* -------------- The Linux-PAM Module PI ------------- */ extern int pam_set_data(pam_handle_t *pamh, const char *module_data_name, diff --git a/libpam/pam_private.h b/libpam/pam_private.h index 1e3b7fa6..24bb47dc 100644 --- a/libpam/pam_private.h +++ b/libpam/pam_private.h @@ -18,8 +18,7 @@ #include "config.h" -/* this is not used at the moment --- AGM */ -#define LIBPAM_VERSION (LIBPAM_VERSION_MAJOR*0x100 + LIBPAM_VERSION_MINOR) +#include #include #include diff --git a/modules/pam_mkhomedir/pam_mkhomedir.c b/modules/pam_mkhomedir/pam_mkhomedir.c index 95bd72fd..e3c75da1 100644 --- a/modules/pam_mkhomedir/pam_mkhomedir.c +++ b/modules/pam_mkhomedir/pam_mkhomedir.c @@ -40,6 +40,7 @@ #include #include #include +#include /* * here, we make a definition for the externally accessible function diff --git a/modules/pam_selinux/pam_selinux.c b/modules/pam_selinux/pam_selinux.c index de795e11..4f086e11 100644 --- a/modules/pam_selinux/pam_selinux.c +++ b/modules/pam_selinux/pam_selinux.c @@ -51,6 +51,7 @@ #include #include #include +#include #define PAM_SM_AUTH #define PAM_SM_SESSION diff --git a/modules/pam_umask/pam_umask.c b/modules/pam_umask/pam_umask.c index 6731278c..b54fa639 100644 --- a/modules/pam_umask/pam_umask.c +++ b/modules/pam_umask/pam_umask.c @@ -46,6 +46,7 @@ #include #include #include +#include #define PAM_SM_SESSION diff --git a/modules/pam_unix/pam_unix_auth.c b/modules/pam_unix/pam_unix_auth.c index 41b55c27..2412b68a 100644 --- a/modules/pam_unix/pam_unix_auth.c +++ b/modules/pam_unix/pam_unix_auth.c @@ -48,6 +48,7 @@ #include #include #include +#include /* indicate the following groups are defined */ diff --git a/modules/pam_unix/support.c b/modules/pam_unix/support.c index fc7fc2b3..91920291 100644 --- a/modules/pam_unix/support.c +++ b/modules/pam_unix/support.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include -- cgit v1.2.3