Przeglądaj źródła

ftppr and -h option handling fixed

z3APA3A 11 lat temu
rodzic
commit
e3645ee971
3 zmienionych plików z 6 dodań i 5 usunięć
  1. 1 0
      src/common.c
  2. 4 4
      src/ftppr.c
  3. 1 1
      src/version.h

+ 1 - 0
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;

+ 4 - 4
src/ftppr.c

@@ -132,12 +132,12 @@ void * ftpprchild(struct clientparam* param) {
 					 (unsigned)(((unsigned char *)(SAADDR(&param->sincl)))[1]),
 					 (unsigned)(((unsigned char *)(SAADDR(&param->sincl)))[2]),
 					 (unsigned)(((unsigned char *)(SAADDR(&param->sincl)))[3]),
-					 (unsigned)(((unsigned char *)(SAPORT(&param->sincl)))[3]),
-					 (unsigned)(((unsigned char *)(SAPORT(&param->sincl)))[3])
+					 (unsigned)(((unsigned char *)(SAPORT(&param->sincl)))[0]),
+					 (unsigned)(((unsigned char *)(SAPORT(&param->sincl)))[1])
 					);
 			else sprintf((char *)buf, "227 OK (127,0,0,1,%u,%u)\r\n", 
-					 (unsigned)(((unsigned char *)(SAPORT(&param->sincl)))[3]),
-					 (unsigned)(((unsigned char *)(SAPORT(&param->sincl)))[3])
+					 (unsigned)(((unsigned char *)(SAPORT(&param->sincl)))[0]),
+					 (unsigned)(((unsigned char *)(SAPORT(&param->sincl)))[1])
 					);			
 		}
 		else {

+ 1 - 1
src/version.h

@@ -1,2 +1,2 @@
 #define VERSION "3proxy-0.8b-devel"
-#define BUILDDATE "141126014759"
+#define BUILDDATE "141210181747"