File dhcp-4.2.2-dhclient-option-checks.bnc675052.diff of Package dhcp

Overview Repositories Revisions Requests Users Attributes Meta

File dhcp-4.2.2-dhclient-option-checks.bnc675052.diff of Package dhcp (Revision 892b1be6bbc5a8f74e3083dc64bff5c8)

Currently displaying revision 892b1be6bbc5a8f74e3083dc64bff5c8 , Show latest

diff --git a/client/dhclient.c b/client/dhclient.c
index 9fd7ccc..82c26bb 100644
--- a/client/dhclient.c
+++ b/client/dhclient.c
@@ -3251,7 +3251,7 @@ void script_write_params (client, prefix, lease)
 		} else {
 			log_error("suspect value in %s "
 				  "option - discarded",
-				  lease->filename);
+				  "filename");
 		}
 	}
 
@@ -3264,7 +3264,7 @@ void script_write_params (client, prefix, lease)
 		} else {
 			log_error("suspect value in %s "
 				  "option - discarded",
-				  lease->server_name);
+				  "server-name");
 		}
 	}
 				
@@ -4193,7 +4193,7 @@ static int check_domain_name(const char *ptr, size_t len, int dots)
 	const char *p;
 
 	/* not empty or complete length not over 255 characters   */
-	if ((len == 0) || (len > 256))
+	if ((len == 0) || (len >= 256))
 		return(-1);
 
 	/* consists of [[:alnum:]-]+ labels separated by [.]      */
diff --git a/common/options.c b/common/options.c
index 80fd8db..6b95f3b 100644
--- a/common/options.c
+++ b/common/options.c
@@ -3916,7 +3916,7 @@ pretty_escape(char **dst, char *dend, const unsigned char **src,
 			}
 		} else if (**src == '"' || **src == '\'' || **src == '$' ||
 			   **src == '`' || **src == '\\' || **src == '|' ||
-			   **src == '&') {
+			   **src == '&' || **src == ';') {
 			if (*dst + 2 > dend)
 				return -1;
 
-- 
1.7.3.4

Places

File dhcp-4.2.2-dhclient-option-checks.bnc675052.diff of Package dhcp (Revision 892b1be6bbc5a8f74e3083dc64bff5c8)

Places