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

File:

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

trunk/src/sh_forward.c

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