Merge pull request #627 from mrunalp/add_groups_check

dqminh · dqminh · commit 5dc7ba0f2433 · 2015-06-15T17:03:53.000+08:00
Only try to get AdditionalGroups if they are configured.
diff --git a/init_linux.go b/init_linux.go
@@ -178,9 +178,12 @@ func setupUser(config *initConfig) error {
 		return err
 	}
 
-	addGroups, err := user.GetAdditionalGroupsPath(config.Config.AdditionalGroups, groupPath)
-	if err != nil {
-		return err
+	var addGroups []int
+	if len(config.Config.AdditionalGroups) > 0 {
+		addGroups, err = user.GetAdditionalGroupsPath(config.Config.AdditionalGroups, groupPath)
+		if err != nil {
+			return err
+		}
 	}
 
 	suppGroups := append(execUser.Sgids, addGroups...)

Original file line number	Diff line number	Diff line change
`@@ -178,9 +178,12 @@ func setupUser(config *initConfig) error {`
`178`	`178`	`return err`
`179`	`179`	`}`
`180`	`180`
`181`		`- addGroups, err := user.GetAdditionalGroupsPath(config.Config.AdditionalGroups, groupPath)`
`182`		`- if err != nil {`
`183`		`- return err`
	`181`	`+ var addGroups []int`
	`182`	`+ if len(config.Config.AdditionalGroups) > 0 {`
	`183`	`+ addGroups, err = user.GetAdditionalGroupsPath(config.Config.AdditionalGroups, groupPath)`
	`184`	`+ if err != nil {`
	`185`	`+ return err`
	`186`	`+ }`
`184`	`187`	`}`
`185`	`188`
`186`	`189`	`suppGroups := append(execUser.Sgids, addGroups...)`