|
 |
ab3a3d |
autofs-5.0.7 - fix inconsistent signed usage for __rpc_ping()
|
|
|
ab3a3d |
|
|
|
ab3a3d |
From: Ian Kent <raven@themaw.net>
|
|
|
ab3a3d |
|
|
|
ab3a3d |
There is some incosistent usage of unsigned int variables with the usage
|
|
|
ab3a3d |
of __rpc_ping().
|
|
|
ab3a3d |
---
|
|
|
ab3a3d |
lib/rpc_subs.c | 12 +++++-------
|
|
|
ab3a3d |
1 file changed, 5 insertions(+), 7 deletions(-)
|
|
|
ab3a3d |
|
|
|
ab3a3d |
diff --git a/lib/rpc_subs.c b/lib/rpc_subs.c
|
|
|
ab3a3d |
index 718caf9..f5742e8 100644
|
|
|
ab3a3d |
--- a/lib/rpc_subs.c
|
|
|
ab3a3d |
+++ b/lib/rpc_subs.c
|
|
|
ab3a3d |
@@ -670,13 +670,11 @@ int rpc_ping_proto(struct conn_info *info)
|
|
|
ab3a3d |
return 1;
|
|
|
ab3a3d |
}
|
|
|
ab3a3d |
|
|
|
ab3a3d |
-static unsigned int __rpc_ping(const char *host,
|
|
|
ab3a3d |
- unsigned long version,
|
|
|
ab3a3d |
- int proto,
|
|
|
ab3a3d |
- long seconds, long micros,
|
|
|
ab3a3d |
- unsigned int option)
|
|
|
ab3a3d |
+static int __rpc_ping(const char *host,
|
|
|
ab3a3d |
+ unsigned long version, int proto,
|
|
|
ab3a3d |
+ long seconds, long micros, unsigned int option)
|
|
|
ab3a3d |
{
|
|
|
ab3a3d |
- unsigned int status;
|
|
|
ab3a3d |
+ int status;
|
|
|
ab3a3d |
struct conn_info info;
|
|
|
ab3a3d |
struct pmap parms;
|
|
|
ab3a3d |
|
|
|
ab3a3d |
@@ -713,7 +711,7 @@ int rpc_ping(const char *host, long seconds, long micros, unsigned int option)
|
|
|
ab3a3d |
{
|
|
|
ab3a3d |
unsigned long vers3 = NFS3_VERSION;
|
|
|
ab3a3d |
unsigned long vers2 = NFS2_VERSION;
|
|
|
ab3a3d |
- unsigned int status;
|
|
|
ab3a3d |
+ int status;
|
|
|
ab3a3d |
|
|
|
ab3a3d |
status = __rpc_ping(host, vers2, IPPROTO_UDP, seconds, micros, option);
|
|
|
ab3a3d |
if (status > 0)
|