diff options
| author | petere <petere@0070b5ef-2f16-0410-befa-9a02bd1d6ddb> | 2011-11-30 06:11:26 +0000 |
|---|---|---|
| committer | petere <petere@0070b5ef-2f16-0410-befa-9a02bd1d6ddb> | 2011-11-30 06:11:26 +0000 |
| commit | 7b69ebd2a74e946c3ba6820724d11b92d493cd26 (patch) | |
| tree | daa2a78d9c664069a58ac036929f4fae37cec3a0 | |
| parent | 1f2eaff8862f2d0a1869438c99af7f254837925c (diff) | |
| download | ntp-7b69ebd2a74e946c3ba6820724d11b92d493cd26.tar.gz | |
ntpdate-debian: Improve parsing of ntp.conf (closes: #606349)
git-svn-id: svn://svn.debian.org/pkg-ntp/ntp/trunk@343 0070b5ef-2f16-0410-befa-9a02bd1d6ddb
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/ntpdate-debian | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index ff27149..a56d5ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,8 +15,9 @@ ntp (1:4.2.6.p3+dfsg-2) UNRELEASED; urgency=low do it more directly. * Explicitly disable building ntpsnmpd and remove man page (closes: #608542; see also #622819) + * ntpdate-debian: Improve parsing of ntp.conf (closes: #606349) - -- Peter Eisentraut <petere@debian.org> Tue, 29 Nov 2011 20:24:26 +0200 + -- Peter Eisentraut <petere@debian.org> Wed, 30 Nov 2011 06:51:46 +0200 ntp (1:4.2.6.p3+dfsg-1) unstable; urgency=low diff --git a/debian/ntpdate-debian b/debian/ntpdate-debian index 239725b..4748b3a 100644 --- a/debian/ntpdate-debian +++ b/debian/ntpdate-debian @@ -14,7 +14,7 @@ if [ "$NTPDATE_USE_NTP_CONF" = yes ]; then fi done if [ -n "$file" ]; then - NTPSERVERS=$(sed -rne 's/^(servers?|peer) ([-_.:[:alnum:]]+).*$/\2/p' "$file" | grep -v '^127\.127\.') || [ $? -le 1 ] + NTPSERVERS=$(sed -rne 's/^(servers?|peer)[[:space:]]+(-[46][[:space:]]+)?([-_.:[:alnum:]]+).*$/\3/p' "$file" | grep -v '^127\.127\.') || [ $? -le 1 ] fi elif [ -r /var/lib/ntpdate/default.dhcp ]; then . /var/lib/ntpdate/default.dhcp |