diff --git a/src/common.c b/src/common.c index bfe1146..8052203 100644 --- a/src/common.c +++ b/src/common.c @@ -276,6 +276,7 @@ int parseconnusername(char *username, struct clientparam *param, int extpasswd, if(!username || !*username) return 1; if ((sb=strchr(username, conf.delimchar)) == NULL){ if(!param->hostname && param->remsock == INVALID_SOCKET) return 2; + if(param->hostname)parsehostname(param->hostname, param, port); return parseusername(username, param, extpasswd); } while ((se=strchr(sb+1, conf.delimchar)))sb=se; diff --git a/src/ftppr.c b/src/ftppr.c index fe1fb47..597b458 100644 --- a/src/ftppr.c +++ b/src/ftppr.c @@ -132,12 +132,12 @@ void * ftpprchild(struct clientparam* param) { (unsigned)(((unsigned char *)(SAADDR(¶m->sincl)))[1]), (unsigned)(((unsigned char *)(SAADDR(¶m->sincl)))[2]), (unsigned)(((unsigned char *)(SAADDR(¶m->sincl)))[3]), - (unsigned)(((unsigned char *)(SAPORT(¶m->sincl)))[3]), - (unsigned)(((unsigned char *)(SAPORT(¶m->sincl)))[3]) + (unsigned)(((unsigned char *)(SAPORT(¶m->sincl)))[0]), + (unsigned)(((unsigned char *)(SAPORT(¶m->sincl)))[1]) ); else sprintf((char *)buf, "227 OK (127,0,0,1,%u,%u)\r\n", - (unsigned)(((unsigned char *)(SAPORT(¶m->sincl)))[3]), - (unsigned)(((unsigned char *)(SAPORT(¶m->sincl)))[3]) + (unsigned)(((unsigned char *)(SAPORT(¶m->sincl)))[0]), + (unsigned)(((unsigned char *)(SAPORT(¶m->sincl)))[1]) ); } else { diff --git a/src/version.h b/src/version.h index 07ee2a2..9971bab 100644 --- a/src/version.h +++ b/src/version.h @@ -1,2 +1,2 @@ #define VERSION "3proxy-0.8b-devel" -#define BUILDDATE "141126014759" +#define BUILDDATE "141210181747"