summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-12-01 11:50:14 +1100
committerDamien Miller <djm@mindrot.org>2010-12-01 11:50:14 +1100
commit188ea814b10e39a399178af1fb18a79ea406f9bb (patch)
treef93930a4af3582bf58b911815a8dc18a97a0d576
parent73de86ac5a1f8a82439dca4988288182ffd11489 (diff)
- OpenBSD CVS Sync
- deraadt@cvs.openbsd.org 2010/11/20 05:12:38 [auth2-pubkey.c] clean up cases of ;;
-rw-r--r--ChangeLog6
-rw-r--r--auth2-pubkey.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 905cb1159..05d9962ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
120101201
2 - OpenBSD CVS Sync
3 - deraadt@cvs.openbsd.org 2010/11/20 05:12:38
4 [auth2-pubkey.c]
5 clean up cases of ;;
6
120101124 720101124
2 - (dtucker) [platform.c session.c] Move the getluid call out of session.c and 8 - (dtucker) [platform.c session.c] Move the getluid call out of session.c and
3 into the platform-specific code Only affects SCO, tested by and ok tim@. 9 into the platform-specific code Only affects SCO, tested by and ok tim@.
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 }