diff options
| author | Chris Hall <chris.hall@highwayman.com> | 2011-09-02 00:53:59 +0100 |
|---|---|---|
| committer | Chris Hall <chris.hall@highwayman.com> | 2011-09-02 00:53:59 +0100 |
| commit | 3690074a486cfada568975e287d9cbb9e687501f (patch) | |
| tree | f6394c1ab1ca8381e9a77acca84f03dc701d10b2 /lib/vty_cli.c | |
| parent | 3f515315d5b17e432453eef67d7ac9e27bc39461 (diff) | |
| download | quagga-3690074a486cfada568975e287d9cbb9e687501f.tar.bz2 quagga-3690074a486cfada568975e287d9cbb9e687501f.tar.xz | |
Merging of euro_ix branch into pipework.
Bring in fixes for bgp dumping with pthreaded BGP Engine.
Bring in new "show nexus xxx" command.
Fix removal of '~' prompt.
Diffstat (limited to 'lib/vty_cli.c')
| -rw-r--r-- | lib/vty_cli.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/lib/vty_cli.c b/lib/vty_cli.c index a6a276e8..a4ab8de3 100644 --- a/lib/vty_cli.c +++ b/lib/vty_cli.c @@ -261,9 +261,7 @@ uty_cli_close(vty_cli cli, bool final) /* Discard any pause_timer, and suppress */ cli->pause_timer = qtimer_free(cli->pause_timer) ; cli->paused = false ; -#if 0 cli->tilde_enabled = false ; -#endif /* If final, free the CLI object. */ if (final) @@ -817,11 +815,7 @@ uty_cli_dispatch(vty_cli cli) uty_cmd_signal(vio, CMD_SUCCESS) ; - cli->blocked = (to_do_now != cmd_do_command) -#if 0 - || !cli->tilde_enabled -#endif - ; + cli->blocked = (to_do_now != cmd_do_command) || !cli->tilde_enabled ; } else { |