Rename pty.[ch] -> sshpty.[ch] and login.[ch] to sshlogin.[ch] to avoid

header conflicts in portable; ok markus@

9 files changed, 22 insertions, 22 deletions

diff --git a/usr.bin/ssh/auth2.c b/usr.bin/ssh/auth2.c
index c96516a796e..fb9aa7402af 100644
--- a/usr.bin/ssh/auth2.c
+++ b/usr.bin/ssh/auth2.c
@@ -23,14 +23,14 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth2.c,v 1.44 2001/03/01 02:45:10 deraadt Exp $");
+RCSID("$OpenBSD: auth2.c,v 1.45 2001/03/04 01:46:29 djm Exp $");
 
 #include <openssl/evp.h>
 
 #include "ssh2.h"
 #include "xmalloc.h"
 #include "rsa.h"
-#include "pty.h"
+#include "sshpty.h"
 #include "packet.h"
 #include "buffer.h"
 #include "log.h"
diff --git a/usr.bin/ssh/serverloop.c b/usr.bin/ssh/serverloop.c
index 52d01dc38fc..cb53de20b37 100644
--- a/usr.bin/ssh/serverloop.c
+++ b/usr.bin/ssh/serverloop.c
@@ -35,14 +35,14 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: serverloop.c,v 1.53 2001/03/02 18:54:31 deraadt Exp $");
+RCSID("$OpenBSD: serverloop.c,v 1.54 2001/03/04 01:46:30 djm Exp $");
 
 #include "xmalloc.h"
 #include "packet.h"
 #include "buffer.h"
 #include "log.h"
 #include "servconf.h"
-#include "pty.h"
+#include "sshpty.h"
 #include "channels.h"
 #include "compat.h"
 #include "ssh1.h"
diff --git a/usr.bin/ssh/session.c b/usr.bin/ssh/session.c
index acca81a0e37..e8465dd2bb0 100644
--- a/usr.bin/ssh/session.c
+++ b/usr.bin/ssh/session.c
@@ -33,13 +33,13 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: session.c,v 1.58 2001/03/02 18:54:31 deraadt Exp $");
+RCSID("$OpenBSD: session.c,v 1.59 2001/03/04 01:46:30 djm Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"
 #include "ssh2.h"
 #include "xmalloc.h"
-#include "pty.h"
+#include "sshpty.h"
 #include "packet.h"
 #include "buffer.h"
 #include "mpaux.h"
@@ -53,7 +53,7 @@ RCSID("$OpenBSD: session.c,v 1.58 2001/03/02 18:54:31 deraadt Exp $");
 #include "pathnames.h"
 #include "log.h"
 #include "servconf.h"
-#include "login.h"
+#include "sshlogin.h"
 #include "serverloop.h"
 #include "canohost.h"
 #include "session.h"
diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c
index 9a18ea8009f..affd15dae39 100644
--- a/usr.bin/ssh/sshd.c
+++ b/usr.bin/ssh/sshd.c
@@ -40,7 +40,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.170 2001/02/28 21:21:41 markus Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.171 2001/03/04 01:46:30 djm Exp $");
 
 #include <openssl/dh.h>
 #include <openssl/bn.h>
@@ -51,7 +51,7 @@ RCSID("$OpenBSD: sshd.c,v 1.170 2001/02/28 21:21:41 markus Exp $");
 #include "ssh2.h"
 #include "xmalloc.h"
 #include "rsa.h"
-#include "pty.h"
+#include "sshpty.h"
 #include "packet.h"
 #include "mpaux.h"
 #include "log.h"
diff --git a/usr.bin/ssh/sshd/Makefile b/usr.bin/ssh/sshd/Makefile
index 45ec2c32dd3..ad5caeb0dd5 100644
--- a/usr.bin/ssh/sshd/Makefile
+++ b/usr.bin/ssh/sshd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.36 2001/03/03 23:59:40 markus Exp $
+#	$OpenBSD: Makefile,v 1.37 2001/03/04 01:46:30 djm Exp $
 
 .PATH:		${.CURDIR}/..
 
@@ -10,7 +10,7 @@ MAN=	sshd.8
 CFLAGS+=-DHAVE_LOGIN_CAP
 
 SRCS=	sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \
-	pty.c login.c servconf.c serverloop.c \
+	sshpty.c sshlogin.c servconf.c serverloop.c \
 	auth.c auth1.c auth2.c auth-options.c session.c dh.c \
 	auth-chall.c auth2-chall.c groupaccess.c
 
diff --git a/usr.bin/ssh/login.c b/usr.bin/ssh/sshlogin.c
index 76ea2277f6d..645ebb30d6d 100644
--- a/usr.bin/ssh/login.c
+++ b/usr.bin/ssh/sshlogin.c
@@ -39,11 +39,11 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: login.c,v 1.17 2001/01/21 19:05:51 markus Exp $");
+RCSID("$OpenBSD: sshlogin.c,v 1.1 2001/03/04 01:46:30 djm Exp $");
 
 #include <util.h>
 #include <utmp.h>
-#include "login.h"
+#include "sshlogin.h"
 #include "log.h"
 
 /*
diff --git a/usr.bin/ssh/login.h b/usr.bin/ssh/sshlogin.h
index 4630eedf449..7285bc23e60 100644
--- a/usr.bin/ssh/login.h
+++ b/usr.bin/ssh/sshlogin.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: login.h,v 1.2 2001/01/29 01:58:16 niklas Exp $	*/
+/*	$OpenBSD: sshlogin.h,v 1.1 2001/03/04 01:46:30 djm Exp $	*/
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -11,8 +11,8 @@
  * incompatible with the protocol description in the RFC file, it must be
  * called by a name other than "ssh" or "Secure Shell".
  */
-#ifndef LOGIN_H
-#define LOGIN_H
+#ifndef SSHLOGIN_H
+#define SSHLOGIN_H
 
 /*
  * Returns the time when the user last logged in.  Returns 0 if the
diff --git a/usr.bin/ssh/pty.c b/usr.bin/ssh/sshpty.c
index 1bb296a0e98..d0f255436ed 100644
--- a/usr.bin/ssh/pty.c
+++ b/usr.bin/ssh/sshpty.c
@@ -12,10 +12,10 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: pty.c,v 1.22 2001/02/08 19:30:52 itojun Exp $");
+RCSID("$OpenBSD: sshpty.c,v 1.1 2001/03/04 01:46:30 djm Exp $");
 
 #include <util.h>
-#include "pty.h"
+#include "sshpty.h"
 #include "log.h"
 
 /* Pty allocated with _getpty gets broken if we do I_PUSH:es to it. */
diff --git a/usr.bin/ssh/pty.h b/usr.bin/ssh/sshpty.h
index 13d8e6026cc..d7aac0f5559 100644
--- a/usr.bin/ssh/pty.h
+++ b/usr.bin/ssh/sshpty.h
@@ -12,10 +12,10 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* RCSID("$OpenBSD: pty.h,v 1.8 2000/09/07 20:27:52 deraadt Exp $"); */
+/* RCSID("$OpenBSD: sshpty.h,v 1.1 2001/03/04 01:46:30 djm Exp $"); */
 
-#ifndef PTY_H
-#define PTY_H
+#ifndef SSHPTY_H
+#define SSHPTY_H
 
 /*
  * Allocates and opens a pty.  Returns 0 if no pty could be allocated, or
@@ -44,4 +44,4 @@ pty_change_window_size(int ptyfd, int row, int col,
 
 void	pty_setowner(struct passwd *pw, const char *ttyname);
 
-#endif				/* PTY_H */
+#endif				/* SSHPTY_H */