Remove deprecated option --plugin

Author: DimitriPapadopoulos

CHANGELOG.md

@@ -14,16 +14,20 @@ Releases
 This high level changelog is usually updated when a release is tagged.
 On the master branch there may be changes that are not (yet) described here.
 
+### not released yet
+
+* [~] remove deprecated option "plugin"
+
 ### 1.23.1
 
 * [-] fix a few coverity warnings
 
 ### 1.23.0
 
-* [-] Support older mac0S versions that lack vdprintf()
-* [-] Patch certificate login error for FortiOS 7.4.4
-* [-] Clear OTP after run
-* [+] Support SAML login authentication
+* [-] support older mac0S versions that lack vdprintf()
+* [-] patch certificate login error for FortiOS 7.4.4
+* [-] clear OTP after run
+* [+] support SAML login authentication
 
 ### 1.22.1
 

src/main.c

@@ -322,7 +322,6 @@ int main(int argc, char *argv[])
 		{"pppd-ifname",          required_argument, NULL, 0},
 		{"pppd-call",            required_argument, NULL, 0},
 		{"pppd-accept-remote",   optional_argument, NULL, 0},
-		{"plugin",               required_argument, NULL, 0}, // deprecated
 #endif
 #if HAVE_USR_SBIN_PPP
 		{"ppp-system",           required_argument, NULL, 0},
@@ -348,7 +347,7 @@ int main(int argc, char *argv[])
 
 		switch (c) {
 		case 0:
-			/* If this option set a flag, do nothing else now. */
+			/* If this option sets a flag, do nothing else now. */
 			if (long_options[option_index].flag != 0)
 				break;
 			if (strcmp(long_options[option_index].name,
@@ -418,16 +417,6 @@ int main(int argc, char *argv[])
 				}
 				break;
 			}
-			// --plugin is deprecated, use --pppd-plugin
-			if (cli_cfg.pppd_plugin == NULL &&
-			    strcmp(long_options[option_index].name,
-			           "plugin") == 0) {
-				log_warn("Option --%s is deprecated, use --pppd-plugin\n",
-				         long_options[option_index].name);
-				free(cli_cfg.pppd_plugin);
-				cli_cfg.pppd_plugin = strdup(optarg);
-				break;
-			}
 #endif
 #if HAVE_USR_SBIN_PPP
 			if (strcmp(long_options[option_index].name,

src/tunnel.c

@@ -345,10 +345,6 @@ static int pppd_run(struct tunnel *tunnel)
 			}
 		}
 		if (tunnel->config->pppd_plugin) {
-			if (ofv_append_varr(&pppd_args, "plugin")) {
-				free(pppd_args.data);
-				return 1;
-			}
 			if (ofv_append_varr(&pppd_args, tunnel->config->pppd_plugin)) {
 				free(pppd_args.data);
 				return 1;