Removed compilation warnings

src/addagent/main.c

@@ -13,7 +13,9 @@
 /* Prototypes */
 static void helpmsg(void) __attribute__((noreturn));
 static void print_banner(void);
+#ifndef WIN32
 static void manage_shutdown(int sig) __attribute__((noreturn));
+#endif
 
 
 #if defined(__MINGW32__)
@@ -66,6 +68,7 @@ static void print_banner()
     return;
 }
 
+#ifndef WIN32
 /* Clean shutdown on kill */
 static void manage_shutdown(__attribute__((unused)) int sig)
 {
@@ -79,6 +82,7 @@ static void manage_shutdown(__attribute__((unused)) int sig)
 
     exit(0);
 }
+#endif
 
 int main(int argc, char **argv)
 {

src/rootcheck/rootcheck-config.c

@@ -43,7 +43,9 @@ short eval_bool2(char *str, short default_val)
 int Read_Rootcheck_Config(const char *cfgfile)
 {
     OS_XML xml;
+#ifdef OSSECHIDS
     char *str = NULL;
+#endif
 
     /* XML Definitions */
     const char *(xml_base_dir[]) = {xml_rootcheck, "base_directory", NULL};

src/syscheckd/run_check.c

@@ -13,6 +13,7 @@
 #include <sched.h>
 #endif
 #ifdef WIN32
+#include <winsock2.h>
 #include <aclapi.h>
 #include <sddl.h>
 #endif

src/syscheckd/syscheck.c

@@ -17,7 +17,9 @@
 
 /* Prototypes */
 static void read_internal(int debug_level);
+#ifndef WIN32
 static void help_syscheckd(void) __attribute__((noreturn));
+#endif
 
 syscheck_config syscheck;
 
@@ -163,6 +165,7 @@ int Start_win32_Syscheck()
 }
 #endif /* WIN32 */
 
+#ifndef WIN32
 /* Print help statement */
 static void help_syscheckd()
 {
@@ -180,7 +183,6 @@ static void help_syscheckd()
     exit(1);
 }
 
-#ifndef WIN32
 /* Syscheck unix main */
 int main(int argc, char **argv)
 {

src/win32/agent_auth.c

@@ -46,7 +46,7 @@ void SendSecurityToken(const int socket, SecBuffer *OutBuffers)
     }
 }
 
-void CreateSecureConnection(char *manager, int port, int *socket, CtxtHandle *context, CredHandle *cred)
+void CreateSecureConnection(char *manager, char *port, int *socket, CtxtHandle *context, CredHandle *cred)
 {
     SECURITY_STATUS status;
     SCHANNEL_CRED auth_cred;
@@ -73,7 +73,7 @@ void CreateSecureConnection(char *manager, int port, int *socket, CtxtHandle *co
     *socket = OS_ConnectTCP(port, manager);
 
     if (socket == 0)
-        ErrorExit("%s: Unable to connect to %s:%d", ARGV0, manager, port);
+        ErrorExit("%s: Unable to connect to %s:%s", ARGV0, manager, port);
 
 
 
@@ -148,7 +148,7 @@ void CreateSecureConnection(char *manager, int port, int *socket, CtxtHandle *co
     // Send remaining tokens if any
     SendSecurityToken(*socket, OutBuffers);
 
-    printf("INFO: Connected to %s:%d\n", manager, port);
+    printf("INFO: Connected to %s:%s\n", manager, port);
     LocalFree(buffer);
 }
 
@@ -391,15 +391,18 @@ int main(int argc, char **argv)
                     ErrorExit("%s: -%c needs an argument",ARGV0, c);
                 agentname = optarg;
                 break;
-            case 'p':
+            case 'p': {
                if(!optarg)
                     ErrorExit("%s: -%c needs an argument",ARGV0, c);
-                port = atoi(optarg);
-                if(port <= 0 || port >= 65536)
+                int tmp_port;
+                tmp_port = atoi(optarg);
+                if(tmp_port <= 0 || tmp_port >= 65536)
                 {
                     ErrorExit("%s: Invalid port: %s", ARGV0, optarg);
                 }
+                port = optarg;
                 break;
+            }
             case 'P':
                 if (!optarg)
                     ErrorExit("%s: -%c needs an argument", ARGV0, c);