Implemented the chain model for X.509 validation.

1 files changed, 14 insertions, 1 deletions

diff --git a/jnlib/argparse.c b/jnlib/argparse.c
index 78ff3a46d..2d46884f0 100644
--- a/jnlib/argparse.c
+++ b/jnlib/argparse.c
@@ -832,8 +832,21 @@ show_help( ARGPARSE_OPTS *opts, unsigned flags )
 	    puts("\n(A single dash may be used instead of the double ones)");
     }
     if( (s=strusage(19)) ) {  /* bug reports to ... */
+        char *s2;
+
 	putchar('\n');
-	fputs(s, stdout);
+        s2 = strstr (s, "@EMAIL@");
+        if (s2)
+          {
+            if (s2-s)
+              fwrite (s, s2-s, 1, stdout);
+            fputs (PACKAGE_BUGREPORT, stdout);
+            s2 += 7;
+            if (*s2)
+              fputs (s2, stdout);
+          }
+        else
+          fputs(s, stdout);
     }
     fflush(stdout);
     exit(0);