aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorRaimo Niskanen <raimo@erlang.org>2015-11-19 12:24:48 +0100
committerRaimo Niskanen <raimo@erlang.org>2015-11-19 12:24:48 +0100
commit4580ee5b133f680cf808ea12ebc0c930e97643b2 (patch)
tree349251bf71343cb0f7258cf41cb962b5dcaeebc9 /erts
parentbd1251dfe4d60f09e569731d36a92e94acbe297a (diff)
downloadotp-4580ee5b133f680cf808ea12ebc0c930e97643b2.tar.gz
otp-4580ee5b133f680cf808ea12ebc0c930e97643b2.tar.bz2
otp-4580ee5b133f680cf808ea12ebc0c930e97643b2.zip
Fix error propagate from setopts
Diffstat (limited to 'erts')
-rw-r--r--erts/emulator/drivers/common/inet_drv.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c
index 3c6922eb8e..6fff863fa6 100644
--- a/erts/emulator/drivers/common/inet_drv.c
+++ b/erts/emulator/drivers/common/inet_drv.c
@@ -1,7 +1,7 @@
/*
* %CopyrightBegin%
*
- * Copyright Ericsson AB 1997-2013. All Rights Reserved.
+ * Copyright Ericsson AB 1997-2015. All Rights Reserved.
*
* The contents of this file are subject to the Erlang Public License,
* Version 1.1, (the "License"); you may not use this file except in
@@ -6051,9 +6051,9 @@ static int inet_set_opts(inet_descriptor* desc, char* ptr, int len)
int arg_sz;
enum PacketParseType old_htype = desc->htype;
int old_active = desc->active;
- int propagate = 0; /* Set to 1 if failure to set this option
- should be propagated to erlang (not all
- errors can be propagated for BC reasons) */
+ int propagate; /* Set to 1 if failure to set this option
+ should be propagated to erlang (not all
+ errors can be propagated for BC reasons) */
int res;
#ifdef HAVE_SCTP
/* SCTP sockets are treated completely separately: */
@@ -6070,6 +6070,7 @@ static int inet_set_opts(inet_descriptor* desc, char* ptr, int len)
arg_ptr = (char*) &ival;
arg_sz = sizeof(ival);
proto = SOL_SOCKET;
+ propagate = 0;
switch(opt) {
case INET_LOPT_HEADER: