summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-10-24 21:01:26 +1100
committerDamien Miller <djm@mindrot.org>2013-10-24 21:01:26 +1100
commit03bf2e61ad6ac59a362a1f11b105586cb755c147 (patch)
tree5a8c93876dc3f24571af056cfcddbd30f3bad81d
parent8f1873191478847773906af961c8984d02a49dd6 (diff)
- dtucker@cvs.openbsd.org 2013/10/23 05:40:58
[servconf.c] fix comment
-rw-r--r--ChangeLog4
-rw-r--r--servconf.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 26b5c5d7a..69dd5f859 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
2 - (djm) [auth-krb5.c] bz#2032 - use local username in krb5_kuserok check 2 - (djm) [auth-krb5.c] bz#2032 - use local username in krb5_kuserok check
3 rather than full client name which may be of form user@REALM; 3 rather than full client name which may be of form user@REALM;
4 patch from Miguel Sanders; ok dtucker@ 4 patch from Miguel Sanders; ok dtucker@
5 - (djm) OpenBSD CVS Sync
6 - dtucker@cvs.openbsd.org 2013/10/23 05:40:58
7 [servconf.c]
8 fix comment
5 9
620131023 1020131023
7 - (djm) OpenBSD CVS Sync 11 - (djm) OpenBSD CVS Sync
diff --git a/servconf.c b/servconf.c
index c761ff01c..100d38d9b 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,5 +1,5 @@
1 1
2/* $OpenBSD: servconf.c,v 1.241 2013/08/06 23:06:01 djm Exp $ */ 2/* $OpenBSD: servconf.c,v 1.242 2013/10/23 05:40:58 dtucker Exp $ */
3/* 3/*
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
5 * All rights reserved 5 * All rights reserved
@@ -641,7 +641,7 @@ out:
641 641
642/* 642/*
643 * All of the attributes on a single Match line are ANDed together, so we need 643 * All of the attributes on a single Match line are ANDed together, so we need
644 * to check every * attribute and set the result to zero if any attribute does 644 * to check every attribute and set the result to zero if any attribute does
645 * not match. 645 * not match.
646 */ 646 */
647static int 647static int