upstream commit

for some reason unix_listener() logged most errors twice
with each message containing only some of the useful information; merge these

OpenBSD-Commit-ID: 1978a7594a9470c0dddcd719586066311b7c9a4a
1 file changed
tree: 02186d04f09b4b1332943dee76944a0b99a663d1
  1. contrib/
  2. openbsd-compat/
  3. regress/
  4. .depend
  5. .gitignore
  6. .skipped-commit-ids
  7. aclocal.m4
  8. addrmatch.c
  9. atomicio.c
  10. atomicio.h
  11. audit-bsm.c
  12. audit-linux.c
  13. audit.c
  14. audit.h
  15. auth-bsdauth.c
  16. auth-krb5.c
  17. auth-options.c
  18. auth-options.h
  19. auth-pam.c
  20. auth-pam.h
  21. auth-passwd.c
  22. auth-rhosts.c
  23. auth-shadow.c
  24. auth-sia.c
  25. auth-sia.h
  26. auth-skey.c
  27. auth.c
  28. auth.h
  29. auth2-chall.c
  30. auth2-gss.c
  31. auth2-hostbased.c
  32. auth2-kbdint.c
  33. auth2-none.c
  34. auth2-passwd.c
  35. auth2-pubkey.c
  36. auth2.c
  37. authfd.c
  38. authfd.h
  39. authfile.c
  40. authfile.h
  41. bitmap.c
  42. bitmap.h
  43. blocks.c
  44. bufaux.c
  45. bufbn.c
  46. bufec.c
  47. buffer.c
  48. buffer.h
  49. buildpkg.sh.in
  50. canohost.c
  51. canohost.h
  52. chacha.c
  53. chacha.h
  54. channels.c
  55. channels.h
  56. cipher-aes.c
  57. cipher-aesctr.c
  58. cipher-aesctr.h
  59. cipher-chachapoly.c
  60. cipher-chachapoly.h
  61. cipher-ctr.c
  62. cipher.c
  63. cipher.h
  64. cleanup.c
  65. clientloop.c
  66. clientloop.h
  67. compat.c
  68. compat.h
  69. config.guess
  70. config.sub
  71. configure.ac
  72. crc32.c
  73. crc32.h
  74. CREDITS
  75. crypto_api.h
  76. defines.h
  77. dh.c
  78. dh.h
  79. digest-libc.c
  80. digest-openssl.c
  81. digest.h
  82. dispatch.c
  83. dispatch.h
  84. dns.c
  85. dns.h
  86. ed25519.c
  87. entropy.c
  88. entropy.h
  89. fatal.c
  90. fe25519.c
  91. fe25519.h
  92. fixalgorithms
  93. fixpaths
  94. fixprogs
  95. ge25519.c
  96. ge25519.h
  97. ge25519_base.data
  98. groupaccess.c
  99. groupaccess.h
  100. gss-genr.c
  101. gss-serv-krb5.c
  102. gss-serv.c
  103. hash.c
  104. hmac.c
  105. hmac.h
  106. hostfile.c
  107. hostfile.h
  108. includes.h
  109. INSTALL
  110. install-sh
  111. kex.c
  112. kex.h
  113. kexc25519.c
  114. kexc25519c.c
  115. kexc25519s.c
  116. kexdh.c
  117. kexdhc.c
  118. kexdhs.c
  119. kexecdh.c
  120. kexecdhc.c
  121. kexecdhs.c
  122. kexgex.c
  123. kexgexc.c
  124. kexgexs.c
  125. key.c
  126. key.h
  127. krl.c
  128. krl.h
  129. LICENCE
  130. log.c
  131. log.h
  132. loginrec.c
  133. loginrec.h
  134. logintest.c
  135. mac.c
  136. mac.h
  137. Makefile.in
  138. match.c
  139. match.h
  140. md5crypt.c
  141. md5crypt.h
  142. mdoc2man.awk
  143. misc.c
  144. misc.h
  145. mkinstalldirs
  146. moduli
  147. moduli.5
  148. moduli.c
  149. monitor.c
  150. monitor.h
  151. monitor_fdpass.c
  152. monitor_fdpass.h
  153. monitor_wrap.c
  154. monitor_wrap.h
  155. msg.c
  156. msg.h
  157. mux.c
  158. myproposal.h
  159. nchan.c
  160. nchan.ms
  161. nchan2.ms
  162. opacket.c
  163. opacket.h
  164. openssh.xml.in
  165. opensshd.init.in
  166. OVERVIEW
  167. packet.c
  168. packet.h
  169. pathnames.h
  170. pkcs11.h
  171. platform-misc.c
  172. platform-pledge.c
  173. platform-tracing.c
  174. platform.c
  175. platform.h
  176. poly1305.c
  177. poly1305.h
  178. progressmeter.c
  179. progressmeter.h
  180. PROTOCOL
  181. PROTOCOL.agent
  182. PROTOCOL.certkeys
  183. PROTOCOL.chacha20poly1305
  184. PROTOCOL.key
  185. PROTOCOL.krl
  186. PROTOCOL.mux
  187. readconf.c
  188. readconf.h
  189. README
  190. README.dns
  191. README.platform
  192. README.privsep
  193. README.tun
  194. readpass.c
  195. rijndael.c
  196. rijndael.h
  197. sandbox-capsicum.c
  198. sandbox-darwin.c
  199. sandbox-null.c
  200. sandbox-pledge.c
  201. sandbox-rlimit.c
  202. sandbox-seccomp-filter.c
  203. sandbox-solaris.c
  204. sandbox-systrace.c
  205. sc25519.c
  206. sc25519.h
  207. scp.1
  208. scp.c
  209. servconf.c
  210. servconf.h
  211. serverloop.c
  212. serverloop.h
  213. session.c
  214. session.h
  215. sftp-client.c
  216. sftp-client.h
  217. sftp-common.c
  218. sftp-common.h
  219. sftp-glob.c
  220. sftp-server-main.c
  221. sftp-server.8
  222. sftp-server.c
  223. sftp.1
  224. sftp.c
  225. sftp.h
  226. smult_curve25519_ref.c
  227. ssh-add.1
  228. ssh-add.c
  229. ssh-agent.1
  230. ssh-agent.c
  231. ssh-dss.c
  232. ssh-ecdsa.c
  233. ssh-ed25519.c
  234. ssh-gss.h
  235. ssh-keygen.1
  236. ssh-keygen.c
  237. ssh-keyscan.1
  238. ssh-keyscan.c
  239. ssh-keysign.8
  240. ssh-keysign.c
  241. ssh-pkcs11-client.c
  242. ssh-pkcs11-helper.8
  243. ssh-pkcs11-helper.c
  244. ssh-pkcs11.c
  245. ssh-pkcs11.h
  246. ssh-rsa.c
  247. ssh-sandbox.h
  248. ssh.1
  249. ssh.c
  250. ssh.h
  251. ssh2.h
  252. ssh_api.c
  253. ssh_api.h
  254. ssh_config
  255. ssh_config.5
  256. sshbuf-getput-basic.c
  257. sshbuf-getput-crypto.c
  258. sshbuf-misc.c
  259. sshbuf.c
  260. sshbuf.h
  261. sshconnect.c
  262. sshconnect.h
  263. sshconnect2.c
  264. sshd.8
  265. sshd.c
  266. sshd_config
  267. sshd_config.5
  268. ssherr.c
  269. ssherr.h
  270. sshkey.c
  271. sshkey.h
  272. sshlogin.c
  273. sshlogin.h
  274. sshpty.c
  275. sshpty.h
  276. sshtty.c
  277. survey.sh.in
  278. TODO
  279. ttymodes.c
  280. ttymodes.h
  281. uidswap.c
  282. uidswap.h
  283. umac.c
  284. umac.h
  285. utf8.c
  286. utf8.h
  287. uuencode.c
  288. uuencode.h
  289. verify.c
  290. version.h
  291. xmalloc.c
  292. xmalloc.h