security/openssh/patches/patch-auth-passwd.c

   1 $NetBSD$
   2
   3 Replace uid 0 with ROOTUID macro
   4
   5 --- auth-passwd.c.orig  2012-04-25 23:51:28.000000000 +0000
   6 +++ auth-passwd.c
   7 @@ -87,7 +87,7 @@ auth_password(Authctxt *authctxt, const
   8  #endif
   9
  10  #ifndef HAVE_CYGWIN
  11 -       if (pw->pw_uid == 0 && options.permit_root_login != PERMIT_YES)
  12 +       if (pw->pw_uid == ROOTUID && options.permit_root_login != PERMIT_YES)
  13                 ok = 0;
  14  #endif
  15         if (*password == '\0' && options.permit_empty_passwd == 0)
  16 @@ -122,7 +122,12 @@ auth_password(Authctxt *authctxt, const
  17                         authctxt->force_pwchange = 1;
  18         }
  19  #endif
  20 +
  21 +#ifdef HAVE_INTERIX
  22 +        result = (!setuser(pw->pw_name, password, SU_CHECK));
  23 +#else
  24         result = sys_auth_passwd(authctxt, password);
  25 +#endif
  26         if (authctxt->force_pwchange)
  27                 disable_forwarding();
  28         return (result && ok);