Describe master mode some more.

diff --git a/dhcp6.c b/dhcp6.c
index 8a81bc5d456ccdc90a459211771d50ba1d03f228..0220d74c8b351cc16b0b210287df0e6fb124ef9c 100644 (file)
--- 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 26edfbbdbdd72d5c4739c06924b879d4944387ae..7a155ff17d3185ed84dda02b3226d30bba217946 100644 (file)
--- 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