summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--sftp-server-main.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 45429881b..4edfb8fa6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
3 chroot. Allows ChrootDirectory to work with selinux support compiled in 3 chroot. Allows ChrootDirectory to work with selinux support compiled in
4 but not enabled. Using it with selinux enabled will require some selinux 4 but not enabled. Using it with selinux enabled will require some selinux
5 support inside the chroot. "looks sane" djm@ 5 support inside the chroot. "looks sane" djm@
6 - (djm) Fix RCS ident in sftp-server-main.c
6 7
720080315 820080315
8 - (djm) [regress/test-exec.sh] Quote putty-related variables in case they are 9 - (djm) [regress/test-exec.sh] Quote putty-related variables in case they are
@@ -3771,4 +3772,4 @@
3771 OpenServer 6 and add osr5bigcrypt support so when someone migrates 3772 OpenServer 6 and add osr5bigcrypt support so when someone migrates
3772 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 3773 passwords between UnixWare and OpenServer they will still work. OK dtucker@
3773 3774
3774$Id: ChangeLog,v 1.4880 2008/03/26 20:27:20 dtucker Exp $ 3775$Id: ChangeLog,v 1.4881 2008/03/26 23:45:49 djm Exp $
diff --git a/sftp-server-main.c b/sftp-server-main.c
index 1d2ea6220..2b14569e4 100644
--- a/sftp-server-main.c
+++ b/sftp-server-main.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: */ 1/* $OpenBSD: sftp-server-main.c,v 1.3 2008/03/26 23:44:41 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2008 Markus Friedl. All rights reserved. 3 * Copyright (c) 2008 Markus Friedl. All rights reserved.
4 * 4 *