Merge pull request #5 from mialinx/master

quickfix for empty credentials
sevlyar · Jan 17, 2015 · 04162ff · 04162ff
2 parents 8fe5849 + 17654fe
commit 04162ff
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/daemon_posix.go b/daemon_posix.go
@@ -247,14 +247,16 @@ func (d *Context) child() (err error) {
 	if len(d.Chroot) > 0 {
 		err = syscall.Chroot(d.Chroot)
 	}
-	if d.Credential.Gid > 0 {
-		if err = syscall.Setgid(int(d.Credential.Gid)); err != nil {
-			return
+	if d.Credential != nil {
+		if d.Credential.Gid > 0 {
+			if err = syscall.Setgid(int(d.Credential.Gid)); err != nil {
+				return
+			}
 		}
-	}
-	if d.Credential.Uid > 0 {
-		if err = syscall.Setuid(int(d.Credential.Uid)); err != nil {
-			return
+		if d.Credential.Uid > 0 {
+			if err = syscall.Setuid(int(d.Credential.Uid)); err != nil {
+				return
+			}
 		}
 	}