Changeset 290 for trunk/src/sh_portcheck.c

Timestamp:

Aug 15, 2010, 12:27:47 PM (14 years ago)

Author:

katerina

Message:

Fixes for tickets #215, #216, #217, #218, version bumped to 2.7.2

File:

• trunk/src/sh_portcheck.c (modified) (8 diffs)

trunk/src/sh_portcheck.c

@@ -47 +47 @@
 
 #define PORTMAP
+#ifdef  HAVE_RPC_RPC_H
 #include <rpc/rpc.h>
 #ifdef  HAVE_RPC_RPCENT_H
@@ -53 +54 @@
 #include <rpc/pmap_clnt.h>
 #include <rpc/pmap_prot.h>
+#endif
 #include <netdb.h>
 
@@ -284 +286 @@
 #endif
 
+#ifdef  HAVE_RPC_RPC_H
 static char * sh_getrpcbynumber (int number, char * buf, size_t len)
 {
@@ -324 +327 @@
   return NULL;
 }
+#endif
 
 static char * sh_getservbyport (int port, const char * proto_in, char * buf, size_t len)
@@ -756 +760 @@
                               unsigned long prot)
 {
+#ifdef  HAVE_RPC_RPC_H
   struct pmaplist * head;
   char *r;
@@ -786 +791 @@
       while (head != NULL);
     }
-
+#else
+  (void) port;
+  (void) address;
+  (void) prot;
+#endif
   return NULL;
 }
@@ -1665 +1674 @@
   char * p;
 
+#ifdef HAVE_RPC_RPC_H
   p = sh_getrpcbynumber(0, buf, sizeof(buf));
   CuAssertTrue(tc, p == NULL);
@@ -1677 +1687 @@
   CuAssertTrue(tc, 0 == strcmp(p, "ypbind"));
   CuAssertTrue(tc, 0 == strcmp(buf, "ypbind"));
+#endif
 
   p = sh_getservbyport(0, SH_PROTO_STR(IPPROTO_TCP), buf, sizeof(buf));
   CuAssertTrue(tc, p == NULL);
 
+#if !defined(HOST_IS_CYGWIN)
   p = sh_getservbyport(22, SH_PROTO_STR(IPPROTO_TCP), buf, sizeof(buf));
   CuAssertPtrNotNull(tc, p);
   CuAssertTrue(tc, 0 == strcmp(p, "ssh"));
   CuAssertTrue(tc, 0 == strcmp(buf, "ssh"));
+#endif
 
   p = sh_getservbyport(13, SH_PROTO_STR(IPPROTO_UDP), buf, sizeof(buf));