| @@ -1,16 +1,16 @@ | | | @@ -1,16 +1,16 @@ |
| 1 | #!/bin/sh | | 1 | #!/bin/sh |
| 2 | # | | 2 | # |
| 3 | # $NetBSD: postinstall,v 1.99 2009/06/23 17:58:30 tron Exp $ | | 3 | # $NetBSD: postinstall,v 1.100 2009/07/20 21:03:42 christos Exp $ |
| 4 | # | | 4 | # |
| 5 | # Copyright (c) 2002-2008 The NetBSD Foundation, Inc. | | 5 | # Copyright (c) 2002-2008 The NetBSD Foundation, Inc. |
| 6 | # All rights reserved. | | 6 | # All rights reserved. |
| 7 | # | | 7 | # |
| 8 | # This code is derived from software contributed to The NetBSD Foundation | | 8 | # This code is derived from software contributed to The NetBSD Foundation |
| 9 | # by Luke Mewburn. | | 9 | # by Luke Mewburn. |
| 10 | # | | 10 | # |
| 11 | # Redistribution and use in source and binary forms, with or without | | 11 | # Redistribution and use in source and binary forms, with or without |
| 12 | # modification, are permitted provided that the following conditions | | 12 | # modification, are permitted provided that the following conditions |
| 13 | # are met: | | 13 | # are met: |
| 14 | # 1. Redistributions of source code must retain the above copyright | | 14 | # 1. Redistributions of source code must retain the above copyright |
| 15 | # notice, this list of conditions and the following disclaimer. | | 15 | # notice, this list of conditions and the following disclaimer. |
| 16 | # 2. Redistributions in binary form must reproduce the above copyright | | 16 | # 2. Redistributions in binary form must reproduce the above copyright |
| @@ -1182,27 +1182,27 @@ do_ssh() | | | @@ -1182,27 +1182,27 @@ do_ssh() |
| 1182 | } | | 1182 | } |
| 1183 | if (kw == "rhostsauthentication" || | | 1183 | if (kw == "rhostsauthentication" || |
| 1184 | kw == "verifyreversemapping" || | | 1184 | kw == "verifyreversemapping" || |
| 1185 | kw == "reversemappingcheck") { | | 1185 | kw == "reversemappingcheck") { |
| 1186 | sub(/^/, "# DEPRECATED:\t") | | 1186 | sub(/^/, "# DEPRECATED:\t") |
| 1187 | } | | 1187 | } |
| 1188 | } | | 1188 | } |
| 1189 | { print } | | 1189 | { print } |
| 1190 | ' | | 1190 | ' |
| 1191 | failed=$(( ${failed} + $? )) | | 1191 | failed=$(( ${failed} + $? )) |
| 1192 | fi | | 1192 | fi |
| 1193 | | | 1193 | |
| 1194 | if ! find_file_in_dirlist moduli "moduli" \ | | 1194 | if ! find_file_in_dirlist moduli "moduli" \ |
| 1195 | "${SRC_DIR}/crypto/dist/ssh" "${SRC_DIR}/etc" ; then | | 1195 | "${SRC_DIR}/crypto/external/bsd/openssh/dist" "${SRC_DIR}/etc" ; then |
| 1196 | failed=1 | | 1196 | failed=1 |
| 1197 | # ${dir} is set by find_file_in_dirlist() | | 1197 | # ${dir} is set by find_file_in_dirlist() |
| 1198 | elif ! compare_dir "${op}" "${dir}" "${DEST_DIR}/etc" 444 moduli; then | | 1198 | elif ! compare_dir "${op}" "${dir}" "${DEST_DIR}/etc" 444 moduli; then |
| 1199 | failed=1 | | 1199 | failed=1 |
| 1200 | fi | | 1200 | fi |
| 1201 | | | 1201 | |
| 1202 | if ! check_dir "${op}" "${DEST_DIR}/var/chroot/sshd" 755 ; then | | 1202 | if ! check_dir "${op}" "${DEST_DIR}/var/chroot/sshd" 755 ; then |
| 1203 | failed=1 | | 1203 | failed=1 |
| 1204 | fi | | 1204 | fi |
| 1205 | | | 1205 | |
| 1206 | if rcconf_is_set "${op}" sshd sshd_conf_dir 1; then | | 1206 | if rcconf_is_set "${op}" sshd sshd_conf_dir 1; then |
| 1207 | failed=1 | | 1207 | failed=1 |
| 1208 | fi | | 1208 | fi |