Module Name: src
Committed By: christos
Date: Tue Jan 3 19:02:55 UTC 2012
Modified Files:
src/lib/libpam/modules/pam_chroot: pam_chroot.c
src/lib/libpam/modules/pam_exec: pam_exec.c
src/lib/libpam/modules/pam_ftpusers: pam_ftpusers.c
src/lib/libpam/modules/pam_lastlog: pam_lastlog.c
src/lib/libpam/modules/pam_login_access: login_access.c
src/lib/libpam/modules/pam_ssh: pam_ssh.c
Log Message:
avoid using %m in format.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/lib/libpam/modules/pam_chroot/pam_chroot.c
cvs rdiff -u -r1.5 -r1.6 src/lib/libpam/modules/pam_exec/pam_exec.c
cvs rdiff -u -r1.5 -r1.6 src/lib/libpam/modules/pam_ftpusers/pam_ftpusers.c
cvs rdiff -u -r1.13 -r1.14 src/lib/libpam/modules/pam_lastlog/pam_lastlog.c
cvs rdiff -u -r1.5 -r1.6 \
src/lib/libpam/modules/pam_login_access/login_access.c
cvs rdiff -u -r1.20 -r1.21 src/lib/libpam/modules/pam_ssh/pam_ssh.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpam/modules/pam_chroot/pam_chroot.c
diff -u src/lib/libpam/modules/pam_chroot/pam_chroot.c:1.4 src/lib/libpam/modules/pam_chroot/pam_chroot.c:1.5
--- src/lib/libpam/modules/pam_chroot/pam_chroot.c:1.4 Mon Apr 18 23:15:34 2005
+++ src/lib/libpam/modules/pam_chroot/pam_chroot.c Tue Jan 3 14:02:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pam_chroot.c,v 1.4 2005/04/19 03:15:34 christos Exp $ */
+/* $NetBSD: pam_chroot.c,v 1.5 2012/01/03 19:02:54 christos Exp $ */
/*-
* Copyright (c) 2003 Networks Associates Technology, Inc.
@@ -38,7 +38,7 @@
#ifdef __FreeBSD__
__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_chroot/pam_chroot.c,v 1.3 2003/04/30 00:40:24 des Exp $");
#else
-__RCSID("$NetBSD: pam_chroot.c,v 1.4 2005/04/19 03:15:34 christos Exp $");
+__RCSID("$NetBSD: pam_chroot.c,v 1.5 2012/01/03 19:02:54 christos Exp $");
#endif
#include <sys/param.h>
@@ -46,6 +46,7 @@ __RCSID("$NetBSD: pam_chroot.c,v 1.4 200
#include <pwd.h>
#include <stdio.h>
#include <string.h>
+#include <errno.h>
#include <unistd.h>
#define PAM_SM_SESSION
@@ -96,11 +97,11 @@ pam_sm_open_session(pam_handle_t *pamh,
openpam_log(PAM_LOG_DEBUG, "chrooting %s to %s", dir, user);
if (chroot(dir) == -1) {
- openpam_log(PAM_LOG_ERROR, "chroot(): %m");
+ openpam_log(PAM_LOG_ERROR, "chroot(): %s", strerror(errno));
return (PAM_SESSION_ERR);
}
if (chdir(cwd) == -1) {
- openpam_log(PAM_LOG_ERROR, "chdir(): %m");
+ openpam_log(PAM_LOG_ERROR, "chdir(): %s", strerror(errno));
return (PAM_SESSION_ERR);
}
pam_setenv(pamh, "HOME", cwd, 1);
Index: src/lib/libpam/modules/pam_exec/pam_exec.c
diff -u src/lib/libpam/modules/pam_exec/pam_exec.c:1.5 src/lib/libpam/modules/pam_exec/pam_exec.c:1.6
--- src/lib/libpam/modules/pam_exec/pam_exec.c:1.5 Wed Feb 2 21:05:59 2011
+++ src/lib/libpam/modules/pam_exec/pam_exec.c Tue Jan 3 14:02:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pam_exec.c,v 1.5 2011/02/03 02:05:59 christos Exp $ */
+/* $NetBSD: pam_exec.c,v 1.6 2012/01/03 19:02:54 christos Exp $ */
/*-
* Copyright (c) 2001,2003 Networks Associates Technology, Inc.
@@ -38,7 +38,7 @@
#ifdef __FreeBSD__
__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_exec/pam_exec.c,v 1.4 2005/02/01 10:37:07 des Exp $");
#else
-__RCSID("$NetBSD: pam_exec.c,v 1.5 2011/02/03 02:05:59 christos Exp $");
+__RCSID("$NetBSD: pam_exec.c,v 1.6 2012/01/03 19:02:54 christos Exp $");
#endif
#include <sys/types.h>
@@ -128,15 +128,15 @@ _pam_exec(pam_handle_t *pamh __unused, i
}
openpam_free_envlist(envlist);
if (pid == -1) {
- openpam_log(PAM_LOG_ERROR, "vfork(): %m");
+ openpam_log(PAM_LOG_ERROR, "vfork(): %s", strerror(errno));
return (PAM_SYSTEM_ERR);
}
if (waitpid(pid, &status, 0) == -1) {
- openpam_log(PAM_LOG_ERROR, "waitpid(): %m");
+ openpam_log(PAM_LOG_ERROR, "waitpid(): %s", strerror(errno));
return (PAM_SYSTEM_ERR);
}
if (childerr != 0) {
- openpam_log(PAM_LOG_ERROR, "execve(): %m");
+ openpam_log(PAM_LOG_ERROR, "execve(): %s", strerror(errno));
return (PAM_SYSTEM_ERR);
}
if (WIFSIGNALED(status)) {
Index: src/lib/libpam/modules/pam_ftpusers/pam_ftpusers.c
diff -u src/lib/libpam/modules/pam_ftpusers/pam_ftpusers.c:1.5 src/lib/libpam/modules/pam_ftpusers/pam_ftpusers.c:1.6
--- src/lib/libpam/modules/pam_ftpusers/pam_ftpusers.c:1.5 Tue Apr 19 09:04:38 2005
+++ src/lib/libpam/modules/pam_ftpusers/pam_ftpusers.c Tue Jan 3 14:02:55 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pam_ftpusers.c,v 1.5 2005/04/19 13:04:38 christos Exp $ */
+/* $NetBSD: pam_ftpusers.c,v 1.6 2012/01/03 19:02:55 christos Exp $ */
/*-
* Copyright (c) 2001 Networks Associates Technology, Inc.
@@ -38,7 +38,7 @@
#ifdef __FreeBSD__
__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_ftpusers/pam_ftpusers.c,v 1.1 2002/05/08 00:30:10 des Exp $");
#else
-__RCSID("$NetBSD: pam_ftpusers.c,v 1.5 2005/04/19 13:04:38 christos Exp $");
+__RCSID("$NetBSD: pam_ftpusers.c,v 1.6 2012/01/03 19:02:55 christos Exp $");
#endif
#include <ctype.h>
@@ -46,6 +46,7 @@ __RCSID("$NetBSD: pam_ftpusers.c,v 1.5 2
#include <paths.h>
#include <pwd.h>
#include <stdio.h>
+#include <errno.h>
#include <stdlib.h>
#include <string.h>
@@ -80,7 +81,7 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int
found = 0;
ulen = strlen(user);
if ((f = fopen(_PATH_FTPUSERS, "r")) == NULL) {
- PAM_LOG("%s: %m", _PATH_FTPUSERS);
+ PAM_LOG("%s: %s", _PATH_FTPUSERS, strerror(errno));
goto done;
}
while (!found && (line = fgetln(f, &len)) != NULL) {
Index: src/lib/libpam/modules/pam_lastlog/pam_lastlog.c
diff -u src/lib/libpam/modules/pam_lastlog/pam_lastlog.c:1.13 src/lib/libpam/modules/pam_lastlog/pam_lastlog.c:1.14
--- src/lib/libpam/modules/pam_lastlog/pam_lastlog.c:1.13 Sun Jan 25 23:01:14 2009
+++ src/lib/libpam/modules/pam_lastlog/pam_lastlog.c Tue Jan 3 14:02:55 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pam_lastlog.c,v 1.13 2009/01/26 04:01:14 lukem Exp $ */
+/* $NetBSD: pam_lastlog.c,v 1.14 2012/01/03 19:02:55 christos Exp $ */
/*-
* Copyright (c) 1980, 1987, 1988, 1991, 1993, 1994
@@ -47,7 +47,7 @@
#ifdef __FreeBSD__
__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_lastlog/pam_lastlog.c,v 1.20 2004/01/26 19:28:37 des Exp $");
#else
-__RCSID("$NetBSD: pam_lastlog.c,v 1.13 2009/01/26 04:01:14 lukem Exp $");
+__RCSID("$NetBSD: pam_lastlog.c,v 1.14 2012/01/03 19:02:55 christos Exp $");
#endif
#include <sys/param.h>
@@ -60,6 +60,7 @@ __RCSID("$NetBSD: pam_lastlog.c,v 1.13 2
#include <stdlib.h>
#include <string.h>
#include <syslog.h>
+#include <errno.h>
#include <time.h>
#include <unistd.h>
#include <stdarg.h>
@@ -291,10 +292,10 @@ doutmpx(const char *username, const char
(void)strncpy(utmpx.ut_id, tty, sizeof(utmpx.ut_id));
}
if (pututxline(&utmpx) == NULL)
- logit(LOG_NOTICE, "Cannot update utmpx %m");
+ logit(LOG_NOTICE, "Cannot update utmpx: %s", strerror(errno));
endutxent();
if (updwtmpx(_PATH_WTMPX, &utmpx) != 0)
- logit(LOG_NOTICE, "Cannot update wtmpx %m");
+ logit(LOG_NOTICE, "Cannot update wtmpx: %s", strerror(errno));
}
static void
@@ -323,7 +324,7 @@ dolastlogx(pam_handle_t *pamh, int quiet
(void)memset(&ll.ll_ss, 0, sizeof(ll.ll_ss));
if (updlastlogx(_PATH_LASTLOGX, pwd->pw_uid, &ll) != 0)
- logit(LOG_NOTICE, "Cannot update lastlogx %m");
+ logit(LOG_NOTICE, "Cannot update lastlogx: %s", strerror(errno));
PAM_LOG("Login recorded in %s", _PATH_LASTLOGX);
}
#endif
@@ -352,7 +353,8 @@ dolastlog(pam_handle_t *pamh, int quiet,
int fd;
if ((fd = open(_PATH_LASTLOG, O_RDWR, 0)) == -1) {
- logit(LOG_NOTICE, "Cannot open `%s' %m", _PATH_LASTLOG);
+ logit(LOG_NOTICE, "Cannot open `%s': %s", _PATH_LASTLOG,
+ strerror(errno));
return;
}
(void)lseek(fd, (off_t)(pwd->pw_uid * sizeof(ll)), SEEK_SET);
Index: src/lib/libpam/modules/pam_login_access/login_access.c
diff -u src/lib/libpam/modules/pam_login_access/login_access.c:1.5 src/lib/libpam/modules/pam_login_access/login_access.c:1.6
--- src/lib/libpam/modules/pam_login_access/login_access.c:1.5 Fri Nov 3 13:55:40 2006
+++ src/lib/libpam/modules/pam_login_access/login_access.c Tue Jan 3 14:02:55 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: login_access.c,v 1.5 2006/11/03 18:55:40 christos Exp $ */
+/* $NetBSD: login_access.c,v 1.6 2012/01/03 19:02:55 christos Exp $ */
/*
* This module implements a simple but effective form of login access
@@ -19,7 +19,7 @@ static char sccsid[] = "%Z% %M% %I% %E%
#ifdef __FreeBSD__
__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_login_access/login_access.c,v 1.12 2004/03/05 08:10:18 markm Exp $");
#else
-__RCSID("$NetBSD: login_access.c,v 1.5 2006/11/03 18:55:40 christos Exp $");
+__RCSID("$NetBSD: login_access.c,v 1.6 2012/01/03 19:02:55 christos Exp $");
#endif
#include <sys/types.h>
@@ -122,7 +122,7 @@ login_access(const char *user, const cha
}
(void) fclose(fp);
} else if (errno != ENOENT) {
- logit(LOG_ERR, "cannot open %s: %m", _PATH_LOGACCESS);
+ logit(LOG_ERR, "cannot open %s: %s", _PATH_LOGACCESS, strerror(errno));
}
return (match == 0 || (line[0] == '+'));
}
Index: src/lib/libpam/modules/pam_ssh/pam_ssh.c
diff -u src/lib/libpam/modules/pam_ssh/pam_ssh.c:1.20 src/lib/libpam/modules/pam_ssh/pam_ssh.c:1.21
--- src/lib/libpam/modules/pam_ssh/pam_ssh.c:1.20 Fri Dec 16 12:37:14 2011
+++ src/lib/libpam/modules/pam_ssh/pam_ssh.c Tue Jan 3 14:02:55 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pam_ssh.c,v 1.20 2011/12/16 17:37:14 drochner Exp $ */
+/* $NetBSD: pam_ssh.c,v 1.21 2012/01/03 19:02:55 christos Exp $ */
/*-
* Copyright (c) 2003 Networks Associates Technology, Inc.
@@ -38,7 +38,7 @@
#ifdef __FreeBSD__
__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_ssh/pam_ssh.c,v 1.40 2004/02/10 10:13:21 des Exp $");
#else
-__RCSID("$NetBSD: pam_ssh.c,v 1.20 2011/12/16 17:37:14 drochner Exp $");
+__RCSID("$NetBSD: pam_ssh.c,v 1.21 2012/01/03 19:02:55 christos Exp $");
#endif
#include <sys/param.h>
@@ -306,19 +306,19 @@ pam_ssh_start_agent(pam_handle_t *pamh,
#endif
/* child: drop privs, close fds and start agent */
if (setgid(pwd->pw_gid) == -1) {
- openpam_log(PAM_LOG_DEBUG, "%s: Cannot setgid %d (%m)",
- __func__, (int)pwd->pw_gid);
+ openpam_log(PAM_LOG_DEBUG, "%s: Cannot setgid %d (%s)",
+ __func__, (int)pwd->pw_gid, strerror(errno));
goto done;
}
if (initgroups(pwd->pw_name, pwd->pw_gid) == -1) {
openpam_log(PAM_LOG_DEBUG,
- "%s: Cannot initgroups for %s (%m)",
- __func__, pwd->pw_name);
+ "%s: Cannot initgroups for %s (%s)",
+ __func__, pwd->pw_name, strerror(errno));
goto done;
}
if (setuid(pwd->pw_uid) == -1) {
- openpam_log(PAM_LOG_DEBUG, "%s: Cannot setuid %d (%m)",
- __func__, (int)pwd->pw_uid);
+ openpam_log(PAM_LOG_DEBUG, "%s: Cannot setuid %d (%s)",
+ __func__, (int)pwd->pw_uid, strerror(errno));
goto done;
}
(void)close(STDIN_FILENO);
