diff options
| -rw-r--r-- | debian/control | 5 | ||||
| -rwxr-xr-x | debian/rules | 10 | ||||
| -rw-r--r-- | src/cfgvti.c | 8 |
3 files changed, 15 insertions, 8 deletions
diff --git a/debian/control b/debian/control index 0ed4d58..ecd43f8 100644 --- a/debian/control +++ b/debian/control @@ -6,10 +6,11 @@ Build-Depends: debhelper (>= 5), autotools-dev Standards-Version: 3.7.2 Package: vyatta-cfg-vpn -Architecture: all +Architecture: any Depends: perl, vyatta-cfg (>= 0.15.33), vyatta-bash | bash (>= 3.1), - vyatta-ipsec + vyatta-ipsec, + libc6 (>= 2.7-6) Description: Vyatta VPN configuration templates/scripts Vyatta VPN configuration templates and scripts. diff --git a/debian/rules b/debian/rules index 9b0e96d..dde505a 100755 --- a/debian/rules +++ b/debian/rules @@ -74,8 +74,8 @@ install: build install -D --mode=0644 debian/lintian $(PKGDIR)/usr/share/lintian/overrides/$(PACKAGE) -# Build architecture-independent files here. -binary-indep: build install +# Build architecture-dependent files here. +binary-arch: build install rm -f debian/files dh_testdir dh_testroot @@ -96,9 +96,9 @@ binary-indep: build install dh_md5sums dh_builddeb -# Build architecture-dependent files here. -binary-arch: build install -# This is an architecture independent package +# Build architecture-independent files here. +binary-indep: build install +# This is an architecture dependent package # so; we have nothing to do by default. binary: binary-indep binary-arch diff --git a/src/cfgvti.c b/src/cfgvti.c index 90dc435..d3c1dc1 100644 --- a/src/cfgvti.c +++ b/src/cfgvti.c @@ -267,7 +267,13 @@ int main (int argc, char *argv[]) } uval = htonl(tmp.s_addr); } else { - uval = htonl(atol(*argv)); + errno = 0; + uval = htonl(strtoul(*argv, 0, 0)); + if (errno) { + fprintf(stderr, + "Invalid \"mark\" %s\n", *argv); + exit(-1); + } } mark = uval; } else if (strcmp(*argv, "remote") == 0) { |