From c35bec214c42f60bb53a355237d4d471d8133486 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Thu, 15 Apr 2010 14:54:42 -0700
Subject: [PATCH] dhcp: ensure the IP4 method is compatible with DHCP

---
 src/dhcp-manager/nm-dhcp-manager.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c
index 94109adcf6..635fe320b0 100644
--- a/src/dhcp-manager/nm-dhcp-manager.c
+++ b/src/dhcp-manager/nm-dhcp-manager.c
@@ -482,6 +482,13 @@ nm_dhcp_manager_start_ip4 (NMDHCPManager *self,
 	priv = NM_DHCP_MANAGER_GET_PRIVATE (self);
 
 	if (s_ip4) {
+		const char *method = nm_setting_ip4_config_get_method (s_ip4);
+
+		if (method) {
+			/* Method must be 'auto' */
+			g_return_val_if_fail (strcmp (method, NM_SETTING_IP4_CONFIG_METHOD_AUTO) == 0, NULL);
+		}
+
 		if (   nm_setting_ip4_config_get_dhcp_send_hostname (s_ip4)
 		    && (nm_setting_ip4_config_get_dhcp_hostname (s_ip4) == NULL)
 		    && priv->hostname_provider != NULL) {