rpms/dhcp
6
0
Fork 0
Code Issues Pull Requests Releases Activity

[dhclient] rename -timeout option to --timeout

Browse Source
This commit is contained in:
Jiri Popelka 2016-08-03 13:29:33 +02:00
parent a11c0d6abc
commit e98359bfb4
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dhcp-dhclient-options.patch
View File

@ -62,7 +62,7 @@ diff -up dhcp-4.3.4/client/dhclient.8.options dhcp-4.3.4/client/dhclient.8
+.I request-option-list +.I request-option-list
+] +]
+[ +[
+.B -timeout +.B --timeout
+.I timeout +.I timeout
+] +]
+[ +[
@ -130,7 +130,7 @@ diff -up dhcp-4.3.4/client/dhclient.8.options dhcp-4.3.4/client/dhclient.8
+parameter. +parameter.
+ +
+.TP +.TP
+.BI \-timeout\ <timeout> +.BI \--timeout\ <timeout>
+Specify the time after which +Specify the time after which
+.B dhclient +.B dhclient
+will decide that no DHCP servers can be contacted when no responses have been +will decide that no DHCP servers can be contacted when no responses have been
@ -173,7 +173,7 @@ diff -up dhcp-4.3.4/client/dhclient.c.options dhcp-4.3.4/client/dhclient.c
- " [-sf script-file] [interface]*", - " [-sf script-file] [interface]*",
+ " [-sf script-file] [interface]*\n" + " [-sf script-file] [interface]*\n"
+ " [-C <dhcp-client-identifier>] [-B]\n" + " [-C <dhcp-client-identifier>] [-B]\n"
+ " [-H <host-name> | -F <fqdn.fqdn>] [-timeout <timeout>]\n" + " [-H <host-name> | -F <fqdn.fqdn>] [--timeout <timeout>]\n"
+ " [-V <vendor-class-identifier>]\n" + " [-V <vendor-class-identifier>]\n"
+ " [--request-options <request option list>]", + " [--request-options <request option list>]",
isc_file_basename(progname)); isc_file_basename(progname));
@ -253,7 +253,7 @@ diff -up dhcp-4.3.4/client/dhclient.c.options dhcp-4.3.4/client/dhclient.c
+ } + }
+ +
+ dhcp_fqdn_arg = argv[i]; + dhcp_fqdn_arg = argv[i];
+ } else if (!strcmp(argv[i], "-timeout")) { + } else if (!strcmp(argv[i], "--timeout")) {
+ if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) { + if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
+ usage(use_noarg, argv[i-1]); + usage(use_noarg, argv[i-1]);
+ exit(1); + exit(1);
@ -338,14 +338,14 @@ diff -up dhcp-4.3.4/client/dhclient.c.options dhcp-4.3.4/client/dhclient.c
+ arg_conf_len = asprintf(&arg_conf, "timeout %d;", timeout_arg); + arg_conf_len = asprintf(&arg_conf, "timeout %d;", timeout_arg);
+ +
+ if ((arg_conf == 0) || (arg_conf_len <= 0)) + if ((arg_conf == 0) || (arg_conf_len <= 0))
+ log_fatal("Unable to process -timeout timeout argument"); + log_fatal("Unable to process --timeout timeout argument");
+ } else { + } else {
+ char *last_arg_conf = arg_conf; + char *last_arg_conf = arg_conf;
+ arg_conf = NULL; + arg_conf = NULL;
+ arg_conf_len = asprintf(&arg_conf, "%s\ntimeout %d;", last_arg_conf, timeout_arg); + arg_conf_len = asprintf(&arg_conf, "%s\ntimeout %d;", last_arg_conf, timeout_arg);
+ +
+ if ((arg_conf == 0) || (arg_conf_len == 0)) + if ((arg_conf == 0) || (arg_conf_len == 0))
+ log_fatal("Unable to process -timeout timeout argument"); + log_fatal("Unable to process --timeout timeout argument");
+ +
+ free(last_arg_conf); + free(last_arg_conf);
+ } + }
@ -391,7 +391,7 @@ diff -up dhcp-4.3.4/client/dhclient.c.options dhcp-4.3.4/client/dhclient.c
+ if (arg_conf_len == 0) + if (arg_conf_len == 0)
+ if ((arg_conf_len = strlen(arg_conf)) == 0) + if ((arg_conf_len = strlen(arg_conf)) == 0)
+ /* huh ? cannot happen ! */ + /* huh ? cannot happen ! */
+ log_fatal("Unable to process -C/-H/-F/-timeout/-V/--request-options configuration arguments"); + log_fatal("Unable to process -C/-H/-F/--timeout/-V/--request-options configuration arguments");
+ +
+ /* parse the extra dhclient.conf configuration arguments + /* parse the extra dhclient.conf configuration arguments
+ * into top level config: */ + * into top level config: */
@ -399,10 +399,10 @@ diff -up dhcp-4.3.4/client/dhclient.c.options dhcp-4.3.4/client/dhclient.c
+ const char *val = NULL; + const char *val = NULL;
+ int token; + int token;
+ +
+ status = new_parse(&cfile, -1, arg_conf, arg_conf_len, "extra dhclient -C/-H/-F/-timeout/-V/--request-options configuration arguments", 0); + status = new_parse(&cfile, -1, arg_conf, arg_conf_len, "extra dhclient -C/-H/-F/--timeout/-V/--request-options configuration arguments", 0);
+ +
+ if ((status != ISC_R_SUCCESS) || (cfile -> warnings_occurred)) + if ((status != ISC_R_SUCCESS) || (cfile -> warnings_occurred))
+ log_fatal("Cannot parse -C/-H/-F/-timeout/-V/--request-options configuration arguments !"); + log_fatal("Cannot parse -C/-H/-F/--timeout/-V/--request-options configuration arguments !");
+ /* more detailed parse failures will be logged */ + /* more detailed parse failures will be logged */
+ +
+ do { + do {
@ -414,7 +414,7 @@ diff -up dhcp-4.3.4/client/dhclient.c.options dhcp-4.3.4/client/dhclient.c
+ } while (1); + } while (1);
+ +
+ if (cfile -> warnings_occurred) + if (cfile -> warnings_occurred)
+ log_fatal("Cannot parse -C/-H/-F/-timeout/-V/--request-options configuration arguments !"); + log_fatal("Cannot parse -C/-H/-F/--timeout/-V/--request-options configuration arguments !");
+ end_parse(&cfile); + end_parse(&cfile);
+ +
+ if (timeout_arg) { + if (timeout_arg) {

1
dhcp.spec
View File

@ -663,6 +663,7 @@ done
%changelog %changelog
* Wed Aug 03 2016 Jiri Popelka <jpopelka@redhat.com> - 12:4.3.4-3 * Wed Aug 03 2016 Jiri Popelka <jpopelka@redhat.com> - 12:4.3.4-3
- [dhclient] rename -R option to --request-options (#1357947) - [dhclient] rename -R option to --request-options (#1357947)
- [dhclient] rename -timeout option to --timeout
* Thu May 26 2016 Tomas Hozza <thozza@redhat.com> - 12:4.3.4-2 * Thu May 26 2016 Tomas Hozza <thozza@redhat.com> - 12:4.3.4-2
- Rebuild against bind99-9.9.9-P1 - Rebuild against bind99-9.9.9-P1