Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/networking/isrv_identd.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/networking/isrv_identd.c (modified) (6 diffs)

branches/2.2.9/mindi-busybox/networking/isrv_identd.c

@@ -3 +3 @@
  * Fake identd server.
  *
- * Copyright (C) 2007 Denis Vlasenko
+ * Copyright (C) 2007 Denys Vlasenko
  *
- * Licensed under GPL version 2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
+#include "libbb.h"
 #include <syslog.h>
-#include "libbb.h"
 #include "isrv.h"
 
@@ -62 +62 @@
     if (p)
         *p = '\0';
-    if (!p && sz && buf->pos <= sizeof(buf->buf))
+    if (!p && sz && buf->pos <= (int)sizeof(buf->buf))
         goto ok;
     /* Terminate session. If we are in server mode, then
@@ -77 +77 @@
 }
 
-static int do_timeout(void **paramp)
+static int do_timeout(void **paramp UNUSED_PARAM)
 {
     return 1; /* terminate session */
@@ -93 +93 @@
 }
 
-int fakeidentd_main(int argc, char **argv);
-int fakeidentd_main(int argc, char **argv)
+int fakeidentd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int fakeidentd_main(int argc UNUSED_PARAM, char **argv)
 {
     enum {
@@ -114 +114 @@
 
     /* Daemonize if no -f and no -i and no -w */
-    if (!(opt & OPT_fiw));
+    if (!(opt & OPT_fiw))
         bb_daemonize_or_rexec(0, argv);
 
@@ -123 +123 @@
      * (Or maybe we need yet another option "log to syslog") */
     if (!(opt & OPT_fiw) /* || (opt & OPT_syslog) */) {
-        openlog(applet_name, 0, LOG_DAEMON);
+        openlog(applet_name, LOG_PID, LOG_DAEMON);
         logmode = LOGMODE_SYSLOG;
     }