Module Name: src
Committed By: pgoyette
Date: Mon Apr 15 03:58:29 UTC 2019
Modified Files:
src/sys/kern: uipc_socket.c
Log Message:
If the compat code successfully handled an option, don't return an error.
To generate a diff of this commit:
cvs rdiff -u -r1.276 -r1.277 src/sys/kern/uipc_socket.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/uipc_socket.c
diff -u src/sys/kern/uipc_socket.c:1.276 src/sys/kern/uipc_socket.c:1.277
--- src/sys/kern/uipc_socket.c:1.276 Mon Apr 15 02:35:28 2019
+++ src/sys/kern/uipc_socket.c Mon Apr 15 03:58:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_socket.c,v 1.276 2019/04/15 02:35:28 pgoyette Exp $ */
+/* $NetBSD: uipc_socket.c,v 1.277 2019/04/15 03:58:29 pgoyette Exp $ */
/*
* Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.276 2019/04/15 02:35:28 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.277 2019/04/15 03:58:29 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -1864,6 +1864,8 @@ sosetopt1(struct socket *so, const struc
break;
default:
+ if (error == 0)
+ break;
solock(so);
error = ENOPROTOOPT;
break;
