[syslog-ng] [PATCH] [pdbtool] debug-id option

[Balint Kovacs]

On 08/29/2011 01:13 PM, Balazs Scheidler wrote:
> On Mon, 2011-08-22 at 10:03 +0200, Balint Kovacs wrote:
>> Hi,
>>
>> sorry about that, please find the output of git-format-patch attached.
>> Is that OK that way?
> yup, great. Applied to 3.4.
Thanks. I found a small glitch in the code, it fails to check if the 
ruleid was supplied at all when emitting "Rule id not found", so it 
always gives an errorneous warning when not using the new option. Please 
find the fix below (also attached as I didn't have the time yet to fix 
my mailer).

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;

-------------- next part --------------
A non-text attachment was scrubbed...
Name: pdbtool.diff
Type: text/x-patch
Size: 714 bytes
Desc: not available
Url : http://lists.balabit.hu/pipermail/syslog-ng/attachments/20110831/12c327f9/attachment.bin