← Back to branch summary

~ubuntu-branches/ubuntu/lucid/iptables/lucid

« back to all changes in this revision

Viewing changes to extensions/libxt_comment.c

  • Committer: Bazaar Package Importer
  • Author(s): Soren Hansen, Iain Lane, Soren Hansen
  • Date: 2008-11-15 01:27:37 UTC
  • mfrom: (5.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20081115012737-o3kdn2z1o9ercq10
Tags: 1.4.1.1-4ubuntu1
https://launchpad.net/bugs/294220
[ Iain Lane ]
* Merge from debian unstable (LP: #294220), remaining changes:
  - debian/patches/0901-build-libipq_pic.a.patch - Build libipq_pic.a with
    -fPIC. Upstream changed build system and patch modified accordingly.

[ Soren Hansen ]
* Revert changes between 1.4.1.1-3 and 1.4.1.1-4, thus bringing back
  the howtos.

Show diffs side-by-side

added added

removed removed

Lines of Context:
extensions/libxt_comment.c
18
18
static void comment_help(void)
19
19
{
20
20
        printf(
21
 
                "COMMENT match options:\n"
22
 
                "--comment COMMENT             Attach a comment to a rule\n\n"
23
 
                );
 
21
                "comment match options:\n"
 
22
                "--comment COMMENT             Attach a comment to a rule\n");
24
23
}
25
24
 
26
25
static const struct option comment_opts[] = {
27
26
        { "comment", 1, NULL, '1' },
28
 
        { }
 
27
        { .name = NULL }
29
28
};
30
29
 
31
30
static void
96
95
static struct xtables_match comment_match = {
97
96
        .family         = AF_INET,
98
97
        .name           = "comment",
99
 
        .version        = IPTABLES_VERSION,
 
98
        .version        = XTABLES_VERSION,
100
99
        .size           = XT_ALIGN(sizeof(struct xt_comment_info)),
101
100
        .userspacesize  = XT_ALIGN(sizeof(struct xt_comment_info)),
102
101
        .help           = comment_help,
110
109
static struct xtables_match comment_match6 = {
111
110
        .family         = AF_INET6,
112
111
        .name           = "comment",
113
 
        .version        = IPTABLES_VERSION,
 
112
        .version        = XTABLES_VERSION,
114
113
        .size           = XT_ALIGN(sizeof(struct xt_comment_info)),
115
114
        .userspacesize  = XT_ALIGN(sizeof(struct xt_comment_info)),
116
115
        .help           = comment_help,