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

Fix shadow warning.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15677 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2005-07-19 18:33:08 +00:00
parent 5116c50655
commit 99a6bdb769
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -570,10 +570,10 @@ void mec(char *msg, enum protection_level level)
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
int int
sec_userok(char *user) sec_userok(char *userstr)
{ {
if(sec_complete) if(sec_complete)
return (*mech->userok)(app_data, user); return (*mech->userok)(app_data, userstr);
return 0; return 0;
} }

8
appl/ftp/ftpd/ftpcmd.y
View File

@@ -750,11 +750,11 @@ host_port
: NUMBER COMMA NUMBER COMMA NUMBER COMMA NUMBER COMMA : NUMBER COMMA NUMBER COMMA NUMBER COMMA NUMBER COMMA
NUMBER COMMA NUMBER NUMBER COMMA NUMBER
{ {
struct sockaddr_in *sin = (struct sockaddr_in *)data_dest; struct sockaddr_in *sin4 = (struct sockaddr_in *)data_dest;
sin->sin_family = AF_INET; sin4->sin_family = AF_INET;
sin->sin_port = htons($9 * 256 + $11); sin4->sin_port = htons($9 * 256 + $11);
sin->sin_addr.s_addr = sin4->sin_addr.s_addr =
htonl(($1 << 24) | ($3 << 16) | ($5 << 8) | $7); htonl(($1 << 24) | ($3 << 16) | ($5 << 8) | $7);
} }
; ;