diff options
21 files changed, 138 insertions, 127 deletions
diff --git a/lib/libpam/modules/Makefile.inc b/lib/libpam/modules/Makefile.inc index fc030cf..e4b0072 100644 --- a/lib/libpam/modules/Makefile.inc +++ b/lib/libpam/modules/Makefile.inc @@ -5,7 +5,6 @@ PAMDIR= ${.CURDIR}/../../../../contrib/libpam INTERNALLIB= yes INTERNALSTATICLIB=yes -CFLAGS+= -Wall CFLAGS+= -I${PAMDIR}/libpam/include CFLAGS+= -I${.CURDIR}/../../libpam @@ -15,3 +14,5 @@ CFLAGS+= -I${.CURDIR}/../../libpam # Punt for the time being until I can figure out how to do it. #DPADD+= ${LIBPAM} #LDADD+= -lpam + +.include "../Makefile.inc" diff --git a/lib/libpam/modules/pam_deny/pam_deny.c b/lib/libpam/modules/pam_deny/pam_deny.c index 1a735cc..e3e7e2d4 100644 --- a/lib/libpam/modules/pam_deny/pam_deny.c +++ b/lib/libpam/modules/pam_deny/pam_deny.c @@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$"); #include "pam_mod_misc.h" PAM_EXTERN int -pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, int argc, const char **argv) { struct options options; @@ -50,7 +50,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_setcred(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_setcred(pam_handle_t *pamh, int flags __unused, int argc, const char **argv) { struct options options; @@ -64,7 +64,7 @@ pam_sm_setcred(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc ,const char **argv) +pam_sm_acct_mgmt(pam_handle_t *pamh, int flags __unused, int argc ,const char **argv) { struct options options; @@ -78,7 +78,7 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc ,const char **argv) } PAM_EXTERN int -pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_chauthtok(pam_handle_t *pamh, int flags __unused, int argc, const char **argv) { struct options options; @@ -92,7 +92,7 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_open_session(pam_handle_t *pamh, int flags __unused, int argc, const char **argv) { struct options options; @@ -106,7 +106,7 @@ pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_close_session(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_close_session(pam_handle_t *pamh, int flags __unused, int argc, const char **argv) { struct options options; diff --git a/lib/libpam/modules/pam_ftp/pam_ftp.c b/lib/libpam/modules/pam_ftp/pam_ftp.c index 6966316..e7a04a0 100644 --- a/lib/libpam/modules/pam_ftp/pam_ftp.c +++ b/lib/libpam/modules/pam_ftp/pam_ftp.c @@ -112,12 +112,12 @@ lookup(const char *user, char *list, const char **userret) * and succeed, otherwise fail. */ PAM_EXTERN int -pam_sm_authenticate(pam_handle_t * pamh, int flags, int argc, const char **argv) +pam_sm_authenticate(pam_handle_t * pamh, int flags __unused, int argc, const char **argv) { struct options options; int retval, anon; - char *users, *context, *prompt, *token, *p; - const char *user; + char *users, *context, *token, *p; + const char *user, *prompt; pam_std_option(&options, other_options, argc, argv); @@ -195,7 +195,7 @@ pam_sm_authenticate(pam_handle_t * pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_setcred(pam_handle_t * pamh, int flags, int argc, const char **argv) +pam_sm_setcred(pam_handle_t * pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; @@ -207,7 +207,7 @@ pam_sm_setcred(pam_handle_t * pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc ,const char **argv) +pam_sm_acct_mgmt(pam_handle_t *pamh __unused, int flags __unused, int argc ,const char **argv) { struct options options; @@ -219,7 +219,7 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc ,const char **argv) } PAM_EXTERN int -pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_chauthtok(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; @@ -231,7 +231,7 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_open_session(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; @@ -243,7 +243,7 @@ pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_close_session(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_close_session(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; diff --git a/lib/libpam/modules/pam_krb5/Makefile b/lib/libpam/modules/pam_krb5/Makefile index 0e0cbaf..72179cd 100644 --- a/lib/libpam/modules/pam_krb5/Makefile +++ b/lib/libpam/modules/pam_krb5/Makefile @@ -27,6 +27,7 @@ LIB= pam_krb5 SHLIB_NAME= pam_krb5.so SRCS= pam_krb5.c +NO_WERROR= yes DPADD= ${LIBKRB5} ${LIBGSSAPI} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} \ ${LIBCOM_ERR} ${LIBROKEN} LDADD= -lkrb5 -lgssapi -lasn1 -lcrypto -lcrypt -lcom_err \ diff --git a/lib/libpam/modules/pam_krb5/pam_krb5.c b/lib/libpam/modules/pam_krb5/pam_krb5.c index 1eaa470..afd13dd 100644 --- a/lib/libpam/modules/pam_krb5/pam_krb5.c +++ b/lib/libpam/modules/pam_krb5/pam_krb5.c @@ -247,7 +247,7 @@ static struct opttab other_options[] = { * authentication management */ PAM_EXTERN int -pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, int argc, const char **argv) { krb5_error_code krbret; krb5_context pam_context; @@ -258,8 +258,8 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv) struct options options; struct passwd *pwd; int retval; - const char *sourceuser, *user, *pass; - char *principal, *princ_name, *service, *cache_name, luser[32]; + const char *sourceuser, *user, *pass, *service; + char *principal, *princ_name, *cache_name, luser[32]; pam_std_option(&options, other_options, argc, argv); @@ -708,7 +708,7 @@ cleanup3: * account management */ PAM_EXTERN int -pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_acct_mgmt(pam_handle_t *pamh, int flags __unused, int argc, const char **argv) { krb5_error_code krbret; krb5_context pam_context; @@ -773,7 +773,7 @@ cleanup: * logging only */ PAM_EXTERN int -pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_open_session(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; @@ -785,7 +785,7 @@ pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_close_session(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_close_session(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; @@ -896,7 +896,7 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char **argv) PAM_LOG("New passwords are the same"); /* Change it */ - krbret = krb5_change_password(pam_context, &creds, (char *)pass, + krbret = krb5_change_password(pam_context, &creds, pass, &result_code, &result_code_string, &result_string); if (krbret != 0) { PAM_LOG("Error krb5_change_password(): %s", @@ -959,7 +959,8 @@ verify_krb_v5_tgt(krb5_context context, krb5_ccache ccache, krb5_keyblock *keyblock; krb5_data packet; krb5_auth_context auth_context; - char phost[BUFSIZ], *services[3], **service; + char phost[BUFSIZ]; + const char *services[3], **service; packet.data = 0; @@ -1047,7 +1048,7 @@ cleanup: /* Free the memory for cache_name. Called by pam_end() */ static void -cleanup_cache(pam_handle_t *pamh, void *data, int pam_end_status) +cleanup_cache(pam_handle_t *pamh __unused, void *data, int pam_end_status __unused) { krb5_context pam_context; krb5_ccache ccache; @@ -1074,13 +1075,13 @@ cleanup_cache(pam_handle_t *pamh, void *data, int pam_end_status) #ifdef COMPAT_HEIMDAL static const char * -compat_princ_component(krb5_context context, krb5_principal princ, int n) +compat_princ_component(krb5_context context __unused, krb5_principal princ, int n) { return princ->name.name_string.val[n]; } static void -compat_free_data_contents(krb5_context context, krb5_data * data) +compat_free_data_contents(krb5_context context __unused, krb5_data * data) { krb5_xfree(data->data); } diff --git a/lib/libpam/modules/pam_lastlog/pam_lastlog.c b/lib/libpam/modules/pam_lastlog/pam_lastlog.c index 8db71f2..d3b8860 100644 --- a/lib/libpam/modules/pam_lastlog/pam_lastlog.c +++ b/lib/libpam/modules/pam_lastlog/pam_lastlog.c @@ -68,7 +68,7 @@ __FBSDID("$FreeBSD$"); extern int login_access(const char *, const char *); PAM_EXTERN int -pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_authenticate(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; @@ -80,7 +80,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_setcred(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_setcred(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; @@ -92,7 +92,7 @@ pam_sm_setcred(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc ,const char **argv) +pam_sm_acct_mgmt(pam_handle_t *pamh __unused, int flags __unused, int argc ,const char **argv) { struct options options; @@ -104,7 +104,7 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc ,const char **argv) } PAM_EXTERN int -pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_chauthtok(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; @@ -219,7 +219,7 @@ pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_close_session(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_close_session(pam_handle_t *pamh, int flags __unused, int argc, const char **argv) { struct options options; 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 cf5b9cc..b9ae44d 100644 --- a/lib/libpam/modules/pam_login_access/pam_login_access.c +++ b/lib/libpam/modules/pam_login_access/pam_login_access.c @@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$"); extern int login_access(const char *, const char *); PAM_EXTERN int -pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_authenticate(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; @@ -67,7 +67,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_setcred(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_setcred(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; @@ -79,7 +79,7 @@ pam_sm_setcred(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc ,const char **argv) +pam_sm_acct_mgmt(pam_handle_t *pamh, int flags __unused, int argc ,const char **argv) { struct options options; const char *rhost, *tty, *user; @@ -129,7 +129,7 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc ,const char **argv) } PAM_EXTERN int -pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_chauthtok(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; @@ -141,7 +141,7 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_open_session(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; @@ -153,7 +153,7 @@ pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_close_session(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_close_session(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; diff --git a/lib/libpam/modules/pam_nologin/pam_nologin.c b/lib/libpam/modules/pam_nologin/pam_nologin.c index 1c6b002..395c337 100644 --- a/lib/libpam/modules/pam_nologin/pam_nologin.c +++ b/lib/libpam/modules/pam_nologin/pam_nologin.c @@ -57,8 +57,10 @@ __FBSDID("$FreeBSD$"); #define NOLOGIN "/var/run/nologin" +static char nologin_def[] = NOLOGIN; + PAM_EXTERN int -pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, int argc, const char **argv) { login_cap_t *lc; struct options options; @@ -79,7 +81,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv) PAM_LOG("Got user: %s", user); lc = login_getclass(NULL); - nologin = login_getcapstr(lc, "nologin", NOLOGIN, NOLOGIN); + nologin = login_getcapstr(lc, "nologin", nologin_def, nologin_def); login_close(lc); lc = NULL; @@ -117,7 +119,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_setcred(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_setcred(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; @@ -129,7 +131,7 @@ pam_sm_setcred(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc ,const char **argv) +pam_sm_acct_mgmt(pam_handle_t *pamh __unused, int flags __unused, int argc ,const char **argv) { struct options options; @@ -141,7 +143,7 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc ,const char **argv) } PAM_EXTERN int -pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_chauthtok(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; @@ -153,7 +155,7 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_open_session(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; @@ -165,7 +167,7 @@ pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_close_session(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_close_session(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; diff --git a/lib/libpam/modules/pam_opie/Makefile b/lib/libpam/modules/pam_opie/Makefile index 704f2f6..79c723b 100644 --- a/lib/libpam/modules/pam_opie/Makefile +++ b/lib/libpam/modules/pam_opie/Makefile @@ -28,6 +28,7 @@ LIB= pam_opie SHLIB_NAME= pam_opie.so SRCS= pam_opie.c +NO_WERROR= yes DPADD= ${LIBOPIE} LDADD= -lopie MAN= pam_opie.8 diff --git a/lib/libpam/modules/pam_opie/pam_opie.c b/lib/libpam/modules/pam_opie/pam_opie.c index 93629d3..327d109 100644 --- a/lib/libpam/modules/pam_opie/pam_opie.c +++ b/lib/libpam/modules/pam_opie/pam_opie.c @@ -67,13 +67,13 @@ static struct opttab other_options[] = { }; PAM_EXTERN int -pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, int argc, const char **argv) { struct opie opie; struct options options; struct passwd *pwd; int retval, i; - char *(promptstr[]) = { "%s\nPassword: ", "%s\nPassword [echo on]: "}; + const char *(promptstr[]) = { "%s\nPassword: ", "%s\nPassword [echo on]: "}; char challenge[OPIE_CHALLENGE_MAX]; char prompt[OPIE_CHALLENGE_MAX+22]; char resp[OPIE_SECRET_MAX]; @@ -152,7 +152,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_setcred(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_setcred(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; @@ -164,7 +164,7 @@ pam_sm_setcred(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc ,const char **argv) +pam_sm_acct_mgmt(pam_handle_t *pamh __unused, int flags __unused, int argc ,const char **argv) { struct options options; @@ -176,7 +176,7 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc ,const char **argv) } PAM_EXTERN int -pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_chauthtok(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; @@ -188,7 +188,7 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_open_session(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; @@ -200,7 +200,7 @@ pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_close_session(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_close_session(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; diff --git a/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c b/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c index 49d18f5..723333a 100644 --- a/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c +++ b/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c @@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$"); #include <pam_mod_misc.h> PAM_EXTERN int -pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, int argc, const char **argv) { struct options options; struct opie opie; @@ -89,7 +89,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_setcred(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_setcred(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; @@ -101,7 +101,7 @@ pam_sm_setcred(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc ,const char **argv) +pam_sm_acct_mgmt(pam_handle_t *pamh __unused, int flags __unused, int argc ,const char **argv) { struct options options; @@ -113,7 +113,7 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc ,const char **argv) } PAM_EXTERN int -pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_chauthtok(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; @@ -125,7 +125,7 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_open_session(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; @@ -137,7 +137,7 @@ pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_close_session(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_close_session(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; diff --git a/lib/libpam/modules/pam_permit/pam_permit.c b/lib/libpam/modules/pam_permit/pam_permit.c index c58b5e2..7bfa40f 100644 --- a/lib/libpam/modules/pam_permit/pam_permit.c +++ b/lib/libpam/modules/pam_permit/pam_permit.c @@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$"); #define NOBODY "nobody" PAM_EXTERN int -pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, int argc, const char **argv) { struct options options; int retval; @@ -65,7 +65,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_setcred(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_setcred(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; @@ -77,7 +77,7 @@ pam_sm_setcred(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc ,const char **argv) +pam_sm_acct_mgmt(pam_handle_t *pamh __unused, int flags __unused, int argc ,const char **argv) { struct options options; @@ -89,7 +89,7 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc ,const char **argv) } PAM_EXTERN int -pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_chauthtok(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; @@ -101,7 +101,7 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_open_session(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; @@ -113,7 +113,7 @@ pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_close_session(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_close_session(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; diff --git a/lib/libpam/modules/pam_radius/Makefile b/lib/libpam/modules/pam_radius/Makefile index 0121f10..0241e52 100644 --- a/lib/libpam/modules/pam_radius/Makefile +++ b/lib/libpam/modules/pam_radius/Makefile @@ -27,6 +27,7 @@ LIB= pam_radius SHLIB_NAME= pam_radius.so SRCS= pam_radius.c +NO_WERROR= yes DPADD= ${LIBRADIUS} LDADD= -lradius diff --git a/lib/libpam/modules/pam_radius/pam_radius.c b/lib/libpam/modules/pam_radius/pam_radius.c index d520b3d..88a7f08 100644 --- a/lib/libpam/modules/pam_radius/pam_radius.c +++ b/lib/libpam/modules/pam_radius/pam_radius.c @@ -208,12 +208,12 @@ do_challenge(pam_handle_t *pamh, struct rad_handle *radh, const char *user) free(resp[num_msgs-1].resp); free(resp); while (num_msgs > 0) - free((void *)msgs[--num_msgs].msg); + free(msgs[--num_msgs].msg); return PAM_SUCCESS; } PAM_EXTERN int -pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, int argc, const char **argv) { struct options options; struct rad_handle *radh; @@ -285,8 +285,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv) * to the value given in the "template_user" * option. */ - retval = pam_get_item(pamh, PAM_USER, - (void *)&tmpuser); + retval = pam_get_item(pamh, PAM_USER, &tmpuser); if (retval != PAM_SUCCESS) PAM_RETURN(retval); if (getpwnam(tmpuser) == NULL) { @@ -329,7 +328,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_setcred(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_setcred(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; @@ -341,7 +340,7 @@ pam_sm_setcred(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc ,const char **argv) +pam_sm_acct_mgmt(pam_handle_t *pamh __unused, int flags __unused, int argc ,const char **argv) { struct options options; @@ -353,7 +352,7 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc ,const char **argv) } PAM_EXTERN int -pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_chauthtok(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; @@ -365,7 +364,7 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_open_session(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; @@ -377,7 +376,7 @@ pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_close_session(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_close_session(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; diff --git a/lib/libpam/modules/pam_rootok/pam_rootok.c b/lib/libpam/modules/pam_rootok/pam_rootok.c index d790010..b608a18 100644 --- a/lib/libpam/modules/pam_rootok/pam_rootok.c +++ b/lib/libpam/modules/pam_rootok/pam_rootok.c @@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$"); #include <pam_mod_misc.h> PAM_EXTERN int -pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, int argc, const char **argv) { struct options options; @@ -69,7 +69,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_setcred(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_setcred(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; @@ -81,7 +81,7 @@ pam_sm_setcred(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc ,const char **argv) +pam_sm_acct_mgmt(pam_handle_t *pamh __unused, int flags __unused, int argc ,const char **argv) { struct options options; @@ -93,7 +93,7 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc ,const char **argv) } PAM_EXTERN int -pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_chauthtok(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; @@ -105,7 +105,7 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_open_session(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; @@ -117,7 +117,7 @@ pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_close_session(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_close_session(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; diff --git a/lib/libpam/modules/pam_securetty/pam_securetty.c b/lib/libpam/modules/pam_securetty/pam_securetty.c index f54a70a..cb7f23d 100644 --- a/lib/libpam/modules/pam_securetty/pam_securetty.c +++ b/lib/libpam/modules/pam_securetty/pam_securetty.c @@ -54,7 +54,7 @@ __FBSDID("$FreeBSD$"); #define TTY_PREFIX "/dev/" PAM_EXTERN int -pam_sm_authenticate(pam_handle_t * pamh, int flags, int argc, const char **argv) +pam_sm_authenticate(pam_handle_t * pamh, int flags __unused, int argc, const char **argv) { struct options options; struct ttyent *ttyfileinfo; @@ -107,7 +107,7 @@ pam_sm_authenticate(pam_handle_t * pamh, int flags, int argc, const char **argv) PAM_EXTERN int -pam_sm_setcred(pam_handle_t * pamh, int flags, int argc, const char **argv) +pam_sm_setcred(pam_handle_t * pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; @@ -119,7 +119,7 @@ pam_sm_setcred(pam_handle_t * pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc ,const char **argv) +pam_sm_acct_mgmt(pam_handle_t *pamh __unused, int flags __unused, int argc ,const char **argv) { struct options options; @@ -131,7 +131,7 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc ,const char **argv) } PAM_EXTERN int -pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_chauthtok(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; @@ -143,7 +143,7 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_open_session(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; @@ -155,7 +155,7 @@ pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_close_session(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_close_session(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; diff --git a/lib/libpam/modules/pam_self/pam_self.c b/lib/libpam/modules/pam_self/pam_self.c index 5b6ff31..713e639 100644 --- a/lib/libpam/modules/pam_self/pam_self.c +++ b/lib/libpam/modules/pam_self/pam_self.c @@ -61,7 +61,7 @@ static struct opttab other_options[] = { }; PAM_EXTERN int -pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, int argc, const char **argv) { struct options options; struct passwd *pwd; @@ -92,7 +92,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_setcred(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_setcred(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; @@ -104,7 +104,7 @@ pam_sm_setcred(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc ,const char **argv) +pam_sm_acct_mgmt(pam_handle_t *pamh __unused, int flags __unused, int argc ,const char **argv) { struct options options; @@ -116,7 +116,7 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc ,const char **argv) } PAM_EXTERN int -pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_chauthtok(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; @@ -128,7 +128,7 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_open_session(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; @@ -140,7 +140,7 @@ pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_close_session(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_close_session(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; diff --git a/lib/libpam/modules/pam_ssh/pam_ssh.c b/lib/libpam/modules/pam_ssh/pam_ssh.c index c8c9d8c..d22c99f 100644 --- a/lib/libpam/modules/pam_ssh/pam_ssh.c +++ b/lib/libpam/modules/pam_ssh/pam_ssh.c @@ -68,12 +68,16 @@ __FBSDID("$FreeBSD$"); #include "log.h" #include "pam_ssh.h" +static int auth_via_key(pam_handle_t *, int, const char *, const char *, const struct passwd *, const char *); +static void key_cleanup(pam_handle_t *, void *, int); +static void ssh_cleanup(pam_handle_t *, void *, int); + /* * Generic cleanup function for SSH "Key" type. */ -void -key_cleanup(pam_handle_t *pamh, void *data, int error_status) +static void +key_cleanup(pam_handle_t *pamh __unused, void *data, int error_status __unused) { if (data) key_free(data); @@ -84,8 +88,8 @@ key_cleanup(pam_handle_t *pamh, void *data, int error_status) * Generic PAM cleanup function for this module. */ -void -ssh_cleanup(pam_handle_t *pamh, void *data, int error_status) +static void +ssh_cleanup(pam_handle_t *pamh __unused, void *data, int error_status __unused) { if (data) free(data); @@ -100,13 +104,13 @@ ssh_cleanup(pam_handle_t *pamh, void *data, int error_status) * for multiple keys. */ -int +static int auth_via_key(pam_handle_t *pamh, int type, const char *file, const char *dir, const struct passwd *user, const char *pass) { char *comment; /* private key comment */ char *data_name; /* PAM state */ - static int index = 0; /* for saved keys */ + static int indx = 0; /* for saved keys */ Key *key; /* user's key */ char *path; /* to key files */ int retval; /* from calls */ @@ -132,7 +136,7 @@ auth_via_key(pam_handle_t *pamh, int type, const char *file, * Save the key and comment to pass to ssh-agent in the session * phase. */ - if (!asprintf(&data_name, "ssh_private_key_%d", index)) { + if (!asprintf(&data_name, "ssh_private_key_%d", indx)) { syslog(LOG_CRIT, "%s: %m", MODULE_NAME); free(comment); return PAM_SERVICE_ERR; @@ -144,7 +148,7 @@ auth_via_key(pam_handle_t *pamh, int type, const char *file, free(comment); return retval; } - if (!asprintf(&data_name, "ssh_key_comment_%d", index)) { + if (!asprintf(&data_name, "ssh_key_comment_%d", indx)) { syslog(LOG_CRIT, "%s: %m", MODULE_NAME); free(comment); return PAM_SERVICE_ERR; @@ -155,13 +159,13 @@ auth_via_key(pam_handle_t *pamh, int type, const char *file, free(comment); return retval; } - ++index; + ++indx; return PAM_SUCCESS; } PAM_EXTERN int -pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, int argc, const char **argv) { struct options options; /* module options */ int authenticated; /* user authenticated? */ @@ -284,7 +288,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv) PAM_EXTERN int -pam_sm_setcred(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_setcred(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; /* module options */ @@ -296,7 +300,7 @@ pam_sm_setcred(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc ,const char **argv) +pam_sm_acct_mgmt(pam_handle_t *pamh __unused, int flags __unused, int argc ,const char **argv) { struct options options; @@ -308,7 +312,7 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc ,const char **argv) } PAM_EXTERN int -pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_chauthtok(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; @@ -322,7 +326,7 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char **argv) typedef AuthenticationConnection AC; PAM_EXTERN int -pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_open_session(pam_handle_t *pamh, int flags __unused, int argc, const char **argv) { struct options options; /* module options */ AC *ac; /* to ssh-agent */ @@ -334,9 +338,9 @@ pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv) char *env_value; /* envariable value */ char *data_name; /* PAM state */ int final; /* final return value */ - int index; /* for saved keys */ + int indx; /* for saved keys */ Key *key; /* user's private key */ - FILE *pipe; /* ssh-agent handle */ + FILE *lpipe; /* ssh-agent handle */ struct passwd *pwd; /* user's passwd entry */ int retval; /* from calls */ uid_t saved_uid; /* caller's uid */ @@ -393,9 +397,9 @@ pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv) env_fp = fopen(env_file, "w"); if (env_fp != NULL) chmod(env_file, S_IRUSR); - pipe = popen(SSH_AGENT, "r"); + lpipe = popen(SSH_AGENT, "r"); seteuid(saved_uid); - if (!pipe) { + if (!lpipe) { syslog(LOG_ERR, "%s: %s: %m", MODULE_NAME, SSH_AGENT); if (env_fp) fclose(env_fp); @@ -408,7 +412,7 @@ pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv) * Save environment for application with pam_putenv(). */ agent_socket = NULL; - while (fgets(env_string, sizeof env_string, pipe)) { + while (fgets(env_string, sizeof env_string, lpipe)) { if (env_fp) fputs(env_string, env_fp); env_value = strchr(env_string, '='); @@ -421,7 +425,7 @@ pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv) /* pass to the application ... */ retval = pam_putenv(pamh, env_string); if (retval != PAM_SUCCESS) { - pclose(pipe); + pclose(lpipe); if (env_fp) fclose(env_fp); PAM_RETURN(PAM_SERVICE_ERR); @@ -454,7 +458,7 @@ pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv) } if (env_fp) fclose(env_fp); - retval = pclose(pipe); + retval = pclose(lpipe); switch (retval) { case -1: syslog(LOG_ERR, "%s: %s: %m", MODULE_NAME, SSH_AGENT); @@ -488,8 +492,8 @@ pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv) /* hand off each private key to the agent */ final = 0; - for (index = 0; ; index++) { - if (!asprintf(&data_name, "ssh_private_key_%d", index)) { + for (indx = 0; ; indx++) { + if (!asprintf(&data_name, "ssh_private_key_%d", indx)) { syslog(LOG_CRIT, "%s: %m", MODULE_NAME); ssh_close_authentication_connection(ac); PAM_RETURN(PAM_SERVICE_ERR); @@ -498,7 +502,7 @@ pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv) free(data_name); if (retval != PAM_SUCCESS) break; - if (!asprintf(&data_name, "ssh_key_comment_%d", index)) { + if (!asprintf(&data_name, "ssh_key_comment_%d", indx)) { syslog(LOG_CRIT, "%s: %m", MODULE_NAME); ssh_close_authentication_connection(ac); PAM_RETURN(PAM_SERVICE_ERR); @@ -520,7 +524,7 @@ pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv) PAM_EXTERN int -pam_sm_close_session(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_close_session(pam_handle_t *pamh, int flags __unused, int argc, const char **argv) { struct options options; /* module options */ const char *env_file; /* ssh-agent environment */ diff --git a/lib/libpam/modules/pam_tacplus/pam_tacplus.c b/lib/libpam/modules/pam_tacplus/pam_tacplus.c index 0dae0dc..1d88de1 100644 --- a/lib/libpam/modules/pam_tacplus/pam_tacplus.c +++ b/lib/libpam/modules/pam_tacplus/pam_tacplus.c @@ -114,7 +114,7 @@ set_msg(struct tac_handle *tach, const char *msg) } PAM_EXTERN int -pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, +pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, int argc, const char **argv) { struct options options; @@ -288,7 +288,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, } PAM_EXTERN int -pam_sm_setcred(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_setcred(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; @@ -300,7 +300,7 @@ pam_sm_setcred(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc ,const char **argv) +pam_sm_acct_mgmt(pam_handle_t *pamh __unused, int flags __unused, int argc ,const char **argv) { struct options options; @@ -312,7 +312,7 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc ,const char **argv) } PAM_EXTERN int -pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_chauthtok(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; @@ -324,7 +324,7 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_open_session(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; @@ -336,7 +336,7 @@ pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_close_session(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_close_session(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; diff --git a/lib/libpam/modules/pam_unix/Makefile b/lib/libpam/modules/pam_unix/Makefile index 8365ab5..619b8c3 100644 --- a/lib/libpam/modules/pam_unix/Makefile +++ b/lib/libpam/modules/pam_unix/Makefile @@ -32,6 +32,7 @@ CFLAGS= -DYP -Dyp_error=warnx \ -I${.CURDIR}/../../../../libexec/ypxfr \ -I${.CURDIR}/../../../../usr.sbin/vipw \ -I${.CURDIR}/../../../../usr.bin/chpass +NO_WERROR= yes DPADD= ${LIBUTIL} ${LIBCRYPT} ${LIBRPCSVC} LDADD= -lutil -lcrypt -lrpcsvc MAN= pam_unix.8 diff --git a/lib/libpam/modules/pam_wheel/pam_wheel.c b/lib/libpam/modules/pam_wheel/pam_wheel.c index ce7e954..8cbb062 100644 --- a/lib/libpam/modules/pam_wheel/pam_wheel.c +++ b/lib/libpam/modules/pam_wheel/pam_wheel.c @@ -79,7 +79,7 @@ in_list(char *const *list, const char *member) } PAM_EXTERN int -pam_sm_authenticate(pam_handle_t * pamh, int flags, int argc, const char **argv) +pam_sm_authenticate(pam_handle_t * pamh, int flags __unused, int argc, const char **argv) { struct options options; struct passwd *pwd; @@ -169,7 +169,7 @@ pam_sm_authenticate(pam_handle_t * pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_setcred(pam_handle_t * pamh, int flags, int argc, const char **argv) +pam_sm_setcred(pam_handle_t * pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; @@ -181,7 +181,7 @@ pam_sm_setcred(pam_handle_t * pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc ,const char **argv) +pam_sm_acct_mgmt(pam_handle_t *pamh __unused, int flags __unused, int argc ,const char **argv) { struct options options; @@ -193,7 +193,7 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc ,const char **argv) } PAM_EXTERN int -pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_chauthtok(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; @@ -205,7 +205,7 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_open_session(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; @@ -217,7 +217,7 @@ pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv) } PAM_EXTERN int -pam_sm_close_session(pam_handle_t *pamh, int flags, int argc, const char **argv) +pam_sm_close_session(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) { struct options options; |
