[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

[Török Edvin]

The following commit has been merged in the debian/unstable branch:
commit 92740b73838afadf4758e385843d0ca3db43e12d
Author: Török Edvin <edwin at clamav.net>
Date:   Wed Jul 15 16:25:27 2009 +0300

    Fix unit tests when run as root (bb #1635).

diff --git a/ChangeLog b/ChangeLog
index d58e69e..74afa63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jul 15 16:25:00 EEST 2009 (edwin)
+-------------------------------------
+ * unit_tests/check_clamd.c: fix unit tests when run as root (bb #1635).
+
 Wed Jul 15 12:50:50 CEST 2009 (acab)
 ------------------------------------
  * libclamav/ishield.c: fix distcheck, patch from edwin
diff --git a/unit_tests/check_clamd.c b/unit_tests/check_clamd.c
index 6d3eb2b..7bd323f 100644
--- a/unit_tests/check_clamd.c
+++ b/unit_tests/check_clamd.c
@@ -740,6 +740,8 @@ static void test_idsession_commands(int split, int instream)
     /* test all commands that must be accepted inside an IDSESSION */
     for (i=0;i < sizeof(basic_tests)/sizeof(basic_tests[0]); i++) {
 	const struct basic_test *test = &basic_tests[i];
+	if (test->skiproot && isroot)
+	    continue;
 	if (test->ids == IDS_OK) {
 	    fail_unless(p+strlen(test->command)+2 < buf+sizeof(buf), "Buffer too small");
 	    *p++ = 'z';
@@ -792,6 +794,8 @@ static void test_idsession_commands(int split, int instream)
     p = recvdata;
     for (i=0;i < sizeof(basic_tests)/sizeof(basic_tests[0]); i++) {
 	const struct basic_test *test = &basic_tests[i];
+	if (test->skiproot && isroot)
+	    continue;
 	if (test->ids == IDS_OK) {
 	    unsigned id;
 	    char *q = strchr(p, ':');

-- 
Debian repository for ClamAV