Patch for fix.c (was RE: sid-milter v0.2.9 released)

[Dick St.P. <stpeters@NetHeaven.com>]

Murray S. Kucherawy writes:
> Quite right.  A commit in fix.c appears to have gone awry.
> 
> This patch should fix it:

The patch generation seems to have gone awry also.  There are
extraneous single spaces at the beginning of most lines, and the patch
fails to apply.  (Note that this is not a space vs. tab difference
that can be overcome with --ignore-whitespace.)

Here's a version that does apply cleanly.  Also posted at
    ftp://ftp.netheaven.com/pub/sid-milter/nh-res-init-0.2.9.patch

______________________________________________________________________
--- libar/fix.c.orig	2005-07-18 18:27:37.000000000 -0400
+++ libar/fix.c	2005-08-01 11:41:21.104959031 -0400
@@ -31,7 +31,6 @@
 #define	SERVICE		"domain"
 #define	PROTOCOL	"udp"
 
-#ifdef NONSTANDARD_RES_STRUCTURE
 /*
 **  AR_RES_STRUCTURE -- res_init() replacement for systems that don't follow
 **                 the de facto standards (e.g. OpenBSD 3.7)
@@ -53,6 +52,7 @@
 int
 ar_res_init(void)
 {
+#ifdef NONSTANDARD_RES_STRUCTURE
 	int data;
 	int nscount = 0;
 	FILE *f;
@@ -140,10 +140,10 @@
 	_res.retry = RES_RETRY;
 
 	return 0;
-}
 #else /* NONSTANDARD_RES_STRUCTURE */
-# define ar_res_init	res_init
+	return res_init();
 #endif /* NONSTANDARD_RES_STRUCTURE */
+}
 
 #ifdef TEST
 int