- (bal) Markus' blessing to rename login.[ch] -> sshlogin.[ch] and

   pty.[ch] -> sshpty.[ch]

10 files changed, 13 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 032d064b3..be687ffcb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20010219
+ - (bal) Markus' blessing to rename login.[ch] -> sshlogin.[ch] and
+   pty.[ch] -> sshpty.[ch]
+
 20010218
  - (bal) Patch for fix FCHMOD reference in ftp-client.c by Tim Rice 
    <tim@multitalents.net> 
@@ -4038,4 +4042,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.800 2001/02/18 12:50:38 djm Exp $
+$Id: ChangeLog,v 1.801 2001/02/18 19:13:33 mouring Exp $
diff --git a/Makefile.in b/Makefile.in
index ed48ba101..2215d78af 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.154 2001/02/18 04:23:10 djm Exp $
+# $Id: Makefile.in,v 1.155 2001/02/18 19:13:33 mouring Exp $
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
@@ -48,7 +48,7 @@ LIBSSH_OBJS=atomicio.o authfd.o authfile.o bufaux.o buffer.o canohost.o channels
 
 SSHOBJS= ssh.o sshconnect.o sshconnect1.o sshconnect2.o log-client.o readconf.o clientloop.o
 
-SSHDOBJS= sshd.o auth.o auth1.o auth2.o auth-chall.o auth2-chall.o auth-rhosts.o auth-options.o auth-krb4.o auth-pam.o auth2-pam.o auth-passwd.o auth-rsa.o auth-rh-rsa.o auth-sia.o dh.o pty.o log-server.o login.o loginrec.o servconf.o serverloop.o md5crypt.o session.o groupaccess.o
+SSHDOBJS= sshd.o auth.o auth1.o auth2.o auth-chall.o auth2-chall.o auth-rhosts.o auth-options.o auth-krb4.o auth-pam.o auth2-pam.o auth-passwd.o auth-rsa.o auth-rh-rsa.o auth-sia.o dh.o sshpty.o log-server.o sshlogin.o loginrec.o servconf.o serverloop.o md5crypt.o session.o groupaccess.o
 
 TROFFMAN        = scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1
 CATMAN          = scp.0 ssh-add.0 ssh-agent.0 ssh-keygen.0 ssh-keyscan.0 ssh.0 sshd.0 sftp-server.0 sftp.0
diff --git a/auth2.c b/auth2.c
index cd3886dcc..e90105066 100644
--- a/auth2.c
+++ b/auth2.c
@@ -30,7 +30,7 @@ RCSID("$OpenBSD: auth2.c,v 1.42 2001/02/13 22:49:40 markus Exp $");
 #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/serverloop.c b/serverloop.c
index 613f5181d..79dbe7909 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -42,7 +42,7 @@ RCSID("$OpenBSD: serverloop.c,v 1.49 2001/02/15 23:19:59 markus Exp $");
 #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/session.c b/session.c
index b84f19ea0..e862c6504 100644
--- a/session.c
+++ b/session.c
@@ -39,7 +39,7 @@ RCSID("$OpenBSD: session.c,v 1.56 2001/02/16 14:03:43 markus Exp $");
 #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.56 2001/02/16 14:03:43 markus 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/sshd.c b/sshd.c
index be046ea65..62e83d2df 100644
--- a/sshd.c
+++ b/sshd.c
@@ -51,7 +51,7 @@ RCSID("$OpenBSD: sshd.c,v 1.167 2001/02/12 23:26:20 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/login.c b/sshlogin.c
index 3e9af193d..3e9af193d 100644
--- a/login.c
+++ b/sshlogin.c
diff --git a/login.h b/sshlogin.h
index 4630eedf4..4630eedf4 100644
--- a/login.h
+++ b/sshlogin.h
diff --git a/pty.c b/sshpty.c
index 4b9370ce5..aca6f027c 100644
--- a/pty.c
+++ b/sshpty.c
@@ -18,7 +18,7 @@ RCSID("$OpenBSD: pty.c,v 1.22 2001/02/08 19:30:52 itojun Exp $");
 # include <util.h>
 #endif /* HAVE_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/pty.h b/sshpty.h
index 13d8e6026..13d8e6026 100644
--- a/pty.h
+++ b/sshpty.h