tags 362213 + patch thanks Hi,
Attached is the diff for my ipsec-tools 1:0.6.7-1.1 NMU.
Cheers,
--
Jérémy Bobbio .''`.
[EMAIL PROTECTED] : :Ⓐ : # apt-get install anarchism
`. `'`
`-
diff -u ipsec-tools-0.6.7/debian/changelog ipsec-tools-0.6.7/debian/changelog
--- ipsec-tools-0.6.7/debian/changelog
+++ ipsec-tools-0.6.7/debian/changelog
@@ -1,3 +1,13 @@
+ipsec-tools (1:0.6.7-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix null pointer checks in: (Closes: #362213)
+ * GETNAMEINFO and GETNAMEINFO_NULL in src/racoon/var.h,
+ * certtest() in src/racoon/eaytest.c.
+ * Fix debian-rules-ignores-make-clean-error lintian warning.
+
+ -- Jérémy Bobbio <[EMAIL PROTECTED]> Sat, 29 Sep 2007 14:37:50 +0200
+
ipsec-tools (1:0.6.7-1) unstable; urgency=low
* New upstream release (closes: #429711)
diff -u ipsec-tools-0.6.7/debian/rules ipsec-tools-0.6.7/debian/rules
--- ipsec-tools-0.6.7/debian/rules
+++ ipsec-tools-0.6.7/debian/rules
@@ -59,7 +59,7 @@
# Add here commands to clean up after the build process.
rm -f config.log
- -$(MAKE) distclean
+ [ ! -f Makefile ] || $(MAKE) distclean
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
endif
only in patch2:
unchanged:
--- ipsec-tools-0.6.7.orig/src/racoon/var.h
+++ ipsec-tools-0.6.7/src/racoon/var.h
@@ -76,9 +76,9 @@
do { \
if (getnameinfo((x), sysdep_sa_len(x), (y), sizeof(y), (z), sizeof(z), \
NIFLAGS) != 0) { \
- if (y) \
+ if (y != NULL) \
strncpy((y), "(invalid)", sizeof(y)); \
- if (z) \
+ if (z != NULL) \
strncpy((z), "(invalid)", sizeof(z)); \
} \
} while (0);
@@ -87,7 +87,7 @@
do { \
if (getnameinfo((x), sysdep_sa_len(x), (y), sizeof(y), NULL, 0, \
NIFLAGS) != 0) { \
- if (y) \
+ if (y != NULL) \
strncpy((y), "(invalid)", sizeof(y)); \
} \
} while (0);
only in patch2:
unchanged:
--- ipsec-tools-0.6.7.orig/src/racoon/eaytest.c
+++ ipsec-tools-0.6.7/src/racoon/eaytest.c
@@ -311,7 +311,7 @@
printf("exact match: succeed.\n");
- if (dnstr_w1) {
+ if (dnstr_w1 != NULL) {
asn1dn = eay_str2asn1dn(dnstr_w1, strlen(dnstr_w1));
if (asn1dn == NULL || asn1dn->l == asn1dn0.l)
errx(1, "asn1dn length wrong for wildcard 1\n");
@@ -321,7 +321,7 @@
printf("wildcard 1 match: succeed.\n");
}
- if (dnstr_w1) {
+ if (dnstr_w1 != NULL) {
asn1dn = eay_str2asn1dn(dnstr_w2, strlen(dnstr_w2));
if (asn1dn == NULL || asn1dn->l == asn1dn0.l)
errx(1, "asn1dn length wrong for wildcard 2\n");
signature.asc
Description: Digital signature
