Skip to content

Commit bcb210e

Browse files
Merge branch 'master' of https://github.com/eclipse-ecal/fineftp-server into feature/stou
2 parents 9254c4f + 452ea71 commit bcb210e

5 files changed

Lines changed: 7 additions & 7 deletions

File tree

.github/workflows/build-macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
steps:
2020

2121
- name: Checkout
22-
uses: actions/checkout@v4
22+
uses: actions/checkout@v6
2323
with:
2424
submodules: 'true'
2525
fetch-depth: 0

.github/workflows/build-ubuntu.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
echo "cpu_architecture=$(dpkg --print-architecture)" >> "$GITHUB_ENV"
4545
4646
- name: Checkout
47-
uses: actions/checkout@v4
47+
uses: actions/checkout@v6
4848
with:
4949
submodules: 'true'
5050
fetch-depth: 0
@@ -89,7 +89,7 @@ jobs:
8989
working-directory: ${{github.workspace}}/_build/_package/
9090

9191
- name: Upload binaries
92-
uses: actions/upload-artifact@v4
92+
uses: actions/upload-artifact@v6
9393
with:
9494
name: ${{ env.PROJECT_NAME }}-${{ env.CMAKE_PROJECT_VERSION }}-${{ env.os_name }}_${{ env.cpu_architecture }}-${{ env.package_postfix }}
9595
path: ${{github.workspace}}/_build/_package/*.deb

.github/workflows/build-windows.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
}
4242
4343
- name: Checkout
44-
uses: actions/checkout@v4
44+
uses: actions/checkout@v6
4545
with:
4646
submodules: 'true'
4747
fetch-depth: 0
@@ -85,7 +85,7 @@ jobs:
8585
echo "CMAKE_PROJECT_VERSION=$cmake_project_version" >> "$Env:GITHUB_ENV"
8686
8787
- name: Upload binaries
88-
uses: actions/upload-artifact@v4
88+
uses: actions/upload-artifact@v6
8989
with:
9090
name: ${{ env.PROJECT_NAME }}-${{ env.CMAKE_PROJECT_VERSION }}-windows-${{ matrix.build_arch }}-${{ env.VS_NAME }}-${{ matrix.library_type }}
9191
path: ${{github.workspace}}/${{env.INSTALL_PREFIX}}

fineftp-server/src/ftp_session.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ namespace fineftp
324324

325325
void FtpSession::handleFtpCommandPASS(const std::string& param)
326326
{
327-
if (last_command_ != "USER")
327+
if (last_command_ != "USER" || username_for_login_.empty())
328328
{
329329
sendFtpMessage(FtpReplyCode::COMMANDS_BAD_SEQUENCE, "Please specify username first");
330330
return;

fineftp-server/version.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
set(FINEFTP_SERVER_VERSION_MAJOR 1)
22
set(FINEFTP_SERVER_VERSION_MINOR 5)
3-
set(FINEFTP_SERVER_VERSION_PATCH 1)
3+
set(FINEFTP_SERVER_VERSION_PATCH 2)

0 commit comments

Comments
 (0)