RE:

["NDSoftware" <extml@ndsoftware.net>]

Hello,

I try to use IPv6 and TLS patch (because patch aren't compatible) I have
apply the patched manually.

When I try to make:

./compile qmail-remote.c
In file included from qmail-remote.c:18:
ipalloc.h:1: unterminated `#if' conditional
In file included from ipme.h:5,
                 from qmail-remote.c:19:
ipalloc.h:1: unterminated `#if' conditional
make: *** [qmail-remote.o] Error 1

My ipalloc.h:

---
#ifndef IPALLOC_H
#define IPALLOC_H

#include "ip.h"

#ifdef TLS
#include "stralloc.h"
struct ip_mx {
  unsigned short af;
  union {
    struct ip_address ip;
#ifdef INET6
    struct ip6_address ip6;
#endif
    } addr;
  int pref; char *fqdn;
};
#else
struct ip_mx {
  unsigned short af;
  union {
    struct ip_address ip;
#ifdef INET6
    struct ip6_address ip6;
#endif
    } addr;
  int pref;
};

#include "gen_alloc.h"

GEN_ALLOC_typedef(ipalloc,struct ip_mx,ix,len,a)
extern int ipalloc_readyplus();
extern int ipalloc_append();

#endif

---

The TLS patch:

---
diff -ur qmail-1.03/ipalloc.h qmail-1.03-tls/ipalloc.h
--- qmail-1.03/ipalloc.h	Mon Jun 15 12:53:16 1998
+++ qmail-1.03-tls/ipalloc.h	Fri Dec 24 15:39:42 1999
@@ -3,7 +3,12 @@
 
 #include "ip.h"
 
+#ifdef TLS
+#include "stralloc.h"
+struct ip_mx { struct ip_address ip; int pref; char *fqdn; } ;
+#else
 struct ip_mx { struct ip_address ip; int pref; } ;
+#endif
 
 #include "gen_alloc.h"
 
---

The IPv6 patch:

---
diff -ur qmail-1.03/ipalloc.h qmail-1.03v6/ipalloc.h
--- qmail-1.03/ipalloc.h	Mon Jun 15 19:53:16 1998
+++ qmail-1.03v6/ipalloc.h	Wed Jul  1 21:53:14 1998
@@ -3,7 +3,16 @@
 
 #include "ip.h"
 
-struct ip_mx { struct ip_address ip; int pref; } ;
+struct ip_mx {
+  unsigned short af;
+  union {
+    struct ip_address ip;
+#ifdef INET6
+    struct ip6_address ip6;
+#endif
+    } addr;
+  int pref;
+};
 
 #include "gen_alloc.h"
 
---

Any help are welcome.