CVS commit: src/external/bsd/dhcp/dist/includes

2015-10-14 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Wed Oct 14 15:58:46 UTC 2015

Modified Files:
src/external/bsd/dhcp/dist/includes: dhcpd.h
src/external/bsd/dhcp/dist/includes/omapip: omapip_p.h

Log Message:
use __sysloglike where appropriate.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/dhcp/dist/includes/dhcpd.h
cvs rdiff -u -r1.1.1.4 -r1.2 \
src/external/bsd/dhcp/dist/includes/omapip/omapip_p.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/dhcp/dist/includes/dhcpd.h
diff -u src/external/bsd/dhcp/dist/includes/dhcpd.h:1.6 src/external/bsd/dhcp/dist/includes/dhcpd.h:1.7
--- src/external/bsd/dhcp/dist/includes/dhcpd.h:1.6	Sat Jul 12 08:09:37 2014
+++ src/external/bsd/dhcp/dist/includes/dhcpd.h	Wed Oct 14 11:58:46 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: dhcpd.h,v 1.6 2014/07/12 12:09:37 spz Exp $	*/
+/*	$NetBSD: dhcpd.h,v 1.7 2015/10/14 15:58:46 christos Exp $	*/
 /* dhcpd.h
 
Definitions for dhcpd... */
@@ -2092,8 +2092,7 @@ int parse_option_token (struct expressio
 			const char **, struct expression *, int, int);
 int parse_allow_deny (struct option_cache **, struct parse *, int);
 int parse_auth_key (struct data_string *, struct parse *);
-int parse_warn (struct parse *, const char *, ...)
-	__attribute__((__format__(__printf__,2,3)));
+int parse_warn (struct parse *, const char *, ...) __sysloglike(2, 3);
 struct expression *parse_domain_list(struct parse *cfile, int);
 
 

Index: src/external/bsd/dhcp/dist/includes/omapip/omapip_p.h
diff -u src/external/bsd/dhcp/dist/includes/omapip/omapip_p.h:1.1.1.4 src/external/bsd/dhcp/dist/includes/omapip/omapip_p.h:1.2
--- src/external/bsd/dhcp/dist/includes/omapip/omapip_p.h:1.1.1.4	Sat Jul 12 07:57:57 2014
+++ src/external/bsd/dhcp/dist/includes/omapip/omapip_p.h	Wed Oct 14 11:58:46 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: omapip_p.h,v 1.1.1.4 2014/07/12 11:57:57 spz Exp $	*/
+/*	$NetBSD: omapip_p.h,v 1.2 2015/10/14 15:58:46 christos Exp $	*/
 /* omapip_p.h
 
Private master include file for the OMAPI library. */
@@ -283,14 +283,10 @@ extern int log_priority;
 extern int log_perror;
 extern void (*log_cleanup) (void);
 
-void log_fatal (const char *, ...)
-	__attribute__((__format__(__printf__,1,2))) ISC_DHCP_NORETURN;
-int log_error (const char *, ...)
-	__attribute__((__format__(__printf__,1,2)));
-int log_info (const char *, ...)
-	__attribute__((__format__(__printf__,1,2)));
-int log_debug (const char *, ...)
-	__attribute__((__format__(__printf__,1,2)));
+void log_fatal (const char *, ...) __sysloglike(1, 2) ISC_DHCP_NORETURN;
+int log_error (const char *, ...) __sysloglike(1, 2);
+int log_info (const char *, ...) __sysloglike(1, 2);
+int log_debug (const char *, ...) __sysloglike(1, 2);
 void do_percentm (char *obuf, const char *ibuf);
 
 isc_result_t uerr2isc (int);

CVS commit: src/external/bsd/dhcp/dist/includes/omapip

2014-12-09 Thread Masao Uebayashi 
Module Name:src
Committed By:   uebayasi
Date:   Wed Dec 10 07:43:34 UTC 2014

Modified Files:
src/external/bsd/dhcp/dist/includes/omapip: result.h

Log Message:
Don't define ISC_R_* symbols, that conflict with the newest bind.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/external/bsd/dhcp/dist/includes/omapip/result.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/dhcp/dist/includes/omapip/result.h
diff -u src/external/bsd/dhcp/dist/includes/omapip/result.h:1.1.1.2 src/external/bsd/dhcp/dist/includes/omapip/result.h:1.2
--- src/external/bsd/dhcp/dist/includes/omapip/result.h:1.1.1.2	Sat Jul 12 11:57:57 2014
+++ src/external/bsd/dhcp/dist/includes/omapip/result.h	Wed Dec 10 07:43:34 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: result.h,v 1.1.1.2 2014/07/12 11:57:57 spz Exp $	*/
+/*	$NetBSD: result.h,v 1.2 2014/12/10 07:43:34 uebayasi Exp $	*/
 /* result.h
  */
 
@@ -81,6 +81,7 @@
 
 // Included for historical reasons, these should be removed as
 // soon as reasonable
+#if 0
 #define ISC_R_HOSTUNKNOWN	DHCP_R_HOSTUNKNOWN
 #define ISC_R_VERSIONMISMATCH	DHCP_R_VERSIONMISMATCH
 #define ISC_R_PROTOCOLERROR	DHCP_R_PROTOCOLERROR	
@@ -114,6 +115,7 @@
 #define ISC_R_NOT_EQUAL		DHCP_R_NOT_EQUAL		
 #define ISC_R_CONNRESET		DHCP_R_CONNRESET		
 #define ISC_R_UNKNOWNATTRIBUTE	DHCP_R_UNKNOWNATTRIBUTE	
+#endif
 
 isc_result_t
 dhcp_result_register(void);

CVS commit: src/external/bsd/dhcp/dist/includes

2013-06-20 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Thu Jun 20 12:26:34 UTC 2013

Modified Files:
src/external/bsd/dhcp/dist/includes: dhcpd.h

Log Message:
add finish_daemon();


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/dhcp/dist/includes/dhcpd.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/dhcp/dist/includes/dhcpd.h
diff -u src/external/bsd/dhcp/dist/includes/dhcpd.h:1.4 src/external/bsd/dhcp/dist/includes/dhcpd.h:1.5
--- src/external/bsd/dhcp/dist/includes/dhcpd.h:1.4	Tue Mar 26 20:38:08 2013
+++ src/external/bsd/dhcp/dist/includes/dhcpd.h	Thu Jun 20 08:26:34 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: dhcpd.h,v 1.4 2013/03/27 00:38:08 christos Exp $	*/
+/*	$NetBSD: dhcpd.h,v 1.5 2013/06/20 12:26:34 christos Exp $	*/
 
 /* dhcpd.h
 
@@ -2753,6 +2753,7 @@ void client_envadd (struct client_state 
 
 struct client_lease *packet_to_lease (struct packet *, struct client_state *);
 void go_daemon (void);
+void finish_daemon (void);
 void write_client_pid_file (void);
 void client_location_changed (void);
 void do_release (struct client_state *);