oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Fix shadow warnings.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15676 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2005-07-19 18:30:48 +00:00
parent 718ab89892
commit 5116c50655
3 changed files with 57 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
appl/ftp/ftp/ftp.c
View File

@@ -166,7 +166,7 @@ login (char *host)
{
char tmp[80];
char defaultpass[128];
char *user, *pass, *acct;
char *userstr, *pass, *acctstr;
int n, aflag = 0;
char *myname = NULL;
@@ -175,7 +175,7 @@ login (char *host)
if (pw != NULL)
myname = pw->pw_name;
user = pass = acct = 0;
userstr = pass = acctstr = 0;
if(sec_login(host))
printf("\n*** Using plaintext user and password ***\n\n");
@@ -183,11 +183,11 @@ login (char *host)
printf("Authentication successful.\n\n");
}
if (ruserpass (host, &user, &pass, &acct) < 0) {
if (ruserpass (host, &userstr, &pass, &acctstr) < 0) {
code = -1;
return (0);
}
while (user == NULL) {
while (userstr == NULL) {
if (myname)
printf ("Name (%s:%s): ", host, myname);
else
@@ -196,19 +196,19 @@ login (char *host)
if (fgets (tmp, sizeof (tmp) - 1, stdin) != NULL)
tmp[strlen (tmp) - 1] = '\0';
if (*tmp == '\0')
user = myname;
userstr = myname;
else
user = tmp;
userstr = tmp;
}
strlcpy(username, user, sizeof(username));
n = command("USER %s", user);
strlcpy(username, userstr, sizeof(username));
n = command("USER %s", userstr);
if (n == COMPLETE)
n = command("PASS dummy"); /* DK: Compatibility with gssftp daemon */
else if(n == CONTINUE) {
if (pass == NULL) {
char prompt[128];
if(myname &&
(!strcmp(user, "ftp") || !strcmp(user, "anonymous"))) {
(!strcmp(userstr, "ftp") || !strcmp(userstr, "anonymous"))) {
snprintf(defaultpass, sizeof(defaultpass),
"%s@%s", myname, mydomain);
snprintf(prompt, sizeof(prompt),
@@ -230,16 +230,16 @@ login (char *host)
}
if (n == CONTINUE) {
aflag++;
acct = tmp;
UI_UTIL_read_pw_string (acct, 128, "Account:", 0);
n = command ("ACCT %s", acct);
acctstr = tmp;
UI_UTIL_read_pw_string (acctstr, 128, "Account:", 0);
n = command ("ACCT %s", acctstr);
}
if (n != COMPLETE) {
warnx ("Login failed.");
return (0);
}
if (!aflag && acct != NULL)
command ("ACCT %s", acct);
if (!aflag && acctstr != NULL)
command ("ACCT %s", acctstr);
if (proxy)
return (1);
for (n = 0; n < macnum; ++n) {
@@ -392,15 +392,15 @@ getreply (int expecteof)
osa.sa_handler (SIGINT);
#endif
if (code == 227 || code == 229) {
char *p;
char *q;
p = strchr (reply_string, '(');
if (p) {
p++;
strlcpy(pasv, p, sizeof(pasv));
p = strrchr(pasv, ')');
if (p)
*p = '\0';
q = strchr (reply_string, '(');
if (q) {
q++;
strlcpy(pasv, q, sizeof(pasv));
q = strrchr(pasv, ')');
if (q)
*q = '\0';
}
}
return code / 100;
@@ -1170,7 +1170,7 @@ parse_epsv (const char *str)
}
static int
parse_pasv (struct sockaddr_in *sin, const char *str)
parse_pasv (struct sockaddr_in *sin4, const char *str)
{
int a0, a1, a2, a3, p0, p1;
@@ -1196,11 +1196,11 @@ parse_pasv (struct sockaddr_in *sin, const char *str)
printf ("Can't parse passive mode string.\n");
return -1;
}
memset (sin, 0, sizeof(*sin));
sin->sin_family = AF_INET;
sin->sin_addr.s_addr = htonl ((a0 << 24) | (a1 << 16) |
memset (sin4, 0, sizeof(*sin4));
sin4->sin_family = AF_INET;
sin4->sin_addr.s_addr = htonl ((a0 << 24) | (a1 << 16) |
(a2 << 8) | a3);
sin->sin_port = htons ((p0 << 8) | p1);
sin4->sin_port = htons ((p0 << 8) | p1);
return 0;
}
@@ -1322,10 +1322,10 @@ noport:
verbose = overbose;
if (result == ERROR) {
struct sockaddr_in *sin = (struct sockaddr_in *)data_addr;
struct sockaddr_in *sin4 = (struct sockaddr_in *)data_addr;
unsigned int a = ntohl(sin->sin_addr.s_addr);
unsigned int p = ntohs(sin->sin_port);
unsigned int a = ntohl(sin4->sin_addr.s_addr);
unsigned int p = ntohs(sin4->sin_port);
if (data_addr->sa_family != AF_INET) {
warnx ("remote server doesn't support EPRT");

18
appl/ftp/ftp/ruserpass.c
View File

@@ -69,39 +69,39 @@ static struct toktab {
*/
static char *
guess_domain (char *hostname, size_t sz)
guess_domain (char *hostname_str, size_t sz)
{
struct addrinfo *ai, *a;
struct addrinfo hints;
int error;
char *dot;
if (gethostname (hostname, sz) < 0) {
strlcpy (hostname, "", sz);
if (gethostname (hostname_str, sz) < 0) {
strlcpy (hostname_str, "", sz);
return "";
}
dot = strchr (hostname, '.');
dot = strchr (hostname_str, '.');
if (dot != NULL)
return dot + 1;
memset (&hints, 0, sizeof(hints));
hints.ai_flags = AI_CANONNAME;
error = getaddrinfo (hostname, NULL, &hints, &ai);
error = getaddrinfo (hostname_str, NULL, &hints, &ai);
if (error)
return hostname;
return hostname_str;
for (a = ai; a != NULL; a = a->ai_next)
if (a->ai_canonname != NULL) {
strlcpy (hostname, ai->ai_canonname, sz);
strlcpy (hostname_str, ai->ai_canonname, sz);
break;
}
freeaddrinfo (ai);
dot = strchr (hostname, '.');
dot = strchr (hostname_str, '.');
if (dot != NULL)
return dot + 1;
else
return hostname;
return hostname_str;
}
int

36
appl/ftp/ftp/security.c
View File

@@ -189,16 +189,16 @@ sec_get_data(int fd, struct buffer *buf, int level)
}
static size_t
buffer_read(struct buffer *buf, void *data, size_t len)
buffer_read(struct buffer *buf, void *dataptr, size_t len)
{
len = min(len, buf->size - buf->index);
memcpy(data, (char*)buf->data + buf->index, len);
memcpy(dataptr, (char*)buf->data + buf->index, len);
buf->index += len;
return len;
}
static size_t
buffer_write(struct buffer *buf, void *data, size_t len)
buffer_write(struct buffer *buf, void *dataptr, size_t len)
{
if(buf->index + len > buf->size) {
void *tmp;
@@ -211,29 +211,29 @@ buffer_write(struct buffer *buf, void *data, size_t len)
buf->data = tmp;
buf->size = buf->index + len;
}
memcpy((char*)buf->data + buf->index, data, len);
memcpy((char*)buf->data + buf->index, dataptr, len);
buf->index += len;
return len;
}
int
sec_read(int fd, void *data, int length)
sec_read(int fd, void *dataptr, int length)
{
size_t len;
int rx = 0;
if(sec_complete == 0 || data_prot == 0)
return read(fd, data, length);
return read(fd, dataptr, length);
if(in_buffer.eof_flag){
in_buffer.eof_flag = 0;
return 0;
}
len = buffer_read(&in_buffer, data, length);
len = buffer_read(&in_buffer, dataptr, length);
length -= len;
rx += len;
data = (char*)data + len;
dataptr = (char*)dataptr + len;
while(length){
int ret;
@@ -246,10 +246,10 @@ sec_read(int fd, void *data, int length)
in_buffer.eof_flag = 1;
return rx;
}
len = buffer_read(&in_buffer, data, length);
len = buffer_read(&in_buffer, dataptr, length);
length -= len;
rx += len;
data = (char*)data + len;
dataptr = (char*)dataptr + len;
}
return rx;
}
@@ -282,21 +282,21 @@ sec_fflush(FILE *F)
}
int
sec_write(int fd, char *data, int length)
sec_write(int fd, char *dataptr, int length)
{
int len = buffer_size;
int tx = 0;
if(data_prot == prot_clear)
return write(fd, data, length);
return write(fd, dataptr, length);
len -= (*mech->overhead)(app_data, data_prot, len);
while(length){
if(length < len)
len = length;
sec_send(fd, data, len);
sec_send(fd, dataptr, len);
length -= len;
data += len;
dataptr += len;
tx += len;
}
return tx;
@@ -348,7 +348,7 @@ sec_read_msg(char *s, int level)
{
int len;
char *buf;
int code;
int return_code;
buf = malloc(strlen(s));
len = base64_decode(s + 4, buf); /* XXX */
@@ -360,14 +360,14 @@ sec_read_msg(char *s, int level)
buf[len] = '\0';
if(buf[3] == '-')
code = 0;
return_code = 0;
else
sscanf(buf, "%d", &code);
sscanf(buf, "%d", &return_code);
if(buf[len-1] == '\n')
buf[len-1] = '\0';
strcpy(s, buf);
free(buf);
return code;
return return_code;
}
int