etch: twoftpd 1.21-4

[Gerrit Pape <pape@smarden.org>]

Hi,

twoftpd 1.21-4 in sid fixes important bug#400118, and I suggest to let
this version into etch.  The diff is minimal and straight forward.

Additionally I suggest the socklog 2.1.0-7 package in sid to be included
in etch, it fixes #401547 with the patch below, no other changes.

Regards, Gerrit.


diff -ur admin~/socklog-2.1.0/src/tryto.c
admin/socklog-2.1.0/src/tryto.c
--- admin~/socklog-2.1.0/src/tryto.c    2006-03-06 13:00:06.000000000 +0000
+++ admin/socklog-2.1.0/src/tryto.c     2006-12-05 08:51:51.115464544 +0000
@@ -237,7 +237,7 @@
       }
       break;
     }
-    if (rc == 0) break;
+    if (rc == 0) _exit(0);
     if (verbose) strerr_warn2(WARNING, "child crashed.", 0);
     if (lseek(0, 0, SEEK_SET) != 0)
        if (verbose) strerr_warn2(WARNING,
@@ -246,7 +246,7 @@
     sleep(1);
   }
 
-  if (processor && (rc != 0)) {
+  if (processor) {
     for (;;) {
       int r;
       char *s;