1 |
dmorgan |
16733 |
diff -p -up dhcp-4.1.1/client/dhclient.c.not_a_string dhcp-4.1.1/client/dhclient.c |
2 |
|
|
--- dhcp-4.1.1/client/dhclient.c.not_a_string 2010-01-07 19:47:40.000000000 -0200 |
3 |
|
|
+++ dhcp-4.1.1/client/dhclient.c 2010-02-25 11:30:19.000000000 -0300 |
4 |
|
|
@@ -381,9 +381,9 @@ main(int argc, char **argv) { |
5 |
|
|
|
6 |
|
|
if (!quiet) { |
7 |
|
|
log_info("%s %s", message, PACKAGE_VERSION); |
8 |
|
|
- log_info(copyright); |
9 |
|
|
- log_info(arr); |
10 |
|
|
- log_info(url); |
11 |
|
|
+ log_info("%s", copyright); |
12 |
|
|
+ log_info("%s", arr); |
13 |
|
|
+ log_info("%s", url); |
14 |
|
|
log_info("%s", ""); |
15 |
|
|
} else { |
16 |
|
|
log_perror = 0; |
17 |
|
|
@@ -647,9 +647,9 @@ main(int argc, char **argv) { |
18 |
|
|
static void usage() |
19 |
|
|
{ |
20 |
|
|
log_info("%s %s", message, PACKAGE_VERSION); |
21 |
|
|
- log_info(copyright); |
22 |
|
|
- log_info(arr); |
23 |
|
|
- log_info(url); |
24 |
|
|
+ log_info("%s", copyright); |
25 |
|
|
+ log_info("%s", arr); |
26 |
|
|
+ log_info("%s", url); |
27 |
|
|
|
28 |
|
|
log_error("Usage: dhclient %s %s", |
29 |
|
|
#ifdef DHCPv6 |
30 |
|
|
diff -p -up dhcp-4.1.1/relay/dhcrelay.c.not_a_string dhcp-4.1.1/relay/dhcrelay.c |
31 |
|
|
--- dhcp-4.1.1/relay/dhcrelay.c.not_a_string 2010-01-07 19:48:02.000000000 -0200 |
32 |
|
|
+++ dhcp-4.1.1/relay/dhcrelay.c 2010-02-25 11:30:22.000000000 -0300 |
33 |
|
|
@@ -403,9 +403,9 @@ main(int argc, char **argv) { |
34 |
|
|
|
35 |
|
|
if (!quiet) { |
36 |
|
|
log_info("%s %s", message, PACKAGE_VERSION); |
37 |
|
|
- log_info(copyright); |
38 |
|
|
- log_info(arr); |
39 |
|
|
- log_info(url); |
40 |
|
|
+ log_info("%s", copyright); |
41 |
|
|
+ log_info("%s", arr); |
42 |
|
|
+ log_info("%s", url); |
43 |
|
|
} else { |
44 |
|
|
quiet = 0; |
45 |
|
|
log_perror = 0; |
46 |
|
|
diff -p -up dhcp-4.1.1/server/dhcpd.c.not_a_string dhcp-4.1.1/server/dhcpd.c |
47 |
|
|
--- dhcp-4.1.1/server/dhcpd.c.not_a_string 2010-02-25 11:29:56.000000000 -0300 |
48 |
|
|
+++ dhcp-4.1.1/server/dhcpd.c 2010-02-25 11:30:22.000000000 -0300 |
49 |
|
|
@@ -459,9 +459,9 @@ main(int argc, char **argv) { |
50 |
|
|
|
51 |
|
|
if (!quiet) { |
52 |
|
|
log_info("%s %s", message, PACKAGE_VERSION); |
53 |
|
|
- log_info (copyright); |
54 |
|
|
- log_info (arr); |
55 |
|
|
- log_info (url); |
56 |
|
|
+ log_info ("%s", copyright); |
57 |
|
|
+ log_info ("%s", arr); |
58 |
|
|
+ log_info ("%s", url); |
59 |
|
|
} else { |
60 |
|
|
quiet = 0; |
61 |
|
|
log_perror = 0; |
62 |
|
|
@@ -1061,9 +1061,9 @@ void postconf_initialization (int quiet) |
63 |
|
|
log_perror = 0; |
64 |
|
|
log_info("%s %s", |
65 |
|
|
message, PACKAGE_VERSION); |
66 |
|
|
- log_info (copyright); |
67 |
|
|
- log_info (arr); |
68 |
|
|
- log_info (url); |
69 |
|
|
+ log_info ("%s", copyright); |
70 |
|
|
+ log_info ("%s", arr); |
71 |
|
|
+ log_info ("%s", url); |
72 |
|
|
log_perror = tmp; |
73 |
|
|
} |
74 |
|
|
} else |
75 |
|
|
@@ -1170,8 +1170,8 @@ void postdb_startup (void) |
76 |
|
|
static void |
77 |
|
|
usage(void) { |
78 |
|
|
log_info("%s %s", message, PACKAGE_VERSION); |
79 |
|
|
- log_info(copyright); |
80 |
|
|
- log_info(arr); |
81 |
|
|
+ log_info("%s", copyright); |
82 |
|
|
+ log_info("%s", arr); |
83 |
|
|
|
84 |
|
|
log_fatal("Usage: dhcpd [-p <UDP port #>] [-f] [-d] [-q] [-t|-T]\n" |
85 |
|
|
#ifdef DHCPv6 |