summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2015-08-21 03:42:19 +0000
committerDamien Miller <djm@mindrot.org>2015-08-21 13:43:25 +1000
commit32a181980c62fce94f7f9ffaf6a79d90f0c309cf (patch)
treed339bae137a029f31a5423c6d97542e326128fb7
parentce445b0ed927e45bd5bdce8f836eb353998dd65c (diff)
upstream commit
fix inverted logic that broke PermitRootLogin; reported by Mantas Mikulenas; ok markus@ Upstream-ID: 260dd6a904c1bb7e43267e394b1c9cf70bdd5ea5
-rw-r--r--auth.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/auth.c b/auth.c
index fc32f6c4b..214c2c708 100644
--- a/auth.c
+++ b/auth.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth.c,v 1.112 2015/08/06 14:53:21 deraadt Exp $ */ 1/* $OpenBSD: auth.c,v 1.113 2015/08/21 03:42:19 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * 4 *
@@ -354,7 +354,7 @@ auth_root_allowed(const char *method)
354 case PERMIT_NO_PASSWD: 354 case PERMIT_NO_PASSWD:
355 if (strcmp(method, "publickey") == 0 || 355 if (strcmp(method, "publickey") == 0 ||
356 strcmp(method, "hostbased") == 0 || 356 strcmp(method, "hostbased") == 0 ||
357 strcmp(method, "gssapi-with-mic")) 357 strcmp(method, "gssapi-with-mic") == 0)
358 return 1; 358 return 1;
359 break; 359 break;
360 case PERMIT_FORCED_ONLY: 360 case PERMIT_FORCED_ONLY: