[bug-inetutils] more fixes

[Simon Josefsson]

I feel there is some duplication between this list and the commit
mailing list :-)

/Simon

>From f5402bc6eb50e263087ff5c9f2c4e0275b5b7dd1 Mon Sep 17 00:00:00 2001
From: Simon Josefsson <address@hidden>
Date: Sat, 14 Nov 2009 17:37:31 +0100
Subject: [PATCH 1/3] Drop replacement of S_ISTXT, we use gnulib.

---
 ChangeLog |    4 ++++
 rcp/rcp.c |    4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1eda8e1..b7a39ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-11-14  Simon Josefsson  <address@hidden>
 
+       * rcp/rcp.c: Drop replacement of S_ISTXT, we use gnulib.
+
+2009-11-14  Simon Josefsson  <address@hidden>
+
        * libinetutils/daemon.c: Doc fix.
 
 2009-11-14  Alfred M. Szmidt  <address@hidden>
diff --git a/rcp/rcp.c b/rcp/rcp.c
index e838b5e..34af034 100644
--- a/rcp/rcp.c
+++ b/rcp/rcp.c
@@ -124,10 +124,6 @@ int doencrypt = 0;
 # endif
 #endif /* KERBEROS  */
 
-#if !defined (S_ISTXT) && defined (S_ISVTX)
-# define S_ISTXT S_ISVTX
-#endif
-
 const char doc[] = "Remote copy SOURCE to DEST, or multiple SOURCE(s) to 
DIRECTORY.";
 const char arg_doc[] = "SOURCE DEST\n"
                        "SOURCE... DIRECTORY\n"
-- 
1.6.5.2

>From 1cad30e67013374684b094c56ab487a7df241adf Mon Sep 17 00:00:00 2001
From: Simon Josefsson <address@hidden>
Date: Sat, 14 Nov 2009 17:48:41 +0100
Subject: [PATCH 2/3] Include config.h properly.

---
 ChangeLog                 |   23 +++++++++++++++++++++++
 ifconfig/system.c         |    2 ++
 libinetutils/argcv.c      |    2 ++
 libinetutils/defauthors.c |    2 ++
 libinetutils/logwtmpko.c  |    2 ++
 libtelnet/forward.c       |    2 ++
 talk/init_disp.c          |    6 ++----
 talkd/acl.c               |    2 ++
 talkd/announce.c          |    2 ++
 talkd/print.c             |    2 ++
 talkd/process.c           |    2 ++
 talkd/table.c             |    2 ++
 telnet/ring.c             |    6 ++----
 telnetd/pty.c             |    2 ++
 telnetd/slc.c             |    2 ++
 telnetd/state.c           |    2 ++
 telnetd/telnetd.c         |    2 ++
 telnetd/term.c            |    2 ++
 telnetd/termstat.c        |    2 ++
 telnetd/utility.c         |    2 ++
 tests/localhost.c         |    2 ++
 21 files changed, 63 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b7a39ff..7a4ea2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,28 @@
 2009-11-14  Simon Josefsson  <address@hidden>
 
+       * ifconfig/system.c: Include config.h properly.
+       * libinetutils/argcv.c: Likewise.
+       * libinetutils/defauthors.c: Likewise.
+       * libinetutils/logwtmpko.c: Likewise.
+       * libtelnet/forward.c: Likewise.
+       * talk/init_disp.c: Likewise.
+       * talkd/acl.c: Likewise.
+       * talkd/announce.c: Likewise.
+       * talkd/print.c: Likewise.
+       * talkd/process.c: Likewise.
+       * talkd/table.c: Likewise.
+       * telnet/ring.c: Likewise.
+       * telnetd/pty.c: Likewise.
+       * telnetd/slc.c: Likewise.
+       * telnetd/state.c: Likewise.
+       * telnetd/telnetd.c: Likewise.
+       * telnetd/term.c: Likewise.
+       * telnetd/termstat.c: Likewise.
+       * telnetd/utility.c: Likewise.
+       * tests/localhost.c: Likewise.
+
+2009-11-14  Simon Josefsson  <address@hidden>
+
        * rcp/rcp.c: Drop replacement of S_ISTXT, we use gnulib.
 
 2009-11-14  Simon Josefsson  <address@hidden>
diff --git a/ifconfig/system.c b/ifconfig/system.c
index 2e07fec..e1ff2a8 100644
--- a/ifconfig/system.c
+++ b/ifconfig/system.c
@@ -17,6 +17,8 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
+#include <config.h>
+
 #if defined(__linux__)
 # include "system/linux.c"
 #elif defined(__sun__)
diff --git a/libinetutils/argcv.c b/libinetutils/argcv.c
index c96918a..bcc0758 100644
--- a/libinetutils/argcv.c
+++ b/libinetutils/argcv.c
@@ -17,6 +17,8 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
+#include <config.h>
+
 #include "argcv.h"
 #include <ctype.h>
 
diff --git a/libinetutils/defauthors.c b/libinetutils/defauthors.c
index 5e4cb58..0bbbd34 100644
--- a/libinetutils/defauthors.c
+++ b/libinetutils/defauthors.c
@@ -16,6 +16,8 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
+#include <config.h>
+
 #include <stdlib.h>
 
 /* Sometimes we do not know exact author names for a given utility. In such
diff --git a/libinetutils/logwtmpko.c b/libinetutils/logwtmpko.c
index d194c5b..ccfe835 100644
--- a/libinetutils/logwtmpko.c
+++ b/libinetutils/logwtmpko.c
@@ -17,5 +17,7 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
+#include <config.h>
+
 #define KEEP_OPEN
 #include "logwtmp.c"
diff --git a/libtelnet/forward.c b/libtelnet/forward.c
index 14012ee..cff68ba 100644
--- a/libtelnet/forward.c
+++ b/libtelnet/forward.c
@@ -49,6 +49,8 @@
 /* General-purpose forwarding routines. These routines may be put into */
 /* libkrb5.a to allow widespread use */
 
+#include <config.h>
+
 #if defined(KRB5) && defined(FORWARD)
 # include <stdio.h>
 # include <pwd.h>
diff --git a/talk/init_disp.c b/talk/init_disp.c
index 06bf023..94c060d 100644
--- a/talk/init_disp.c
+++ b/talk/init_disp.c
@@ -46,6 +46,8 @@
  * SUCH DAMAGE.
  */
 
+#include <config.h>
+
 #include <stdlib.h>
 
 /*
@@ -53,10 +55,6 @@
  * as well as the signal handling routines.
  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #ifdef HAVE_TERMIOS_H
 # include <termios.h>
 #else
diff --git a/talkd/acl.c b/talkd/acl.c
index 309f440..0bc9f9b 100644
--- a/talkd/acl.c
+++ b/talkd/acl.c
@@ -17,6 +17,8 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
+#include <config.h>
+
 #include <intalkd.h>
 #include <pwd.h>
 #include <regex.h>
diff --git a/talkd/announce.c b/talkd/announce.c
index 7737d99..d59a037 100644
--- a/talkd/announce.c
+++ b/talkd/announce.c
@@ -18,6 +18,8 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
+#include <config.h>
+
 #include <intalkd.h>
 #include <stdarg.h>
 #include <sys/uio.h>
diff --git a/talkd/print.c b/talkd/print.c
index 43a5e49..ce8af55 100644
--- a/talkd/print.c
+++ b/talkd/print.c
@@ -17,6 +17,8 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
+#include <config.h>
+
 #include <intalkd.h>
 
 #define D(c) #c
diff --git a/talkd/process.c b/talkd/process.c
index a6497f6..0dbbe15 100644
--- a/talkd/process.c
+++ b/talkd/process.c
@@ -17,6 +17,8 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
+#include <config.h>
+
 #include <intalkd.h>
 #include <readutmp.h>
 
diff --git a/talkd/table.c b/talkd/table.c
index 2e45041..85f0c3d 100644
--- a/talkd/table.c
+++ b/talkd/table.c
@@ -17,6 +17,8 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
+#include <config.h>
+
 #include <intalkd.h>
 
 typedef struct request_table table_t;
diff --git a/telnet/ring.c b/telnet/ring.c
index 70f8d58..b892479 100644
--- a/telnet/ring.c
+++ b/telnet/ring.c
@@ -46,6 +46,8 @@
  * SUCH DAMAGE.
  */
 
+#include <config.h>
+
 #include <string.h>
 
 /*
@@ -59,10 +61,6 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #include       <stdio.h>
 #include       <errno.h>
 
diff --git a/telnetd/pty.c b/telnetd/pty.c
index 2835379..cead620 100644
--- a/telnetd/pty.c
+++ b/telnetd/pty.c
@@ -17,6 +17,8 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
+#include <config.h>
+
 #include "telnetd.h"
 #include <sys/wait.h>
 #include <pty.h>
diff --git a/telnetd/slc.c b/telnetd/slc.c
index 44764a3..314bf82 100644
--- a/telnetd/slc.c
+++ b/telnetd/slc.c
@@ -47,6 +47,8 @@
  * SUCH DAMAGE.
  */
 
+#include <config.h>
+
 #include "telnetd.h"
 
 /*
diff --git a/telnetd/state.c b/telnetd/state.c
index c6ebb1b..976e955 100644
--- a/telnetd/state.c
+++ b/telnetd/state.c
@@ -47,6 +47,8 @@
  * SUCH DAMAGE.
  */
 
+#include <config.h>
+
 #include "telnetd.h"
 #include <stdarg.h>
 
diff --git a/telnetd/telnetd.c b/telnetd/telnetd.c
index 71a7023..5b7f29b 100644
--- a/telnetd/telnetd.c
+++ b/telnetd/telnetd.c
@@ -18,6 +18,8 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
+#include <config.h>
+
 #include "telnetd.h"
 
 #ifdef HAVE_SYS_UTSNAME_H
diff --git a/telnetd/term.c b/telnetd/term.c
index 223da38..a9f1f77 100644
--- a/telnetd/term.c
+++ b/telnetd/term.c
@@ -17,6 +17,8 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
+#include <config.h>
+
 #include <telnetd.h>
 
 #if defined(HAVE_TERMIOS_H)
diff --git a/telnetd/termstat.c b/telnetd/termstat.c
index 83d5b6f..a71f2aa 100644
--- a/telnetd/termstat.c
+++ b/telnetd/termstat.c
@@ -47,6 +47,8 @@
  * SUCH DAMAGE.
  */
 
+#include <config.h>
+
 #include "telnetd.h"
 
 /*
diff --git a/telnetd/utility.c b/telnetd/utility.c
index 800e104..d14e4b1 100644
--- a/telnetd/utility.c
+++ b/telnetd/utility.c
@@ -18,6 +18,8 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
+#include <config.h>
+
 #define TELOPTS
 #define TELCMDS
 #define SLC_NAMES
diff --git a/tests/localhost.c b/tests/localhost.c
index 14ca0bc..a3daeec 100644
--- a/tests/localhost.c
+++ b/tests/localhost.c
@@ -16,6 +16,8 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see `http://www.gnu.org/licenses/'. */
 
+#include <config.h>
+
 #include "libinetutils.h"
 
 #include <stdio.h>
-- 
1.6.5.2