mirror of
https://github.com/3proxy/3proxy.git
synced 2025-02-23 10:35:40 +08:00
ftppr and -h option handling fixed
This commit is contained in:
parent
f82d1e296b
commit
e3645ee971
@ -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;
|
||||
|
@ -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 {
|
||||
|
@ -1,2 +1,2 @@
|
||||
#define VERSION "3proxy-0.8b-devel"
|
||||
#define BUILDDATE "141126014759"
|
||||
#define BUILDDATE "141210181747"
|
||||
|
Loading…
Reference in New Issue
Block a user