summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog12
-rw-r--r--authfile.c2
-rw-r--r--channels.c2
-rw-r--r--sftp-server.c4
-rw-r--r--ssh-agent.c4
-rw-r--r--ssh-keyscan.c2
-rw-r--r--uidswap.c4
7 files changed, 21 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index a99195e5..16898e19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+20001221
+ - (stevesk) OpenBSD CVS updates:
+ - markus@cvs.openbsd.org 2000/12/19 15:43:45
+ [authfile.c channels.c sftp-server.c ssh-agent.c]
+ remove() -> unlink() for consistency
+ - markus@cvs.openbsd.org 2000/12/19 15:48:09
+ [ssh-keyscan.c]
+ replace <ssl/x.h> with <openssl/x.h>
+ - markus@cvs.openbsd.org 2000/12/17 02:33:40
+ [uidswap.c]
+ typo; from wsanchez@apple.com
+
20001220
- (djm) Workaround PAM inconsistencies between Solaris derived PAM code
and Linux-PAM. Based on report and fix from Andrew Morgan
diff --git a/authfile.c b/authfile.c
index 986b10f6..86dcdee2 100644
--- a/authfile.c
+++ b/authfile.c
@@ -36,7 +36,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: authfile.c,v 1.21 2000/11/12 19:50:37 markus Exp $");
+RCSID("$OpenBSD: authfile.c,v 1.22 2000/12/19 22:43:44 markus Exp $");
#include <openssl/bn.h>
#include <openssl/dsa.h>
diff --git a/channels.c b/channels.c
index 49023a27..8c0a7a45 100644
--- a/channels.c
+++ b/channels.c
@@ -40,7 +40,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: channels.c,v 1.75 2000/12/05 20:34:09 markus Exp $");
+RCSID("$OpenBSD: channels.c,v 1.76 2000/12/19 22:43:44 markus Exp $");
#include "ssh.h"
#include "packet.h"
diff --git a/sftp-server.c b/sftp-server.c
index 5be2d4db..8a77e58c 100644
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -22,7 +22,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "includes.h"
-RCSID("$OpenBSD: sftp-server.c,v 1.7 2000/12/09 14:08:27 markus Exp $");
+RCSID("$OpenBSD: sftp-server.c,v 1.8 2000/12/19 22:43:44 markus Exp $");
#include "ssh.h"
#include "buffer.h"
@@ -854,7 +854,7 @@ process_remove(void)
id = get_int();
name = get_string(NULL);
TRACE("remove id %d name %s", id, name);
- ret = remove(name);
+ ret = unlink(name);
status = (ret == -1) ? errno_to_portable(errno) : SSH_FX_OK;
send_status(id, status);
xfree(name);
diff --git a/ssh-agent.c b/ssh-agent.c
index c5e4447c..00e81321 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-agent.c,v 1.43 2000/12/13 23:25:44 markus Exp $ */
+/* $OpenBSD: ssh-agent.c,v 1.44 2000/12/19 22:43:45 markus Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -37,7 +37,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: ssh-agent.c,v 1.43 2000/12/13 23:25:44 markus Exp $");
+RCSID("$OpenBSD: ssh-agent.c,v 1.44 2000/12/19 22:43:45 markus Exp $");
#include "ssh.h"
#include "rsa.h"
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 81c8e0b1..bd20fea2 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -8,7 +8,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: ssh-keyscan.c,v 1.4 2000/12/13 23:26:53 markus Exp $");
+RCSID("$OpenBSD: ssh-keyscan.c,v 1.5 2000/12/19 22:48:08 markus Exp $");
#ifdef HAVE_SYS_QUEUE_H
#include <sys/queue.h>
diff --git a/uidswap.c b/uidswap.c
index 76cbd6c4..19fc11b9 100644
--- a/uidswap.c
+++ b/uidswap.c
@@ -12,7 +12,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: uidswap.c,v 1.9 2000/09/07 20:27:55 deraadt Exp $");
+RCSID("$OpenBSD: uidswap.c,v 1.10 2000/12/17 09:33:40 markus Exp $");
#include "ssh.h"
#include "uidswap.h"
@@ -50,7 +50,7 @@ temporarily_use_uid(uid_t uid)
/* Set the effective uid to the given (unprivileged) uid. */
if (seteuid(uid) == -1)
debug("seteuid %u: %.100s", (u_int) uid, strerror(errno));
-#else /* SAVED_IDS_WORK_WITH_SETUID */
+#else /* SAVED_IDS_WORK_WITH_SETEUID */
/* Propagate the privileged uid to all of our uids. */
if (setuid(geteuid()) < 0)
debug("setuid %u: %.100s", (u_int) geteuid(), strerror(errno));