Fix compile with commandline compat.

diff --git a/config.h b/config.h
index 9e36197971d2ff62d48a804001521b4352036bde..d978a5d6edcd983ed81be8205f211a9afc839c39 100644 (file)
--- a/config.h
+++ b/config.h
@@ -46,7 +46,6 @@
 /* #define THERE_IS_NO_FORK */
 
 /* Packname name and pathname definitions. */
-
 #define PACKAGE                        "dhcpcd"
 
 #ifndef SYSCONFDIR

diff --git a/dhcpcd.c b/dhcpcd.c
index 36cefe374b2ca2c98913fad6d0c57581c313fb1e..f1f7f667609a586522b25c45c2a77f9c201a3cd0 100644 (file)
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -103,7 +103,7 @@ char **dhcpcd_argv = NULL;
 int dhcpcd_argc = 0;
 char *dhcpcd_skiproutes = NULL;
 #define EXTRA_OPTS "XZ:"
-#elif CMDLINE_COMAPT
+#elif defined(CMDLINE_COMPAT)
 # define EXTRA_OPTS "NRSY"
 #endif
 
@@ -341,7 +341,7 @@ parse_config_line(const char *opt, char *line, struct options *options)
 
                if (longopts[i].has_arg == required_argument && !line) {
                        fprintf(stderr,
-                               "dhcpcd: option requires an argument -- %s\n",
+                               PACKAGE ": option requires an argument -- %s\n",
                                opt);
                        return -1;
                }
@@ -349,7 +349,7 @@ parse_config_line(const char *opt, char *line, struct options *options)
                return parse_option(longopts[i].val, line, options);
        }
 
-       fprintf(stderr, "dhcpcd: unknown option -- %s\n", opt);
+       fprintf(stderr, PACKAGE ": unknown option -- %s\n", opt);
        return -1;
 }
 
@@ -600,7 +600,7 @@ main(int argc, char **argv)
                        del_reqmask(options->reqmask, DHCP_DNSSEARCH);
                        break;
                case 'S':
-                       add_mask(options->requmask, DHCP_MSCR);
+                       add_reqmask(options->reqmask, DHCP_MSCSR);
                        break;
                case 'Y':
                        del_reqmask(options->reqmask, DHCP_NISSERVER);