[syslog-ng] preparations for 3.3.2

[Balint Kovacs]

On 10/29/2011 05:51 PM, Balazs Scheidler wrote:
> Hi,
>
> Since there are a nice number of fixes accumulated on the 3.3 tree, I'd
> like to prepare for the 3.3.2 release.
>
> Before doing the actual release though, I'd appreciate any kind of
> feedback you can give.
>
> The current state is in git right now, I'll try to create a timestamped
> tarball later this weekend.
>
> Thanks.
>
Hi,

there seems to be a patch of mine missing from both the 3.3 and 3.4 
trees, that fixes a mistake that I did while implementing the 'pdbtool 
test' explicit rule id check. Right now if no rule-id is supplied to 
test, pdbtool always prints and error message and quits with exit code 
3. Most probably this went unnoticed in mailing list traffic, can you 
please apply before releasing 3.3.2?

Thanks,
Balint

commit d6b94979493c4871fac712525ab9b516a824d376
Author: Balint Kovacs <blint at balabit.hu>
Date:   Wed Aug 31 15:30:52 2011 +0200

     pdbtool: fix missing check in pdbtool test ruleid warning

Signed-off-by: Balint Kovacs <blint at balabit.hu>

diff --git a/modules/dbparser/pdbtool.c b/modules/dbparser/pdbtool.c
index 1c5d818..35b502c 100644
--- a/modules/dbparser/pdbtool.c
+++ b/modules/dbparser/pdbtool.c
@@ -759,7 +759,7 @@ pdbtool_test(int argc, char *argv[])
      return 1;
    if (failed_to_match)
      return 2;
-  if (failed_to_find_id)
+  if (failed_to_find_id && test_ruleid)
      {
        printf("Could not find the specified ID, or the defined rule 
doesn't have an example message.\n");
        return 3;