[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug-inetutils] Re: telnet cleanup
From: |
Simon Josefsson |
Subject: |
[bug-inetutils] Re: telnet cleanup |
Date: |
Wed, 10 Jun 2009 12:07:35 +0200 |
User-agent: |
Gnus/5.110011 (No Gnus v0.11) Emacs/23.0.94 (gnu/linux) |
Simon Josefsson <address@hidden> writes:
> I'll sent an updated patch to fix the compiler warnings next.
I have applied this smaller patch that focus on the important warnings.
/Simon
? m4
? lib/.cvsignore
? lib/.deps
? lib/Makefile
? lib/Makefile.in
? lib/charset.alias
? lib/configmake.h
Index: ChangeLog
===================================================================
RCS file: /sources/inetutils/inetutils/ChangeLog,v
retrieving revision 1.353
diff -u -p -r1.353 ChangeLog
--- ChangeLog 2 Jun 2009 15:05:54 -0000 1.353
+++ ChangeLog 10 Jun 2009 10:05:46 -0000
@@ -1,3 +1,17 @@
+2009-06-10 Simon Josefsson <address@hidden>
+
+ * libinetutils/shishi.c: Add includes for strlen, memcpy, etc.
+ * libtelnet/Makefile.am (noinst_HEADERS): Add genget.h.
+ * libtelnet/auth-proto.h: Add prototype for auth_sendname, used by
+ kerberos5.c and shishi.c.
+ * libtelnet/auth.c: Add include for alarm.
+ * libtelnet/enc_des.c: Add include for memcpy, etc. Make type of
+ encrypt_debug_mode explicit.
+ * libtelnet/encrypt.c: Add includes for printf, isprefix, etc.
+ (encrypt_send_keyid, encrypt_dec_keyid): Make return type explicit.
+ (encrypt_keyid): Make return type explicit and mark as static.
+ * libtelnet/misc.c: Add includes for auth_init and encrypt_init.
+
2009-06-02 Simon Josefsson <address@hidden>
* README-alpha: Mention statcvs URL.
Index: libinetutils/shishi.c
===================================================================
RCS file: /sources/inetutils/inetutils/libinetutils/shishi.c,v
retrieving revision 1.3
diff -u -p -r1.3 shishi.c
--- libinetutils/shishi.c 29 Jun 2007 16:29:31 -0000 1.3
+++ libinetutils/shishi.c 10 Jun 2009 10:05:46 -0000
@@ -1,5 +1,5 @@
/* shishi.c -- functions to use kerberos V with shishi
- Copyright (C) 1990-1999, 2000, 2002, 2007 Free Software Foundation, Inc.
+ Copyright (C) 1990-1999, 2000, 2002, 2007, 2009 Free Software Foundation,
Inc.
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
@@ -20,10 +20,12 @@
#endif
#ifdef SHISHI
+# include <string.h>
# include <stdlib.h>
# include <errno.h>
# include <shishi.h>
# include <syslog.h>
+# include <unistd.h>
# include <shishi_def.h>
/* shishi authentication */
Index: libtelnet/Makefile.am
===================================================================
RCS file: /sources/inetutils/inetutils/libtelnet/Makefile.am,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile.am
--- libtelnet/Makefile.am 29 Jun 2007 16:29:31 -0000 1.8
+++ libtelnet/Makefile.am 10 Jun 2009 10:05:46 -0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2007, 2009 Free Software Foundation, Inc.
# This file is part of GNU Inetutils.
#
# GNU Inetutils is free software; you can redistribute it and/or modify
@@ -22,5 +22,4 @@ noinst_LIBRARIES = libtelnet.a
libtelnet_a_SOURCES = auth.c enc_des.c encrypt.c forward.c genget.c getent.c
kerberos.c kerberos5.c misc.c read_passwd.c shishi.c
-noinst_HEADERS = auth-proto.h auth.h enc-proto.h encrypt.h key-proto.h
misc-proto.h misc.h
-
+noinst_HEADERS = auth-proto.h auth.h enc-proto.h encrypt.h genget.h
key-proto.h misc-proto.h misc.h
Index: libtelnet/auth-proto.h
===================================================================
RCS file: /sources/inetutils/inetutils/libtelnet/auth-proto.h,v
retrieving revision 1.7
diff -u -p -r1.7 auth-proto.h
--- libtelnet/auth-proto.h 10 Jun 2009 09:43:20 -0000 1.7
+++ libtelnet/auth-proto.h 10 Jun 2009 10:05:46 -0000
@@ -84,6 +84,7 @@ void auth_finished (TN_Authenticator *,
int auth_wait (char *);
void auth_disable_name (char *);
void auth_gen_printsub (unsigned char *, int, unsigned char *, int);
+int auth_sendname (unsigned char *, int);
# ifdef KRB4
int kerberos4_init (TN_Authenticator *, int);
Index: libtelnet/auth.c
===================================================================
RCS file: /sources/inetutils/inetutils/libtelnet/auth.c,v
retrieving revision 1.11
diff -u -p -r1.11 auth.c
--- libtelnet/auth.c 10 Jun 2009 09:43:20 -0000 1.11
+++ libtelnet/auth.c 10 Jun 2009 10:05:46 -0000
@@ -87,6 +87,8 @@
# include <string.h>
# endif
+# include <unistd.h>
+
# include "encrypt.h"
# include "auth.h"
# include "misc-proto.h"
Index: libtelnet/enc_des.c
===================================================================
RCS file: /sources/inetutils/inetutils/libtelnet/enc_des.c,v
retrieving revision 1.11
diff -u -p -r1.11 enc_des.c
--- libtelnet/enc_des.c 10 Jun 2009 09:43:21 -0000 1.11
+++ libtelnet/enc_des.c 10 Jun 2009 10:05:46 -0000
@@ -69,7 +69,7 @@ extern Shishi *shishi_handle;
# include "key-proto.h"
# include "misc-proto.h"
-extern encrypt_debug_mode;
+extern int encrypt_debug_mode;
# define CFB 0
# define OFB 1
@@ -82,6 +82,8 @@ extern encrypt_debug_mode;
# define FAILED -1
+#include <string.h>
+
struct fb
{
Block krbdes_key;
Index: libtelnet/encrypt.c
===================================================================
RCS file: /sources/inetutils/inetutils/libtelnet/encrypt.c,v
retrieving revision 1.11
diff -u -p -r1.11 encrypt.c
--- libtelnet/encrypt.c 10 Jun 2009 09:43:21 -0000 1.11
+++ libtelnet/encrypt.c 10 Jun 2009 10:05:46 -0000
@@ -89,6 +89,9 @@
# include <string.h>
# endif
+#include <stdio.h>
+#include "genget.h"
+
/*
* These functions pointers point to the current routines
* for encrypting and decrypting data.
@@ -791,20 +794,7 @@ encrypt_request_start (data, cnt)
static unsigned char str_keyid[(MAXKEYLEN * 2) + 5] =
{ IAC, SB, TELOPT_ENCRYPT };
-encrypt_enc_keyid (keyid, len)
- unsigned char *keyid;
- int len;
-{
- encrypt_keyid (&ki[1], keyid, len);
-}
-
-encrypt_dec_keyid (keyid, len)
- unsigned char *keyid;
- int len;
-{
- encrypt_keyid (&ki[0], keyid, len);
-}
-
+static void
encrypt_keyid (kp, keyid, len)
struct key_info *kp;
unsigned char *keyid;
@@ -856,6 +846,22 @@ encrypt_keyid (kp, keyid, len)
}
void
+encrypt_enc_keyid (keyid, len)
+ unsigned char *keyid;
+ int len;
+{
+ encrypt_keyid (&ki[1], keyid, len);
+}
+
+void
+encrypt_dec_keyid (keyid, len)
+ unsigned char *keyid;
+ int len;
+{
+ encrypt_keyid (&ki[0], keyid, len);
+}
+
+void
encrypt_send_keyid (dir, keyid, keylen, saveit)
int dir;
unsigned char *keyid;
Index: libtelnet/misc.c
===================================================================
RCS file: /sources/inetutils/inetutils/libtelnet/misc.c,v
retrieving revision 1.9
diff -u -p -r1.9 misc.c
--- libtelnet/misc.c 10 Jun 2009 09:43:21 -0000 1.9
+++ libtelnet/misc.c 10 Jun 2009 10:05:46 -0000
@@ -54,6 +54,8 @@
#include <stdlib.h>
#include <stdio.h>
+#include "auth.h"
+#include "encrypt.h"
#include "misc.h"
char *RemoteHostName;
- [bug-inetutils] telnet cleanup, Simon Josefsson, 2009/06/08
- Re: [bug-inetutils] telnet cleanup, Jeff Bailey, 2009/06/08
- [bug-inetutils] Re: telnet cleanup, Simon Josefsson, 2009/06/09
- Re: [bug-inetutils] Re: telnet cleanup, Alfred M. Szmidt, 2009/06/09
- [bug-inetutils] Re: telnet cleanup, Simon Josefsson, 2009/06/09
- [bug-inetutils] Re: telnet cleanup, Alfred M. Szmidt, 2009/06/10
- [bug-inetutils] Re: telnet cleanup, Simon Josefsson, 2009/06/10
- [bug-inetutils] Re: telnet cleanup,
Simon Josefsson <=
- [bug-inetutils] Re: telnet cleanup, Alfred M. Szmidt, 2009/06/11
- [bug-inetutils] Re: telnet cleanup, Simon Josefsson, 2009/06/11
- [bug-inetutils] Re: telnet cleanup, Alfred M. Szmidt, 2009/06/14
- [bug-inetutils] Re: telnet cleanup, Simon Josefsson, 2009/06/15
- [bug-inetutils] Re: telnet cleanup, Alfred M. Szmidt, 2009/06/16
- Re: [bug-inetutils] Re: telnet cleanup, Sergey Poznyakoff, 2009/06/15
- Re: [bug-inetutils] Re: telnet cleanup, Sergey Poznyakoff, 2009/06/11
- Re: [bug-inetutils] Re: telnet cleanup, Ted Smith, 2009/06/09
- Re: [bug-inetutils] Re: telnet cleanup, Alfred M. Szmidt, 2009/06/10
- Re: [bug-inetutils] Re: telnet cleanup, Karl Berry, 2009/06/09