On Sun, Jun 19, 2005 at 12:38:58AM +0200, Tomasz Kojm said:
> On Sat, 18 Jun 2005 14:20:20 -0400
> Stephen Gran <[EMAIL PROTECTED]> wrote:
> 
> > the following patch corrects this,a nd results in
> > /* #undef SENDMAIL_VERSION_A */
> > which is correct if sendmail is not installed
> 
> Fixed in CVS.

The second part of this patch, to make it compile with gcc-4.0
(currently complains about no left operand)

--- clamav-milter/clamav-milter.c.old   2005-06-19 13:13:40.157521584 -0400
+++ clamav-milter/clamav-milter.c       2005-06-19 13:15:57.435610442 -0400
@@ -1054,9 +1054,11 @@

                if(cfgopt(copt, "LogVerbose")) {
                        logVerbose = 1;
+#if defined SENDMAIL_VERSION_A && defined SENDMAIL_VERSION_B
 #if    ((SENDMAIL_VERSION_A > 8) || ((SENDMAIL_VERSION_A == 8) && 
(SENDMAIL_VERSION_B >= 13)))
                        smfi_setdbg(6);
 #endif
+#endif
                }
                use_syslog = 1;

@@ -1573,12 +1575,14 @@
                return EX_UNAVAILABLE;
        }

+#if defined SENDMAIL_VERSION_A && defined SENDMAIL_VERSION_B
 #if    ((SENDMAIL_VERSION_A > 8) || ((SENDMAIL_VERSION_A == 8) && 
(SENDMAIL_VERSION_B >= 13)))
        if(smfi_opensocket(1) == MI_FAILURE) {
                cli_errmsg("Can't open/create %s\n", port);
                return EX_CONFIG;
        }
 #endif
+#endif

        signal(SIGPIPE, SIG_IGN);       /* libmilter probably does this as well 
*/


Thanks,
-- 
 --------------------------------------------------------------------------
|  Stephen Gran                  | Let us live!!! Let us love!!! Let us    |
|  [EMAIL PROTECTED]             | share the deepest secrets of our        |
|  http://www.lobefin.net/~steve | souls!!!  You first.                    |
 --------------------------------------------------------------------------

Attachment: signature.asc
Description: Digital signature

_______________________________________________
http://lurker.clamav.net/list/clamav-devel.html

Reply via email to