From 461c4c3a4103cc85d74e0ce9eb389926defacab9 Mon Sep 17 00:00:00 2001
From: chris hellberg <chris@chrishellberg.com>
Date: Thu, 30 Dec 2021 20:44:26 -0500
Subject: [PATCH] bugfix to shift non-variable options to end of list in
 getopt()

---
 src/iodine.c  | 8 ++++----
 src/iodined.c | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/iodine.c b/src/iodine.c
index e8ebb66..3b9b76d 100644
--- a/src/iodine.c
+++ b/src/iodine.c
@@ -195,7 +195,7 @@ int main(int argc, char **argv)
 		__progname++;
 #endif
 
-	while ((choice = getopt(argc, argv, "46vfhruS:t:d:R:P:m:M:F:T:O:L:I")) != -1) {
+	while ((choice = getopt(argc, argv, "t:d:R:P:m:M:z:F:T:O:L:I:46vfhruS")) != -1) {
 		switch(choice) {
 		case '4':
 			nameserv_family = AF_INET;
@@ -220,6 +220,9 @@ int main(int argc, char **argv)
 		case 'u':
 			username = optarg;
 			break;
+                case 'S':
+                        forward_v6 = 1;
+                        break;
 		case 't':
 			newroot = optarg;
 			break;
@@ -271,9 +274,6 @@ int main(int argc, char **argv)
 			if (!lazymode)
 				selecttimeout = 1;
 			break;
-                case 'S':
-                        forward_v6 = 1;
-                        break; 
 		case 'I':
 			selecttimeout = atoi(optarg);
 			if (selecttimeout < 1)
diff --git a/src/iodined.c b/src/iodined.c
index cc4f025..16c2fb0 100644
--- a/src/iodined.c
+++ b/src/iodined.c
@@ -2451,7 +2451,7 @@ main(int argc, char **argv)
 	srand(time(NULL));
 	fw_query_init();
 
-	while ((choice = getopt(argc, argv, "46vcsSfhDu:t:d:m:l:L:p:n:b:P:z:F:i:")) != -1) {
+	while ((choice = getopt(argc, argv, "t:d:m:l:L:p:n:b:P:z:F:i:46vcsSfhDu")) != -1) {
 		switch(choice) {
 		case '4':
 			addrfamily = AF_INET;