===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/doas/doas.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -c -r1.49 -r1.50
*** src/usr.bin/doas/doas.c	2016/01/24 13:19:21	1.49
--- src/usr.bin/doas/doas.c	2016/02/07 20:01:58	1.50
***************
*** 1,4 ****
! /* $OpenBSD: doas.c,v 1.49 2016/01/24 13:19:21 gsoares Exp $ */
  /*
   * Copyright (c) 2015 Ted Unangst <tedu@openbsd.org>
   *
--- 1,4 ----
! /* $OpenBSD: doas.c,v 1.50 2016/02/07 20:01:58 tedu Exp $ */
  /*
   * Copyright (c) 2015 Ted Unangst <tedu@openbsd.org>
   *
***************
*** 428,434 ****
  			    "doas (%.32s@%.32s) password: ", myname, host);
  			challenge = cbuf;
  		}
! 		response = readpassphrase(challenge, rbuf, sizeof(rbuf), 0);
  		if (!auth_userresponse(as, response, 0)) {
  			syslog(LOG_AUTHPRIV | LOG_NOTICE,
  			    "failed auth for %s", myname);
--- 428,440 ----
  			    "doas (%.32s@%.32s) password: ", myname, host);
  			challenge = cbuf;
  		}
! 		response = readpassphrase(challenge, rbuf, sizeof(rbuf),
! 		    RPP_REQUIRE_TTY);
! 		if (response == NULL && errno == ENOTTY) {
! 			syslog(LOG_AUTHPRIV | LOG_NOTICE,
! 			    "tty required for %s", myname);
! 			errx(1, "a tty is required");
! 		}
  		if (!auth_userresponse(as, response, 0)) {
  			syslog(LOG_AUTHPRIV | LOG_NOTICE,
  			    "failed auth for %s", myname);