tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Ben Lindstrom 2001-01-08 06:13:41 +00:00
parent 9ce907c3d6
commit a383baac46
12 changed files with 59 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ChangeLog
View File

@ -1,3 +1,23 @@
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
20010107 20010107
- (bal) OpenBSD Sync - (bal) OpenBSD Sync
- markus@cvs.openbsd.org 2001/01/06 11:23:27 - markus@cvs.openbsd.org 2001/01/06 11:23:27

3
auth1.c
View File

@ -10,7 +10,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: auth1.c,v 1.9 2000/12/27 12:34:49 markus Exp $"); RCSID("$OpenBSD: auth1.c,v 1.10 2001/01/07 19:06:25 markus Exp $");
#ifdef HAVE_OSF_SIA #ifdef HAVE_OSF_SIA
# include <sia.h> # include <sia.h>
@ -479,6 +479,7 @@ do_authentication()
packet_start(SSH_SMSG_SUCCESS); packet_start(SSH_SMSG_SUCCESS);
packet_send(); packet_send();
packet_write_wait(); packet_write_wait();
xfree(user);
#ifdef WITH_AIXAUTHENTICATE #ifdef WITH_AIXAUTHENTICATE
/* We don't have a pty yet, so just label the line as "ssh" */ /* We don't have a pty yet, so just label the line as "ssh" */

7
cli.c
View File

@ -1,5 +1,5 @@
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: cli.c,v 1.2 2000/10/16 09:38:44 djm Exp $"); RCSID("$OpenBSD: cli.c,v 1.4 2001/01/07 21:26:55 markus Exp $");
#include "xmalloc.h" #include "xmalloc.h"
#include "ssh.h" #include "ssh.h"
@ -145,9 +145,12 @@ cli_write(char* buf, int size)
for (pos = 0; pos < len; pos += ret) { for (pos = 0; pos < len; pos += ret) {
ret = write(cli_output, output + pos, len - pos); ret = write(cli_output, output + pos, len - pos);
if (ret == -1) if (ret == -1) {
xfree(output);
return -1; return -1;
}
} }
xfree(output);
return 0; return 0;
} }

8
log-client.c
View File

@ -36,12 +36,12 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: log-client.c,v 1.12 2000/09/12 20:53:10 markus Exp $"); RCSID("$OpenBSD: log-client.c,v 1.13 2001/01/07 11:28:04 markus Exp $");
#include "xmalloc.h" #include "xmalloc.h"
#include "ssh.h" #include "ssh.h"
static LogLevel log_level = SYSLOG_LEVEL_INFO; static LogLevel log_level = SYSLOG_LEVEL_NOTICE;
/* Initialize the log. /* Initialize the log.
* av0 program name (should be argv[0]) * av0 program name (should be argv[0])
@ -53,9 +53,9 @@ log_init(char *av0, LogLevel level, SyslogFacility ignored1, int ignored2)
{ {
switch (level) { switch (level) {
case SYSLOG_LEVEL_QUIET: case SYSLOG_LEVEL_QUIET:
case SYSLOG_LEVEL_ERROR:
case SYSLOG_LEVEL_FATAL: case SYSLOG_LEVEL_FATAL:
case SYSLOG_LEVEL_INFO: case SYSLOG_LEVEL_ERROR:
case SYSLOG_LEVEL_NOTICE:
case SYSLOG_LEVEL_VERBOSE: case SYSLOG_LEVEL_VERBOSE:
case SYSLOG_LEVEL_DEBUG1: case SYSLOG_LEVEL_DEBUG1:
case SYSLOG_LEVEL_DEBUG2: case SYSLOG_LEVEL_DEBUG2:

18
log-server.c
View File

@ -36,14 +36,14 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: log-server.c,v 1.17 2000/09/12 20:53:10 markus Exp $"); RCSID("$OpenBSD: log-server.c,v 1.18 2001/01/07 11:28:05 markus Exp $");
#include <syslog.h> #include <syslog.h>
#include "packet.h" #include "packet.h"
#include "xmalloc.h" #include "xmalloc.h"
#include "ssh.h" #include "ssh.h"
static LogLevel log_level = SYSLOG_LEVEL_INFO; static LogLevel log_level = SYSLOG_LEVEL_NOTICE;
static int log_on_stderr = 0; static int log_on_stderr = 0;
static int log_facility = LOG_AUTH; static int log_facility = LOG_AUTH;
@ -58,9 +58,9 @@ log_init(char *av0, LogLevel level, SyslogFacility facility, int on_stderr)
{ {
switch (level) { switch (level) {
case SYSLOG_LEVEL_QUIET: case SYSLOG_LEVEL_QUIET:
case SYSLOG_LEVEL_ERROR:
case SYSLOG_LEVEL_FATAL: case SYSLOG_LEVEL_FATAL:
case SYSLOG_LEVEL_INFO: case SYSLOG_LEVEL_ERROR:
case SYSLOG_LEVEL_NOTICE:
case SYSLOG_LEVEL_VERBOSE: case SYSLOG_LEVEL_VERBOSE:
case SYSLOG_LEVEL_DEBUG1: case SYSLOG_LEVEL_DEBUG1:
case SYSLOG_LEVEL_DEBUG2: case SYSLOG_LEVEL_DEBUG2:
@ -133,15 +133,17 @@ do_log(LogLevel level, const char *fmt, va_list args)
if (level > log_level) if (level > log_level)
return; return;
switch (level) { switch (level) {
case SYSLOG_LEVEL_FATAL:
txt = "fatal";
pri = LOG_CRIT;
break;
case SYSLOG_LEVEL_ERROR: case SYSLOG_LEVEL_ERROR:
txt = "error"; txt = "error";
pri = LOG_ERR; pri = LOG_ERR;
break; break;
case SYSLOG_LEVEL_FATAL: case SYSLOG_LEVEL_NOTICE:
txt = "fatal"; pri = LOG_NOTICE;
pri = LOG_ERR;
break; break;
case SYSLOG_LEVEL_INFO:
case SYSLOG_LEVEL_VERBOSE: case SYSLOG_LEVEL_VERBOSE:
pri = LOG_INFO; pri = LOG_INFO;
break; break;

7
log.c
View File

@ -36,7 +36,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: log.c,v 1.12 2000/12/19 23:17:57 markus Exp $"); RCSID("$OpenBSD: log.c,v 1.13 2001/01/07 11:28:05 markus Exp $");
#include "ssh.h" #include "ssh.h"
#include "xmalloc.h" #include "xmalloc.h"
@ -71,7 +71,7 @@ log(const char *fmt,...)
{ {
va_list args; va_list args;
va_start(args, fmt); va_start(args, fmt);
do_log(SYSLOG_LEVEL_INFO, fmt, args); do_log(SYSLOG_LEVEL_NOTICE, fmt, args);
va_end(args); va_end(args);
} }
@ -209,12 +209,13 @@ static struct {
{ "QUIET", SYSLOG_LEVEL_QUIET }, { "QUIET", SYSLOG_LEVEL_QUIET },
{ "FATAL", SYSLOG_LEVEL_FATAL }, { "FATAL", SYSLOG_LEVEL_FATAL },
{ "ERROR", SYSLOG_LEVEL_ERROR }, { "ERROR", SYSLOG_LEVEL_ERROR },
{ "INFO", SYSLOG_LEVEL_INFO }, { "NOTICE", SYSLOG_LEVEL_NOTICE },
{ "VERBOSE", SYSLOG_LEVEL_VERBOSE }, { "VERBOSE", SYSLOG_LEVEL_VERBOSE },
{ "DEBUG", SYSLOG_LEVEL_DEBUG1 }, { "DEBUG", SYSLOG_LEVEL_DEBUG1 },
{ "DEBUG1", SYSLOG_LEVEL_DEBUG1 }, { "DEBUG1", SYSLOG_LEVEL_DEBUG1 },
{ "DEBUG2", SYSLOG_LEVEL_DEBUG2 }, { "DEBUG2", SYSLOG_LEVEL_DEBUG2 },
{ "DEBUG3", SYSLOG_LEVEL_DEBUG3 }, { "DEBUG3", SYSLOG_LEVEL_DEBUG3 },
{ "INFO", SYSLOG_LEVEL_NOTICE }, /* backward compatible */
{ NULL, 0 } { NULL, 0 }
}; };

4
readconf.c
View File

@ -12,7 +12,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: readconf.c,v 1.52 2000/12/27 12:30:19 markus Exp $"); RCSID("$OpenBSD: readconf.c,v 1.53 2001/01/07 11:28:05 markus Exp $");
#include "ssh.h" #include "ssh.h"
#include "readconf.h" #include "readconf.h"
@ -804,7 +804,7 @@ fill_default_options(Options * options)
if (options->user_hostfile2 == NULL) if (options->user_hostfile2 == NULL)
options->user_hostfile2 = SSH_USER_HOSTFILE2; options->user_hostfile2 = SSH_USER_HOSTFILE2;
if (options->log_level == (LogLevel) - 1) if (options->log_level == (LogLevel) - 1)
options->log_level = SYSLOG_LEVEL_INFO; options->log_level = SYSLOG_LEVEL_NOTICE;
/* options->proxy_command should not be set by default */ /* options->proxy_command should not be set by default */
/* options->user will be set in the main program if appropriate */ /* options->user will be set in the main program if appropriate */
/* options->hostname will be set in the main program if appropriate */ /* options->hostname will be set in the main program if appropriate */

4
servconf.c
View File

@ -10,7 +10,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: servconf.c,v 1.55 2000/12/19 23:17:57 markus Exp $"); RCSID("$OpenBSD: servconf.c,v 1.56 2001/01/07 11:28:06 markus Exp $");
#include "ssh.h" #include "ssh.h"
#include "servconf.h" #include "servconf.h"
@ -129,7 +129,7 @@ fill_default_server_options(ServerOptions *options)
if (options->log_facility == (SyslogFacility) (-1)) if (options->log_facility == (SyslogFacility) (-1))
options->log_facility = SYSLOG_FACILITY_AUTH; options->log_facility = SYSLOG_FACILITY_AUTH;
if (options->log_level == (LogLevel) (-1)) if (options->log_level == (LogLevel) (-1))
options->log_level = SYSLOG_LEVEL_INFO; options->log_level = SYSLOG_LEVEL_NOTICE;
if (options->rhosts_authentication == -1) if (options->rhosts_authentication == -1)
options->rhosts_authentication = 0; options->rhosts_authentication = 0;
if (options->rhosts_rsa_authentication == -1) if (options->rhosts_rsa_authentication == -1)

6
ssh.1
View File

@ -34,7 +34,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" .\"
.\" $OpenBSD: ssh.1,v 1.75 2001/01/04 22:35:32 djm Exp $ .\" $OpenBSD: ssh.1,v 1.76 2001/01/07 11:28:06 markus Exp $
.Dd September 25, 1999 .Dd September 25, 1999
.Dt SSH 1 .Dt SSH 1
.Os .Os
@ -814,8 +814,8 @@ Only the superuser can forward privileged ports.
Gives the verbosity level that is used when logging messages from Gives the verbosity level that is used when logging messages from
.Nm ssh . .Nm ssh .
The possible values are: The possible values are:
QUIET, FATAL, ERROR, INFO, VERBOSE and DEBUG. QUIET, FATAL, ERROR, NOTICE, VERBOSE and DEBUG.
The default is INFO. The default is NOTICE.
.It Cm NumberOfPasswordPrompts .It Cm NumberOfPasswordPrompts
Specifies the number of password prompts before giving up. Specifies the number of password prompts before giving up.
The argument to this keyword must be an integer. The argument to this keyword must be an integer.

4
ssh.h
View File

@ -12,7 +12,7 @@
* called by a name other than "ssh" or "Secure Shell". * called by a name other than "ssh" or "Secure Shell".
*/ */
/* RCSID("$OpenBSD: ssh.h,v 1.56 2000/12/19 23:17:58 markus Exp $"); */ /* RCSID("$OpenBSD: ssh.h,v 1.57 2001/01/07 11:28:06 markus Exp $"); */
#ifndef SSH_H #ifndef SSH_H
#define SSH_H #define SSH_H
@ -445,7 +445,7 @@ typedef enum {
SYSLOG_LEVEL_QUIET, SYSLOG_LEVEL_QUIET,
SYSLOG_LEVEL_FATAL, SYSLOG_LEVEL_FATAL,
SYSLOG_LEVEL_ERROR, SYSLOG_LEVEL_ERROR,
SYSLOG_LEVEL_INFO, SYSLOG_LEVEL_NOTICE,
SYSLOG_LEVEL_VERBOSE, SYSLOG_LEVEL_VERBOSE,
SYSLOG_LEVEL_DEBUG1, SYSLOG_LEVEL_DEBUG1,
SYSLOG_LEVEL_DEBUG2, SYSLOG_LEVEL_DEBUG2,

6
sshd.8
View File

@ -34,7 +34,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" .\"
.\" $OpenBSD: sshd.8,v 1.78 2001/01/04 22:35:32 djm Exp $ .\" $OpenBSD: sshd.8,v 1.79 2001/01/07 11:28:07 markus Exp $
.Dd September 25, 1999 .Dd September 25, 1999
.Dt SSHD 8 .Dt SSHD 8
.Os .Os
@ -492,8 +492,8 @@ The default is 600 (seconds).
Gives the verbosity level that is used when logging messages from Gives the verbosity level that is used when logging messages from
.Nm sshd . .Nm sshd .
The possible values are: The possible values are:
QUIET, FATAL, ERROR, INFO, VERBOSE and DEBUG. QUIET, FATAL, ERROR, NOTICE, VERBOSE and DEBUG.
The default is INFO. The default is NOTICE.
Logging with level DEBUG violates the privacy of users Logging with level DEBUG violates the privacy of users
and is not recommended. and is not recommended.
.It Cm MaxStartups .It Cm MaxStartups

4
sshd.c
View File

@ -40,7 +40,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: sshd.c,v 1.145 2001/01/04 22:25:58 markus Exp $"); RCSID("$OpenBSD: sshd.c,v 1.146 2001/01/07 11:28:07 markus Exp $");
#include "xmalloc.h" #include "xmalloc.h"
#include "rsa.h" #include "rsa.h"
@ -673,7 +673,7 @@ main(int ac, char **av)
* key (unless started from inetd) * key (unless started from inetd)
*/ */
log_init(__progname, log_init(__progname,
options.log_level == -1 ? SYSLOG_LEVEL_INFO : options.log_level, options.log_level == -1 ? SYSLOG_LEVEL_NOTICE : options.log_level,
options.log_facility == -1 ? SYSLOG_FACILITY_AUTH : options.log_facility, options.log_facility == -1 ? SYSLOG_FACILITY_AUTH : options.log_facility,
!silent && !inetd_flag); !silent && !inetd_flag);