# # # patch "ssh_agent.cc" # from [b1b6ff8f4b9519073f1c896bfe7ba0d6d8d0032e] # to [f5fb3370e362e5cfb7cec6307a6b6bc00a2ae9e6] # # patch "tests/ssh_agent/__driver__.lua" # from [22ec3f6ffb11d2bb6d283b47cc8dfb12ac6aa3ed] # to [ae65ea618c56e651096ed787bb431680be6256b1] # ============================================================ --- ssh_agent.cc b1b6ff8f4b9519073f1c896bfe7ba0d6d8d0032e +++ ssh_agent.cc f5fb3370e362e5cfb7cec6307a6b6bc00a2ae9e6 @@ -92,7 +92,7 @@ ssh_agent::ssh_agent() authsocket = getenv("SSH_AUTH_SOCK"); - if (!authsocket) + if (!authsocket || !strlen(authsocket)) { L(FL("ssh_agent: connect: ssh-agent socket not found")); return; ============================================================ --- tests/ssh_agent/__driver__.lua 22ec3f6ffb11d2bb6d283b47cc8dfb12ac6aa3ed +++ tests/ssh_agent/__driver__.lua ae65ea618c56e651096ed787bb431680be6256b1 @@ -38,10 +38,10 @@ function cleanup() function cleanup() check({"kill", os.getenv("SSH_AGENT_PID")}, 0, false, false) - set_env("SSH_AGENT_PID", "") - set_env("SSH_AUTH_SOCK", "") + restore_env() end +save_env() check({"ssh-agent"}, 0, true, false) for line in io.lines("stdout") do for k, v in string.gmatch(line, "([%w_]+)=([%w/\.-]+)") do