diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-01-08 06:13:41 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-01-08 06:13:41 +0000 |
commit | a383baac4604a7de1710e87fba0403e4a56d5472 (patch) | |
tree | 62d267f992fd15d00e9382f95199b138877435b7 | |
parent | 9ce907c3d60637943dfa46a4542164498be19ea8 (diff) |
20010108
- (bal) Fixed another typo in cli.c
- (bal) OpenBSD Sync
- markus@cvs.openbsd.org 2001/01/07 21:26:55
[cli.c]
typo
- markus@cvs.openbsd.org 2001/01/07 21:26:55
[cli.c]
missing free, stevesk@pobox.com
- markus@cvs.openbsd.org 2001/01/07 19:06:25
[auth1.c]
missing free, stevesk@pobox.com
- markus@cvs.openbsd.org 2001/01/07 11:28:04
[log-client.c log-server.c log.c readconf.c servconf.c ssh.1
ssh.h sshd.8 sshd.c]
rename SYSLOG_LEVEL_INFO->SYSLOG_LEVEL_NOTICE
syslog priority changes:
fatal() LOG_ERR -> LOG_CRIT
log() LOG_INFO -> LOG_NOTICE
-rw-r--r-- | ChangeLog | 20 | ||||
-rw-r--r-- | auth1.c | 3 | ||||
-rw-r--r-- | cli.c | 7 | ||||
-rw-r--r-- | log-client.c | 8 | ||||
-rw-r--r-- | log-server.c | 18 | ||||
-rw-r--r-- | log.c | 7 | ||||
-rw-r--r-- | readconf.c | 4 | ||||
-rw-r--r-- | servconf.c | 4 | ||||
-rw-r--r-- | ssh.1 | 6 | ||||
-rw-r--r-- | ssh.h | 4 | ||||
-rw-r--r-- | sshd.8 | 6 | ||||
-rw-r--r-- | sshd.c | 4 |
12 files changed, 59 insertions, 32 deletions
@@ -1,3 +1,23 @@ | |||
1 | 20010108 | ||
2 | - (bal) Fixed another typo in cli.c | ||
3 | - (bal) OpenBSD Sync | ||
4 | - markus@cvs.openbsd.org 2001/01/07 21:26:55 | ||
5 | [cli.c] | ||
6 | typo | ||
7 | - markus@cvs.openbsd.org 2001/01/07 21:26:55 | ||
8 | [cli.c] | ||
9 | missing free, stevesk@pobox.com | ||
10 | - markus@cvs.openbsd.org 2001/01/07 19:06:25 | ||
11 | [auth1.c] | ||
12 | missing free, stevesk@pobox.com | ||
13 | - markus@cvs.openbsd.org 2001/01/07 11:28:04 | ||
14 | [log-client.c log-server.c log.c readconf.c servconf.c ssh.1 | ||
15 | ssh.h sshd.8 sshd.c] | ||
16 | rename SYSLOG_LEVEL_INFO->SYSLOG_LEVEL_NOTICE | ||
17 | syslog priority changes: | ||
18 | fatal() LOG_ERR -> LOG_CRIT | ||
19 | log() LOG_INFO -> LOG_NOTICE | ||
20 | |||
1 | 20010107 | 21 | 20010107 |
2 | - (bal) OpenBSD Sync | 22 | - (bal) OpenBSD Sync |
3 | - markus@cvs.openbsd.org 2001/01/06 11:23:27 | 23 | - markus@cvs.openbsd.org 2001/01/06 11:23:27 |
@@ -10,7 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include "includes.h" | 12 | #include "includes.h" |
13 | RCSID("$OpenBSD: auth1.c,v 1.9 2000/12/27 12:34:49 markus Exp $"); | 13 | RCSID("$OpenBSD: auth1.c,v 1.10 2001/01/07 19:06:25 markus Exp $"); |
14 | 14 | ||
15 | #ifdef HAVE_OSF_SIA | 15 | #ifdef HAVE_OSF_SIA |
16 | # include <sia.h> | 16 | # include <sia.h> |
@@ -479,6 +479,7 @@ do_authentication() | |||
479 | packet_start(SSH_SMSG_SUCCESS); | 479 | packet_start(SSH_SMSG_SUCCESS); |
480 | packet_send(); | 480 | packet_send(); |
481 | packet_write_wait(); | 481 | packet_write_wait(); |
482 | xfree(user); | ||
482 | 483 | ||
483 | #ifdef WITH_AIXAUTHENTICATE | 484 | #ifdef WITH_AIXAUTHENTICATE |
484 | /* We don't have a pty yet, so just label the line as "ssh" */ | 485 | /* We don't have a pty yet, so just label the line as "ssh" */ |
@@ -1,5 +1,5 @@ | |||
1 | #include "includes.h" | 1 | #include "includes.h" |
2 | RCSID("$OpenBSD: cli.c,v 1.2 2000/10/16 09:38:44 djm Exp $"); | 2 | RCSID("$OpenBSD: cli.c,v 1.4 2001/01/07 21:26:55 markus Exp $"); |
3 | 3 | ||
4 | #include "xmalloc.h" | 4 | #include "xmalloc.h" |
5 | #include "ssh.h" | 5 | #include "ssh.h" |
@@ -145,9 +145,12 @@ cli_write(char* buf, int size) | |||
145 | 145 | ||
146 | for (pos = 0; pos < len; pos += ret) { | 146 | for (pos = 0; pos < len; pos += ret) { |
147 | ret = write(cli_output, output + pos, len - pos); | 147 | ret = write(cli_output, output + pos, len - pos); |
148 | if (ret == -1) | 148 | if (ret == -1) { |
149 | xfree(output); | ||
149 | return -1; | 150 | return -1; |
151 | } | ||
150 | } | 152 | } |
153 | xfree(output); | ||
151 | return 0; | 154 | return 0; |
152 | } | 155 | } |
153 | 156 | ||
diff --git a/log-client.c b/log-client.c index 505c8c337..bfcab30ba 100644 --- a/log-client.c +++ b/log-client.c | |||
@@ -36,12 +36,12 @@ | |||
36 | */ | 36 | */ |
37 | 37 | ||
38 | #include "includes.h" | 38 | #include "includes.h" |
39 | RCSID("$OpenBSD: log-client.c,v 1.12 2000/09/12 20:53:10 markus Exp $"); | 39 | RCSID("$OpenBSD: log-client.c,v 1.13 2001/01/07 11:28:04 markus Exp $"); |
40 | 40 | ||
41 | #include "xmalloc.h" | 41 | #include "xmalloc.h" |
42 | #include "ssh.h" | 42 | #include "ssh.h" |
43 | 43 | ||
44 | static LogLevel log_level = SYSLOG_LEVEL_INFO; | 44 | static LogLevel log_level = SYSLOG_LEVEL_NOTICE; |
45 | 45 | ||
46 | /* Initialize the log. | 46 | /* Initialize the log. |
47 | * av0 program name (should be argv[0]) | 47 | * av0 program name (should be argv[0]) |
@@ -53,9 +53,9 @@ log_init(char *av0, LogLevel level, SyslogFacility ignored1, int ignored2) | |||
53 | { | 53 | { |
54 | switch (level) { | 54 | switch (level) { |
55 | case SYSLOG_LEVEL_QUIET: | 55 | case SYSLOG_LEVEL_QUIET: |
56 | case SYSLOG_LEVEL_ERROR: | ||
57 | case SYSLOG_LEVEL_FATAL: | 56 | case SYSLOG_LEVEL_FATAL: |
58 | case SYSLOG_LEVEL_INFO: | 57 | case SYSLOG_LEVEL_ERROR: |
58 | case SYSLOG_LEVEL_NOTICE: | ||
59 | case SYSLOG_LEVEL_VERBOSE: | 59 | case SYSLOG_LEVEL_VERBOSE: |
60 | case SYSLOG_LEVEL_DEBUG1: | 60 | case SYSLOG_LEVEL_DEBUG1: |
61 | case SYSLOG_LEVEL_DEBUG2: | 61 | case SYSLOG_LEVEL_DEBUG2: |
diff --git a/log-server.c b/log-server.c index 943c31417..2335a3ef4 100644 --- a/log-server.c +++ b/log-server.c | |||
@@ -36,14 +36,14 @@ | |||
36 | */ | 36 | */ |
37 | 37 | ||
38 | #include "includes.h" | 38 | #include "includes.h" |
39 | RCSID("$OpenBSD: log-server.c,v 1.17 2000/09/12 20:53:10 markus Exp $"); | 39 | RCSID("$OpenBSD: log-server.c,v 1.18 2001/01/07 11:28:05 markus Exp $"); |
40 | 40 | ||
41 | #include <syslog.h> | 41 | #include <syslog.h> |
42 | #include "packet.h" | 42 | #include "packet.h" |
43 | #include "xmalloc.h" | 43 | #include "xmalloc.h" |
44 | #include "ssh.h" | 44 | #include "ssh.h" |
45 | 45 | ||
46 | static LogLevel log_level = SYSLOG_LEVEL_INFO; | 46 | static LogLevel log_level = SYSLOG_LEVEL_NOTICE; |
47 | static int log_on_stderr = 0; | 47 | static int log_on_stderr = 0; |
48 | static int log_facility = LOG_AUTH; | 48 | static int log_facility = LOG_AUTH; |
49 | 49 | ||
@@ -58,9 +58,9 @@ log_init(char *av0, LogLevel level, SyslogFacility facility, int on_stderr) | |||
58 | { | 58 | { |
59 | switch (level) { | 59 | switch (level) { |
60 | case SYSLOG_LEVEL_QUIET: | 60 | case SYSLOG_LEVEL_QUIET: |
61 | case SYSLOG_LEVEL_ERROR: | ||
62 | case SYSLOG_LEVEL_FATAL: | 61 | case SYSLOG_LEVEL_FATAL: |
63 | case SYSLOG_LEVEL_INFO: | 62 | case SYSLOG_LEVEL_ERROR: |
63 | case SYSLOG_LEVEL_NOTICE: | ||
64 | case SYSLOG_LEVEL_VERBOSE: | 64 | case SYSLOG_LEVEL_VERBOSE: |
65 | case SYSLOG_LEVEL_DEBUG1: | 65 | case SYSLOG_LEVEL_DEBUG1: |
66 | case SYSLOG_LEVEL_DEBUG2: | 66 | case SYSLOG_LEVEL_DEBUG2: |
@@ -133,15 +133,17 @@ do_log(LogLevel level, const char *fmt, va_list args) | |||
133 | if (level > log_level) | 133 | if (level > log_level) |
134 | return; | 134 | return; |
135 | switch (level) { | 135 | switch (level) { |
136 | case SYSLOG_LEVEL_FATAL: | ||
137 | txt = "fatal"; | ||
138 | pri = LOG_CRIT; | ||
139 | break; | ||
136 | case SYSLOG_LEVEL_ERROR: | 140 | case SYSLOG_LEVEL_ERROR: |
137 | txt = "error"; | 141 | txt = "error"; |
138 | pri = LOG_ERR; | 142 | pri = LOG_ERR; |
139 | break; | 143 | break; |
140 | case SYSLOG_LEVEL_FATAL: | 144 | case SYSLOG_LEVEL_NOTICE: |
141 | txt = "fatal"; | 145 | pri = LOG_NOTICE; |
142 | pri = LOG_ERR; | ||
143 | break; | 146 | break; |
144 | case SYSLOG_LEVEL_INFO: | ||
145 | case SYSLOG_LEVEL_VERBOSE: | 147 | case SYSLOG_LEVEL_VERBOSE: |
146 | pri = LOG_INFO; | 148 | pri = LOG_INFO; |
147 | break; | 149 | break; |
@@ -36,7 +36,7 @@ | |||
36 | */ | 36 | */ |
37 | 37 | ||
38 | #include "includes.h" | 38 | #include "includes.h" |
39 | RCSID("$OpenBSD: log.c,v 1.12 2000/12/19 23:17:57 markus Exp $"); | 39 | RCSID("$OpenBSD: log.c,v 1.13 2001/01/07 11:28:05 markus Exp $"); |
40 | 40 | ||
41 | #include "ssh.h" | 41 | #include "ssh.h" |
42 | #include "xmalloc.h" | 42 | #include "xmalloc.h" |
@@ -71,7 +71,7 @@ log(const char *fmt,...) | |||
71 | { | 71 | { |
72 | va_list args; | 72 | va_list args; |
73 | va_start(args, fmt); | 73 | va_start(args, fmt); |
74 | do_log(SYSLOG_LEVEL_INFO, fmt, args); | 74 | do_log(SYSLOG_LEVEL_NOTICE, fmt, args); |
75 | va_end(args); | 75 | va_end(args); |
76 | } | 76 | } |
77 | 77 | ||
@@ -209,12 +209,13 @@ static struct { | |||
209 | { "QUIET", SYSLOG_LEVEL_QUIET }, | 209 | { "QUIET", SYSLOG_LEVEL_QUIET }, |
210 | { "FATAL", SYSLOG_LEVEL_FATAL }, | 210 | { "FATAL", SYSLOG_LEVEL_FATAL }, |
211 | { "ERROR", SYSLOG_LEVEL_ERROR }, | 211 | { "ERROR", SYSLOG_LEVEL_ERROR }, |
212 | { "INFO", SYSLOG_LEVEL_INFO }, | 212 | { "NOTICE", SYSLOG_LEVEL_NOTICE }, |
213 | { "VERBOSE", SYSLOG_LEVEL_VERBOSE }, | 213 | { "VERBOSE", SYSLOG_LEVEL_VERBOSE }, |
214 | { "DEBUG", SYSLOG_LEVEL_DEBUG1 }, | 214 | { "DEBUG", SYSLOG_LEVEL_DEBUG1 }, |
215 | { "DEBUG1", SYSLOG_LEVEL_DEBUG1 }, | 215 | { "DEBUG1", SYSLOG_LEVEL_DEBUG1 }, |
216 | { "DEBUG2", SYSLOG_LEVEL_DEBUG2 }, | 216 | { "DEBUG2", SYSLOG_LEVEL_DEBUG2 }, |
217 | { "DEBUG3", SYSLOG_LEVEL_DEBUG3 }, | 217 | { "DEBUG3", SYSLOG_LEVEL_DEBUG3 }, |
218 | { "INFO", SYSLOG_LEVEL_NOTICE }, /* backward compatible */ | ||
218 | { NULL, 0 } | 219 | { NULL, 0 } |
219 | }; | 220 | }; |
220 | 221 | ||
diff --git a/readconf.c b/readconf.c index d90ba37bb..5b552815f 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: readconf.c,v 1.52 2000/12/27 12:30:19 markus Exp $"); | 15 | RCSID("$OpenBSD: readconf.c,v 1.53 2001/01/07 11:28:05 markus Exp $"); |
16 | 16 | ||
17 | #include "ssh.h" | 17 | #include "ssh.h" |
18 | #include "readconf.h" | 18 | #include "readconf.h" |
@@ -804,7 +804,7 @@ fill_default_options(Options * options) | |||
804 | if (options->user_hostfile2 == NULL) | 804 | if (options->user_hostfile2 == NULL) |
805 | options->user_hostfile2 = SSH_USER_HOSTFILE2; | 805 | options->user_hostfile2 = SSH_USER_HOSTFILE2; |
806 | if (options->log_level == (LogLevel) - 1) | 806 | if (options->log_level == (LogLevel) - 1) |
807 | options->log_level = SYSLOG_LEVEL_INFO; | 807 | options->log_level = SYSLOG_LEVEL_NOTICE; |
808 | /* options->proxy_command should not be set by default */ | 808 | /* options->proxy_command should not be set by default */ |
809 | /* options->user will be set in the main program if appropriate */ | 809 | /* options->user will be set in the main program if appropriate */ |
810 | /* options->hostname will be set in the main program if appropriate */ | 810 | /* options->hostname will be set in the main program if appropriate */ |
diff --git a/servconf.c b/servconf.c index 8dd6e7d88..6604e3d23 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -10,7 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include "includes.h" | 12 | #include "includes.h" |
13 | RCSID("$OpenBSD: servconf.c,v 1.55 2000/12/19 23:17:57 markus Exp $"); | 13 | RCSID("$OpenBSD: servconf.c,v 1.56 2001/01/07 11:28:06 markus Exp $"); |
14 | 14 | ||
15 | #include "ssh.h" | 15 | #include "ssh.h" |
16 | #include "servconf.h" | 16 | #include "servconf.h" |
@@ -129,7 +129,7 @@ fill_default_server_options(ServerOptions *options) | |||
129 | if (options->log_facility == (SyslogFacility) (-1)) | 129 | if (options->log_facility == (SyslogFacility) (-1)) |
130 | options->log_facility = SYSLOG_FACILITY_AUTH; | 130 | options->log_facility = SYSLOG_FACILITY_AUTH; |
131 | if (options->log_level == (LogLevel) (-1)) | 131 | if (options->log_level == (LogLevel) (-1)) |
132 | options->log_level = SYSLOG_LEVEL_INFO; | 132 | options->log_level = SYSLOG_LEVEL_NOTICE; |
133 | if (options->rhosts_authentication == -1) | 133 | if (options->rhosts_authentication == -1) |
134 | options->rhosts_authentication = 0; | 134 | options->rhosts_authentication = 0; |
135 | if (options->rhosts_rsa_authentication == -1) | 135 | if (options->rhosts_rsa_authentication == -1) |
@@ -34,7 +34,7 @@ | |||
34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
36 | .\" | 36 | .\" |
37 | .\" $OpenBSD: ssh.1,v 1.75 2001/01/04 22:35:32 djm Exp $ | 37 | .\" $OpenBSD: ssh.1,v 1.76 2001/01/07 11:28:06 markus Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSH 1 | 39 | .Dt SSH 1 |
40 | .Os | 40 | .Os |
@@ -814,8 +814,8 @@ Only the superuser can forward privileged ports. | |||
814 | Gives the verbosity level that is used when logging messages from | 814 | Gives the verbosity level that is used when logging messages from |
815 | .Nm ssh . | 815 | .Nm ssh . |
816 | The possible values are: | 816 | The possible values are: |
817 | QUIET, FATAL, ERROR, INFO, VERBOSE and DEBUG. | 817 | QUIET, FATAL, ERROR, NOTICE, VERBOSE and DEBUG. |
818 | The default is INFO. | 818 | The default is NOTICE. |
819 | .It Cm NumberOfPasswordPrompts | 819 | .It Cm NumberOfPasswordPrompts |
820 | Specifies the number of password prompts before giving up. | 820 | Specifies the number of password prompts before giving up. |
821 | The argument to this keyword must be an integer. | 821 | The argument to this keyword must be an integer. |
@@ -12,7 +12,7 @@ | |||
12 | * called by a name other than "ssh" or "Secure Shell". | 12 | * called by a name other than "ssh" or "Secure Shell". |
13 | */ | 13 | */ |
14 | 14 | ||
15 | /* RCSID("$OpenBSD: ssh.h,v 1.56 2000/12/19 23:17:58 markus Exp $"); */ | 15 | /* RCSID("$OpenBSD: ssh.h,v 1.57 2001/01/07 11:28:06 markus Exp $"); */ |
16 | 16 | ||
17 | #ifndef SSH_H | 17 | #ifndef SSH_H |
18 | #define SSH_H | 18 | #define SSH_H |
@@ -445,7 +445,7 @@ typedef enum { | |||
445 | SYSLOG_LEVEL_QUIET, | 445 | SYSLOG_LEVEL_QUIET, |
446 | SYSLOG_LEVEL_FATAL, | 446 | SYSLOG_LEVEL_FATAL, |
447 | SYSLOG_LEVEL_ERROR, | 447 | SYSLOG_LEVEL_ERROR, |
448 | SYSLOG_LEVEL_INFO, | 448 | SYSLOG_LEVEL_NOTICE, |
449 | SYSLOG_LEVEL_VERBOSE, | 449 | SYSLOG_LEVEL_VERBOSE, |
450 | SYSLOG_LEVEL_DEBUG1, | 450 | SYSLOG_LEVEL_DEBUG1, |
451 | SYSLOG_LEVEL_DEBUG2, | 451 | SYSLOG_LEVEL_DEBUG2, |
@@ -34,7 +34,7 @@ | |||
34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
36 | .\" | 36 | .\" |
37 | .\" $OpenBSD: sshd.8,v 1.78 2001/01/04 22:35:32 djm Exp $ | 37 | .\" $OpenBSD: sshd.8,v 1.79 2001/01/07 11:28:07 markus Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSHD 8 | 39 | .Dt SSHD 8 |
40 | .Os | 40 | .Os |
@@ -492,8 +492,8 @@ The default is 600 (seconds). | |||
492 | Gives the verbosity level that is used when logging messages from | 492 | Gives the verbosity level that is used when logging messages from |
493 | .Nm sshd . | 493 | .Nm sshd . |
494 | The possible values are: | 494 | The possible values are: |
495 | QUIET, FATAL, ERROR, INFO, VERBOSE and DEBUG. | 495 | QUIET, FATAL, ERROR, NOTICE, VERBOSE and DEBUG. |
496 | The default is INFO. | 496 | The default is NOTICE. |
497 | Logging with level DEBUG violates the privacy of users | 497 | Logging with level DEBUG violates the privacy of users |
498 | and is not recommended. | 498 | and is not recommended. |
499 | .It Cm MaxStartups | 499 | .It Cm MaxStartups |
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: sshd.c,v 1.145 2001/01/04 22:25:58 markus Exp $"); | 43 | RCSID("$OpenBSD: sshd.c,v 1.146 2001/01/07 11:28:07 markus Exp $"); |
44 | 44 | ||
45 | #include "xmalloc.h" | 45 | #include "xmalloc.h" |
46 | #include "rsa.h" | 46 | #include "rsa.h" |
@@ -673,7 +673,7 @@ main(int ac, char **av) | |||
673 | * key (unless started from inetd) | 673 | * key (unless started from inetd) |
674 | */ | 674 | */ |
675 | log_init(__progname, | 675 | log_init(__progname, |
676 | options.log_level == -1 ? SYSLOG_LEVEL_INFO : options.log_level, | 676 | options.log_level == -1 ? SYSLOG_LEVEL_NOTICE : options.log_level, |
677 | options.log_facility == -1 ? SYSLOG_FACILITY_AUTH : options.log_facility, | 677 | options.log_facility == -1 ? SYSLOG_FACILITY_AUTH : options.log_facility, |
678 | !silent && !inetd_flag); | 678 | !silent && !inetd_flag); |
679 | 679 | ||