Decrement optc when removing an option.

CREDITS

@@ -45,6 +45,7 @@ ideas:
 	Mikko Työläjärvi <mbsd@pacbell.net>
 	Nick Hibma <nick@van-laarhoven.org>
 	Patrick Bihan-Faou <patrick-fbsd@mindstep.com>
+	Robert Morris <rtm@lcs.mit.edu>
 	Robert Watson <rwatson@freebsd.org>
 	Ruslan Ermilov <ru@freebsd.org>
 	Sebastian Krahmer <sebastian.krahmer@gmail.com>

HISTORY

@@ -2,6 +2,9 @@ OpenPAM ???							2020-07-??
 
  - BUGFIX: Fix race condition in openpam_ttyconv(3) when used with
    expect scripts.
+
+ - BUGFIX: In openpam_set_option(3), when removing an option, properly
+   decrement the option count.
 ============================================================================
 OpenPAM Tabebuia						2019-02-24
 

LICENSE

@@ -1,6 +1,6 @@
 
 Copyright (c) 2002-2003 Networks Associates Technology, Inc.
-Copyright (c) 2004-2019 Dag-Erling Smørgrav
+Copyright (c) 2004-2023 Dag-Erling Smørgrav
 All rights reserved.
 
 This software was developed for the FreeBSD Project by ThinkSec AS and

lib/libpam/openpam_set_option.c

@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2011 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2023 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -83,6 +83,7 @@ openpam_set_option(pam_handle_t *pamh,
 		for (free(cur->optv[i]); i < cur->optc; ++i)
 			cur->optv[i] = cur->optv[i + 1];
 		cur->optv[i] = NULL;
+		--cur->optc;
 		RETURNC(PAM_SUCCESS);
 	}
 	if (asprintf(&opt, "%.*s=%s", (int)len, option, value) < 0)

t/t_openpam_straddch.c

@@ -122,7 +122,7 @@ end:
 static int
 t_straddch_realloc_ok(char **desc CRYB_UNUSED, void *arg CRYB_UNUSED)
 {
-	char *str, *_str;
+	char *str;
 	size_t size, _size, len, _len;
 	int i, ret;
 
@@ -136,7 +136,6 @@ t_straddch_realloc_ok(char **desc CRYB_UNUSED, void *arg CRYB_UNUSED)
 	if (!ret)
 		goto end;
 	// repeatedly append to it until size changes
-	_str = str;
 	_size = size;
 	_len = len;
 	for (i = ' '; i <= '~'; i++) { // assume ascii