Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

const poisoning.

This commit is contained in:
mycroft 1998-07-26 21:47:47 +00:00
parent d92a424ade
commit f56c79f70c
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
usr.bin/ftp/extern.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: extern.h,v 1.22 1998/07/22 16:06:28 lukem Exp $ */
/* $NetBSD: extern.h,v 1.23 1998/07/26 21:47:47 mycroft Exp $ */
/*-
* Copyright (c) 1994 The Regents of the University of California.
@ -69,7 +69,7 @@ void doproxy __P((int, char **));
char *dotrans __P((char *));
int empty __P((struct fd_set *, int));
int foregroundproc __P((void));
int ftp_login __P((const char *, char *, char *));
int ftp_login __P((const char *, const char *, const char *));
void get __P((int, char **));
struct cmd *getcmd __P((const char *));
int getit __P((int, char **, int, const char *));
@ -126,7 +126,8 @@ void resetsockbufsize __P((void));
void restart __P((int, char **));
void rmthelp __P((int, char **));
void rmtstatus __P((int, char **));
int ruserpass __P((const char *, char **, char **, char **));
int ruserpass __P((const char *, const char **, const char **,
const char **));
void sendrequest __P((const char *, const char *, const char *, int));
void setascii __P((int, char **));
void setbell __P((int, char **));

6
usr.bin/ftp/ruserpass.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ruserpass.c,v 1.18 1998/07/06 06:50:49 mrg Exp $ */
/* $NetBSD: ruserpass.c,v 1.19 1998/07/26 21:47:47 mycroft Exp $ */
/*
* Copyright (c) 1985, 1993, 1994
@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)ruserpass.c 8.4 (Berkeley) 4/27/95";
#else
__RCSID("$NetBSD: ruserpass.c,v 1.18 1998/07/06 06:50:49 mrg Exp $");
__RCSID("$NetBSD: ruserpass.c,v 1.19 1998/07/26 21:47:47 mycroft Exp $");
#endif
#endif /* not lint */
@ -85,7 +85,7 @@ static struct toktab {
int
ruserpass(host, aname, apass, aacct)
const char *host;
char **aname, **apass, **aacct;
const char **aname, **apass, **aacct;
{
char *hdir, buf[BUFSIZ], *tmp;
char myname[MAXHOSTNAMELEN + 1], *mydomain;

10
usr.bin/ftp/util.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: util.c,v 1.28 1998/07/22 16:06:28 lukem Exp $ */
/* $NetBSD: util.c,v 1.29 1998/07/26 21:47:48 mycroft Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -72,7 +72,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: util.c,v 1.28 1998/07/22 16:06:28 lukem Exp $");
__RCSID("$NetBSD: util.c,v 1.29 1998/07/26 21:47:48 mycroft Exp $");
#endif /* not lint */
/*
@ -238,10 +238,10 @@ setpeer(argc, argv)
int
ftp_login(host, user, pass)
const char *host;
char *user, *pass;
const char *user, *pass;
{
char tmp[80];
char *acct;
const char *acct;
char anonpass[MAXLOGNAME + 1 + MAXHOSTNAMELEN + 1]; /* user@hostname */
char hostname[MAXHOSTNAMELEN + 1];
struct passwd *pw;
@ -292,7 +292,7 @@ ftp_login(host, user, pass)
}
while (user == NULL) {
char *myname = getlogin();
const char *myname = getlogin();
if (myname == NULL && (pw = getpwuid(getuid())) != NULL)
myname = pw->pw_name;