summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-11-22 14:48:49 +1100
committerDamien Miller <djm@mindrot.org>2003-11-22 14:48:49 +1100
commit841b9f1aadbc18ad1e70d592c64e88782426bb53 (patch)
tree25b9ee006ca40b00b9b6acd332b3ad849b3d1700
parentce34674a9fe98fd8d9df6f54de8dd3fc707826a8 (diff)
- (djm) [sftp-int.c] Remove duplicated code from bogus sync
-rw-r--r--ChangeLog3
-rw-r--r--sftp-int.c1
2 files changed, 2 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5f9913adb..8ae79cb62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
7 Use permanently_set_uid for SIA, only define DISABLE_FD_PASSING when SIA 7 Use permanently_set_uid for SIA, only define DISABLE_FD_PASSING when SIA
8 is enabled, rely on SIA to check for locked accounts if enabled. ok djm@ 8 is enabled, rely on SIA to check for locked accounts if enabled. ok djm@
9 - (djm) [scp.c] Rename limitbw -> limit_rate to match upstreamed patch 9 - (djm) [scp.c] Rename limitbw -> limit_rate to match upstreamed patch
10 - (djm) [sftp-int.c] Remove duplicated code from bogus sync
10 11
1120031121 1220031121
12 - (djm) OpenBSD CVS Sync 13 - (djm) OpenBSD CVS Sync
@@ -1508,4 +1509,4 @@
1508 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 1509 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
1509 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 1510 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
1510 1511
1511$Id: ChangeLog,v 1.3123 2003/11/22 03:39:04 djm Exp $ 1512$Id: ChangeLog,v 1.3124 2003/11/22 03:48:49 djm Exp $
diff --git a/sftp-int.c b/sftp-int.c
index 599a3444d..edb475bbb 100644
--- a/sftp-int.c
+++ b/sftp-int.c
@@ -352,7 +352,6 @@ get_pathname(const char **cpp, char **path)
352 if (cp[i] == quot) { /* Found quote */ 352 if (cp[i] == quot) { /* Found quote */
353 i++; 353 i++;
354 (*path)[j] = '\0'; 354 (*path)[j] = '\0';
355 i++;
356 break; 355 break;
357 } 356 }
358 if (cp[i] == '\0') { /* End of string */ 357 if (cp[i] == '\0') { /* End of string */