6635417 more memory leaks in SunSSH

6687441 typo in comment for record_login() in sshlogin.c
6686336 ssh source code should use FD_CLOEXEC macro instead of 1
6839514 SSH's debug3() says login while it should mention logout
6820920 Sun SSH daemon crashes if /usr/bin/locale isn't present
6368560 extra backslashes in RB_PROTOTYPE
6496644 deprecate UseLogin and remove code supporting this feature from sshd(1m)
6445661 confusing debug message printed at debug level 3
6531556 ssh "You don't exist, go away" message is not helpful and rude
6670875 remove SECUREWARE code from SunSSH
6663391 confusing message in sshconnect1.c when all authentication methods fail
6822495 unlocalized message "illegal option" is seen with ssh command
6545293 ssh: ~? help and man page do not quite match for definition of ~B
6656381 ssh can crash when using libumem and given a bad local forwarding specification

1 files changed, 19 insertions, 22 deletions

diff --git a/usr/src/cmd/ssh/include/sshconnect.h b/usr/src/cmd/ssh/include/sshconnect.h
index 60404e13e5..74eaccfbbc 100644
--- a/usr/src/cmd/ssh/include/sshconnect.h
+++ b/usr/src/cmd/ssh/include/sshconnect.h
@@ -1,20 +1,4 @@
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-/*	$OpenBSD: sshconnect.h,v 1.17 2002/06/19 00:27:55 deraadt Exp $	*/
-
-#ifndef	_SSHCONNECT_H
-#define	_SSHCONNECT_H
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,6 +21,19 @@ extern "C" {
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+/*	$OpenBSD: sshconnect.h,v 1.17 2002/06/19 00:27:55 deraadt Exp $	*/
+
+#ifndef	_SSHCONNECT_H
+#define	_SSHCONNECT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 typedef struct Sensitive Sensitive;
 struct Sensitive {
@@ -46,11 +43,11 @@ struct Sensitive {
 };
 
 int
-ssh_connect(const char *, struct sockaddr_storage *, u_short, int, int,
+ssh_connect(const char *, struct sockaddr_storage *, ushort_t, int, int,
     int, const char *);
 
 void
-ssh_login(Sensitive *, const char *, struct sockaddr *, struct passwd *);
+ssh_login(Sensitive *, const char *, struct sockaddr *, char *);
 
 int	 verify_host_key(char *, struct sockaddr *, Key *);
 int	 accept_host_key(char *, struct sockaddr *, Key *);
@@ -67,15 +64,15 @@ void	 ssh_put_password(char *);
 /*
  * Macros to raise/lower permissions.
  */
-#define PRIV_START do {				\
+#define	PRIV_START do {				\
 	int save_errno = errno;			\
-	(void)seteuid(original_effective_uid);	\
+	(void) seteuid(original_effective_uid);	\
 	errno = save_errno;			\
 } while (0)
 
-#define PRIV_END do {				\
+#define	PRIV_END do {				\
 	int save_errno = errno;			\
-	(void)seteuid(original_real_uid);	\
+	(void) seteuid(original_real_uid);	\
 	errno = save_errno;			\
 } while (0)