From b3a154da2130f03f86973eaee90434f99fa2ab7a Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Thu, 24 Nov 2005 17:15:31 +0000 Subject: Relevant BUGIDs: none Purpose of commit: cleanup Commit summary: --------------- 2005-11-24 Dmitry V. Levin * configure.in: Do not check for strerror. * libpam_misc/misc_conv.c (read_string): Replace strerror() call with %m specifier. * libpamc/pamc_converse.c (pamc_converse): Likewise. * modules/pam_echo/pam_echo.c (pam_echo): Likewise. * modules/pam_localuser/pam_localuser.c (pam_sm_authenticate): Likewise. * modules/pam_selinux/pam_selinux.c (security_label_tty): Likewise. (security_restorelabel_tty, security_label_tty): Append %m specifier where appropriate. * modules/pam_selinux/pam_selinux_check.c (main): Replace strerror() call with %m specifier. * modules/pam_unix/pam_unix_passwd.c (save_old_password, _update_passwd, _update_shadow): Likewise. * modules/pam_unix/support.c (_unix_run_helper_binary): Likewise. * modules/pam_unix/unix_chkpwd.c (_update_shadow): Likewise. * po/Linux-PAM.pot: Update strings from pam_selinux. * po/cs.po: Likewise. * po/de.po: Likewise. * po/es.po: Likewise. * po/fi.po: Likewise. * po/fr.po: Likewise. * po/hu.po: Likewise. * po/it.po: Likewise. * po/ja.po: Likewise. * po/nb.po: Likewise. * po/pa.po: Likewise. * po/pl.po: Likewise. * po/pt.po: Likewise. * po/pt_BR.po: Likewise. * po/zh_CN.po: Likewise. * po/zh_TW.po: Likewise. --- modules/pam_selinux/pam_selinux.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'modules/pam_selinux/pam_selinux.c') diff --git a/modules/pam_selinux/pam_selinux.c b/modules/pam_selinux/pam_selinux.c index 373a38f3..a6ea3e1d 100644 --- a/modules/pam_selinux/pam_selinux.c +++ b/modules/pam_selinux/pam_selinux.c @@ -231,7 +231,7 @@ security_restorelabel_tty(const pam_handle_t *pamh, if (setfilecon(ptr, context) && errno != ENOENT) { pam_syslog(pamh, LOG_NOTICE, - "Warning! Could not relabel %s with %s, not relabeling.\n", + "Warning! Could not relabel %s with %s, not relabeling: %m", ptr, context); } } @@ -257,18 +257,18 @@ security_label_tty(pam_handle_t *pamh, char *tty, if (getfilecon(ptr, &prev_context) < 0) { pam_syslog(pamh, LOG_NOTICE, - "Warning! Could not get current context for %s, not relabeling.", + "Warning! Could not get current context for %s, not relabeling: %m", ptr); return NULL; } if( security_compute_relabel(usercon,prev_context,SECCLASS_CHR_FILE, &newdev_context)!=0) { - pam_syslog(pamh,LOG_NOTICE, - "Warning! Could not get new context for %s, not relabeling.", + pam_syslog(pamh, LOG_NOTICE, + "Warning! Could not get new context for %s, not relabeling: %m", ptr); pam_syslog(pamh, LOG_NOTICE, - "usercon=%s, prev_context=%s\n", usercon, prev_context); + "usercon=%s, prev_context=%s", usercon, prev_context); freecon(prev_context); return NULL; } @@ -276,8 +276,8 @@ security_label_tty(pam_handle_t *pamh, char *tty, if (status) { pam_syslog(pamh, LOG_NOTICE, - "Warning! Could not relabel %s with %s, not relabeling.%s", - ptr,newdev_context,strerror(errno)); + "Warning! Could not relabel %s with %s, not relabeling: %m", + ptr,newdev_context); freecon(prev_context); prev_context=NULL; } -- cgit v1.2.3