From: Roy Marples <roy@marples.name>
Date: Mon, 15 Sep 2014 08:13:45 +0000 (+0000)
Subject: Describe master mode some more.
X-Git-Tag: v6.4.4~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5669f066a3443c73a3870d42242dee2c82e997f1;p=thirdparty%2Fdhcpcd.git

Describe master mode some more.
---

diff --git a/dhcp6.c b/dhcp6.c
index 8a81bc5d..0220d74c 100644
--- a/dhcp6.c
+++ b/dhcp6.c
@@ -2668,10 +2668,12 @@ dhcp6_handledata(void *arg)
 		break;
 	case DHCP6_RECONFIGURE:
 		if (auth == NULL) {
-			syslog(LOG_ERR,
+			syslog(ifo->options & DHCPCD_AUTH_REQUIRE ?
+			    LOG_ERR : LOG_WARNING,
 			    "%s: unauthenticated %s from %s",
 			    ifp->name, op, ctx->sfrom);
-			return;
+			if (ifo->options & DHCPCD_AUTH_REQUIRE)
+				return;
 		}
 		syslog(LOG_INFO, "%s: %s from %s",
 		    ifp->name, op, ctx->sfrom);
diff --git a/dhcpcd.8.in b/dhcpcd.8.in
index 26edfbbd..7a155ff1 100644
--- a/dhcpcd.8.in
+++ b/dhcpcd.8.in
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd September 14, 2014
+.Dd September 15, 2014
 .Dt DHCPCD 8
 .Os
 .Sh NAME
@@ -143,6 +143,14 @@ If a list of interfaces are given on the command line, then
 only works with those interfaces, otherwise
 .Nm
 discovers available Ethernet interfaces.
+This is called Master mode and this behaviour can be forced with the
+.Fl M , Fl Fl master
+option so that an individual interface can start
+.Nm
+but only one instance is running.
+The
+.Nm dhcpcd-ui
+project expects dhcpcd to be running this way.
 If any interface reports a working carrier then
 .Nm
 will try and obtain a lease before forking to the background,
@@ -321,6 +329,7 @@ DHCP server.
 Start
 .Nm
 in master mode even if only one interface specified on the command line.
+See the Multiple Interfaces section above.
 .It Fl m , Fl Fl metric Ar metric
 Metrics are used to prefer an interface over another one, lowest wins.
 .Nm