- patch from Denis Vlasenko to add and use bb_xchdir()

[oweals/busybox.git] / networking / fakeidentd.c

diff --git a/networking/fakeidentd.c b/networking/fakeidentd.c
index 40d5cf1b7c5b9bb65f53133ce396403dd89f6aa1..cae6b813821a790a31afe0fc2a55a088ac5e4195 100644 (file)
--- a/networking/fakeidentd.c
+++ b/networking/fakeidentd.c
@@ -6,20 +6,7 @@
  * Original Author: Tomi Ollila <too@iki.fi>
  *                  http://www.guru-group.fi/~too/sw/
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 #include <unistd.h>
@@ -51,11 +38,11 @@
 #define MAXIDLETIME 45
 
 static const char ident_substr[] = " : USERID : UNIX : ";
-static const int ident_substr_len = sizeof(ident_substr) - 1;
+enum { ident_substr_len = sizeof(ident_substr) - 1 };
 #define PIDFILE "/var/run/identd.pid"
 
 /*
- * We have to track the 'first connection socket' so that we 
+ * We have to track the 'first connection socket' so that we
  * don't go around closing file descriptors for non-clients.
  *
  * descriptor setup normally
@@ -117,8 +104,7 @@ static void inetbind(void)
        else
                port = se->s_port;
 
-       if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0)
-               bb_perror_msg_and_die("Cannot create server socket");
+       s = bb_xsocket(AF_INET, SOCK_STREAM, 0);
 
        setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one));
 
@@ -127,10 +113,10 @@ static void inetbind(void)
        addr.sin_family = AF_INET;
        addr.sin_port = htons(port);
 
-       if (bind(s, (struct sockaddr *)&addr, len) < 0)
+       if (bind(s, (struct sockaddr *)&addr, len) < 0) /* bb_xbind? */
                bb_perror_msg_and_die("Cannot bind() port %i", IDENT_PORT);
 
-       if (listen(s, 5) < 0)
+       if (listen(s, 5) < 0) /* bb_xlisten? */
                bb_perror_msg_and_die("Cannot listen() on port %i", IDENT_PORT);
 
        movefd(s, 0);