7f83a080cf
- fix typo in libtirpc file name. - fix rework error return handling in rpc code. - allow MOUNT_WAIT to override probe. - improve UDP RPC timeout handling. - fix segfault in get_query_dn(). - use strtok_r() in linux_version_code(). - fix sss wildcard match. - fix dlopen() error handling in sss module. - fix configure string length tests for sss library.
46 lines
1.2 KiB
Diff
46 lines
1.2 KiB
Diff
autofs-5.0.6 - fix rework error return handling in rpc code
|
||
|
||
From: Dustin Polke <DuPol@gmx.de>
|
||
|
||
This fixes the following error:
|
||
rpc_subs.c: In function ‘rpc_do_create_client’:
|
||
rpc_subs.c:203:3: error: a label can only be part of a statement and a
|
||
declaration is not a statement
|
||
---
|
||
|
||
CHANGELOG | 1 +
|
||
lib/rpc_subs.c | 4 ++--
|
||
2 files changed, 3 insertions(+), 2 deletions(-)
|
||
|
||
|
||
--- autofs-5.0.6.orig/CHANGELOG
|
||
+++ autofs-5.0.6/CHANGELOG
|
||
@@ -33,6 +33,7 @@
|
||
- check scandir() return value.
|
||
- fix function to check mount.nfs version.
|
||
- fix typo in libtirpc file name.
|
||
+- fix rework error return handling in rpc code.
|
||
|
||
28/06/2011 autofs-5.0.6
|
||
-----------------------
|
||
--- autofs-5.0.6.orig/lib/rpc_subs.c
|
||
+++ autofs-5.0.6/lib/rpc_subs.c
|
||
@@ -155,7 +155,7 @@ static int rpc_do_create_client(struct s
|
||
CLIENT *clnt = NULL;
|
||
struct sockaddr_in in4_laddr;
|
||
struct sockaddr_in *in4_raddr;
|
||
- int type, proto;
|
||
+ int type, proto, ret;
|
||
socklen_t slen;
|
||
|
||
*client = NULL;
|
||
@@ -200,7 +200,7 @@ static int rpc_do_create_client(struct s
|
||
break;
|
||
|
||
case IPPROTO_TCP:
|
||
- int ret = connect_nb(*fd, addr, slen, &info->timeout);
|
||
+ ret = connect_nb(*fd, addr, slen, &info->timeout);
|
||
if (ret < 0)
|
||
return ret;
|
||
|