summaryrefslogtreecommitdiff
path: root/svr-agentfwd.c
diff options
context:
space:
mode:
authorMatt Johnston <matt@ucc.asn.au>2004-08-12 16:41:58 +0000
committerMatt Johnston <matt@ucc.asn.au>2004-08-12 16:41:58 +0000
commite3e03ba5123d76b27b28db134603dbd6a1111f06 (patch)
tree0b54a905a49358adc37ce32e3e80239dd6ebd736 /svr-agentfwd.c
parenta82d614485700729f2b650d45a73dbf55094707f (diff)
downloaddropbear-e3e03ba5123d76b27b28db134603dbd6a1111f06.tar.gz
Merging in the changes from 0.41-0.43 main Dropbear tree
Diffstat (limited to 'svr-agentfwd.c')
-rw-r--r--svr-agentfwd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/svr-agentfwd.c b/svr-agentfwd.c
index b588586..4e9aa56 100644
--- a/svr-agentfwd.c
+++ b/svr-agentfwd.c
@@ -64,7 +64,7 @@ int agentreq(struct ChanSess * chansess) {
/* create the unix socket dir and file */
if (bindagent(fd, chansess) == DROPBEAR_FAILURE) {
- return DROPBEAR_FAILURE;
+ goto fail;
}
/* listen */
@@ -146,7 +146,7 @@ void agentcleanup(struct ChanSess * chansess) {
chansess->agentlistener = NULL;
}
- if (chansess->agentfile && chansess->agentdir) {
+ if (chansess->agentfile != NULL && chansess->agentdir != NULL) {
/* Remove the dir as the user. That way they can't cause problems except
* for themselves */