diff options
| author | Colin Watson <cjwatson@debian.org> | 2004-03-01 02:25:32 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2004-03-01 02:25:32 +0000 |
| commit | ea8116a11e3de70036dbc665ccb0d486cf89cac9 (patch) | |
| tree | d73ccdff78d8608e156465af42e6a1b3527fb2d6 /regress/sftp-batch.sh | |
| parent | e39b311381a5609cc05acf298c42fba196dc524b (diff) | |
| parent | f5bda272678ec6dccaa5f29379cf60cb855018e8 (diff) | |
Merge 3.8p1 to the trunk. This builds and runs, but I haven't tested it
extensively yet.
ProtocolKeepAlives is now just a compatibility alias for
ServerAliveInterval.
Diffstat (limited to 'regress/sftp-batch.sh')
| -rw-r--r-- | regress/sftp-batch.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/regress/sftp-batch.sh b/regress/sftp-batch.sh index f648eae80..365c47cfc 100644 --- a/regress/sftp-batch.sh +++ b/regress/sftp-batch.sh | |||
| @@ -1,11 +1,11 @@ | |||
| 1 | # $OpenBSD: sftp-batch.sh,v 1.2 2003/01/10 07:52:41 djm Exp $ | 1 | # $OpenBSD: sftp-batch.sh,v 1.3 2004/01/13 09:49:06 djm Exp $ |
| 2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
| 3 | 3 | ||
| 4 | tid="sftp batchfile" | 4 | tid="sftp batchfile" |
| 5 | 5 | ||
| 6 | DATA=/bin/ls${EXEEXT} | 6 | DATA=/bin/ls${EXEEXT} |
| 7 | COPY=${OBJ}/copy | 7 | COPY=${OBJ}/copy |
| 8 | BATCH=${OBJ}/sftp-batch.tmp | 8 | BATCH=${OBJ}/sftp.bb |
| 9 | 9 | ||
| 10 | rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd ${BATCH}.* | 10 | rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd ${BATCH}.* |
| 11 | 11 | ||