From 9c91f407199e55695db12b960d205ba98c9f881f Mon Sep 17 00:00:00 2001 From: hidnplayr Date: Mon, 27 Aug 2012 23:29:21 +0000 Subject: [PATCH] Added missing files, fixed ftpd. git-svn-id: svn://kolibrios.org@2945 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/new-stack/network/ftpd.ini | 8 ++++++++ data/new-stack/network/users.ini | 19 +++++++++++++++++++ .../net/applications/ftpd/commands.inc | 4 ++-- 3 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 data/new-stack/network/ftpd.ini create mode 100644 data/new-stack/network/users.ini diff --git a/data/new-stack/network/ftpd.ini b/data/new-stack/network/ftpd.ini new file mode 100644 index 0000000000..216d00a2c4 --- /dev/null +++ b/data/new-stack/network/ftpd.ini @@ -0,0 +1,8 @@ +[ftpd] +port=21 +conn=10 +ip=127.0.0.1 + +[pasv] +start=2000 +end=5000 \ No newline at end of file diff --git a/data/new-stack/network/users.ini b/data/new-stack/network/users.ini new file mode 100644 index 0000000000..46a5aab613 --- /dev/null +++ b/data/new-stack/network/users.ini @@ -0,0 +1,19 @@ +; Access modes +; +; List = 1 +; Read = 2 +; Write = 4 +; Delete = 8 +; Change directory = 16 + + +[anonymous] +pass= ; leavy empty for none +home=/rd/1/ +mode=3 + +[test] +pass=1234 +home=/rd/1/ +mode=31 + diff --git a/kernel/branches/net/applications/ftpd/commands.inc b/kernel/branches/net/applications/ftpd/commands.inc index 3f4bb03938..a0168b18ba 100644 --- a/kernel/branches/net/applications/ftpd/commands.inc +++ b/kernel/branches/net/applications/ftpd/commands.inc @@ -483,7 +483,7 @@ cmdLIST: invoke con_write_asciiz, str_newline ; Start the search - invoke file.find.first, ebx, str_mask, FA_READONLY+FA_FOLDER+FA_NORMAL+FA_ARCHIVED + invoke file.find.first, ebx, str_mask, FA_READONLY+FA_FOLDER+FA_ARCHIVED;+FA_NORMAL test eax, eax jz .nosuchdir @@ -570,7 +570,7 @@ cmdLIST: stosw test [ebp + thread_data.permissions], ABORT ; Did we receive ABOR command from client? -;;; jnz .abort ; TODO + jnz abort_transfer ; check next file invoke file.find.next, ebx