Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't include syslog.h if you are not going to use it.

This commit is contained in:
christos 2006-11-03 18:03:23 +00:00
parent da98d43bd0
commit 105f63f965
5 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/libpam/modules/pam_group/pam_group.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pam_group.c,v 1.9 2005/04/19 13:04:19 christos Exp $ */
/* $NetBSD: pam_group.c,v 1.10 2006/11/03 18:03:23 christos Exp $ */
/*-
* Copyright (c) 2003 Networks Associates Technology, Inc.
@ -38,7 +38,7 @@
#ifdef __FreeBSD__
__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_group/pam_group.c,v 1.4 2003/12/11 13:55:15 des Exp $");
#else
__RCSID("$NetBSD: pam_group.c,v 1.9 2005/04/19 13:04:19 christos Exp $");
__RCSID("$NetBSD: pam_group.c,v 1.10 2006/11/03 18:03:23 christos Exp $");
#endif
#include <sys/types.h>
@ -49,7 +49,6 @@ __RCSID("$NetBSD: pam_group.c,v 1.9 2005/04/19 13:04:19 christos Exp $");
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <syslog.h>
#include <unistd.h>
#include <login_cap.h>

28
lib/libpam/modules/pam_login_access/login_access.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: login_access.c,v 1.3 2005/04/19 13:04:38 christos Exp $ */
/* $NetBSD: login_access.c,v 1.4 2006/11/03 18:03:23 christos Exp $ */
/*
* This module implements a simple but effective form of login access
@ -19,7 +19,7 @@ static char sccsid[] = "%Z% %M% %I% %E% %U%";
#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.3 2005/04/19 13:04:38 christos Exp $");
__RCSID("$NetBSD: login_access.c,v 1.4 2006/11/03 18:03:23 christos Exp $");
#endif
#include <sys/types.h>
@ -31,6 +31,7 @@ __RCSID("$NetBSD: login_access.c,v 1.3 2005/04/19 13:04:38 christos Exp $");
#include <string.h>
#include <syslog.h>
#include <unistd.h>
#include <stdarg.h>
#include "pam_login_access.h"
@ -55,6 +56,19 @@ static int user_match(const char *, const char *);
/* login_access - match username/group and host/tty with access control file */
static void
logit(int level, const char *fmt, ...)
{
va_list ap;
struct syslog_data data;
openlog_r("pam_login_access", LOG_PID, LOG_AUTHPRIV, &data);
va_start(ap, fmt);
vsyslog_r(level, &data, fmt, ap);
va_end(ap);
closelog_r(&data);
}
int
login_access(const char *user, const char *from)
{
@ -79,7 +93,7 @@ login_access(const char *user, const char *from)
while (!match && fgets(line, sizeof(line), fp)) {
lineno++;
if (line[end = strlen(line) - 1] != '\n') {
syslog(LOG_ERR, "%s: line %d: missing newline or line too long",
logit(LOG_ERR, "%s: line %d: missing newline or line too long",
_PATH_LOGACCESS, lineno);
continue;
}
@ -94,12 +108,12 @@ login_access(const char *user, const char *from)
|| !(users = strtok((char *) 0, fs))
|| !(froms = strtok((char *) 0, fs))
|| strtok((char *) 0, fs)) {
syslog(LOG_ERR, "%s: line %d: bad field count", _PATH_LOGACCESS,
logit(LOG_ERR, "%s: line %d: bad field count", _PATH_LOGACCESS,
lineno);
continue;
}
if (perm[0] != '+' && perm[0] != '-') {
syslog(LOG_ERR, "%s: line %d: bad first field", _PATH_LOGACCESS,
logit(LOG_ERR, "%s: line %d: bad first field", _PATH_LOGACCESS,
lineno);
continue;
}
@ -108,7 +122,7 @@ login_access(const char *user, const char *from)
}
(void) fclose(fp);
} else if (errno != ENOENT) {
syslog(LOG_ERR, "cannot open %s: %m", _PATH_LOGACCESS);
logit(LOG_ERR, "cannot open %s: %m", _PATH_LOGACCESS);
}
return (match == 0 || (line[0] == '+'));
}
@ -152,7 +166,7 @@ static int
netgroup_match(const char *group __unused,
const char *machine __unused, const char *user __unused)
{
syslog(LOG_ERR, "NIS netgroup support not configured");
logit(LOG_ERR, "NIS netgroup support not configured");
return 0;
}

5
lib/libpam/modules/pam_login_access/pam_login_access.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pam_login_access.c,v 1.2 2004/12/12 08:18:46 christos Exp $ */
/* $NetBSD: pam_login_access.c,v 1.3 2006/11/03 18:03:23 christos Exp $ */
/*-
* Copyright (c) 2001 Mark R V Murray
@ -40,14 +40,13 @@
#ifdef __FreeBSD__
__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_login_access/pam_login_access.c,v 1.11 2004/02/10 10:13:21 des Exp $");
#else
__RCSID("$NetBSD: pam_login_access.c,v 1.2 2004/12/12 08:18:46 christos Exp $");
__RCSID("$NetBSD: pam_login_access.c,v 1.3 2006/11/03 18:03:23 christos Exp $");
#endif
#define _BSD_SOURCE
#include <sys/param.h>
#include <syslog.h>
#include <unistd.h>
#define PAM_SM_ACCOUNT

5
lib/libpam/modules/pam_rootok/pam_rootok.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pam_rootok.c,v 1.2 2004/12/12 08:18:47 christos Exp $ */
/* $NetBSD: pam_rootok.c,v 1.3 2006/11/03 18:03:23 christos Exp $ */
/*-
* Copyright (c) 2001 Mark R V Murray
@ -40,13 +40,12 @@
#ifdef __FreeBSD__
__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_rootok/pam_rootok.c,v 1.8 2002/04/12 22:27:23 des Exp $");
#else
__RCSID("$NetBSD: pam_rootok.c,v 1.2 2004/12/12 08:18:47 christos Exp $");
__RCSID("$NetBSD: pam_rootok.c,v 1.3 2006/11/03 18:03:23 christos Exp $");
#endif
#define _BSD_SOURCE
#include <unistd.h>
#include <syslog.h>
#define PAM_SM_AUTH

5
lib/libpam/modules/pam_self/pam_self.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pam_self.c,v 1.4 2005/04/19 03:15:36 christos Exp $ */
/* $NetBSD: pam_self.c,v 1.5 2006/11/03 18:03:23 christos Exp $ */
/*-
* Copyright (c) 2001 Mark R V Murray
@ -40,14 +40,13 @@
#ifdef __FreeBSD__
__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_self/pam_self.c,v 1.9 2002/04/12 22:27:24 des Exp $");
#else
__RCSID("$NetBSD: pam_self.c,v 1.4 2005/04/19 03:15:36 christos Exp $");
__RCSID("$NetBSD: pam_self.c,v 1.5 2006/11/03 18:03:23 christos Exp $");
#endif
#define _BSD_SOURCE
#include <pwd.h>
#include <unistd.h>
#include <syslog.h>
#define PAM_SM_AUTH