From dee497d659371fdb793c8ec8e220d72ccaa02332 Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk Date: Tue, 6 Nov 2007 15:24:26 +0000 Subject: Relevant BUGIDs: 1822761 Purpose of commit: bugfix Commit summary: --------------- 2007-11-06 Thorsten Kukuk * xtests/tst-pam_group1.c: Include stdlib.h * xtests/tst-pam_succeed_if1.c: Likewise. * xtests/tst-pam_limits1.c: Likewise. * xtests/tst-pam_access1.c: Likewise. * xtests/tst-pam_access2.c: Likewise. * xtests/tst-pam_access3.c: Likewise. * xtests/tst-pam_access4.c: Likewise. * xtests/tst-pam_unix1.c: Likewise. * xtests/tst-pam_unix2.c: Likewise. * xtests/tst-pam_unix3.c: Likewise. * xtests/tst-pam_cracklib1.c: Likewise. * xtests/tst-pam_cracklib2.c: Likewise. 2007-10-30 Peter Breitenlohner * modules/pam_rhosts/pam_rhosts_auth.c (__icheckhost): Correct misplaced parenthesis. * modules/pam_unix/pam_unix_acct.c (pam_sm_acct_mgmt): Prevent use of dngettext() when NLS is disabled. * modules/pam_exec/pam_exec.c (call_exec): Avoid gcc warning. * doc/specs/parse_y.y (set_label, new_counter): Break trigraphs to avoid gcc warning. * modules/pam_wheel/pam_wheel.c: Remove excessive initializer elements. --- ChangeLog | 23 +++++++++++++++++++++++ doc/specs/parse_y.y | 4 ++-- modules/pam_exec/pam_exec.c | 2 +- modules/pam_rhosts/pam_rhosts_auth.c | 2 +- modules/pam_unix/pam_unix_acct.c | 2 +- modules/pam_wheel/pam_wheel.c | 3 +-- xtests/tst-pam_access1.c | 1 + xtests/tst-pam_access2.c | 1 + xtests/tst-pam_access3.c | 1 + xtests/tst-pam_access4.c | 1 + xtests/tst-pam_cracklib1.c | 1 + xtests/tst-pam_cracklib2.c | 1 + xtests/tst-pam_group1.c | 1 + xtests/tst-pam_limits1.c | 1 + xtests/tst-pam_succeed_if1.c | 1 + xtests/tst-pam_unix1.c | 1 + xtests/tst-pam_unix2.c | 1 + xtests/tst-pam_unix3.c | 1 + 18 files changed, 41 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index fd3dbe12..1209c9ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,18 @@ 2007-11-06 Thorsten Kukuk + * xtests/tst-pam_group1.c: Include stdlib.h + * xtests/tst-pam_succeed_if1.c: Likewise. + * xtests/tst-pam_limits1.c: Likewise. + * xtests/tst-pam_access1.c: Likewise. + * xtests/tst-pam_access2.c: Likewise. + * xtests/tst-pam_access3.c: Likewise. + * xtests/tst-pam_access4.c: Likewise. + * xtests/tst-pam_unix1.c: Likewise. + * xtests/tst-pam_unix2.c: Likewise. + * xtests/tst-pam_unix3.c: Likewise. + * xtests/tst-pam_cracklib1.c: Likewise. + * xtests/tst-pam_cracklib2.c: Likewise. + * libpam/pam_static_modules.h: Fix name of pam_namespace variable. 2007-11-01 Peter Breitenlohner @@ -8,6 +21,16 @@ 2007-10-30 Peter Breitenlohner + * modules/pam_rhosts/pam_rhosts_auth.c (__icheckhost): Correct + misplaced parenthesis. + * modules/pam_unix/pam_unix_acct.c (pam_sm_acct_mgmt): Prevent use of + dngettext() when NLS is disabled. + * modules/pam_exec/pam_exec.c (call_exec): Avoid gcc warning. + * doc/specs/parse_y.y (set_label, new_counter): Break trigraphs to + avoid gcc warning. + * modules/pam_wheel/pam_wheel.c: Remove excessive initializer + elements. + * modules/pam_cracklib/pam_cracklib.8.xml: Correct typo. * modules/pam_limits/limits.conf.5.xml: Likewise. * modules/pam_listfile/pam_listfile.8.xml: Likewise. diff --git a/doc/specs/parse_y.y b/doc/specs/parse_y.y index 9ea51654..87fc54ea 100644 --- a/doc/specs/parse_y.y +++ b/doc/specs/parse_y.y @@ -229,7 +229,7 @@ void set_label(const char *label, const char *target) { if (target == NULL) { yyerror("no hanging value for label"); - target = ""; + target = ""; /* avoid trigraph warning */ } label_root = set_key(label_root, label, target); } @@ -242,7 +242,7 @@ char *new_counter(const char *key) if (key[i++] != '#') { yyerror("bad index"); - return strdup(""); + return strdup(""); /* avoid trigraph warning */ } while (key[i] == '$') { diff --git a/modules/pam_exec/pam_exec.c b/modules/pam_exec/pam_exec.c index 34ba7404..49790d80 100644 --- a/modules/pam_exec/pam_exec.c +++ b/modules/pam_exec/pam_exec.c @@ -208,7 +208,7 @@ call_exec (pam_handle_t *pamh, int argc, const char **argv) exit (ENOMEM); for (i = 0; i < (argc - optargc); i++) - arggv[i] = argv[i+optargc]; + arggv[i] = strdup(argv[i+optargc]); arggv[i] = NULL; if (debug) diff --git a/modules/pam_rhosts/pam_rhosts_auth.c b/modules/pam_rhosts/pam_rhosts_auth.c index 48fdeced..db28290a 100644 --- a/modules/pam_rhosts/pam_rhosts_auth.c +++ b/modules/pam_rhosts/pam_rhosts_auth.c @@ -267,7 +267,7 @@ __icheckhost (pam_handle_t *pamh, struct _options *opts, u_int32_t raddr /* Try for raw ip address first. */ - if (isdigit(*lhost) && (int32_t)(laddr = inet_addr(lhost) != -1)) + if (isdigit(*lhost) && (int32_t)(laddr = inet_addr(lhost)) != -1) return (negate*(! (raddr ^ laddr))); /* Better be a hostname. */ diff --git a/modules/pam_unix/pam_unix_acct.c b/modules/pam_unix/pam_unix_acct.c index cb2550df..6b04ed2f 100644 --- a/modules/pam_unix/pam_unix_acct.c +++ b/modules/pam_unix/pam_unix_acct.c @@ -317,7 +317,7 @@ PAM_EXTERN int pam_sm_acct_mgmt(pam_handle_t * pamh, int flags, pam_syslog(pamh, LOG_DEBUG, "password for user %s will expire in %d days", uname, daysleft); -#ifdef HAVE_DNGETTEXT +#if defined HAVE_DNGETTEXT && defined ENABLE_NLS snprintf (buf, sizeof (buf), dngettext(PACKAGE, "Warning: your password will expire in %d day", diff --git a/modules/pam_wheel/pam_wheel.c b/modules/pam_wheel/pam_wheel.c index ca0e171d..d7d8096e 100644 --- a/modules/pam_wheel/pam_wheel.c +++ b/modules/pam_wheel/pam_wheel.c @@ -274,8 +274,7 @@ struct pam_module _pam_wheel_modstruct = { pam_sm_acct_mgmt, NULL, NULL, - NULL, - NULL, + NULL }; #endif /* PAM_STATIC */ diff --git a/xtests/tst-pam_access1.c b/xtests/tst-pam_access1.c index 457b95d4..15711297 100644 --- a/xtests/tst-pam_access1.c +++ b/xtests/tst-pam_access1.c @@ -45,6 +45,7 @@ #endif #include +#include #include #include diff --git a/xtests/tst-pam_access2.c b/xtests/tst-pam_access2.c index b6e18812..293d72ab 100644 --- a/xtests/tst-pam_access2.c +++ b/xtests/tst-pam_access2.c @@ -45,6 +45,7 @@ #endif #include +#include #include #include diff --git a/xtests/tst-pam_access3.c b/xtests/tst-pam_access3.c index cd989bb3..817ce930 100644 --- a/xtests/tst-pam_access3.c +++ b/xtests/tst-pam_access3.c @@ -45,6 +45,7 @@ #endif #include +#include #include #include diff --git a/xtests/tst-pam_access4.c b/xtests/tst-pam_access4.c index acdb46f1..2b887a4d 100644 --- a/xtests/tst-pam_access4.c +++ b/xtests/tst-pam_access4.c @@ -45,6 +45,7 @@ #endif #include +#include #include #include diff --git a/xtests/tst-pam_cracklib1.c b/xtests/tst-pam_cracklib1.c index 1600df97..b0e52051 100644 --- a/xtests/tst-pam_cracklib1.c +++ b/xtests/tst-pam_cracklib1.c @@ -36,6 +36,7 @@ #endif #include +#include #include #include diff --git a/xtests/tst-pam_cracklib2.c b/xtests/tst-pam_cracklib2.c index a3d3ff88..84b4ef64 100644 --- a/xtests/tst-pam_cracklib2.c +++ b/xtests/tst-pam_cracklib2.c @@ -39,6 +39,7 @@ #endif #include +#include #include #include #include diff --git a/xtests/tst-pam_group1.c b/xtests/tst-pam_group1.c index f5a04bc0..ca0c2ac9 100644 --- a/xtests/tst-pam_group1.c +++ b/xtests/tst-pam_group1.c @@ -49,6 +49,7 @@ #include #include +#include #include #include #include diff --git a/xtests/tst-pam_limits1.c b/xtests/tst-pam_limits1.c index ed3d3679..d8952400 100644 --- a/xtests/tst-pam_limits1.c +++ b/xtests/tst-pam_limits1.c @@ -46,6 +46,7 @@ #endif #include +#include #include #include #include diff --git a/xtests/tst-pam_succeed_if1.c b/xtests/tst-pam_succeed_if1.c index 24f42302..c0187743 100644 --- a/xtests/tst-pam_succeed_if1.c +++ b/xtests/tst-pam_succeed_if1.c @@ -46,6 +46,7 @@ #endif #include +#include #include #include diff --git a/xtests/tst-pam_unix1.c b/xtests/tst-pam_unix1.c index 7b884997..5ee24082 100644 --- a/xtests/tst-pam_unix1.c +++ b/xtests/tst-pam_unix1.c @@ -40,6 +40,7 @@ #endif #include +#include #include #include diff --git a/xtests/tst-pam_unix2.c b/xtests/tst-pam_unix2.c index bf6cd8e7..65a75f3e 100644 --- a/xtests/tst-pam_unix2.c +++ b/xtests/tst-pam_unix2.c @@ -42,6 +42,7 @@ #endif #include +#include #include #include diff --git a/xtests/tst-pam_unix3.c b/xtests/tst-pam_unix3.c index bd5ffca4..50a94587 100644 --- a/xtests/tst-pam_unix3.c +++ b/xtests/tst-pam_unix3.c @@ -43,6 +43,7 @@ #endif #include +#include #include #include -- cgit v1.2.3