xt_SYSRQ: fix compile error when crypto is turned off

This commit is contained in:
Jan Engelhardt
2012-01-20 21:19:13 +01:00
parent a6b06502ca
commit 916013cd89
2 changed files with 5 additions and 0 deletions

View File

@@ -4,6 +4,7 @@ HEAD
Fixes: Fixes:
- compat_xtables: fixed mistranslation of checkentry return values - compat_xtables: fixed mistranslation of checkentry return values
(affected kernels < 2.6.23) (affected kernels < 2.6.23)
- xt_SYSRQ: fix compile error when crypto is turned off
v1.41 (2012-01-04) v1.41 (2012-01-04)

View File

@@ -225,8 +225,10 @@ sysrq_tg4(struct sk_buff **pskb, const struct xt_action_param *par)
": " NIPQUAD_FMT ":%u -> :%u len=%u\n", ": " NIPQUAD_FMT ":%u -> :%u len=%u\n",
NIPQUAD(iph->saddr), htons(udph->source), NIPQUAD(iph->saddr), htons(udph->source),
htons(udph->dest), len); htons(udph->dest), len);
#ifdef WITH_CRYPTO
sprintf(sysrq_digest_password, NIPQUAD_FMT ",%s", sprintf(sysrq_digest_password, NIPQUAD_FMT ",%s",
NIPQUAD(iph->daddr), sysrq_password); NIPQUAD(iph->daddr), sysrq_password);
#endif
return sysrq_tg((void *)udph + sizeof(struct udphdr), len); return sysrq_tg((void *)udph + sizeof(struct udphdr), len);
} }
@@ -258,8 +260,10 @@ sysrq_tg6(struct sk_buff **pskb, const struct xt_action_param *par)
": " NIP6_FMT ":%hu -> :%hu len=%u\n", ": " NIP6_FMT ":%hu -> :%hu len=%u\n",
NIP6(iph->saddr), ntohs(udph->source), NIP6(iph->saddr), ntohs(udph->source),
ntohs(udph->dest), len); ntohs(udph->dest), len);
#ifdef WITH_CRYPTO
sprintf(sysrq_digest_password, NIP6_FMT ",%s", sprintf(sysrq_digest_password, NIP6_FMT ",%s",
NIP6(iph->daddr), sysrq_password); NIP6(iph->daddr), sysrq_password);
#endif
return sysrq_tg((void *)udph + sizeof(struct udphdr), len); return sysrq_tg((void *)udph + sizeof(struct udphdr), len);
} }
#endif #endif