Mon Mar 5 19:01:50 2012 UTC ()
Pull up the following revisions(s) (requested by joerg in ticket #74):
	usr.sbin/sdpd/sdpd.h:	revision 1.2
	usr.sbin/sdpd/server.c:	revision 1.11

Fix format string. Make sure problem doesn't reappear by using __printf_like
as appropriate.


(sborrill)
diff -r1.1 -r1.1.10.1 src/usr.sbin/sdpd/sdpd.h
diff -r1.10 -r1.10.4.1 src/usr.sbin/sdpd/server.c

cvs diff -r1.1 -r1.1.10.1 src/usr.sbin/sdpd/sdpd.h (expand / switch to context diff)
--- src/usr.sbin/sdpd/sdpd.h 2009/05/12 10:05:07 1.1
+++ src/usr.sbin/sdpd/sdpd.h 2012/03/05 19:01:49 1.1.10.1
@@ -1,4 +1,4 @@
-/*	$NetBSD: sdpd.h,v 1.1 2009/05/12 10:05:07 plunky Exp $	*/
+/*	$NetBSD: sdpd.h,v 1.1.10.1 2012/03/05 19:01:49 sborrill Exp $	*/
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -134,14 +134,14 @@
 /* log.c */
 void	log_open(char const *, bool);
 void	log_close(void);
-void	log_emerg(char const *, ...);
-void	log_alert(char const *, ...);
-void	log_crit(char const *, ...);
-void	log_err(char const *, ...);
-void	log_warning(char const *, ...);
-void	log_notice(char const *, ...);
-void	log_info(char const *, ...);
-void	log_debug(char const *, ...);
+void	log_emerg(char const *, ...) __printflike(1, 2);
+void	log_alert(char const *, ...) __printflike(1, 2);
+void	log_crit(char const *, ...) __printflike(1, 2);
+void	log_err(char const *, ...) __printflike(1, 2);
+void	log_warning(char const *, ...) __printflike(1, 2);
+void	log_notice(char const *, ...) __printflike(1, 2);
+void	log_info(char const *, ...) __printflike(1, 2);
+void	log_debug(char const *, ...) __printflike(1, 2);
 
 /* record.c */
 uint16_t record_insert_request(server_t *, int);

cvs diff -r1.10 -r1.10.4.1 src/usr.sbin/sdpd/server.c (expand / switch to context diff)
--- src/usr.sbin/sdpd/server.c 2011/07/01 03:07:21 1.10
+++ src/usr.sbin/sdpd/server.c 2012/03/05 19:01:49 1.10.4.1
@@ -1,4 +1,4 @@
-/*	$NetBSD: server.c,v 1.10 2011/07/01 03:07:21 joerg Exp $	*/
+/*	$NetBSD: server.c,v 1.10.4.1 2012/03/05 19:01:49 sborrill Exp $	*/
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -58,7 +58,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: server.c,v 1.10 2011/07/01 03:07:21 joerg Exp $");
+__RCSID("$NetBSD: server.c,v 1.10.4.1 2012/03/05 19:01:49 sborrill Exp $");
 
 #include <sys/select.h>
 #include <sys/stat.h>
@@ -112,7 +112,7 @@
 	srv->ctllen = CMSG_SPACE(SOCKCREDSIZE(MAX_GROUPS));
 	srv->ctlbuf = malloc(srv->ctllen);
 	if (srv->ctlbuf == NULL) {
-		log_crit("Malloc cmsg buffer (len=%d) failed.", srv->ctllen);
+		log_crit("Malloc cmsg buffer (len=%zu) failed.", srv->ctllen);
 		goto fail;
 	}