浏览代码

Compiler Warnings using Oracle Developer Studio on Solaris

More fixes for issue #75
John C. Frickson 9 年之前
父节点
当前提交
4a88099e43
共有 4 个文件被更改,包括 7 次插入7 次删除
  1. 1 0
      src/acl.c
  2. 1 1
      src/check_nrpe.c
  3. 4 5
      src/nrpe.c
  4. 1 1
      src/utils.c

+ 1 - 0
src/acl.c

@@ -29,6 +29,7 @@
  */
 
 #include "../include/config.h"
+#include "../include/common.h"
 
 #include <sys/types.h>
 #include <sys/socket.h>

+ 1 - 1
src/check_nrpe.c

@@ -58,7 +58,7 @@ const SSL_METHOD *meth;
 SSL_CTX *ctx;
 SSL *ssl;
 int use_ssl = TRUE;
-long ssl_opts = SSL_OP_ALL;
+unsigned long ssl_opts = SSL_OP_ALL;
 #else
 int use_ssl = FALSE;
 #endif

+ 4 - 5
src/nrpe.c

@@ -235,10 +235,10 @@ int init(void)
 void init_ssl(void)
 {
 #ifdef HAVE_SSL
-	DH       *dh;
-	char      seedfile[FILENAME_MAX];
-	int       i, c, x, vrfy;
-	long      ssl_opts = SSL_OP_ALL | SSL_OP_SINGLE_DH_USE;
+	DH            *dh;
+	char          seedfile[FILENAME_MAX];
+	int           i, c, x, vrfy;
+	unsigned long ssl_opts = SSL_OP_ALL | SSL_OP_SINGLE_DH_USE;
 
 	if (use_ssl == FALSE) {
 		if (debug == TRUE)
@@ -2396,7 +2396,6 @@ void sighandler(int sig)
 void child_sighandler(int sig)
 {
 	exit(0);					/* terminate */
-	return;						/* so the compiler doesn't complain... */
 }
 
 /* tests whether or not a client request is valid */

+ 1 - 1
src/utils.c

@@ -245,7 +245,7 @@ void add_listen_addr(struct addrinfo **listen_addrs, int address_family, char *a
 
 int clean_environ(const char *keep_env_vars, const char *nrpe_user)
 {
-#ifdef HAVE_PATHS_H
+#if defined(HAVE_PATHS_H) && defined(_PATH_STDPATH)
 	static char	*path = _PATH_STDPATH;
 #else
 	static char	*path = "/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin";