===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/doas/doas.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -c -r1.59 -r1.60
*** src/usr.bin/doas/doas.c	2016/07/12 12:10:42	1.59
--- src/usr.bin/doas/doas.c	2016/07/18 16:46:30	1.60
***************
*** 1,4 ****
! /* $OpenBSD: doas.c,v 1.59 2016/07/12 12:10:42 semarie Exp $ */
  /*
   * Copyright (c) 2015 Ted Unangst <tedu@openbsd.org>
   *
--- 1,4 ----
! /* $OpenBSD: doas.c,v 1.60 2016/07/18 16:46:30 zhuk Exp $ */
  /*
   * Copyright (c) 2015 Ted Unangst <tedu@openbsd.org>
   *
***************
*** 281,289 ****
  
  	if (sflag) {
  		sh = getenv("SHELL");
! 		if (sh == NULL || *sh == '\0')
! 			shargv[0] = pw->pw_shell;
! 		else
  			shargv[0] = sh;
  		argv = shargv;
  		argc = 1;
--- 281,291 ----
  
  	if (sflag) {
  		sh = getenv("SHELL");
! 		if (sh == NULL || *sh == '\0') {
! 			shargv[0] = strdup(pw->pw_shell);
! 			if (shargv[0] == NULL)
! 				err(1, NULL);
! 		} else
  			shargv[0] = sh;
  		argv = shargv;
  		argc = 1;