summaryrefslogtreecommitdiff
path: root/auth.c
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2016-12-15 21:29:05 +0000
committerDamien Miller <djm@mindrot.org>2016-12-16 13:12:18 +1100
commitfe06b68f824f8f55670442fb31f2c03526dd326c (patch)
tree774306a66d58616c2878748cdbc1f0348585246e /auth.c
parentdcc7d74242a574fd5c4afbb4224795b1644321e7 (diff)
upstream commit
Add missing braces in DenyUsers code. Patch from zev at bewilderbeest.net, ok deraadt@ Upstream-ID: d747ace338dcf943b077925f90f85f789714b54e
Diffstat (limited to 'auth.c')
-rw-r--r--auth.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/auth.c b/auth.c
index 2de2db42c..6ee6116df 100644
--- a/auth.c
+++ b/auth.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth.c,v 1.118 2016/11/08 22:04:34 djm Exp $ */ 1/* $OpenBSD: auth.c,v 1.119 2016/12/15 21:29:05 dtucker Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * 4 *
@@ -192,7 +192,7 @@ allowed_user(struct passwd * pw)
192 192
193 /* Return false if user is listed in DenyUsers */ 193 /* Return false if user is listed in DenyUsers */
194 if (options.num_deny_users > 0) { 194 if (options.num_deny_users > 0) {
195 for (i = 0; i < options.num_deny_users; i++) 195 for (i = 0; i < options.num_deny_users; i++) {
196 r = match_user(pw->pw_name, hostname, ipaddr, 196 r = match_user(pw->pw_name, hostname, ipaddr,
197 options.deny_users[i]); 197 options.deny_users[i]);
198 if (r < 0) { 198 if (r < 0) {
@@ -204,6 +204,7 @@ allowed_user(struct passwd * pw)
204 pw->pw_name, hostname); 204 pw->pw_name, hostname);
205 return 0; 205 return 0;
206 } 206 }
207 }
207 } 208 }
208 /* Return false if AllowUsers isn't empty and user isn't listed there */ 209 /* Return false if AllowUsers isn't empty and user isn't listed there */
209 if (options.num_allow_users > 0) { 210 if (options.num_allow_users > 0) {