 @@ -1,14 +1,14 @@
-/*	$NetBSD: pam_lastlog.c,v 1.14 2012/01/03 19:02:55 christos Exp $	*/
+/*	$NetBSD: pam_lastlog.c,v 1.15 2014/01/07 02:07:43 joerg Exp $	*/
 /*-
  * Copyright (c) 1980, 1987, 1988, 1991, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 2001 Mark R V Murray
  * All rights reserved.
  * Copyright (c) 2001 Networks Associates Technology, Inc.
  * All rights reserved.
  * Copyright (c) 2004 Joe R. Doupnik
  * All rights reserved.
+ *
  * Portions of this software were developed for the FreeBSD Project by
  * ThinkSec AS and NAI Labs, the Security Research Division of Network
 @@ -37,27 +37,27 @@
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #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.14 2012/01/03 19:02:55 christos Exp $");
+__RCSID("$NetBSD: pam_lastlog.c,v 1.15 2014/01/07 02:07:43 joerg Exp $");
 #endif
 #include <sys/param.h>
 #include <fcntl.h>
 #include <util.h>
 #include <paths.h>
 #include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
 #include <errno.h>
 @@ -85,26 +85,27 @@ static void dolastlog(pam_handle_t *, in
 #ifdef SUPPORT_UTMPX
 #include <utmpx.h>
 static void doutmpx(const char *, const char *, const char *,
     const struct sockaddr_storage *ss, const struct timeval *);
 static void dolastlogx(pam_handle_t *, int, const struct passwd *, const char *,
     const char *, const struct sockaddr_storage *ss, const struct timeval *);
 #endif
 #if defined(SUPPORT_UTMPX) || defined(SUPPORT_UTMP)
 static void domsg(pam_handle_t *, time_t, const char *, size_t, const char *,
     size_t);
 #endif
 __printflike(2, 3)
 static void
 logit(int level, const char *fmt, ...)
+{
 	va_list ap;
 	struct syslog_data data = SYSLOG_DATA_INIT;
 	openlog_r("pam_lastlog", LOG_PID, LOG_AUTHPRIV, &data);
 	va_start(ap, fmt);
 	vsyslog_r(level, &data, fmt, ap);
 	va_end(ap);
 	closelog_r(&data);
+}

 @@ -1,35 +1,35 @@
-/*	$NetBSD: login_access.c,v 1.7 2013/12/29 22:54:58 christos Exp $	*/
+/*	$NetBSD: login_access.c,v 1.8 2014/01/07 02:07:43 joerg Exp $	*/
 /*
  * This module implements a simple but effective form of login access
  * control based on login names and on host (or domain) names, internet
  * addresses (or network numbers), or on terminal line names in case of
  * non-networked logins. Diagnostics are reported through syslog(3).
+ *
  * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
  */
 #if 0
 #ifndef lint
 static char sccsid[] = "%Z% %M% %I% %E% %U%";
 #endif
 #endif
 #include <sys/cdefs.h>
 #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.7 2013/12/29 22:54:58 christos Exp $");
+__RCSID("$NetBSD: login_access.c,v 1.8 2014/01/07 02:07:43 joerg Exp $");
 #endif
 #include <sys/types.h>
 #include <ctype.h>
 #include <errno.h>
 #include <grp.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
 #include <unistd.h>
 #include <stdarg.h>
 @@ -46,26 +46,27 @@ static char sep[] = ", \t";		/* list-ele
 #define YES             1
 #define NO              0
 static int	from_match(const char *, const char *);
 static int	list_match(char *, const char *,
 				int (*)(const char *, const char *));
 static int	netgroup_match(const char *, const char *, const char *);
 static int	string_match(const char *, const char *);
 static int	user_match(const char *, const char *);
 /* login_access - match username/group and host/tty with access control file */
 __printflike(2, 3)
 static void
 logit(int level, const char *fmt, ...)
+{
 	va_list ap;
 	struct syslog_data data = SYSLOG_DATA_INIT;
 	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);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pam_radius.c,v 1.7 2006/11/03 18:55:40 christos Exp $	*/
+/*	$NetBSD: pam_radius.c,v 1.8 2014/01/07 02:07:43 joerg Exp $	*/
 /*-
  * Copyright 1998 Juniper Networks, Inc.
  * All rights reserved.
  * Copyright (c) 2001-2003 Networks Associates Technology, Inc.
  * All rights reserved.
+ *
  * Portions of this software were developed for the FreeBSD Project by
  * ThinkSec AS and NAI Labs, the Security Research Division of Network
  * Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
  * ("CBOSS"), as part of the DARPA CHATS research program.
+ *
  * Redistribution and use in source and binary forms, with or without
 @@ -30,27 +30,27 @@
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifdef __FreeBSD__
 __FBSDID("$FreeBSD: src/lib/libpam/modules/pam_radius/pam_radius.c,v 1.22 2004/06/25 12:32:45 kan Exp $");
 #else
-__RCSID("$NetBSD: pam_radius.c,v 1.7 2006/11/03 18:55:40 christos Exp $");
+__RCSID("$NetBSD: pam_radius.c,v 1.8 2014/01/07 02:07:43 joerg Exp $");
 #endif
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>
 #include <pwd.h>
 #include <radlib.h>
 #include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
 #include <unistd.h>
 #include <stdarg.h>
 @@ -66,26 +66,27 @@ __RCSID("$NetBSD: pam_radius.c,v 1.7 200
 #define PAM_OPT_NAS_ID		"nas_id"
 #define PAM_OPT_NAS_IPADDR	"nas_ipaddr"
 #define	MAX_CHALLENGE_MSGS	10
 #define	PASSWORD_PROMPT		"RADIUS Password:"
 static int	 build_access_request(struct rad_handle *, const char *,
 		    const char *, const char *, const char *, const void *,
 		    size_t);
 static int	 do_accept(pam_handle_t *, struct rad_handle *);
 static int	 do_challenge(pam_handle_t *, struct rad_handle *,
 		    const char *);
 __printflike(2, 3)
 static void
 logit(int level, const char *fmt, ...)
+{
 	va_list ap;
 	struct syslog_data data = SYSLOG_DATA_INIT;
 	openlog_r("pam_radius", LOG_PID, LOG_AUTHPRIV, &data);
 	va_start(ap, fmt);
 	vsyslog_r(level, &data, fmt, ap);
 	va_end(ap);
 	closelog_r(&data);
+}