@@ -56,7 +56,6 @@ type CommonConfig struct {

 	GraphDriver          string              `json:"storage-driver,omitempty"`

 	GraphOptions         []string            `json:"storage-opts,omitempty"`

 	Labels               []string            `json:"labels,omitempty"`

-	LogConfig            LogConfig           `json:"log-config,omitempty"`

 	Mtu                  int                 `json:"mtu,omitempty"`

 	Pidfile              string              `json:"pidfile,omitempty"`

 	Root                 string              `json:"graph,omitempty"`

@@ -76,12 +75,16 @@ type CommonConfig struct {

 	// reachable by other hosts.

 	ClusterAdvertise string `json:"cluster-advertise,omitempty"`

-	Debug      bool             `json:"debug,omitempty"`

-	Hosts      []string         `json:"hosts,omitempty"`

-	LogLevel   string           `json:"log-level,omitempty"`

-	TLS        bool             `json:"tls,omitempty"`

-	TLSVerify  bool             `json:"tlsverify,omitempty"`

-	TLSOptions CommonTLSOptions `json:"tls-opts,omitempty"`

+	Debug     bool     `json:"debug,omitempty"`

+	Hosts     []string `json:"hosts,omitempty"`

+	LogLevel  string   `json:"log-level,omitempty"`

+	TLS       bool     `json:"tls,omitempty"`

+	TLSVerify bool     `json:"tlsverify,omitempty"`

+

+	// Embedded structs that allow config

+	// deserialization without the full struct.

+	CommonTLSOptions

+	LogConfig

 	reloadLock sync.Mutex

 	valuesSet  map[string]interface{}

@@ -227,7 +230,8 @@ func findConfigurationConflicts(config map[string]interface{}, flags *flag.FlagS

 		}

 	}

-	// 2. Discard keys that might have a given name, like `labels`.

+	// 2. Discard values that implement NamedOption.

+	// Their configuration name differs from their flag name, like `labels` and `label`.

 	unknownNamedConflicts := func(f *flag.Flag) {

 		if namedOption, ok := f.Value.(opts.NamedOption); ok {

 			if _, valid := unknownKeys[namedOption.Name()]; valid {

@@ -204,9 +204,9 @@ func (cli *DaemonCli) CmdDaemon(args ...string) error {

 	defaultHost := opts.DefaultHost

 	if cli.Config.TLS {

 		tlsOptions := tlsconfig.Options{

-			CAFile:   cli.Config.TLSOptions.CAFile,

-			CertFile: cli.Config.TLSOptions.CertFile,

-			KeyFile:  cli.Config.TLSOptions.KeyFile,

+			CAFile:   cli.Config.CommonTLSOptions.CAFile,

+			CertFile: cli.Config.CommonTLSOptions.CertFile,

+			KeyFile:  cli.Config.CommonTLSOptions.KeyFile,

 		}

 		if cli.Config.TLSVerify {

@@ -338,12 +338,12 @@ func loadDaemonCliConfig(config *daemon.Config, daemonFlags *flag.FlagSet, commo

 	config.LogLevel = commonConfig.LogLevel

 	config.TLS = commonConfig.TLS

 	config.TLSVerify = commonConfig.TLSVerify

-	config.TLSOptions = daemon.CommonTLSOptions{}

+	config.CommonTLSOptions = daemon.CommonTLSOptions{}

 	if commonConfig.TLSOptions != nil {

-		config.TLSOptions.CAFile = commonConfig.TLSOptions.CAFile

-		config.TLSOptions.CertFile = commonConfig.TLSOptions.CertFile

-		config.TLSOptions.KeyFile = commonConfig.TLSOptions.KeyFile

+		config.CommonTLSOptions.CAFile = commonConfig.TLSOptions.CAFile

+		config.CommonTLSOptions.CertFile = commonConfig.TLSOptions.CertFile

+		config.CommonTLSOptions.KeyFile = commonConfig.TLSOptions.KeyFile

 	}

 	if configFile != "" {

@@ -51,8 +51,8 @@ func TestLoadDaemonCliConfigWithTLS(t *testing.T) {

 	if loadedConfig == nil {

 		t.Fatalf("expected configuration %v, got nil", c)

 	}

-	if loadedConfig.TLSOptions.CAFile != "/tmp/ca.pem" {

-		t.Fatalf("expected /tmp/ca.pem, got %s: %q", loadedConfig.TLSOptions.CAFile, loadedConfig)

+	if loadedConfig.CommonTLSOptions.CAFile != "/tmp/ca.pem" {

+		t.Fatalf("expected /tmp/ca.pem, got %s: %q", loadedConfig.CommonTLSOptions.CAFile, loadedConfig)

 	}

 }

@@ -217,9 +217,12 @@ func TestLoadDaemonCliConfigWithLogLevel(t *testing.T) {

 	}

 }

-func TestLoadDaemonCliConfigWithTLSOptions(t *testing.T) {

+func TestLoadDaemonConfigWithEmbeddedOptions(t *testing.T) {

 	c := &daemon.Config{}

 	common := &cli.CommonFlags{}

+	flags := mflag.NewFlagSet("test", mflag.ContinueOnError)

+	flags.String([]string{"-tlscacert"}, "", "")

+	flags.String([]string{"-log-driver"}, "", "")

 	f, err := ioutil.TempFile("", "docker-config-")

 	if err != nil {

@@ -227,11 +230,9 @@ func TestLoadDaemonCliConfigWithTLSOptions(t *testing.T) {

 	}

 	configFile := f.Name()

-	f.Write([]byte(`{"tls-opts": {"tlscacert": "/etc/certs/ca.pem"}}`))

+	f.Write([]byte(`{"tlscacert": "/etc/certs/ca.pem", "log-driver": "syslog"}`))

 	f.Close()

-	flags := mflag.NewFlagSet("test", mflag.ContinueOnError)

-	flags.String([]string{"-tlscacert"}, "", "")

 	loadedConfig, err := loadDaemonCliConfig(c, flags, common, configFile)

 	if err != nil {

 		t.Fatal(err)

@@ -239,7 +240,10 @@ func TestLoadDaemonCliConfigWithTLSOptions(t *testing.T) {

 	if loadedConfig == nil {

 		t.Fatalf("expected configuration %v, got nil", c)

 	}

-	if loadedConfig.TLSOptions.CAFile != "/etc/certs/ca.pem" {

-		t.Fatalf("expected CA file path /etc/certs/ca.pem, got %v", loadedConfig.TLSOptions.CAFile)

+	if loadedConfig.CommonTLSOptions.CAFile != "/etc/certs/ca.pem" {

+		t.Fatalf("expected CA file path /etc/certs/ca.pem, got %v", loadedConfig.CommonTLSOptions.CAFile)

+	}

+	if loadedConfig.LogConfig.Type != "syslog" {

+		t.Fatalf("expected LogConfig type syslog, got %v", loadedConfig.LogConfig.Type)

 	}

 }

@@ -838,10 +838,8 @@ This is a full example of the allowed configuration options in the file:

 	"storage-driver": "",

 	"storage-opts": "",

 	"labels": [],

-	"log-config": {

-		"log-driver": "",

-		"log-opts": []

-	},

+	"log-driver": "",

+	"log-opts": [],

 	"mtu": 0,

 	"pidfile": "",

 	"graph": "",

@@ -853,11 +851,9 @@ This is a full example of the allowed configuration options in the file:

 	"log-level": "",

 	"tls": true,

 	"tlsverify": true,

-	"tls-opts": {

-		"tlscacert": "",

-		"tlscert": "",

-		"tlskey": ""

-	},

+	"tlscacert": "",

+	"tlscert": "",

+	"tlskey": "",

 	"api-cors-headers": "",

 	"selinux-enabled": false,

 	"userns-remap": "",