$NetBSD: patch-am,v 1.9 2011/02/16 17:45:08 taca Exp $ --- auth2.c.orig 2011-02-16 01:25:58.000000000 +0000 +++ auth2.c @@ -307,7 +307,7 @@ userauth_finish(Authctxt *authctxt, int authctxt->user); /* Special handling for root */ - if (authenticated && authctxt->pw->pw_uid == 0 && + if (authenticated && authctxt->pw->pw_uid == ROOTUID && !auth_root_allowed(method)) { authenticated = 0; #ifdef SSH_AUDIT_EVENTS