diff options
author | Colin Watson <cjwatson@debian.org> | 2011-01-24 11:46:57 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2011-01-24 11:46:57 +0000 |
commit | 0970072c89b079b022538e3c366fbfa2c53fc821 (patch) | |
tree | b7024712d74234bb5a8b036ccbc9109e2e211296 /auth2-pubkey.c | |
parent | 4e8aa4da57000c7bba8e5c49163bc0c0ca383f78 (diff) | |
parent | 478ff799463ca926a8dfbabf058f4e84aaffc65a (diff) |
merge 5.7p1
Diffstat (limited to 'auth2-pubkey.c')
-rw-r--r-- | auth2-pubkey.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/auth2-pubkey.c b/auth2-pubkey.c index 35cf79c9f..7d2141355 100644 --- a/auth2-pubkey.c +++ b/auth2-pubkey.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth2-pubkey.c,v 1.26 2010/06/29 23:16:46 djm Exp $ */ | 1 | /* $OpenBSD: auth2-pubkey.c,v 1.27 2010/11/20 05:12:38 deraadt Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -232,7 +232,7 @@ match_principals_file(char *file, struct passwd *pw, struct KeyCert *cert) | |||
232 | if ((ep = strrchr(cp, ' ')) != NULL || | 232 | if ((ep = strrchr(cp, ' ')) != NULL || |
233 | (ep = strrchr(cp, '\t')) != NULL) { | 233 | (ep = strrchr(cp, '\t')) != NULL) { |
234 | for (; *ep == ' ' || *ep == '\t'; ep++) | 234 | for (; *ep == ' ' || *ep == '\t'; ep++) |
235 | ;; | 235 | ; |
236 | line_opts = cp; | 236 | line_opts = cp; |
237 | cp = ep; | 237 | cp = ep; |
238 | } | 238 | } |