Changes in trunk/src/sh_mail.c [22:20]

File:

• trunk/src/sh_mail.c (modified) (20 diffs)

trunk/src/sh_mail.c

@@ -271 +271 @@
 
 static
-int sh_filter_filteradd (const char * argstring, 
-                         sh_filter_type * filter, int ftype)
+int sh_filter_filteradd (char * argstring, sh_filter_type * filter, int ftype)
 {
   int     i = 0;
@@ -373 +372 @@
  */
 static 
-int sh_filter_filter (const char * message, sh_filter_type * filter)
+int sh_filter_filter (char * message, sh_filter_type * filter)
 {
   int i;
@@ -433 +432 @@
  * -- add keywords to the OR filter
  */
-int sh_mail_add_or (const char * str)
+int sh_mail_add_or (char * str)
 {
   return (sh_filter_filteradd (str, &(mail_filter), SH_FILT_OR));
@@ -441 +440 @@
  * -- add keywords to the AND filter
  */
-int sh_mail_add_and (const char * str)
+int sh_mail_add_and (char * str)
 {
   return (sh_filter_filteradd (str, &(mail_filter), SH_FILT_AND));
@@ -449 +448 @@
  * -- add keywords to the NOT filter
  */
-int sh_mail_add_not (const char * str)
+int sh_mail_add_not (char * str)
 {
   return (sh_filter_filteradd (str, &(mail_filter), SH_FILT_NOT));
@@ -474 +473 @@
 }
 
-int sh_mail_setaddress (const char * address)
+int sh_mail_setaddress (char * address)
 {
   char     *     p;
@@ -524 +523 @@
 }
 
-int sh_mail_setaddress_int (const char * address)
+int sh_mail_setaddress_int (char * address)
 {
   int i;
@@ -534 +533 @@
 }
 
-int sh_mail_setNum (const char * str)
+int sh_mail_setNum (char * str)
 {
   int i = atoi (str);
@@ -550 +549 @@
 static int all_in_one = S_FALSE;
 
-int sh_mail_setFlag (const char * str)
+int sh_mail_setFlag (char * str)
 {
   int i;
@@ -560 +559 @@
 static char * mail_subject = NULL;
 
-int set_mail_subject (const char * str)
+int set_mail_subject (char * str)
 {
   SL_ENTER(_("set_mail_subject"));
@@ -1007 +1006 @@
         /* reveal first signature key
          */
-        /* flawfinder: ignore */
-        (void) sl_strlcpy(skey->crypt, skey->mailkey_new, KEY_LEN+1); 
+        (void) sl_strlcpy(skey->crypt, skey->mailkey_new, KEY_LEN+1);
 
         BREAKEXIT(sh_util_encode);
-        /* flawfinder: ignore */
         sh_util_encode(skey->crypt, bufcompress, 0, 'A');
 
-        /* flawfinder: ignore */
         (void) sl_strlcat (mailMsg, skey->crypt, msgbufsize);
-        /* flawfinder: ignore */
         memset (skey->crypt, 0, KEY_LEN);
         isfirst = 0;
@@ -1026 +1021 @@
     (void) sl_strlcpy (skey->mailkey_old, skey->mailkey_new, KEY_LEN+1);
 
-    sl_snprintf(subject, sizeof(subject), _("%06d %010ld::%s\r\n"),
-                mailcount, (long) id_audit, sh.host.name);
+    /*@-bufferoverflowhigh@*/
+    sprintf(subject, _("%06d %010ld::%s\r\n"),         /* known to fit  */
+            mailcount, (long) id_audit, sh.host.name);
+    /*@+bufferoverflowhigh@*/
 
     (void) sl_strlcat (mailMsg, subject, msgbufsize);
@@ -1225 +1222 @@
 static char * relay_host = NULL;
 
-int sh_mail_set_relay (const char * str_s)
+int sh_mail_set_relay (char * str_s)
 {
   size_t i = 0;
@@ -1254 +1251 @@
 static char * mail_sender = NULL;
 
-int sh_mail_set_sender (const char *str)
+int sh_mail_set_sender (char *str)
 {
   if (mail_sender != NULL) 
@@ -1738 +1735 @@
       if (g != 1)
         {
-          sl_snprintf(errmsg, sizeof(errmsg),
-                      _("Bad response (%d), expected %d"), rcode, code);
-
+          /*@-bufferoverflowhigh@*/
+          sprintf(errmsg,                              /* known to fit  */
+                  _("Bad response (%d), expected %d"), rcode, code);
+          /*@+bufferoverflowhigh@*/
           sh_error_handle((-1), FIL__, __LINE__, 0, MSG_E_NET, 
                           errmsg, _("sh_mail_wait"), 
@@ -1885 +1883 @@
   int  ret, length, status;
   mx * result;
-  size_t len;
 
   typedef union
@@ -2068 +2065 @@
        */
       result[count].pref = pref;
-      len = strlen (expanded) + 1;
-      result[count].address = SH_ALLOC (len);
-      sl_strlcpy (result[count].address, expanded, len);
+      result[count].address = SH_ALLOC (strlen (expanded) + 1);
+      strcpy (result[count].address, expanded);        /* known to fit  */
     }
   while (ret > 0 && comp_dn < eom && count);
@@ -2105 +2101 @@
   mx     * result;
   dnsrep * retval;
-  char     errmsg[128];
-  size_t   len;
+  char     errmsg[128]; 
 
   SL_ENTER(_("return_mx"));
@@ -2133 +2128 @@
                            _("get_mx"));
 #else
-          /* flawfinder: ignore *//* test code only */
           strcpy  (errmsg,                               /* known to fit  */
                    _("No MX record for domain "));
@@ -2161 +2155 @@
       result->pref  = 0;
       /*@-type@*/
-      len = strlen (host->h_name) + 1;
-      result->address = SH_ALLOC (len);
-      sl_strlcpy (result->address, host->h_name, len);
+      result->address = SH_ALLOC (strlen (host->h_name) + 1);
+      strcpy (result->address, host->h_name);          /* known to fit  */
       /*@+type@*/
       SL_RETURN (retval, _("return_mx"));