Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[sftp server] reverse map default ids #3253

Closed
wants to merge 14 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions 3rd-party/libssh/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ set(libssh_VERSION_MAJOR "${CMAKE_MATCH_1}")
set(libssh_VERSION_MINOR "${CMAKE_MATCH_2}")
set(libssh_VERSION_PATCH "${CMAKE_MATCH_3}")

add_compile_options(-DCHUNKSIZE=65536)

string(REGEX REPLACE "^set\\(LIBRARY_VERSION \"(.*)\"\\)$" "\\1"
LIBRARY_VERSION "${LIBRARY_VERSION}")
if (NOT LIBRARY_VERSION)
Expand Down
2 changes: 1 addition & 1 deletion 3rd-party/libssh/libssh
4 changes: 2 additions & 2 deletions 3rd-party/submodule_info.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ Version: 1.52.1 (+[our patches](https://github.com/CanonicalLtd/grpc/compare/v1.
<https://github.com/grpc/grpc/releases>

### libssh
Version: 0.10.4 (+[our patches](https://github.com/CanonicalLtd/libssh/compare/libssh-0.10.4..3413f2fe)) |
<https://github.com/CanonicalLtd/libssh.git> |
Version: 0.10.5 (+[our patches](https://github.com/canonical/libssh/compare/libssh-0.10.5..843b97db)) |
<https://github.com/canonical/libssh.git> |
<https://www.libssh.org/>

### fmt
Expand Down
2 changes: 2 additions & 0 deletions include/multipass/file_ops.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ class FileOps : public Singleton<FileOps>
virtual bool exists(const QFileInfo& file) const;
virtual bool isDir(const QFileInfo& file) const;
virtual bool isReadable(const QFileInfo& file) const;
virtual uint ownerId(const QFileInfo& file) const;
virtual uint groupId(const QFileInfo& file) const;

// QFile operations
virtual bool exists(const QFile& file) const;
Expand Down
Loading
Loading