comparison cli-session.c @ 1411:798854f62430 fuzz

merge from main
author Matt Johnston <matt@ucc.asn.au>
date Wed, 14 Jun 2017 23:31:42 +0800
parents e8f67918fdc9
children 38c6bcbf4f4a
comparison
equal deleted inserted replaced
1408:27e65d3aed5f 1411:798854f62430
79 #else 79 #else
80 /* For keepalive */ 80 /* For keepalive */
81 {SSH_MSG_REQUEST_SUCCESS, ignore_recv_response}, 81 {SSH_MSG_REQUEST_SUCCESS, ignore_recv_response},
82 {SSH_MSG_REQUEST_FAILURE, ignore_recv_response}, 82 {SSH_MSG_REQUEST_FAILURE, ignore_recv_response},
83 #endif 83 #endif
84 {0, 0} /* End */ 84 {0, NULL} /* End */
85 }; 85 };
86 86
87 static const struct ChanType *cli_chantypes[] = { 87 static const struct ChanType *cli_chantypes[] = {
88 #if DROPBEAR_CLI_REMOTETCPFWD 88 #if DROPBEAR_CLI_REMOTETCPFWD
89 &cli_chan_tcpremote, 89 &cli_chan_tcpremote,
285 285
286 if (cli_opts.backgrounded) { 286 if (cli_opts.backgrounded) {
287 int devnull; 287 int devnull;
288 /* keeping stdin open steals input from the terminal and 288 /* keeping stdin open steals input from the terminal and
289 is confusing, though stdout/stderr could be useful. */ 289 is confusing, though stdout/stderr could be useful. */
290 devnull = open(_PATH_DEVNULL, O_RDONLY); 290 devnull = open(DROPBEAR_PATH_DEVNULL, O_RDONLY);
291 if (devnull < 0) { 291 if (devnull < 0) {
292 dropbear_exit("Opening /dev/null: %d %s", 292 dropbear_exit("Opening /dev/null: %d %s",
293 errno, strerror(errno)); 293 errno, strerror(errno));
294 } 294 }
295 dup2(devnull, STDIN_FILENO); 295 dup2(devnull, STDIN_FILENO);