diff options
Diffstat (limited to 'usr/src/cmd/ssh/include')
| -rw-r--r-- | usr/src/cmd/ssh/include/config.h | 3 | ||||
| -rw-r--r-- | usr/src/cmd/ssh/include/sshconnect.h | 41 | ||||
| -rw-r--r-- | usr/src/cmd/ssh/include/sshlogin.h | 29 | ||||
| -rw-r--r-- | usr/src/cmd/ssh/include/sys-tree.h | 5 | ||||
| -rw-r--r-- | usr/src/cmd/ssh/include/tildexpand.h | 21 |
5 files changed, 39 insertions, 60 deletions
diff --git a/usr/src/cmd/ssh/include/config.h b/usr/src/cmd/ssh/include/config.h index 963aee5bb2..978559f2d0 100644 --- a/usr/src/cmd/ssh/include/config.h +++ b/usr/src/cmd/ssh/include/config.h @@ -28,9 +28,6 @@ extern "C" { /* SCO workaround */ /* #undef BROKEN_SYS_TERMIO_H */ -/* Define if you have SecureWare-based protected password database */ -/* #undef HAVE_SECUREWARE */ - /* If your header files don't define LOGIN_PROGRAM, then use this (detected) */ /* from environment and PATH */ #define LOGIN_PROGRAM_FALLBACK "/usr/bin/login" 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) diff --git a/usr/src/cmd/ssh/include/sshlogin.h b/usr/src/cmd/ssh/include/sshlogin.h index 23ced22a9c..e7d2ee7c89 100644 --- a/usr/src/cmd/ssh/include/sshlogin.h +++ b/usr/src/cmd/ssh/include/sshlogin.h @@ -1,15 +1,3 @@ -/* $OpenBSD: sshlogin.h,v 1.4 2002/08/29 15:57:25 stevesk Exp $ */ - -#ifndef _SSHLOGIN_H -#define _SSHLOGIN_H - -#pragma ident "%Z%%M% %I% %E% SMI" - -#ifdef __cplusplus -extern "C" { -#endif - - /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -22,10 +10,19 @@ extern "C" { * called by a name other than "ssh" or "Secure Shell". */ /* - * Copyright 2003 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ +/* $OpenBSD: sshlogin.h,v 1.4 2002/08/29 15:57:25 stevesk Exp $ */ + +#ifndef _SSHLOGIN_H +#define _SSHLOGIN_H + +#ifdef __cplusplus +extern "C" { +#endif + void record_login(pid_t pid, const char *ttyname, const char *progname, const char *user); @@ -36,12 +33,6 @@ record_logout(pid_t pid, const char *ttyname, const char *progname, u_long get_last_login_time(uid_t uid, const char *logname, char *buf, u_int bufsize); -#ifdef LOGIN_NEEDS_UTMPX -void -record_utmp_only(pid_t pid, const char *ttyname, const char *user, - const char *host, struct sockaddr *addr); -#endif - #ifdef __cplusplus } #endif diff --git a/usr/src/cmd/ssh/include/sys-tree.h b/usr/src/cmd/ssh/include/sys-tree.h index 93d55e4a2c..fbd31a8f7c 100644 --- a/usr/src/cmd/ssh/include/sys-tree.h +++ b/usr/src/cmd/ssh/include/sys-tree.h @@ -27,8 +27,6 @@ #ifndef _SYS_TREE_H #define _SYS_TREE_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __cplusplus extern "C" { #endif @@ -384,8 +382,7 @@ struct type *name##_RB_REMOVE(struct name *, struct type *); \ struct type *name##_RB_INSERT(struct name *, struct type *); \ struct type *name##_RB_FIND(struct name *, struct type *); \ struct type *name##_RB_NEXT(struct name *, struct type *); \ -struct type *name##_RB_MINMAX(struct name *, int); \ - \ +struct type *name##_RB_MINMAX(struct name *, int); /* Main rb operation. * Moves node close to the key of elm to top diff --git a/usr/src/cmd/ssh/include/tildexpand.h b/usr/src/cmd/ssh/include/tildexpand.h index c81ceb9c7b..22e95b7779 100644 --- a/usr/src/cmd/ssh/include/tildexpand.h +++ b/usr/src/cmd/ssh/include/tildexpand.h @@ -1,15 +1,3 @@ -/* $OpenBSD: tildexpand.h,v 1.4 2001/06/26 17:27:25 markus Exp $ */ - -#ifndef _TILDEXPAND_H -#define _TILDEXPAND_H - -#pragma ident "%Z%%M% %I% %E% SMI" - -#ifdef __cplusplus -extern "C" { -#endif - - /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -22,6 +10,15 @@ extern "C" { * called by a name other than "ssh" or "Secure Shell". */ +/* $OpenBSD: tildexpand.h,v 1.4 2001/06/26 17:27:25 markus Exp $ */ + +#ifndef _TILDEXPAND_H +#define _TILDEXPAND_H + +#ifdef __cplusplus +extern "C" { +#endif + char *tilde_expand_filename(const char *, uid_t); #ifdef __cplusplus |