summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2003-06-22 12:33:27 +1000
committerDarren Tucker <dtucker@zip.com.au>2003-06-22 12:33:27 +1000
commite0194e52ca533eef87e3799ff987f83eab7eadcf (patch)
treefc3fcd9eff34f76a03d0790bf17ca4446701269b
parent50cea67222ce5d5d5d334c8dd8eb5885d056ba04 (diff)
- (dtucker) OpenBSD CVS Sync (regress/)
- markus@cvs.openbsd.org 2003/06/21 09:14:05 [reconfigure.sh] missing $SUDO; from dtucker@zip.com.au - (dtucker) [regress/authorized_keys_root] Remove temp data file from CVS.
-rw-r--r--ChangeLog9
-rw-r--r--regress/authorized_keys_root2
-rw-r--r--regress/reconfigure.sh4
3 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 184b747d7..078ff6e20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
120030622
2 - (dtucker) OpenBSD CVS Sync (regress/)
3 - markus@cvs.openbsd.org 2003/06/21 09:14:05
4 [reconfigure.sh]
5 missing $SUDO; from dtucker@zip.com.au
6 - (dtucker) [regress/authorized_keys_root] Remove temp data file from CVS.
7
120030618 820030618
2 - (djm) OpenBSD CVS Sync 9 - (djm) OpenBSD CVS Sync
3 - markus@cvs.openbsd.org 2003/06/12 07:57:38 10 - markus@cvs.openbsd.org 2003/06/12 07:57:38
@@ -560,4 +567,4 @@
560 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 567 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
561 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 568 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
562 569
563$Id: ChangeLog,v 1.2816 2003/06/18 12:45:34 dtucker Exp $ 570$Id: ChangeLog,v 1.2817 2003/06/22 02:33:27 dtucker Exp $
diff --git a/regress/authorized_keys_root b/regress/authorized_keys_root
deleted file mode 100644
index 328537120..000000000
--- a/regress/authorized_keys_root
+++ /dev/null
@@ -1,2 +0,0 @@
1ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAt6ttBacbgvLPsF1VWWfT51t55/5Mj62Xp8EaoH5SNSaLiGIgrrja077lKEept75U4uKFUYU5JJX9GPE9A7Y43LXv+/A6Jm4rEj/U0s4H8tf0UmzVC3t6xh0sRK0hYVNILyoHnIAgdY8CmOiybw7p6DxJY8MRAehD3n9+kFcachU= root@xenon
21024 35 132789427207755621599908461558918671787816692978751485815532032934821830960131244604702969298486352138126114080367609979552547448841583955126231410604842765726397407176910594168641969541792069550006878863592030567875913190224374005367884774859544943329148178663694126456638431428703289837638970464685771819219 root@xenon
diff --git a/regress/reconfigure.sh b/regress/reconfigure.sh
index 1de846a7e..4315f0a40 100644
--- a/regress/reconfigure.sh
+++ b/regress/reconfigure.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: reconfigure.sh,v 1.1 2003/06/12 15:43:32 markus Exp $ 1# $OpenBSD: reconfigure.sh,v 1.2 2003/06/21 09:14:05 markus Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="simple connect after reconfigure" 4tid="simple connect after reconfigure"
@@ -8,7 +8,7 @@ SSHD=/usr/sbin/sshd
8 8
9start_sshd 9start_sshd
10 10
11kill -HUP `cat $PIDFILE` 11$SUDO kill -HUP `cat $PIDFILE`
12sleep 1 12sleep 1
13 13
14trace "wait for sshd to restart" 14trace "wait for sshd to restart"