===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/doas/doas.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -c -r1.70 -r1.71
*** src/usr.bin/doas/doas.c	2017/03/09 21:25:01	1.70
--- src/usr.bin/doas/doas.c	2017/04/06 21:14:12	1.71
***************
*** 1,4 ****
! /* $OpenBSD: doas.c,v 1.70 2017/03/09 21:25:01 tedu Exp $ */
  /*
   * Copyright (c) 2015 Ted Unangst <tedu@openbsd.org>
   *
--- 1,4 ----
! /* $OpenBSD: doas.c,v 1.71 2017/04/06 21:14:12 tedu Exp $ */
  /*
   * Copyright (c) 2015 Ted Unangst <tedu@openbsd.org>
   *
***************
*** 129,135 ****
  }
  
  static int
! permit(uid_t uid, gid_t *groups, int ngroups, struct rule **lastr,
      uid_t target, const char *cmd, const char **cmdargs)
  {
  	int i;
--- 129,135 ----
  }
  
  static int
! permit(uid_t uid, gid_t *groups, int ngroups, const struct rule **lastr,
      uid_t target, const char *cmd, const char **cmdargs)
  {
  	int i;
***************
*** 176,182 ****
  checkconfig(const char *confpath, int argc, char **argv,
      uid_t uid, gid_t *groups, int ngroups, uid_t target)
  {
! 	struct rule *rule;
  
  	setresuid(uid, uid, uid);
  	parseconfig(confpath, 0);
--- 176,182 ----
  checkconfig(const char *confpath, int argc, char **argv,
      uid_t uid, gid_t *groups, int ngroups, uid_t target)
  {
! 	const struct rule *rule;
  
  	setresuid(uid, uid, uid);
  	parseconfig(confpath, 0);
***************
*** 251,257 ****
  	char cmdline[LINE_MAX];
  	char myname[_PW_NAME_LEN + 1];
  	struct passwd *pw;
! 	struct rule *rule;
  	uid_t uid;
  	uid_t target = 0;
  	gid_t groups[NGROUPS_MAX + 1];
--- 251,257 ----
  	char cmdline[LINE_MAX];
  	char myname[_PW_NAME_LEN + 1];
  	struct passwd *pw;
! 	const struct rule *rule;
  	uid_t uid;
  	uid_t target = 0;
  	gid_t groups[NGROUPS_MAX + 1];