svn rev #3273: trunk/ bsd/ gssftp/ftp/ gssftp/ftpd/ libmissing/ libpty/ telnet/libtelnet/ ...
ghudson@MIT.EDU
ghudson at MIT.EDU
Thu Nov 5 15:15:06 EST 2009
Commit By: ghudson
Log Message:
Warning cleanup.
Changed Files:
U trunk/bsd/forward.c
U trunk/bsd/kcmd.c
U trunk/bsd/krcp.c
U trunk/bsd/krlogin.c
U trunk/bsd/krlogind.c
U trunk/bsd/krsh.c
U trunk/bsd/login.c
U trunk/gssftp/ftp/cmds.c
U trunk/gssftp/ftp/domacro.c
U trunk/gssftp/ftp/ftp.c
U trunk/gssftp/ftp/ftp_var.h
U trunk/gssftp/ftp/main.c
U trunk/gssftp/ftp/radix.c
U trunk/gssftp/ftp/secure.c
U trunk/gssftp/ftp/secure.h
U trunk/gssftp/ftpd/ftpcmd.y
U trunk/gssftp/ftpd/ftpd.c
U trunk/gssftp/ftpd/ftpd_var.h
U trunk/gssftp/ftpd/secure.h
U trunk/k5-platform.h
U trunk/libmissing/asprintf.c
U trunk/libmissing/daemon.c
U trunk/libmissing/getdtablesize.c
U trunk/libmissing/getopt.c
U trunk/libmissing/herror.c
U trunk/libmissing/parsetos.c
U trunk/libmissing/setenv.c
U trunk/libmissing/setsid.c
U trunk/libmissing/strcasecmp.c
U trunk/libmissing/strdup.c
U trunk/libmissing/strerror.c
U trunk/libmissing/strftime.c
U trunk/libmissing/strlcpy.c
U trunk/libpty/cleanup.c
U trunk/libpty/dump-utmp.c
U trunk/libpty/err.c
U trunk/libpty/getpty.c
U trunk/libpty/init.c
U trunk/libpty/init_slave.c
U trunk/libpty/libpty.h
U trunk/libpty/logwtmp.c
U trunk/libpty/open_ctty.c
U trunk/libpty/open_slave.c
U trunk/libpty/pty-int.h
U trunk/libpty/pty_paranoia.c
U trunk/libpty/sane_hostname.c
U trunk/libpty/update_utmp.c
U trunk/libpty/update_wtmp.c
U trunk/libpty/vhangup.c
U trunk/libpty/void_assoc.c
U trunk/telnet/libtelnet/auth.c
U trunk/telnet/libtelnet/enc_des.c
U trunk/telnet/libtelnet/encrypt.c
U trunk/telnet/libtelnet/misc.c
U trunk/telnet/telnet/commands.c
U trunk/telnet/telnet/main.c
U trunk/telnet/telnet/telnet.c
U trunk/telnet/telnetd/utility.c
Modified: trunk/bsd/forward.c
===================================================================
--- trunk/bsd/forward.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/bsd/forward.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -20,14 +20,14 @@
*/
#if defined(KERBEROS) || defined(KRB5)
-#include <stdio.h>
-#include <netdb.h>
+#include <k5-platform.h>
+#include <krb5.h>
+
#include <sys/types.h>
#include <sys/stat.h>
+#include <netdb.h>
+#include <unistd.h>
-#include <krb5.h>
-#include <k5-platform.h>
-
#include "defines.h"
/* Decode, decrypt and store the forwarded creds in the local ccache. */
Modified: trunk/bsd/kcmd.c
===================================================================
--- trunk/bsd/kcmd.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/bsd/kcmd.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -46,6 +46,8 @@
*/
/* derived from @(#)rcmd.c 5.17 (Berkeley) 6/27/88 */
+
+#include <autoconf.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
@@ -295,7 +297,7 @@
} else {
char num[8];
socklen_t len = sizeof (*fromp);
- size_t slen;
+ ssize_t slen;
int s2 = getport(lportp, addrfamilyp), s3;
fd_set rfds, xfds;
struct timeval waitlen;
@@ -899,7 +901,7 @@
store_ptr = storage;
nstored = rd_len;
if (use_ivecs) {
- int rd_len2;
+ size_t rd_len2;
rd_len2 = storage[0] & 0xff;
rd_len2 <<= 8; rd_len2 |= storage[1] & 0xff;
rd_len2 <<= 8; rd_len2 |= storage[2] & 0xff;
Modified: trunk/bsd/krcp.c
===================================================================
--- trunk/bsd/krcp.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/bsd/krcp.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -31,6 +31,8 @@
* rcp
*/
+#include <autoconf.h>
+
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
@@ -112,11 +114,11 @@
int port = 0;
struct buffer {
- unsigned int cnt;
+ size_t cnt;
char *buf;
};
-struct buffer *allocbuf(struct buffer *, int, int);
+static struct buffer *allocbuf(struct buffer *, int, size_t);
#define NULLBUF (struct buffer *) 0
@@ -1139,27 +1141,26 @@
struct buffer *allocbuf(bp, fd, blksize)
struct buffer *bp;
- int fd, blksize;
+ int fd;
+ size_t blksize;
{
struct stat stb;
- int size;
if (fstat(fd, &stb) < 0) {
error("rcp: fstat: %s\n", error_message(errno));
return (NULLBUF);
}
- size = blksize;
- if (bp->cnt < size) {
+ if (bp->cnt < blksize) {
if (bp->buf != 0)
free(bp->buf);
- bp->buf = (char *)malloc((unsigned) size);
+ bp->buf = malloc(blksize);
if (bp->buf == 0) {
error("rcp: malloc: out of memory\n");
return (NULLBUF);
}
}
- bp->cnt = size;
+ bp->cnt = blksize;
return (bp);
}
Modified: trunk/bsd/krlogin.c
===================================================================
--- trunk/bsd/krlogin.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/bsd/krlogin.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -256,7 +256,7 @@
void oob (void);
krb5_sigtype lostpeer (int);
void setsignal (int sig, krb5_sigtype (*act)());
-static int read_wrapper(int fd, char *buf, int size, int *got_esc);
+static int read_wrapper(int fd, char *buf, size_t size, int *got_esc);
static void prf(char *f);
void try_normal(char **);
static void mode(int);
@@ -557,7 +557,7 @@
}
#ifdef POSIX_TERMIOS
if (tcgetattr(0, &ttyb) == 0) {
- int ospeed = cfgetospeed (&ttyb);
+ speed_t ospeed = cfgetospeed (&ttyb);
term[sizeof(term) - 1] = '\0';
(void) strncat(term, "/", sizeof(term) - 1 - strlen(term));
@@ -1119,7 +1119,7 @@
static int read_wrapper(fd,buf,size,got_esc)
int fd;
char *buf;
- int size;
+ size_t size;
int *got_esc;
{
static char tbuf[1024];
Modified: trunk/bsd/krlogind.c
===================================================================
--- trunk/bsd/krlogind.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/bsd/krlogind.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -910,7 +910,7 @@
static int control(pty, cp, n)
int pty;
unsigned char *cp;
- int n;
+ size_t n;
{
struct winsize w;
int pgrp, got_pgrp;
@@ -1008,7 +1008,7 @@
}
#define pkcontrol(c) ((c)&(TIOCPKT_FLUSHWRITE|TIOCPKT_NOSTOP|TIOCPKT_DOSTOP))
if (FD_ISSET(f, &ibits)) {
- fcc = rcmd_stream_read(f, fibuf, sizeof (fibuf), 0);
+ fcc = rcmd_stream_read(f, (char *) fibuf, sizeof (fibuf), 0);
if (fcc < 0 && ((errno == EWOULDBLOCK) || (errno == EAGAIN))) {
fcc = 0;
} else {
@@ -1097,7 +1097,7 @@
}
if (FD_ISSET(f, &obits) && pcc > 0) {
- cc = rcmd_stream_write(f, pbp, pcc, 0);
+ cc = rcmd_stream_write(f, (char *) pbp, pcc, 0);
if (cc < 0 && ((errno == EWOULDBLOCK) || (errno == EAGAIN))) {
/* also shouldn't happen */
sleep(5);
Modified: trunk/bsd/krsh.c
===================================================================
--- trunk/bsd/krsh.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/bsd/krsh.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -27,6 +27,8 @@
/* based on @(#)rsh.c 5.7 (Berkeley) 9/20/88 */
+#include <autoconf.h>
+
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
Modified: trunk/bsd/login.c
===================================================================
--- trunk/bsd/login.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/bsd/login.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -25,7 +25,7 @@
All rights reserved.\n";
#endif /* not lint */
-#include <autoconf.h>
+#include <k5-platform.h>
/* based on @(#)login.c 5.25 (Berkeley) 1/6/89 */
@@ -83,7 +83,9 @@
#include <sys/file.h>
#include <sys/ioctl.h>
#include <fcntl.h>
+#include <netdb.h>
+#include <time.h>
#include <utmp.h>
#include <signal.h>
@@ -142,7 +144,6 @@
#ifdef KRB5_GET_TICKETS
#include <krb5.h>
#include <profile.h>
-#include <k5-platform.h>
#include "com_err.h"
#define KRB5_ENV_CCNAME "KRB5CCNAME"
#endif /* KRB5_GET_TICKETS */
@@ -440,7 +441,7 @@
int krbflag; /* set if tickets have been obtained */
#endif /* KRB5_GET_TICKETS */
-void k_init (ttyn)
+static void k_init (ttyn)
char *ttyn;
{
#ifdef KRB5_GET_TICKETS
@@ -919,7 +920,7 @@
*/
if (fflag && pwd) {
- int uid = (int) getuid();
+ uid_t uid = getuid();
passwd_req = (uid && uid != pwd->pw_uid);
}
@@ -1070,16 +1071,11 @@
}
/* nothing else left to fail -- really log in */
- {
- struct utmp utmp;
+ login_time = time(NULL);
+ if ((retval = pty_update_utmp(PTY_USER_PROCESS, getpid(), username, ttyn,
+ hostname, PTY_TTYSLOT_USABLE)) < 0)
+ com_err (argv[0], retval, "while updating utmp");
- login_time = time(&utmp.ut_time);
- if ((retval = pty_update_utmp(PTY_USER_PROCESS, getpid(), username,
- ttyn, hostname,
- PTY_TTYSLOT_USABLE)) < 0)
- com_err (argv[0], retval, "while updating utmp");
- }
-
quietlog = access(HUSHLOGIN, F_OK) == 0;
dolastlog(hostname, quietlog, tty);
Modified: trunk/gssftp/ftp/cmds.c
===================================================================
--- trunk/gssftp/ftp/cmds.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/gssftp/ftp/cmds.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -116,7 +116,8 @@
char ***pargv;
char *prompt;
{
- int len = strlen(line), ret;
+ size_t len = strlen(line);
+ int ret;
extern sig_t intr();
if (len >= sizeof(line) - 3) {
Modified: trunk/gssftp/ftp/domacro.c
===================================================================
--- trunk/gssftp/ftp/domacro.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/gssftp/ftp/domacro.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -94,7 +94,7 @@
}
cp1--;
if (argc - 2 >= j) {
- if(cp2 + strlen(argv[j+1]) - line < sizeof(line))
+ if(cp2 - line + strlen(argv[j+1]) < sizeof(line))
(void) strncpy(cp2, argv[j+1],
sizeof(line) - 1 -
(cp2 - line));
@@ -107,7 +107,7 @@
loopflg = 1;
cp1++;
if (count < argc) {
- if(cp2 + strlen(argv[count]) - line < sizeof(line))
+ if(cp2 - line + strlen(argv[count]) < sizeof(line))
(void) strncpy(cp2, argv[count],
sizeof(line) - 1 -
(cp2 - line));
Modified: trunk/gssftp/ftp/ftp.c
===================================================================
--- trunk/gssftp/ftp/ftp.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/gssftp/ftp/ftp.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -104,6 +104,7 @@
#include <pwd.h>
#endif
+#include <arpa/inet.h>
#include <arpa/ftp.h>
#include <arpa/telnet.h>
@@ -200,7 +201,7 @@
memset(&hisctladdr, 0, sizeof (hisctladdr));
hisctladdr.sin_addr.s_addr = inet_addr(host);
- if (hisctladdr.sin_addr.s_addr != -1) {
+ if (hisctladdr.sin_addr.s_addr != INADDR_NONE) {
hisctladdr.sin_family = AF_INET;
(void) strncpy(hostnamebuf, host, sizeof(hostnamebuf));
} else {
@@ -426,7 +427,7 @@
static int secure_command(char* cmd)
{
unsigned char in[FTP_BUFSIZ], out[FTP_BUFSIZ];
- int length;
+ size_t length;
if (auth_type && clevel != PROT_C) {
#ifdef GSSAPI
@@ -472,8 +473,9 @@
}
fprintf(cout, "%s %s", clevel == PROT_P ? "ENC" : "MIC", in);
if(debug)
- fprintf(stderr, "secure_command(%s)\nencoding %d bytes %s %s\n",
- cmd, length, clevel==PROT_P ? "ENC" : "MIC", in);
+ fprintf(stderr, "secure_command(%s)\nencoding %lu bytes %s %s\n",
+ cmd, (unsigned long) length,
+ clevel==PROT_P ? "ENC" : "MIC", in);
} else fputs(cmd, cout);
fprintf(cout, "\r\n");
(void) fflush(cout);
@@ -662,7 +664,7 @@
}
#endif
else {
- int len;
+ size_t len;
kerror = radix_encode((unsigned char *)obuf,
(unsigned char *)ibuf,
&len, 1);
@@ -779,7 +781,7 @@
volatile sig_t oldintr, oldintp;
volatile long bytes = 0, hashbytes = HASHBYTES;
char *volatile lmode;
- unsigned char buf[FTP_BUFSIZ], *bufp;
+ char buf[FTP_BUFSIZ], *bufp;
if (verbose && printnames) {
if (local && *local != '-')
@@ -1905,7 +1907,7 @@
int oldverbose = verbose;
#ifdef GSSAPI
u_char out_buf[FTP_BUFSIZ];
- int i;
+ size_t i;
#endif /* GSSAPI */
if (auth_type) return(1); /* auth already succeeded */
@@ -1985,7 +1987,7 @@
}
if (send_tok.length != 0) {
- int len = send_tok.length;
+ size_t len = send_tok.length;
reply_parse = "ADAT="; /* for command() later */
oldverbose = verbose;
verbose = (trial == n_gss_trials-1)?0:-1;
Modified: trunk/gssftp/ftp/ftp_var.h
===================================================================
--- trunk/gssftp/ftp/ftp_var.h 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/gssftp/ftp/ftp_var.h 2009-11-05 20:15:06 UTC (rev 3273)
@@ -278,7 +278,7 @@
int ruserpass (char *, char **, char **, char **);
/* radix.h */
-int radix_encode (unsigned char *, unsigned char *, int *, int);
+int radix_encode (unsigned char *, unsigned char *, size_t *, int);
char *radix_error (int);
/* getpass.c */
Modified: trunk/gssftp/ftp/main.c
===================================================================
--- trunk/gssftp/ftp/main.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/gssftp/ftp/main.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -128,7 +128,7 @@
autoencrypt = 0;
argc--, argv++;
while (argc > 0 && **argv == '-') {
- for (cp = *argv + 1; *cp; cp++)
+ for (cp = *argv + 1; *cp; cp++) {
switch (*cp) {
case 'd':
@@ -176,7 +176,7 @@
progname);
exit(1);
}
- nextopt:
+ }
argc--, argv++;
}
fromatty = isatty(fileno(stdin));
@@ -553,7 +553,8 @@
register struct cmd *c;
if (argc == 1) {
- register int i, j, w, k;
+ register int i, j, w;
+ size_t k;
int columns, width = 0, lines;
extern int NCMDS;
Modified: trunk/gssftp/ftp/radix.c
===================================================================
--- trunk/gssftp/ftp/radix.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/gssftp/ftp/radix.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -13,9 +13,11 @@
int radix_encode(inbuf, outbuf, len, decode)
unsigned char inbuf[], outbuf[];
-int *len, decode;
+size_t *len;
+int decode;
{
- int i,j,D = 0;
+ size_t i,j;
+ int D = 0;
char *p;
unsigned char c = 0;
Modified: trunk/gssftp/ftp/secure.c
===================================================================
--- trunk/gssftp/ftp/secure.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/gssftp/ftp/secure.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -226,7 +226,7 @@
int
secure_write(fd, buf, nbyte)
int fd;
-unsigned char *buf;
+char *buf;
unsigned int nbyte;
{
unsigned int i;
@@ -235,7 +235,7 @@
if (dlevel == PROT_C)
return(write(fd,buf,nbyte));
for (i=0; nbyte>0; nbyte--)
- if ((c = secure_putbyte(fd, buf[i++])) < 0)
+ if ((c = secure_putbyte(fd, (unsigned char) buf[i++])) < 0)
return(c);
return(i);
}
@@ -255,8 +255,6 @@
static unsigned int bufsize; /* size of outbuf */
ftp_int32 length = 0;
ftp_uint32 net_len;
- unsigned int fudge = smaxbuf - smaxqueue; /* Difference in length
- buffer lengths required */
/* Other auth types go here ... */
#ifdef GSSAPI
@@ -330,7 +328,7 @@
length, MAX);
return(ERR);
}
- if ((kerror = looping_read(fd, (char *) ucbuf, (int) length)) != length) {
+ if ((kerror = looping_read(fd, (char *) ucbuf, (int) length)) != (int) length) {
secure_error("Couldn't read %u byte PROT buffer: %s",
length, kerror == -1 ?
strerror(errno) : "premature EOF");
Modified: trunk/gssftp/ftp/secure.h
===================================================================
--- trunk/gssftp/ftp/secure.h 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/gssftp/ftp/secure.h 2009-11-05 20:15:06 UTC (rev 3273)
@@ -8,7 +8,7 @@
int secure_flush (int);
int secure_putc (int, FILE *);
int secure_getc (FILE *);
-int secure_write (int, unsigned char *, unsigned int);
+int secure_write (int, char *, unsigned int);
int secure_read (int, char *, unsigned int);
void secure_gss_error (OM_uint32 maj_stat, OM_uint32 min_stat, char *s);
Modified: trunk/gssftp/ftpd/ftpcmd.y
===================================================================
--- trunk/gssftp/ftpd/ftpcmd.y 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/gssftp/ftpd/ftpcmd.y 2009-11-05 20:15:06 UTC (rev 3273)
@@ -626,7 +626,7 @@
}
| ADAT SP STRING CRLF
{
- auth_data((char *) $3);
+ auth_data((unsigned char *) $3);
free($3);
}
| QUIT CRLF
@@ -1023,8 +1023,10 @@
return (NULL);
*cs++ = '\0';
if (auth_type) {
- char out[sizeof(cbuf)], *cp;
- int len, mic;
+ unsigned char out[sizeof(cbuf)];
+ char *cp;
+ size_t len;
+ int mic;
/* Check to see if we have a protected command. */
@@ -1074,15 +1076,15 @@
#endif /* NOENCRYPTION */
if ((cp = strpbrk(cs, " \r\n")))
*cp = '\0';
- kerror = radix_encode(cs, out, &len, 1);
+ kerror = radix_encode((unsigned char *) cs, out, &len, 1);
if (kerror) {
reply(501, "Can't base 64 decode argument to %s command (%s)",
mic ? "MIC" : "ENC", radix_error(kerror));
*s = '\0';
return(s);
}
- if (debug) syslog(LOG_DEBUG, "getline got %d from %s <%s>\n",
- len, cs, mic?"MIC":"ENC");
+ if (debug) syslog(LOG_DEBUG, "getline got %lu from %s <%s>\n",
+ (unsigned long) len, cs, mic?"MIC":"ENC");
clevel = mic ? PROT_S : PROT_P;
#ifdef GSSAPI
/* we know this is a MIC or ENC already, and out/len already has the bits */
@@ -1143,14 +1145,15 @@
return(s);
}
}
-#endif GSSAPI
+#endif /* GSSAPI */
if (debug) {
if (!strncmp(s, "PASS ", 5) && !guest)
syslog(LOG_DEBUG, "command: <PASS XXX>");
else
- syslog(LOG_DEBUG, "command: <%.*s>(%d)",
- strlen(s) - 2, s, strlen(s));
+ syslog(LOG_DEBUG, "command: <%.*s>(%lu)",
+ (int)(strlen(s) - 2), s,
+ (unsigned long) strlen(s));
}
return (s);
}
Modified: trunk/gssftp/ftpd/ftpd.c
===================================================================
--- trunk/gssftp/ftpd/ftpd.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/gssftp/ftpd/ftpd.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -271,7 +271,8 @@
char *argv[];
char **envp;
{
- int addrlen, c, on = 1, tos, port = -1;
+ socklen_t addrlen;
+ int c, on = 1, tos, port = -1;
extern char *optarg;
extern int optopt;
char *option_string = "AaCcdElp:T:t:U:u:vw:";
@@ -725,7 +726,7 @@
int result;
#ifdef GSSAPI
if (auth_type && strcmp(auth_type, "GSSAPI") == 0) {
- int len;
+ size_t len;
authorized = ftpd_gss_userok(&client_name, name) == 0;
len = sizeof("GSSAPI user is not authorized as "
@@ -1142,8 +1143,10 @@
pdata = -1;
done:
(*closefunc)(fin);
- if (logging > 2 && !cmd)
- syslog(LOG_NOTICE, "get: %i bytes transferred", byte_count);
+ if (logging > 2 && !cmd) {
+ syslog(LOG_NOTICE, "get: %lu bytes transferred",
+ (unsigned long) byte_count);
+ }
}
void
@@ -1212,8 +1215,10 @@
pdata = -1;
done:
(*closefunc)(fout);
- if (logging > 2)
- syslog(LOG_NOTICE, "put: %i bytes transferred", byte_count);
+ if (logging > 2) {
+ syslog(LOG_NOTICE, "put: %lu bytes transferred",
+ (unsigned long) byte_count);
+ }
}
FILE *
@@ -1280,7 +1285,8 @@
else
sizebuf[0] = '\0';
if (pdata >= 0) {
- int s, fromlen = sizeof(data_dest);
+ int s;
+ socklen_t fromlen = sizeof(data_dest);
s = accept(pdata, (struct sockaddr *)&data_dest, &fromlen);
if (s < 0) {
@@ -1532,7 +1538,8 @@
{
char line[FTP_BUFSIZ];
FILE *fin;
- int c, n;
+ int c;
+ size_t n;
char str[FTP_BUFSIZ], *p;
if (strlen(filename) + sizeof("/bin/ls -lgA ")
@@ -1682,7 +1689,8 @@
* radix_encode, gss_seal, plus slop.
*/
char in[FTP_BUFSIZ*3/2], out[FTP_BUFSIZ*3/2];
- int length = 0, kerror;
+ size_t length = 0;
+ int kerror;
if (n) snprintf(in, sizeof(in), "%d%c", n, cont_char);
else in[0] = '\0';
strncat(in, buf, sizeof (in) - strlen(in) - 1);
@@ -1725,7 +1733,9 @@
if (length >= sizeof(in) / 4 * 3) {
syslog(LOG_ERR, "input to radix_encode too long");
fputs(in, stdout);
- } else if ((kerror = radix_encode(out, in, &length, 0))) {
+ } else if ((kerror = radix_encode((unsigned char *) out,
+ (unsigned char *) in,
+ &length, 0))) {
syslog(LOG_ERR, "Couldn't encode reply (%s)",
radix_error(kerror));
fputs(in,stdout);
@@ -2007,7 +2017,7 @@
void
passive()
{
- int len;
+ socklen_t len;
register char *p, *a;
pdata = socket(AF_INET, SOCK_STREAM, 0);
@@ -2127,9 +2137,10 @@
int
auth_data(adata)
-char *adata;
+unsigned char *adata;
{
- int kerror, length;
+ int kerror;
+ size_t length;
if (auth_type) {
reply(503, "Authentication already established");
@@ -2146,14 +2157,14 @@
gss_cred_id_t server_creds, deleg_creds;
gss_name_t client;
OM_uint32 ret_flags;
- int rad_len;
+ size_t rad_len;
gss_buffer_desc name_buf;
gss_name_t server_name;
OM_uint32 acquire_maj, acquire_min, accept_maj, accept_min,
stat_maj, stat_min;
gss_OID mechid;
gss_buffer_desc tok, out_tok;
- char gbuf[FTP_BUFSIZ];
+ unsigned char gbuf[FTP_BUFSIZ];
u_char gout_buf[FTP_BUFSIZ];
char localname[MAXHOSTNAMELEN];
char service_name[MAXHOSTNAMELEN+10];
Modified: trunk/gssftp/ftpd/ftpd_var.h
===================================================================
--- trunk/gssftp/ftpd/ftpd_var.h 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/gssftp/ftpd/ftpd_var.h 2009-11-05 20:15:06 UTC (rev 3273)
@@ -39,11 +39,11 @@
/* radix.c */
char *radix_error (int);
-int radix_encode (unsigned char *, unsigned char *, int *, int);
+int radix_encode (unsigned char *, unsigned char *, size_t *, int);
/* ftpd.c */
void ack(char *);
-int auth_data(char *);
+int auth_data(unsigned char *);
void auth(char *);
void cwd(char *);
void delete_file(char *);
Modified: trunk/gssftp/ftpd/secure.h
===================================================================
--- trunk/gssftp/ftpd/secure.h 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/gssftp/ftpd/secure.h 2009-11-05 20:15:06 UTC (rev 3273)
@@ -8,7 +8,7 @@
int secure_flush (int);
int secure_putc (int, FILE *);
int secure_getc (FILE *);
-int secure_write (int, unsigned char *, unsigned int);
+int secure_write (int, char *, unsigned int);
int secure_read (int, char *, unsigned int);
void secure_gss_error (OM_uint32 maj_stat, OM_uint32 min_stat, char *s);
Modified: trunk/k5-platform.h
===================================================================
--- trunk/k5-platform.h 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/k5-platform.h 2009-11-05 20:15:06 UTC (rev 3273)
@@ -110,9 +110,8 @@
__attribute__((__format__(__printf__, 2, 3)))
#endif
;
+#endif /* HAVE_VASPRINTF */
-#endif /* NEED_VASPRINTF_PROTO */
-
/* Return true if the snprintf return value RESULT reflects a buffer
overflow for the buffer size SIZE.
Modified: trunk/libmissing/asprintf.c
===================================================================
--- trunk/libmissing/asprintf.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/libmissing/asprintf.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -27,6 +27,8 @@
* Provide {,v}asprintf for platforms that don't have them.
*/
+#include <k5-platform.h>
+
/* On error: BSD: Set *ret to NULL. GNU: *ret is undefined.
Since we want to be able to use the GNU version directly, we need
Modified: trunk/libmissing/daemon.c
===================================================================
--- trunk/libmissing/daemon.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/libmissing/daemon.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*/
-#include <autoconf.h>
+#include <k5-platform.h>
#include <fcntl.h>
#include <sys/types.h>
@@ -46,8 +46,7 @@
#endif
int
-daemon(nochdir, noclose)
- int nochdir, noclose;
+daemon(int nochdir, int noclose)
{
int cpid;
Modified: trunk/libmissing/getdtablesize.c
===================================================================
--- trunk/libmissing/getdtablesize.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/libmissing/getdtablesize.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -1,3 +1,5 @@
+#include <k5-platform.h>
+
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
Modified: trunk/libmissing/getopt.c
===================================================================
--- trunk/libmissing/getopt.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/libmissing/getopt.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -33,12 +33,8 @@
/* based on @(#)getopt.c 8.1 (Berkeley) 6/4/93 */
-#include <autoconf.h>
+#include <k5-platform.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
/*
* get option letter from argument vector
*/
@@ -53,10 +49,7 @@
#define EMSG ""
int
-getopt(nargc, nargv, ostr)
- int nargc;
- char * const *nargv;
- const char *ostr;
+getopt(int nargc, char *const *nargv, const char *ostr)
{
static char *place = EMSG; /* option letter processing */
register char *oli; /* option letter list index */
Modified: trunk/libmissing/herror.c
===================================================================
--- trunk/libmissing/herror.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/libmissing/herror.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -33,10 +33,8 @@
/* based on @(#)herror.c 8.1 (Berkeley) 6/4/93 */
-#include <autoconf.h>
+#include <k5-platform.h>
-#include <stdio.h>
-
char *h_errlist[] = {
"Error 0",
"Unknown host", /* 1 HOST_NOT_FOUND */
@@ -52,8 +50,8 @@
* herror --
* print the error indicated by the h_errno value.
*/
-herror(s)
- const char *s;
+void
+herror(const char *s)
{
if (s && *s) {
fprintf(stderr, "%s: ", s);
Modified: trunk/libmissing/parsetos.c
===================================================================
--- trunk/libmissing/parsetos.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/libmissing/parsetos.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -4,10 +4,8 @@
* Unix systems. This is part of UNICOS 7.0 and later.
*/
-#include <autoconf.h>
+#include <k5-platform.h>
-#include <stdio.h>
-#include <stdlib.h>
#include <sys/types.h>
#include <netdb.h>
#include <errno.h>
Modified: trunk/libmissing/setenv.c
===================================================================
--- trunk/libmissing/setenv.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/libmissing/setenv.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -17,10 +17,9 @@
/* based on @(#)setenv.c 5.2 (Berkeley) 6/27/88 */
+#include <k5-platform.h>
+
#include <sys/types.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
static char *_findenv(char *, int*);
/*
@@ -29,9 +28,7 @@
* "value". If rewrite is set, replace any current value.
*/
int
-setenv(name, value, rewrite)
- register char *name, *value;
- int rewrite;
+setenv(char *name, char *value, int rewrite)
{
extern char **environ;
static int alloced; /* if allocated space before */
@@ -86,8 +83,7 @@
* Delete environmental variable "name".
*/
void
-unsetenv(name)
- char *name;
+unsetenv(char *name)
{
extern char **environ;
register char **P;
@@ -123,8 +119,7 @@
* Returns ptr to value associated with name, if any, else NULL.
*/
char *
-getenv(name)
- char *name;
+getenv(char *name)
{
int offset;
@@ -142,9 +137,7 @@
* This routine *should* be a static; don't use it.
*/
static char *
-_findenv(name, offset)
- register char *name;
- int *offset;
+_findenv(char *name, int *offset)
{
extern char **environ;
register unsigned int len;
Modified: trunk/libmissing/setsid.c
===================================================================
--- trunk/libmissing/setsid.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/libmissing/setsid.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -33,14 +33,14 @@
/* based on @(#)setsid.c 8.1 (Berkeley) 6/4/93 */
-#include <autoconf.h>
+#include <k5-platform.h>
/*
* Emulate the functionality of setsid(), called when forking
* and execing the new process.
*/
-extern char *line;
+int
setsid()
{
#ifndef convex
Modified: trunk/libmissing/strcasecmp.c
===================================================================
--- trunk/libmissing/strcasecmp.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/libmissing/strcasecmp.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -31,14 +31,9 @@
* SUCH DAMAGE.
*/
-#include <autoconf.h>
+#include <k5-platform.h>
#include <sys/types.h>
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#include <strings.h>
-#endif
/* based on @(#)strcasecmp.c 8.1 (Berkeley) 6/4/93 */
@@ -85,8 +80,7 @@
};
int
-strcasecmp(s1, s2)
- const char *s1, *s2;
+strcasecmp(const char *s1, const char *s2)
{
register const u_char *cm = charmap,
*us1 = (const u_char *)s1,
@@ -99,9 +93,7 @@
}
int
-strncasecmp(s1, s2, n)
- const char *s1, *s2;
- register size_t n;
+strncasecmp(const char *s1, const char *s2, size_t n)
{
if (n != 0) {
register const u_char *cm = charmap,
Modified: trunk/libmissing/strdup.c
===================================================================
--- trunk/libmissing/strdup.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/libmissing/strdup.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -33,21 +33,14 @@
/* based on @(#)strdup.c 8.1 (Berkeley) 6/4/93 */
-#include <autoconf.h>
+#include <k5-platform.h>
#include <sys/types.h>
#include <stddef.h>
-#include <stdlib.h>
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#include <strings.h>
-#endif
char *
-strdup(str)
- const char *str;
+strdup(const char *str)
{
size_t len;
char *copy;
Modified: trunk/libmissing/strerror.c
===================================================================
--- trunk/libmissing/strerror.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/libmissing/strerror.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -33,17 +33,10 @@
/* based on @(#)strerror.c 8.1 (Berkeley) 6/4/93 */
-#include <autoconf.h>
+#include <k5-platform.h>
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#include <strings.h>
-#endif
-
char *
-strerror(num)
- int num;
+strerror(int num)
{
extern int sys_nerr;
extern char *sys_errlist[];
Modified: trunk/libmissing/strftime.c
===================================================================
--- trunk/libmissing/strftime.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/libmissing/strftime.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -33,7 +33,7 @@
/* based on @(#)strftime.c 8.1 (Berkeley) 6/4/93 */
-#include <autoconf.h>
+#include <k5-platform.h>
#include <sys/types.h>
#include <sys/time.h>
@@ -42,11 +42,6 @@
#else
#define TM_YEAR_BASE 1900 /* from <tzfile.h> */
#endif
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#include <strings.h>
-#endif
static char *afmt[] = {
"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat",
@@ -75,11 +70,7 @@
static size_t _fmt __P((const char *, const struct tm *));
size_t
-strftime(s, maxsize, format, t)
- char *s;
- size_t maxsize;
- const char *format;
- const struct tm *t;
+strftime(char *s, size_t maxsize, const char *format, const struct tm *t)
{
pt = s;
@@ -93,9 +84,7 @@
}
static size_t
-_fmt(format, t)
- register const char *format;
- const struct tm *t;
+_fmt(const char *format, const struct tm *t)
{
for (; *format; ++format) {
if (*format == '%')
@@ -262,8 +251,7 @@
}
static int
-_secs(t)
- const struct tm *t;
+_secs(const struct tm *t)
{
static char buf[15];
register time_t s;
@@ -279,8 +267,7 @@
}
static int
-_conv(n, digits, pad)
- int n, digits, pad;
+_conv(int n, int digits, int pad)
{
static char buf[10];
register char *p;
@@ -293,8 +280,7 @@
}
static int
-_add(str)
- register char *str;
+_add(char *str)
{
for (;; ++pt, --gsize) {
if (!gsize)
Modified: trunk/libmissing/strlcpy.c
===================================================================
--- trunk/libmissing/strlcpy.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/libmissing/strlcpy.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -16,8 +16,8 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#include <k5-platform.h>
#include <sys/types.h>
-#include <string.h>
/*
* Copy src to string dst of size siz. At most siz-1 characters
Modified: trunk/libpty/cleanup.c
===================================================================
--- trunk/libpty/cleanup.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/libpty/cleanup.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -20,8 +20,6 @@
*
*/
-#include "com_err.h"
-#include "libpty.h"
#include "pty-int.h"
#ifdef HAVE_SYS_WAIT_H
#include <sys/wait.h>
Modified: trunk/libpty/dump-utmp.c
===================================================================
--- trunk/libpty/dump-utmp.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/libpty/dump-utmp.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -18,6 +18,8 @@
* dump-utmp.c: dump utmp and utmpx format files for debugging purposes.
*/
+#include <autoconf.h>
+
#include <sys/types.h>
#include <sys/file.h>
#include <fcntl.h>
Modified: trunk/libpty/err.c
===================================================================
--- trunk/libpty/err.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/libpty/err.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -42,7 +42,8 @@
const char *pty_error_message(long code)
{
- if (code < 0 || code >= (sizeof(error_table) / sizeof(*error_table)))
+ if (code < 0 ||
+ (size_t) code >= (sizeof(error_table) / sizeof(*error_table)))
return "Unknown libpty error code";
return error_table[code];
}
Modified: trunk/libpty/getpty.c
===================================================================
--- trunk/libpty/getpty.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/libpty/getpty.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -20,13 +20,11 @@
*
*/
-#include "com_err.h"
-#include "libpty.h"
#include "pty-int.h"
-#include "k5-platform.h"
+#include <k5-platform.h>
long
-ptyint_getpty_ext(int *fd, char *slave, int slavelength, int do_grantpt)
+ptyint_getpty_ext(int *fd, char *slave, size_t slavelength, int do_grantpt)
{
#if !defined(HAVE__GETPTY) && !defined(HAVE_OPENPTY)
char *cp;
@@ -106,7 +104,7 @@
}
ptynum = (int)(stb.st_rdev&0xFF);
snprintf(slavebuf, sizeof(slavebuf), "/dev/ttyp%x", ptynum);
- if (strlen(slavebuf) > slavelength - 1) {
+ if (strlen(slavebuf) + 1 > slavelength) {
close(*fd);
*fd = -1;
return PTY_GETPTY_SLAVE_TOOLONG;
@@ -127,7 +125,7 @@
/* got pty */
slavebuf[sizeof("/dev/") - 1] = 't';
- if (strlen(slavebuf) > slavelength -1) {
+ if (strlen(slavebuf) + 1 > slavelength) {
close(*fd);
*fd = -1;
return PTY_GETPTY_SLAVE_TOOLONG;
@@ -143,7 +141,7 @@
}
long
-pty_getpty(int *fd, char *slave, int slavelength)
+pty_getpty(int *fd, char *slave, size_t slavelength)
{
return ptyint_getpty_ext(fd, slave, slavelength, 1);
}
Modified: trunk/libpty/init.c
===================================================================
--- trunk/libpty/init.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/libpty/init.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -22,8 +22,6 @@
*
*/
-#include "com_err.h"
-#include "libpty.h"
#include "pty-int.h"
long pty_init(void)
Modified: trunk/libpty/init_slave.c
===================================================================
--- trunk/libpty/init_slave.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/libpty/init_slave.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -19,8 +19,6 @@
*
*/
-#include "com_err.h"
-#include "libpty.h"
#include "pty-int.h"
/* * The following is an array of modules that should be pushed on the
Modified: trunk/libpty/libpty.h
===================================================================
--- trunk/libpty/libpty.h 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/libpty/libpty.h 2009-11-05 20:15:06 UTC (rev 3273)
@@ -21,6 +21,7 @@
*/
#ifndef __LIBPTY_H__
+#include <stddef.h>
/* Constants for pty_update_utmp */
#define PTY_LOGIN_PROCESS 0
@@ -47,7 +48,7 @@
#define PTY_OPEN_SLAVE_TOOSHORT 13
long pty_init(void);
-long pty_getpty ( int *fd, char *slave, int slavelength);
+long pty_getpty ( int *fd, char *slave, size_t slavelength);
long pty_open_slave (const char *slave, int *fd);
long pty_open_ctty (const char *slave, int *fd);
@@ -64,7 +65,8 @@
struct sockaddr;
#endif
-long pty_make_sane_hostname(const struct sockaddr *, int, int, int, char **);
+long pty_make_sane_hostname(const struct sockaddr *, size_t, int, int,
+ char **);
const char *pty_error_message(long code);
Modified: trunk/libpty/logwtmp.c
===================================================================
--- trunk/libpty/logwtmp.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/libpty/logwtmp.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -19,8 +19,6 @@
*
*/
-#include "com_err.h"
-#include "libpty.h"
#include "pty-int.h"
#if defined(HAVE_SETUTXENT) || defined(HAVE_SETUTENT)
@@ -43,6 +41,7 @@
size_t len;
const char *cp;
char utmp_id[5];
+ struct timeval tv;
#endif
#ifdef HAVE_LOGWTMP
@@ -60,10 +59,12 @@
strncpy(utx.ut_host, host, sizeof(utx.ut_host));
utx.ut_host[sizeof(utx.ut_host) - 1] = '\0';
#endif
+ gettimeofday(&tv, NULL);
#ifdef HAVE_SETUTXENT
- gettimeofday(&utx.ut_tv, NULL);
+ utx.ut_tv.tv_sec = tv.tv_sec;
+ utx.ut_tv.tv_usec = tv.tv_usec;
#else
- (void)time(&utx.ut_time);
+ utx.ut_time = tv.tv_sec;
#endif
utx.ut_pid = (loggingin ? getpid() : 0);
utx.ut_type = (loggingin ? USER_PROCESS : DEAD_PROCESS);
Modified: trunk/libpty/open_ctty.c
===================================================================
--- trunk/libpty/open_ctty.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/libpty/open_ctty.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -19,8 +19,6 @@
*
*/
-#include "com_err.h"
-#include "libpty.h"
#include "pty-int.h"
/*
Modified: trunk/libpty/open_slave.c
===================================================================
--- trunk/libpty/open_slave.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/libpty/open_slave.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -21,8 +21,6 @@
*
*/
-#include "com_err.h"
-#include "libpty.h"
#include "pty-int.h"
long
Modified: trunk/libpty/pty-int.h
===================================================================
--- trunk/libpty/pty-int.h 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/libpty/pty-int.h 2009-11-05 20:15:06 UTC (rev 3273)
@@ -1,5 +1,9 @@
/* Includes needed by libpty*/
#ifndef __PTY_INT_H__
+#include <k5-platform.h>
+#include <com_err.h>
+#include "libpty.h"
+
#include <sys/types.h>
#if defined(_AIX) && defined(_THREAD_SAFE)
@@ -16,8 +20,6 @@
# undef _THREAD_SAFE
#endif
-#include "autoconf.h"
-
#ifdef HAVE_UTMP_H
#include <utmp.h>
#endif
@@ -31,12 +33,7 @@
#ifdef __SCO__
#include <sys/unistd.h>
#endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#include <stdio.h>
-
#ifdef HAVE_PTY_H
#include <pty.h>
#endif
@@ -45,8 +42,6 @@
#include <sys/file.h>
#include <sys/time.h>
#include <ctype.h>
-#include <fcntl.h>
-#include <errno.h>
#include <pwd.h>
#ifdef HAVE_SYS_LABEL_H
@@ -123,7 +118,7 @@
/* Internal functions */
long ptyint_void_association(void);
long ptyint_open_ctty (char *slave, int *fd);
-long ptyint_getpty_ext(int *, char *, int, int);
+long ptyint_getpty_ext(int *, char *, size_t, int);
#ifdef HAVE_SETUTXENT
long ptyint_update_wtmpx(struct utmpx *utx);
#endif
Modified: trunk/libpty/pty_paranoia.c
===================================================================
--- trunk/libpty/pty_paranoia.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/libpty/pty_paranoia.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -184,8 +184,6 @@
* non-root.
*/
-#include "com_err.h"
-#include "libpty.h"
#include "pty-int.h"
#include <sys/wait.h>
#include <stdlib.h>
Modified: trunk/libpty/sane_hostname.c
===================================================================
--- trunk/libpty/sane_hostname.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/libpty/sane_hostname.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -20,10 +20,8 @@
* express or implied warranty.
*
*/
-#include "com_err.h"
#include "pty-int.h"
#include <sys/socket.h>
-#include "libpty.h"
#include <arpa/inet.h>
#include "socket-utils.h"
@@ -37,7 +35,7 @@
}
long
-pty_make_sane_hostname(const struct sockaddr *addr, int maxlen,
+pty_make_sane_hostname(const struct sockaddr *addr, size_t maxlen,
int strip_ldomain, int always_ipaddr, char **out)
{
struct addrinfo *ai = 0;
Modified: trunk/libpty/update_utmp.c
===================================================================
--- trunk/libpty/update_utmp.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/libpty/update_utmp.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -316,8 +316,6 @@
* username both in utmp and wtmp.
*/
-#include "com_err.h"
-#include "libpty.h"
#include "pty-int.h"
#include "k5-platform.h"
@@ -508,6 +506,7 @@
const char *cp;
size_t len;
char utmp_id[5];
+ struct timeval tv;
/*
* Zero things out in case there are fields we don't handle here.
@@ -576,11 +575,13 @@
if (process_type != PTY_LOGIN_PROCESS)
utxtmp = best_utxent(&utx);
+ if (gettimeofday(&tv, NULL))
+ return errno;
#ifdef HAVE_SETUTXENT
- if (gettimeofday(&utx.ut_tv, NULL))
- return errno;
+ utx.ut_tv.tv_sec = tv.tv_sec;
+ utx.ut_tv.tv_usec = tv.tv_usec;
#else
- (void)time(&utx.ut_time);
+ utx.ut_time = tv.tv_sec;
#endif
/*
* On what system is there not ut_host? Unix98 doesn't mandate
Modified: trunk/libpty/update_wtmp.c
===================================================================
--- trunk/libpty/update_wtmp.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/libpty/update_wtmp.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -19,8 +19,6 @@
*
*/
-#include "com_err.h"
-#include "libpty.h"
#include "pty-int.h"
#if !defined(WTMP_FILE) && defined(_PATH_WTMP)
Modified: trunk/libpty/vhangup.c
===================================================================
--- trunk/libpty/vhangup.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/libpty/vhangup.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -20,8 +20,6 @@
*
*/
-#include "com_err.h"
-#include "libpty.h"
#include "pty-int.h"
void ptyint_vhangup(void)
Modified: trunk/libpty/void_assoc.c
===================================================================
--- trunk/libpty/void_assoc.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/libpty/void_assoc.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -20,8 +20,6 @@
*
*/
-#include "com_err.h"
-#include "libpty.h"
#include "pty-int.h"
/*
Modified: trunk/telnet/libtelnet/auth.c
===================================================================
--- trunk/telnet/libtelnet/auth.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/telnet/libtelnet/auth.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -382,7 +382,7 @@
* Save the list of authentication mechanisms
*/
auth_send_cnt = cnt;
- if (auth_send_cnt > sizeof(_auth_send_data))
+ if ((size_t) auth_send_cnt > sizeof(_auth_send_data))
auth_send_cnt = sizeof(_auth_send_data);
memcpy(_auth_send_data, data, (unsigned) auth_send_cnt);
auth_send_data = _auth_send_data;
@@ -504,7 +504,7 @@
printf(">>>%s: Empty name in NAME\r\n", Name);
return;
}
- if (cnt > sizeof(savename) - 1) {
+ if ((size_t) cnt > sizeof(savename) - 1) {
if (auth_debug_mode)
printf(">>>%s: Name in NAME (%d) exceeds %d length\r\n",
Name, cnt, (int) sizeof(savename)-1);
Modified: trunk/telnet/libtelnet/enc_des.c
===================================================================
--- trunk/telnet/libtelnet/enc_des.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/telnet/libtelnet/enc_des.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -164,10 +164,10 @@
krb5_enc_data dout;
din.length = 8;
- din.data = in;
+ din.data = (char *) in;
dout.ciphertext.length = 8;
- dout.ciphertext.data = out;
+ dout.ciphertext.data = (char *) out;
dout.enctype = ENCTYPE_UNKNOWN;
code = krb5_c_encrypt(telnet_context, &stp->str_key, 0, 0,
@@ -238,7 +238,7 @@
int dir;
int server;
{
- int x;
+ size_t x;
unsigned char *p;
register int state;
@@ -275,7 +275,7 @@
{
krb5_data d;
- d.data = fbp->temp_feed;
+ d.data = (char *) fbp->temp_feed;
d.length = sizeof(fbp->temp_feed);
if (krb5_c_random_make_octets(telnet_context, &d))
Modified: trunk/telnet/libtelnet/encrypt.c
===================================================================
--- trunk/telnet/libtelnet/encrypt.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/telnet/libtelnet/encrypt.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -771,7 +771,7 @@
if (ep->keyid)
(void)(*ep->keyid)(dir, kp->keyid, &kp->keylen);
- } else if ((len != kp->keylen) ||
+ } else if ((len != (unsigned int) kp->keylen) ||
(memcmp(keyid, kp->keyid, len) != 0)) {
/*
* Length or contents are different
Modified: trunk/telnet/libtelnet/misc.c
===================================================================
--- trunk/telnet/libtelnet/misc.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/telnet/libtelnet/misc.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -37,6 +37,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include "misc.h"
#include "auth.h"
#include "encrypt.h"
Modified: trunk/telnet/telnet/commands.c
===================================================================
--- trunk/telnet/telnet/commands.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/telnet/telnet/commands.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -2418,7 +2418,7 @@
{
#if defined(IP_OPTIONS) && defined(IPPROTO_IP)
char *srp = 0;
- int srlen;
+ int srlen = 0;
#endif
char *cmd, *hostp = 0, *portp = 0, *volatile user = 0;
struct addrinfo *addrs = 0, *addrp;
@@ -2497,7 +2497,7 @@
if (temp == 0) {
herror(srp);
return 0;
- } else if (temp == -1) {
+ } else if (temp == (unsigned long) -1) {
printf("Bad source route option: %s\r\n", hostp);
return 0;
} else {
Modified: trunk/telnet/telnet/main.c
===================================================================
--- trunk/telnet/telnet/main.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/telnet/telnet/main.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -39,7 +39,7 @@
/* based on @(#)main.c 5.5 (Berkeley) 12/18/92 */
-#include <autoconf.h>
+#include <k5-platform.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
Modified: trunk/telnet/telnet/telnet.c
===================================================================
--- trunk/telnet/telnet/telnet.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/telnet/telnet/telnet.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -166,7 +166,7 @@
# define telopt_environ TELOPT_NEW_ENVIRON
#endif
-jmp_buf toplevel = { 0 };
+jmp_buf toplevel;
jmp_buf peerdied;
int flushline;
@@ -1124,7 +1124,7 @@
default:
str_lm[3] = DONT;
str_lm[4] = cmd[0];
- if (NETROOM() > sizeof(str_lm)) {
+ if ((size_t) NETROOM() > sizeof(str_lm)) {
ring_supply_data(&netoring, str_lm, sizeof(str_lm));
printsub('>', &str_lm[2], sizeof(str_lm)-2);
}
@@ -1164,7 +1164,7 @@
default:
str_lm[3] = WONT;
str_lm[4] = cmd[0];
- if (NETROOM() > sizeof(str_lm)) {
+ if ((size_t) NETROOM() > sizeof(str_lm)) {
ring_supply_data(&netoring, str_lm, sizeof(str_lm));
printsub('>', &str_lm[2], sizeof(str_lm)-2);
}
@@ -1209,7 +1209,7 @@
str_lm_mode[4] = linemode;
if (!init)
str_lm_mode[4] |= MODE_ACK;
- if (NETROOM() > sizeof(str_lm_mode)) {
+ if ((size_t) NETROOM() > sizeof(str_lm_mode)) {
ring_supply_data(&netoring, str_lm_mode, sizeof(str_lm_mode));
printsub('>', &str_lm_mode[2], sizeof(str_lm_mode)-2);
}
@@ -1335,7 +1335,7 @@
slc_import(def)
int def;
{
- if (NETROOM() > sizeof(slc_import_val)) {
+ if ((size_t) NETROOM() > sizeof(slc_import_val)) {
if (def) {
ring_supply_data(&netoring, slc_import_def, sizeof(slc_import_def));
printsub('>', &slc_import_def[2], sizeof(slc_import_def)-2);
@@ -1481,7 +1481,7 @@
unsigned char flags;
cc_t value;
{
- if ((slc_replyp - slc_reply) + 6 > sizeof(slc_reply))
+ if ((size_t)(slc_replyp - slc_reply + 6) > sizeof(slc_reply))
return;
if ((*slc_replyp++ = func) == IAC)
*slc_replyp++ = IAC;
@@ -1494,7 +1494,7 @@
void
slc_end_reply()
{
- register int len;
+ register size_t len;
len = slc_replyp - slc_reply;
if (len <= 4 || (len + 2 > sizeof(slc_reply)))
@@ -1502,7 +1502,7 @@
*slc_replyp++ = IAC;
*slc_replyp++ = SE;
len += 2;
- if (NETROOM() > len) {
+ if ((size_t) NETROOM() > len) {
ring_supply_data(&netoring, slc_reply, slc_replyp - slc_reply);
printsub('>', &slc_reply[2], slc_replyp - slc_reply - 2);
}
Modified: trunk/telnet/telnetd/utility.c
===================================================================
--- trunk/telnet/telnetd/utility.c 2009-11-05 20:13:59 UTC (rev 3272)
+++ trunk/telnet/telnetd/utility.c 2009-11-05 20:15:06 UTC (rev 3273)
@@ -428,13 +428,13 @@
* number of characters that *would* have been output, not the
* number actually output.
*/
- if (len <= 0 || len > sizeof(buf))
+ if (len <= 0 || (size_t) len > sizeof(buf))
return;
- if (remain < len && !noflush) {
+ if (remain < (size_t) len && !noflush) {
netflush();
remain = sizeof(netobuf) - (nfrontp - netobuf);
}
- if (remain < len)
+ if (remain < (size_t) len)
return; /* still not enough space? */
memcpy(nfrontp, buf, (size_t)len);
nfrontp += len;
More information about the Krb5-appl-commits
mailing list