[Cvs-cvs] ccvs/src ChangeLog import.c sanity.sh

[Larry Jones]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Larry Jones <scjones>   07/03/04 00:27:56

Modified files:
        src            : ChangeLog import.c sanity.sh 

Log message:
        Merge changes from cvs1-11-x-branch.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3502&r2=1.3503
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/import.c?cvsroot=cvs&r1=1.178&r2=1.179
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/sanity.sh?cvsroot=cvs&r1=1.1171&r2=1.1172

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3502
retrieving revision 1.3503
diff -u -b -r1.3502 -r1.3503
--- ChangeLog   19 Dec 2006 04:24:03 -0000      1.3502
+++ ChangeLog   4 Mar 2007 00:27:56 -0000       1.3503
@@ -1,3 +1,8 @@
+2007-03-01  Larry Jones  <address@hidden>
+
+       * import.c (import_descend_dir): Correct error message.
+       * sanity.sh (pserver-3a): New test.
+
 2006-12-18  Mark D. Baushke  <address@hidden>
 
        * cvs.h (checksum_t): New typedef union for md5 checksum

Index: import.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/import.c,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -b -r1.178 -r1.179
--- import.c    4 May 2006 14:55:32 -0000       1.178
+++ import.c    4 Mar 2007 00:27:56 -0000       1.179
@@ -1811,8 +1811,8 @@
     if (CVS_CHDIR (dir) < 0)
     {
        ierrno = errno;
-       fperrmsg (logfp, 0, ierrno, "ERROR: cannot chdir to %s", repository);
-       error (0, ierrno, "ERROR: cannot chdir to %s", repository);
+       fperrmsg (logfp, 0, ierrno, "ERROR: cannot chdir to %s", dir);
+       error (0, ierrno, "ERROR: cannot chdir to %s", dir);
        err = 1;
        goto out;
     }

Index: sanity.sh
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/sanity.sh,v
retrieving revision 1.1171
retrieving revision 1.1172
diff -u -b -r1.1171 -r1.1172
--- sanity.sh   14 Sep 2006 15:33:41 -0000      1.1171
+++ sanity.sh   4 Mar 2007 00:27:56 -0000       1.1172
@@ -31403,6 +31403,16 @@
 END AUTH REQUEST
 EOF
 
+           dotest_fail pserver-3a "${testcvs} --allow-root=${CVSROOT_DIRNAME} 
pserver" \
+"$CPROG pserver: ${CVSROOT_DIRNAME}XXX: no such repository
+I HATE YOU" <<EOF
+BEGIN AUTH REQUEST
+${CVSROOT_DIRNAME}XXX
+testme
+Ay::'d
+END AUTH REQUEST
+EOF
+
            # Confirm that not sending a newline during auth cannot constitute
            # a denial-of-service attack.  This assumes that PATH_MAX is less
            # than 65536 bytes.  If PATH_MAX is larger than 65535 bytes, this