Module Name: src
Committed By: joerg
Date: Sun Apr 8 21:56:48 UTC 2018
Modified Files:
src/crypto/external/bsd/openssh/dist: servconf.c sshd.c
Log Message:
Fix clang build by adding __dead annotations.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/crypto/external/bsd/openssh/dist/servconf.c
cvs rdiff -u -r1.29 -r1.30 src/crypto/external/bsd/openssh/dist/sshd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/dist/servconf.c
diff -u src/crypto/external/bsd/openssh/dist/servconf.c:1.26 src/crypto/external/bsd/openssh/dist/servconf.c:1.27
--- src/crypto/external/bsd/openssh/dist/servconf.c:1.26 Fri Apr 6 18:59:00 2018
+++ src/crypto/external/bsd/openssh/dist/servconf.c Sun Apr 8 21:56:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: servconf.c,v 1.26 2018/04/06 18:59:00 christos Exp $ */
+/* $NetBSD: servconf.c,v 1.27 2018/04/08 21:56:48 joerg Exp $ */
/* $OpenBSD: servconf.c,v 1.326 2018/03/01 20:32:16 markus Exp $ */
/*
@@ -13,7 +13,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: servconf.c,v 1.26 2018/04/06 18:59:00 christos Exp $");
+__RCSID("$NetBSD: servconf.c,v 1.27 2018/04/08 21:56:48 joerg Exp $");
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/queue.h>
@@ -1053,7 +1053,7 @@ out:
return result;
}
-static void
+__dead static void
match_test_missing_fatal(const char *criteria, const char *attrib)
{
fatal("'Match %s' in configuration but '%s' not in connection "
Index: src/crypto/external/bsd/openssh/dist/sshd.c
diff -u src/crypto/external/bsd/openssh/dist/sshd.c:1.29 src/crypto/external/bsd/openssh/dist/sshd.c:1.30
--- src/crypto/external/bsd/openssh/dist/sshd.c:1.29 Fri Apr 6 18:59:00 2018
+++ src/crypto/external/bsd/openssh/dist/sshd.c Sun Apr 8 21:56:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sshd.c,v 1.29 2018/04/06 18:59:00 christos Exp $ */
+/* $NetBSD: sshd.c,v 1.30 2018/04/08 21:56:48 joerg Exp $ */
/* $OpenBSD: sshd.c,v 1.506 2018/03/03 03:15:51 djm Exp $ */
/*
* Author: Tatu Ylonen <y...@cs.hut.fi>
@@ -44,7 +44,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: sshd.c,v 1.29 2018/04/06 18:59:00 christos Exp $");
+__RCSID("$NetBSD: sshd.c,v 1.30 2018/04/08 21:56:48 joerg Exp $");
#include <sys/types.h>
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -1338,6 +1338,9 @@ check_ip_options(struct ssh *ssh)
}
/* Set the routing domain for this process */
+#if !defined(__OpenBSD__)
+__dead
+#endif
static void
set_process_rdomain(struct ssh *ssh, const char *name)
{
