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 a99195e5d..16898e192 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
120001221
2 - (stevesk) OpenBSD CVS updates:
3 - markus@cvs.openbsd.org 2000/12/19 15:43:45
4 [authfile.c channels.c sftp-server.c ssh-agent.c]
5 remove() -> unlink() for consistency
6 - markus@cvs.openbsd.org 2000/12/19 15:48:09
7 [ssh-keyscan.c]
8 replace <ssl/x.h> with <openssl/x.h>
9 - markus@cvs.openbsd.org 2000/12/17 02:33:40
10 [uidswap.c]
11 typo; from wsanchez@apple.com
12
120001220 1320001220
2 - (djm) Workaround PAM inconsistencies between Solaris derived PAM code 14 - (djm) Workaround PAM inconsistencies between Solaris derived PAM code
3 and Linux-PAM. Based on report and fix from Andrew Morgan 15 and Linux-PAM. Based on report and fix from Andrew Morgan
diff --git a/authfile.c b/authfile.c
index 986b10f6b..86dcdee28 100644
--- a/authfile.c
+++ b/authfile.c
@@ -36,7 +36,7 @@
36 */ 36 */
37 37
38#include "includes.h" 38#include "includes.h"
39RCSID("$OpenBSD: authfile.c,v 1.21 2000/11/12 19:50:37 markus Exp $"); 39RCSID("$OpenBSD: authfile.c,v 1.22 2000/12/19 22:43:44 markus Exp $");
40 40
41#include <openssl/bn.h> 41#include <openssl/bn.h>
42#include <openssl/dsa.h> 42#include <openssl/dsa.h>
diff --git a/channels.c b/channels.c
index 49023a278..8c0a7a455 100644
--- a/channels.c
+++ b/channels.c
@@ -40,7 +40,7 @@
40 */ 40 */
41 41
42#include "includes.h" 42#include "includes.h"
43RCSID("$OpenBSD: channels.c,v 1.75 2000/12/05 20:34:09 markus Exp $"); 43RCSID("$OpenBSD: channels.c,v 1.76 2000/12/19 22:43:44 markus Exp $");
44 44
45#include "ssh.h" 45#include "ssh.h"
46#include "packet.h" 46#include "packet.h"
diff --git a/sftp-server.c b/sftp-server.c
index 5be2d4db4..8a77e58c2 100644
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -22,7 +22,7 @@
22 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 22 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23 */ 23 */
24#include "includes.h" 24#include "includes.h"
25RCSID("$OpenBSD: sftp-server.c,v 1.7 2000/12/09 14:08:27 markus Exp $"); 25RCSID("$OpenBSD: sftp-server.c,v 1.8 2000/12/19 22:43:44 markus Exp $");
26 26
27#include "ssh.h" 27#include "ssh.h"
28#include "buffer.h" 28#include "buffer.h"
@@ -854,7 +854,7 @@ process_remove(void)
854 id = get_int(); 854 id = get_int();
855 name = get_string(NULL); 855 name = get_string(NULL);
856 TRACE("remove id %d name %s", id, name); 856 TRACE("remove id %d name %s", id, name);
857 ret = remove(name); 857 ret = unlink(name);
858 status = (ret == -1) ? errno_to_portable(errno) : SSH_FX_OK; 858 status = (ret == -1) ? errno_to_portable(errno) : SSH_FX_OK;
859 send_status(id, status); 859 send_status(id, status);
860 xfree(name); 860 xfree(name);
diff --git a/ssh-agent.c b/ssh-agent.c
index c5e4447c4..00e813218 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-agent.c,v 1.43 2000/12/13 23:25:44 markus Exp $ */ 1/* $OpenBSD: ssh-agent.c,v 1.44 2000/12/19 22:43:45 markus Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -37,7 +37,7 @@
37 */ 37 */
38 38
39#include "includes.h" 39#include "includes.h"
40RCSID("$OpenBSD: ssh-agent.c,v 1.43 2000/12/13 23:25:44 markus Exp $"); 40RCSID("$OpenBSD: ssh-agent.c,v 1.44 2000/12/19 22:43:45 markus Exp $");
41 41
42#include "ssh.h" 42#include "ssh.h"
43#include "rsa.h" 43#include "rsa.h"
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 81c8e0b1e..bd20fea2d 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -8,7 +8,7 @@
8 */ 8 */
9 9
10#include "includes.h" 10#include "includes.h"
11RCSID("$OpenBSD: ssh-keyscan.c,v 1.4 2000/12/13 23:26:53 markus Exp $"); 11RCSID("$OpenBSD: ssh-keyscan.c,v 1.5 2000/12/19 22:48:08 markus Exp $");
12 12
13#ifdef HAVE_SYS_QUEUE_H 13#ifdef HAVE_SYS_QUEUE_H
14#include <sys/queue.h> 14#include <sys/queue.h>
diff --git a/uidswap.c b/uidswap.c
index 76cbd6c40..19fc11b92 100644
--- a/uidswap.c
+++ b/uidswap.c
@@ -12,7 +12,7 @@
12 */ 12 */
13 13
14#include "includes.h" 14#include "includes.h"
15RCSID("$OpenBSD: uidswap.c,v 1.9 2000/09/07 20:27:55 deraadt Exp $"); 15RCSID("$OpenBSD: uidswap.c,v 1.10 2000/12/17 09:33:40 markus Exp $");
16 16
17#include "ssh.h" 17#include "ssh.h"
18#include "uidswap.h" 18#include "uidswap.h"
@@ -50,7 +50,7 @@ temporarily_use_uid(uid_t uid)
50 /* Set the effective uid to the given (unprivileged) uid. */ 50 /* Set the effective uid to the given (unprivileged) uid. */
51 if (seteuid(uid) == -1) 51 if (seteuid(uid) == -1)
52 debug("seteuid %u: %.100s", (u_int) uid, strerror(errno)); 52 debug("seteuid %u: %.100s", (u_int) uid, strerror(errno));
53#else /* SAVED_IDS_WORK_WITH_SETUID */ 53#else /* SAVED_IDS_WORK_WITH_SETEUID */
54 /* Propagate the privileged uid to all of our uids. */ 54 /* Propagate the privileged uid to all of our uids. */
55 if (setuid(geteuid()) < 0) 55 if (setuid(geteuid()) < 0)
56 debug("setuid %u: %.100s", (u_int) geteuid(), strerror(errno)); 56 debug("setuid %u: %.100s", (u_int) geteuid(), strerror(errno));