1*4882a593SmuzhiyunFrom 7f8878ac1aaf4a19992d39379797c151301bedb1 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Oleksiy Obitotskyy <oobitots@cisco.com> 3*4882a593SmuzhiyunDate: Mon, 5 Feb 2018 08:29:10 -0800 4*4882a593SmuzhiyunSubject: [PATCH] Fix build with clang 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunFix "error: non-void function 'fix_options' should return a value". 7*4882a593SmuzhiyunAdd function prototype to tcpd.c and miscd.c. 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunUpstream-Status: Pending 10*4882a593Smuzhiyun 11*4882a593SmuzhiyunSigned-off-by: Oleksiy Obitotskyy <oobitots@cisco.com> 12*4882a593Smuzhiyun--- 13*4882a593Smuzhiyun v2 - add function prototypes 14*4882a593Smuzhiyun 15*4882a593Smuzhiyun fix_options.c | 2 +- 16*4882a593Smuzhiyun miscd.c | 4 ++++ 17*4882a593Smuzhiyun tcpd.c | 4 ++++ 18*4882a593Smuzhiyun 3 files changed, 9 insertions(+), 1 deletion(-) 19*4882a593Smuzhiyun 20*4882a593Smuzhiyundiff --git a/fix_options.c b/fix_options.c 21*4882a593Smuzhiyunindex b5e81b8..9958ff4 100644 22*4882a593Smuzhiyun--- a/fix_options.c 23*4882a593Smuzhiyun+++ b/fix_options.c 24*4882a593Smuzhiyun@@ -29,7 +29,7 @@ static char sccsid[] = "@(#) fix_options.c 1.6 97/04/08 02:29:19"; 25*4882a593Smuzhiyun 26*4882a593Smuzhiyun /* fix_options - get rid of IP-level socket options */ 27*4882a593Smuzhiyun 28*4882a593Smuzhiyun-fix_options(request) 29*4882a593Smuzhiyun+void fix_options(request) 30*4882a593Smuzhiyun struct request_info *request; 31*4882a593Smuzhiyun { 32*4882a593Smuzhiyun #ifdef IP_OPTIONS 33*4882a593Smuzhiyundiff --git a/miscd.c b/miscd.c 34*4882a593Smuzhiyunindex 1ab835c..723b83a 100644 35*4882a593Smuzhiyun--- a/miscd.c 36*4882a593Smuzhiyun+++ b/miscd.c 37*4882a593Smuzhiyun@@ -40,6 +40,10 @@ static char sccsid[] = "@(#) miscd.c 1.10 96/02/11 17:01:30"; 38*4882a593Smuzhiyun #include "patchlevel.h" 39*4882a593Smuzhiyun #include "tcpd.h" 40*4882a593Smuzhiyun 41*4882a593Smuzhiyun+#ifdef KILL_IP_OPTIONS 42*4882a593Smuzhiyun+void fix_options(struct request_info *); 43*4882a593Smuzhiyun+#endif 44*4882a593Smuzhiyun+ 45*4882a593Smuzhiyun int allow_severity = SEVERITY; /* run-time adjustable */ 46*4882a593Smuzhiyun int deny_severity = LOG_WARNING; /* ditto */ 47*4882a593Smuzhiyun 48*4882a593Smuzhiyundiff --git a/tcpd.c b/tcpd.c 49*4882a593Smuzhiyunindex d865b9c..a179891 100644 50*4882a593Smuzhiyun--- a/tcpd.c 51*4882a593Smuzhiyun+++ b/tcpd.c 52*4882a593Smuzhiyun@@ -38,6 +38,10 @@ static char sccsid[] = "@(#) tcpd.c 1.10 96/02/11 17:01:32"; 53*4882a593Smuzhiyun #include "patchlevel.h" 54*4882a593Smuzhiyun #include "tcpd.h" 55*4882a593Smuzhiyun 56*4882a593Smuzhiyun+#ifdef KILL_IP_OPTIONS 57*4882a593Smuzhiyun+void fix_options(struct request_info *); 58*4882a593Smuzhiyun+#endif 59*4882a593Smuzhiyun+ 60*4882a593Smuzhiyun int allow_severity = SEVERITY; /* run-time adjustable */ 61*4882a593Smuzhiyun int deny_severity = LOG_WARNING; /* ditto */ 62*4882a593Smuzhiyun 63*4882a593Smuzhiyun-- 64*4882a593Smuzhiyun2.10.3.dirty 65*4882a593Smuzhiyun 66