Skip to content

Fix macos CI build, disable unix socket forwarding #395

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.

Sign up for GitHub

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

Merged
mkj merged 2 commits into from
Dec 16, 2025
Merged

Fix macos CI build, disable unix socket forwarding #395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfb4065
Fix CI builds, disable unix socket forwarding
mkj Dec 16, 2025
8263b66
Avoid unused declaration with unix socket disabled
mkj Dec 16, 2025
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
3 changes: 3 additions & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ jobs:
# macos doesn't have setresgid
localoptions: |
#define DROPBEAR_SVR_DROP_PRIVS 0
#define DROPBEAR_SVR_LOCALSTREAMFWD 0

- name: macos 15
os: macos-15
Expand All @@ -96,6 +97,7 @@ jobs:
# macos doesn't have setresgid
localoptions: |
#define DROPBEAR_SVR_DROP_PRIVS 0
#define DROPBEAR_SVR_LOCALSTREAMFWD 0

# Check that debug code doesn't bitrot
- name: DEBUG_TRACE
Expand Down Expand Up @@ -235,6 +237,7 @@ jobs:
sed -i "s/DEFAULT_IDLE_TIMEOUT 1/DEFAULT_IDLE_TIMEOUT 99/" localoptions.h
# DROPBEAR_SVR_DROP_PRIVS is on by default, turn it off
echo "#define DROPBEAR_SVR_DROP_PRIVS 0" >> localoptions.h
echo "#define DROPBEAR_SVR_LOCALSTREAMFWD 0" >> localoptions.h

- name: make
run: |
Expand Down
2 changes: 2 additions & 0 deletions src/svr-tcpfwd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@ void recv_msg_global_request_remotetcp() {
static int svr_cancelremotetcp(void);
static int svr_remotetcpreq(int *allocated_listen_port);
static int newtcpdirect(struct Channel * channel);
#if DROPBEAR_SVR_LOCALSTREAMFWD
static int newstreamlocal(struct Channel * channel);
#endif

#if DROPBEAR_SVR_REMOTETCPFWD
static const struct ChanType svr_chan_tcpremote = {
Expand Down