diff options
author | Colin Watson <cjwatson@debian.org> | 2010-01-24 21:39:36 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-01-24 21:39:36 +0000 |
commit | 964476f91b66c475d5b8fa1e8b28d39a97a1b56e (patch) | |
tree | d12ff16d94cffc5d84dba0193eaaa616967c9c2c /contrib/cygwin/ssh-user-config | |
parent | cadac134eda6ed97478afdc528a68dd33f31dbc5 (diff) | |
parent | 1e4cfeee6c17b02af09418c5afe4a4d71aaaf0c8 (diff) |
import openssh-5.3p1-gsskex-all-20100124.patch
Diffstat (limited to 'contrib/cygwin/ssh-user-config')
-rw-r--r-- | contrib/cygwin/ssh-user-config | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/contrib/cygwin/ssh-user-config b/contrib/cygwin/ssh-user-config index f210bd556..f1a001a93 100644 --- a/contrib/cygwin/ssh-user-config +++ b/contrib/cygwin/ssh-user-config | |||
@@ -1,8 +1,20 @@ | |||
1 | #!/bin/bash | 1 | #!/bin/bash |
2 | # | 2 | # |
3 | # ssh-user-config, Copyright 2000, 2001, 2002, 2003, Red Hat Inc. | 3 | # ssh-user-config, Copyright 2000-2008 Red Hat Inc. |
4 | # | 4 | # |
5 | # This file is part of the Cygwin port of OpenSSH. | 5 | # This file is part of the Cygwin port of OpenSSH. |
6 | # | ||
7 | # Permission to use, copy, modify, and distribute this software for any | ||
8 | # purpose with or without fee is hereby granted, provided that the above | ||
9 | # copyright notice and this permission notice appear in all copies. | ||
10 | # | ||
11 | # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS | ||
12 | # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
13 | # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. | ||
14 | # IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, | ||
15 | # DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR | ||
16 | # OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR | ||
17 | # THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
6 | 18 | ||
7 | # ====================================================================== | 19 | # ====================================================================== |
8 | # Initialization | 20 | # Initialization |
@@ -118,14 +130,14 @@ check_user_homedir() { | |||
118 | pwdhome=$(awk -F: '{ if ( $3 == '${uid}' ) print $6; }' < ${SYSCONFDIR}/passwd) | 130 | pwdhome=$(awk -F: '{ if ( $3 == '${uid}' ) print $6; }' < ${SYSCONFDIR}/passwd) |
119 | if [ "X${pwdhome}" = "X" ] | 131 | if [ "X${pwdhome}" = "X" ] |
120 | then | 132 | then |
121 | csih_error_multiline \ | 133 | csih_error_multi \ |
122 | "There is no home directory set for you in ${SYSCONFDIR}/passwd." \ | 134 | "There is no home directory set for you in ${SYSCONFDIR}/passwd." \ |
123 | 'Setting $HOME is not sufficient!' | 135 | 'Setting $HOME is not sufficient!' |
124 | fi | 136 | fi |
125 | 137 | ||
126 | if [ ! -d "${pwdhome}" ] | 138 | if [ ! -d "${pwdhome}" ] |
127 | then | 139 | then |
128 | csih_error_multiline \ | 140 | csih_error_multi \ |
129 | "${pwdhome} is set in ${SYSCONFDIR}/passwd as your home directory" \ | 141 | "${pwdhome} is set in ${SYSCONFDIR}/passwd as your home directory" \ |
130 | 'but it is not a valid directory. Cannot create user identity files.' | 142 | 'but it is not a valid directory. Cannot create user identity files.' |
131 | fi | 143 | fi |
@@ -291,7 +303,7 @@ done | |||
291 | # Check passwd file | 303 | # Check passwd file |
292 | if [ ! -f ${SYSCONFDIR}/passwd ] | 304 | if [ ! -f ${SYSCONFDIR}/passwd ] |
293 | then | 305 | then |
294 | csih_error_multiline \ | 306 | csih_error_multi \ |
295 | "${SYSCONFDIR}/passwd is nonexistant. Please generate an ${SYSCONFDIR}/passwd file" \ | 307 | "${SYSCONFDIR}/passwd is nonexistant. Please generate an ${SYSCONFDIR}/passwd file" \ |
296 | 'first using mkpasswd. Check if it contains an entry for you and' \ | 308 | 'first using mkpasswd. Check if it contains an entry for you and' \ |
297 | 'please care for the home directory in your entry as well.' | 309 | 'please care for the home directory in your entry as well.' |