hoi :)

On Sat, Mar 04, 2006 at 12:35:20AM +0100, Thibaut VARENE wrote:
> I noticed recently that oidentd no longer starts on my machine. Using 
> strace, I noticed something that looks like a bogus behaviour: even 
> though the daemon is not told to forward requests, it tries to open 
> /proc/net/ip_conntrack (which doesn't exist on my system as it is not 
> acting as a router) and seems to fail because it can't find this file.

could you please test this patch:
a binary package is also available at
http://tali.admingilde.org/debian/oidentd_2.0.7-5_i386.deb

Index: debian/changelog
===================================================================
--- debian/changelog    (Revision 74)
+++ debian/changelog    (Arbeitskopie)
@@ -1,3 +1,9 @@
+oidentd (2.0.7-5) unstable; urgency=low
+
+  * Don't choke on kernels without masquerade support, Closes: #354006
+
+ -- Martin Waitz <[EMAIL PROTECTED]>  Tue,  7 Mar 2006 21:37:21 +0100
+
 oidentd (2.0.7-4) unstable; urgency=low
 
   * Apply patch from Christof Douma to open netfilter file descriptors
Index: src/kernel/linux.c
===================================================================
--- src/kernel/linux.c  (Revision 68)
+++ src/kernel/linux.c  (Arbeitskopie)
@@ -69,14 +69,18 @@
 #ifdef MASQ_SUPPORT
        masq_fp = fopen(MASQFILE, "r");
        if (masq_fp == NULL) {
-               if (errno != ENOENT)
+               if (errno != ENOENT) {
                        debug("fopen: %s: %s", MASQFILE, strerror(errno));
+                       return false;
+               }
 
                masq_fp = fopen(CONNTRACK, "r");
                if (masq_fp == NULL) {
-                       if (errno != ENOENT)
+                       if (errno != ENOENT) {
                                debug("fopen: %s: %s", CONNTRACK, 
strerror(errno));
-                       return false; //return true to allow operation without 
masquerade support
+                               return false;
+                       }
+                       masq_fp = fopen("/dev/null", "r");
                }
 
                netfilter = true;

-- 
Martin Waitz

Attachment: signature.asc
Description: Digital signature

Reply via email to