diff options
| author | dim <dim@FreeBSD.org> | 2016-01-27 22:52:20 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2016-01-27 22:52:20 +0000 |
| commit | aef1771e36f9842a113b9905d0d5926fe9d694aa (patch) | |
| tree | d95f1229e13deff9a13cff3acee802c25b074b1d /etc | |
| parent | 2c8b37701007da0b1290d6550bc8cddadbb513fe (diff) | |
| parent | 10573611b43e8082c286b3e78d3b4d021883b6e8 (diff) | |
| download | FreeBSD-src-aef1771e36f9842a113b9905d0d5926fe9d694aa.zip FreeBSD-src-aef1771e36f9842a113b9905d0d5926fe9d694aa.tar.gz | |
Merge ^/head r294777 through r294960.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/defaults/rc.conf | 2 | ||||
| -rw-r--r-- | etc/group | 1 | ||||
| -rw-r--r-- | etc/master.passwd | 2 | ||||
| -rwxr-xr-x | etc/rc.d/ntpd | 2 |
4 files changed, 5 insertions, 2 deletions
diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf index 380f0d3..a674acb 100644 --- a/etc/defaults/rc.conf +++ b/etc/defaults/rc.conf @@ -368,6 +368,8 @@ ntp_db_leapfile="/var/db/ntpd.leap-seconds.list" # Working copy (updated weekly) leapfile ntp_leapfile_sources="https://www.ietf.org/timezones/data/leap-seconds.list" # Source from which to fetch leapfile +ntp_leapfile_fetch_opts="-mq" # Options to use for ntp leapfile fetch, + # e.g. --no-verify-peer ntp_leapfile_expiry_days=30 # Check for new leapfile 30 days prior to # expiry. ntp_leapfile_fetch_verbose="NO" # Be verbose during NTP leapfile fetch @@ -29,6 +29,7 @@ dialer:*:68: network:*:69: audit:*:77: www:*:80: +_ypldap:*:160: hast:*:845: nogroup:*:65533: nobody:*:65534: diff --git a/etc/master.passwd b/etc/master.passwd index fc7fef5..e603192 100644 --- a/etc/master.passwd +++ b/etc/master.passwd @@ -22,6 +22,6 @@ uucp:*:66:66::0:0:UUCP pseudo-user:/var/spool/uucppublic:/usr/local/libexec/uucp pop:*:68:6::0:0:Post Office Owner:/nonexistent:/usr/sbin/nologin auditdistd:*:78:77::0:0:Auditdistd unprivileged user:/var/empty:/usr/sbin/nologin www:*:80:80::0:0:World Wide Web Owner:/nonexistent:/usr/sbin/nologin -_ypldap:*:93:93::0:0:YP Ldap unprivileged user:/var/empty:/usr/sbin/nologin +_ypldap:*:160:160::0:0:YP Ldap unprivileged user:/var/empty:/usr/sbin/nologin hast:*:845:845::0:0:HAST unprivileged user:/var/empty:/usr/sbin/nologin nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/usr/sbin/nologin diff --git a/etc/rc.d/ntpd b/etc/rc.d/ntpd index f014110..7f28358 100755 --- a/etc/rc.d/ntpd +++ b/etc/rc.d/ntpd @@ -105,7 +105,7 @@ ntpd_fetch_leapfile() { $verbose Within ntp leapfile expiry limit, initiating fetch for url in $ntp_leapfile_sources ; do $verbose fetching $url - fetch -mqo $ntp_tmp_leapfile $url && break + fetch $ntp_leapfile_fetch_opts -o $ntp_tmp_leapfile $url && break done ntp_ver_no_tmp=$(get_ntp_leapfile_ver $ntp_tmp_leapfile) if [ "$ntp_ver_no_tmp" -gt "$ntp_ver_no_db" ]; then |
