aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/src/ssh_file.erl
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2017-03-02 12:11:06 +0100
committerHans Nilsson <[email protected]>2017-03-02 12:11:06 +0100
commit654f7791bd4c1248ed78401ebeade0f98a2250b3 (patch)
treef95e79faadb151d4cb151592a16d535a8db79276 /lib/ssh/src/ssh_file.erl
parentcf732330c011fb28f58c7e4c043381eac352a9fb (diff)
parent931df53bc431c47140620864b04d4622f9e41421 (diff)
downloadotp-654f7791bd4c1248ed78401ebeade0f98a2250b3.tar.gz
otp-654f7791bd4c1248ed78401ebeade0f98a2250b3.tar.bz2
otp-654f7791bd4c1248ed78401ebeade0f98a2250b3.zip
Merge branch 'hans/ssh/options_freshup/OTP-12872'
Diffstat (limited to 'lib/ssh/src/ssh_file.erl')
-rw-r--r--lib/ssh/src/ssh_file.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssh/src/ssh_file.erl b/lib/ssh/src/ssh_file.erl
index 216f65f33a..898b4cc5c4 100644
--- a/lib/ssh/src/ssh_file.erl
+++ b/lib/ssh/src/ssh_file.erl
@@ -192,8 +192,8 @@ lookup_user_key(Key, User, Opts) ->
ssh_dir({remoteuser, User}, Opts) ->
case proplists:get_value(user_dir_fun, Opts) of
undefined ->
- case proplists:get_value(user_dir, Opts) of
- undefined ->
+ case proplists:get_value(user_dir, Opts, false) of
+ false ->
default_user_dir();
Dir ->
Dir