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

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

diff --git a/ChangeLog b/ChangeLog
index 0bf86658793660266aad1087e79e94177df6306e..ee9946c410b68f3cc113d0f098f9321475793e8d 100644 (file)
--- 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> 

diff --git a/Makefile.in b/Makefile.in
index 174ee1acb1a6e377c6a71f2558f2326315cb3af0..ef50d9883f821e2829853aca26c91679192cf94b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -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 cd3886dcc16dfb223b1057efc16925474699d0de..e9010506608f8e07c2e7d46de3aa3d29e80819a4 100644 (file)
--- 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 613f5181da159d26e81eb08c5cd935391c27f2c1..79dbe7909979d345735306594c1d52e8efd0bb29 100644 (file)
--- 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 b84f19ea0dcecb7ebd5d8986156d4c54e72d3543..e862c6504acb8f7df4a364c40f46864800d471ee 100644 (file)
--- 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 be046ea65f56c6933ca0e0b2d72213fdb02b4116..62e83d2dfe00264333473852c1c6dfb13b1b21e8 100644 (file)
--- 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
similarity index 100%
rename from login.c
rename to sshlogin.c

diff --git a/login.h b/sshlogin.h
similarity index 100%
rename from login.h
rename to sshlogin.h

diff --git a/pty.c b/sshpty.c
similarity index 99%
rename from pty.c
rename to sshpty.c
index 4b9370ce57f59bd84ce2d42fc4479125c5357d7e..aca6f027cb978e4842941d1ab9701a07c7388d18 100644 (file)
--- 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
similarity index 100%
rename from pty.h
rename to sshpty.h