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

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

@@ -69,39 +69,39 @@ static struct toktab {
*/ */
static char * static char *
guess_domain (char *hostname, size_t sz) guess_domain (char *hostname_str, size_t sz)
{ {
struct addrinfo *ai, *a; struct addrinfo *ai, *a;
struct addrinfo hints; struct addrinfo hints;
int error; int error;
char *dot; char *dot;
if (gethostname (hostname, sz) < 0) { if (gethostname (hostname_str, sz) < 0) {
strlcpy (hostname, "", sz); strlcpy (hostname_str, "", sz);
return ""; return "";
} }
dot = strchr (hostname, '.'); dot = strchr (hostname_str, '.');
if (dot != NULL) if (dot != NULL)
return dot + 1; return dot + 1;
memset (&hints, 0, sizeof(hints)); memset (&hints, 0, sizeof(hints));
hints.ai_flags = AI_CANONNAME; hints.ai_flags = AI_CANONNAME;
error = getaddrinfo (hostname, NULL, &hints, &ai); error = getaddrinfo (hostname_str, NULL, &hints, &ai);
if (error) if (error)
return hostname; return hostname_str;
for (a = ai; a != NULL; a = a->ai_next) for (a = ai; a != NULL; a = a->ai_next)
if (a->ai_canonname != NULL) { if (a->ai_canonname != NULL) {
strlcpy (hostname, ai->ai_canonname, sz); strlcpy (hostname_str, ai->ai_canonname, sz);
break; break;
} }
freeaddrinfo (ai); freeaddrinfo (ai);
dot = strchr (hostname, '.'); dot = strchr (hostname_str, '.');
if (dot != NULL) if (dot != NULL)
return dot + 1; return dot + 1;
else else
return hostname; return hostname_str;
} }
int 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 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); 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; buf->index += len;
return len; return len;
} }
static size_t 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) { if(buf->index + len > buf->size) {
void *tmp; void *tmp;
@@ -211,29 +211,29 @@ buffer_write(struct buffer *buf, void *data, size_t len)
buf->data = tmp; buf->data = tmp;
buf->size = buf->index + len; buf->size = buf->index + len;
} }
memcpy((char*)buf->data + buf->index, data, len); memcpy((char*)buf->data + buf->index, dataptr, len);
buf->index += len; buf->index += len;
return len; return len;
} }
int int
sec_read(int fd, void *data, int length) sec_read(int fd, void *dataptr, int length)
{ {
size_t len; size_t len;
int rx = 0; int rx = 0;
if(sec_complete == 0 || data_prot == 0) if(sec_complete == 0 || data_prot == 0)
return read(fd, data, length); return read(fd, dataptr, length);
if(in_buffer.eof_flag){ if(in_buffer.eof_flag){
in_buffer.eof_flag = 0; in_buffer.eof_flag = 0;
return 0; return 0;
} }
len = buffer_read(&in_buffer, data, length); len = buffer_read(&in_buffer, dataptr, length);
length -= len; length -= len;
rx += len; rx += len;
data = (char*)data + len; dataptr = (char*)dataptr + len;
while(length){ while(length){
int ret; int ret;
@@ -246,10 +246,10 @@ sec_read(int fd, void *data, int length)
in_buffer.eof_flag = 1; in_buffer.eof_flag = 1;
return rx; return rx;
} }
len = buffer_read(&in_buffer, data, length); len = buffer_read(&in_buffer, dataptr, length);
length -= len; length -= len;
rx += len; rx += len;
data = (char*)data + len; dataptr = (char*)dataptr + len;
} }
return rx; return rx;
} }
@@ -282,21 +282,21 @@ sec_fflush(FILE *F)
} }
int int
sec_write(int fd, char *data, int length) sec_write(int fd, char *dataptr, int length)
{ {
int len = buffer_size; int len = buffer_size;
int tx = 0; int tx = 0;
if(data_prot == prot_clear) if(data_prot == prot_clear)
return write(fd, data, length); return write(fd, dataptr, length);
len -= (*mech->overhead)(app_data, data_prot, len); len -= (*mech->overhead)(app_data, data_prot, len);
while(length){ while(length){
if(length < len) if(length < len)
len = length; len = length;
sec_send(fd, data, len); sec_send(fd, dataptr, len);
length -= len; length -= len;
data += len; dataptr += len;
tx += len; tx += len;
} }
return tx; return tx;
@@ -348,7 +348,7 @@ sec_read_msg(char *s, int level)
{ {
int len; int len;
char *buf; char *buf;
int code; int return_code;
buf = malloc(strlen(s)); buf = malloc(strlen(s));
len = base64_decode(s + 4, buf); /* XXX */ len = base64_decode(s + 4, buf); /* XXX */
@@ -360,14 +360,14 @@ sec_read_msg(char *s, int level)
buf[len] = '\0'; buf[len] = '\0';
if(buf[3] == '-') if(buf[3] == '-')
code = 0; return_code = 0;
else else
sscanf(buf, "%d", &code); sscanf(buf, "%d", &return_code);
if(buf[len-1] == '\n') if(buf[len-1] == '\n')
buf[len-1] = '\0'; buf[len-1] = '\0';
strcpy(s, buf); strcpy(s, buf);
free(buf); free(buf);
return code; return return_code;
} }
int int