Changes in trunk/src/sh_forward.c [20:27]

File:

• trunk/src/sh_forward.c (modified) (25 diffs)

trunk/src/sh_forward.c

@@ -335 +335 @@
 #endif
 
-#ifdef SH_WITH_CLIENT
+#if defined(SH_WITH_CLIENT) || defined(SH_WITH_SERVER)
 
 static int count_dev_server = 0;
@@ -345 +345 @@
 }
 
-int sh_forward_setlogserver (char * address)
+int sh_forward_setlogserver (const char * address)
 {
   SL_ENTER(_("sh_forward_setlogserver"));
@@ -708 +708 @@
 static long sh_forward_try (char * errmsg);
 
+static unsigned int ServerPort = SH_DEFAULT_PORT;
+
+int sh_forward_server_port (const char * str)
+{
+  unsigned long l;
+  char * endptr;
+
+  SL_ENTER(_("sh_forward_server_port"));
+
+  l = strtoul (str, &endptr, 0);
+  if (l > 65535 || endptr == str)
+    {
+      SL_RETURN (-1, _("sh_forward_server_port"));
+    }
+  ServerPort = (unsigned int) l;
+  SL_RETURN (0, _("sh_forward_server_port"));
+}
 
 long sh_forward (char * errmsg)
@@ -880 +897 @@
 
   sockfd = connect_port_2 (sh.srvexport.name, sh.srvexport.alt, 
-                           SH_DEFAULT_PORT, 
+                           ServerPort, 
                            error_call, &error_num, error_msg, 256);
 
@@ -1441 +1458 @@
                                                 flag_err,
                                                 MSG_TCP_NOCONF);
-                              } else {
+                              } 
+#ifdef SH_WITH_CLIENT
+                              else {
                                 sh_socket_server_cmd(buffer);
                               }
+#endif
                               flag_err = 0;
 
@@ -1911 +1931 @@
 
 
-int sh_forward_use_clt_class (char * c)
+int sh_forward_use_clt_class (const char * c)
 {
   int i;
@@ -1919 +1939 @@
 }
 
-int sh_forward_use_clt_sev (char * c)
+int sh_forward_use_clt_sev (const char * c)
 {
   int i;
@@ -1950 +1970 @@
 }
 
-extern int safe_logger (int signal, int method, pid_t thepid);
-
-int sh_forward_register_client (char * str)
+
+int sh_forward_register_client (const char * str)
 {
   client_t   * newclt;
   client_t   * testclt;
 
-  char       * ptr;
+  const char * ptr;
   int          sepnum = 0;
   int          sep[2];
@@ -1980 +1999 @@
       if (all_clients == NULL) 
         {
-          (void) safe_logger (0, 0, getpid());
+          (void) safe_logger (0, 0, NULL);
           aud__exit(FIL__, __LINE__, EXIT_FAILURE);
         }
@@ -2012 +2031 @@
         newclt->status_arr[i] = CLT_INACTIVE;
       sl_strlcpy(newclt->timestamp[CLT_INACTIVE],   sh_unix_time(0), TIM_MAX);
+      /* truncate */
       sl_strlcpy(newclt->hostname,  &str[0],        sep[0]+1);
+      /* truncate */
       sl_strlcpy(newclt->salt,      &str[sep[0]+1], sep[1]-sep[0]);
       sl_strlcpy(newclt->verifier,  &str[sep[1]+1], sl_strlen(str)-sep[1]+1);
@@ -2386 +2407 @@
 
 #if defined(WITH_EXTERNAL)
-  sprintf(msg, _("%s %s %s"),                       /* known to fit  */
-          conn->hostname, 
-          conn->timestamp[status],
-          _(clt_stat[status]));
+  sl_snprintf(msg, sizeof(msg), _("%s %s %s"),
+              conn->hostname, conn->timestamp[status], _(clt_stat[status]));
   sh_ext_execute('s', 'r', 'v', msg, 0);
 #endif
@@ -2398 +2417 @@
 static time_t time_client_limit = 86400;
 
-int sh_forward_set_time_limit (char * c)
+int sh_forward_set_time_limit (const char * c)
 {
   long val;
@@ -2448 +2467 @@
 static int lookup_err = SH_ERR_SEVERE;
 
-int sh_forward_lookup_level (char * c)
+int sh_forward_lookup_level (const char * c)
 {
   int ci =  sh_error_convert_level (c);
@@ -2603 +2622 @@
 static int UseSocketPeer = S_FALSE;
 
-int set_socket_peer (char * c)
+int set_socket_peer (const char * c)
 {
   return sh_util_flagval(c, &UseSocketPeer);
@@ -2731 +2750 @@
   char       hash[SH_MAXMSGLEN + KEY_LEN + KEY_LEN + 1];
   char     * buffer;
-  long       len;
 
   int        clt_sev;
@@ -2737 +2755 @@
 
   UINT32     ticks;
+  size_t     len;
   int        i;
   char     * test;
@@ -2821 +2840 @@
                     sh_error_handle((-1), FIL__, __LINE__, 0, MSG_TCP_FAUTH,
                                     &(conn->buf[KEY_LEN]));
-                  strcpy(conn->buf,                      /* known to fit  */
-                         &(conn->buf[KEY_LEN])); 
+                  len = sl_strlen(&(conn->buf[KEY_LEN])) + 1;
+                  /* &(conn->buf[KEY_LEN]) is hostname         */
+                  /* may overlap, thus only memmove is correct */
+                  memmove(conn->buf, &(conn->buf[KEY_LEN]), len); 
                   this_client->session_key[0]    = '\0';
                   this_client->session_key_timer = (time_t) 1;
@@ -2835 +2856 @@
                   conn->K = NULL;
                 }
-              i = sl_strlen(&(conn->buf[KEY_LEN])) + KEY_LEN + 1;
-              conn->K = SH_ALLOC(i);
+              len = sl_strlen(&(conn->buf[KEY_LEN])) + KEY_LEN + 1;
+              conn->K = SH_ALLOC(len);
 
               sl_strlcpy (conn->K, 
@@ -2914 +2935 @@
               conn->A = SH_ALLOC(3*KEY_LEN+1);
               sl_strlcpy (conn->A, conn->K, KEY_LEN+1); 
-              sl_strlcat(conn->A, conn->buf, /* ignore remainder */
+              sl_strlcat(conn->A, conn->buf, /* truncate */
                          2*KEY_LEN+1);
               sl_strlcat(conn->A, conn->client_entry->session_key, 
@@ -3278 +3299 @@
                     sh_error_handle((-1), FIL__, __LINE__, 0, MSG_TCP_FAUTH,
                                     &(conn->buf[KEY_LEN]));
-                  strcpy(conn->buf,                      /* known to fit  */
-                         &(conn->buf[KEY_LEN]));
+                  len = sl_strlen(&(conn->buf[KEY_LEN])) + 1;
+                  /* &(conn->buf[KEY_LEN]) is hostname         */
+                  /* may overlap, thus only memmove is correct */
+                  memmove(conn->buf, &(conn->buf[KEY_LEN]), len); 
                   this_client->session_key[0]    = '\0';
                   this_client->session_key_timer = (time_t) 1;
@@ -3293 +3316 @@
                   conn->K = NULL;
                 }
-              i = sl_strlen(&(conn->buf[KEY_LEN])) + KEY_LEN + 1;
-              conn->K = SH_ALLOC(i);
+              len = sl_strlen(&(conn->buf[KEY_LEN])) + KEY_LEN + 1;
+              conn->K = SH_ALLOC(len);
 
               sl_strlcpy (conn->K, 
@@ -4600 +4623 @@
 static unsigned int server_port = SH_DEFAULT_PORT;
 
-int sh_forward_set_port (char * str)
+int sh_forward_set_port (const char * str)
 {
   int retval = 0;
   unsigned long   i;
-  char * endptr = str;
+  char * endptr;
   
   SL_ENTER(_("sh_forward_set_port"));
@@ -4621 +4644 @@
 static int            use_server_interface = 0;
 
-int sh_forward_set_interface (char * str)
+int sh_forward_set_interface (const char * str)
 {
   if (0 == strcmp(str, _("INADDR_ANY")))
@@ -4814 +4837 @@
    */
   new_act.sa_handler = SIG_IGN;
+  sigemptyset( &new_act.sa_mask );         /* set an empty mask       */
+  new_act.sa_flags = 0;                    /* init sa_flags           */
   retry_sigaction (FIL__, __LINE__, SIGPIPE, &new_act, &old_act);
 
@@ -5571 +5596 @@
 }
 
-int set_syslog_active(char * c)
+int set_syslog_active(const char * c)
 {
   return sh_util_flagval(c, &enable_syslog_socket);