1 files changed, 6 insertions, 7 deletions

diff --git a/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch b/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch
index 9825216369..cd99aad135 100644
--- a/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch
+++ b/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch
@@ -1,4 +1,4 @@
-From 66533c7c6f347d257020675a1ed6e0c59cbbc3f0 Mon Sep 17 00:00:00 2001
+From f512071dd3a4c29d4bf048c5a89c4ba9160e37b1 Mon Sep 17 00:00:00 2001
 From: Chen Qi <Qi.Chen@windriver.com>
 Date: Thu, 17 Jul 2014 15:53:34 +0800
 Subject: [PATCH] commonio.c-fix-unexpected-open-failure-in-chroot-env
@@ -15,32 +15,31 @@ Note that this patch doesn't change the logic in the code, it just expands
 the codes.
 
 Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
-
 ---
  lib/commonio.c | 16 ++++++++++++----
  1 file changed, 12 insertions(+), 4 deletions(-)
 
 diff --git a/lib/commonio.c b/lib/commonio.c
-index 16fa7e7..d6bc297 100644
+index 01a26c9..82b2868 100644
 --- a/lib/commonio.c
 +++ b/lib/commonio.c
-@@ -632,10 +632,18 @@ int commonio_open (struct commonio_db *db, int mode)
+@@ -601,10 +601,18 @@ int commonio_open (struct commonio_db *db, int mode)
         db->cursor = NULL;
         db->changed = false;
  
 -       fd = open (db->filename,
 -                    (db->readonly ? O_RDONLY : O_RDWR)
--                  | O_NOCTTY | O_NONBLOCK | O_NOFOLLOW);
+-                  | O_NOCTTY | O_NONBLOCK | O_NOFOLLOW | O_CLOEXEC);
 -       saved_errno = errno;
 +       if (db->readonly) {
 +               fd = open (db->filename,
 +                          (true ? O_RDONLY : O_RDWR)
-+                          | O_NOCTTY | O_NONBLOCK | O_NOFOLLOW);
++                          | O_NOCTTY | O_NONBLOCK | O_NOFOLLOW | O_CLOEXEC);
 +               saved_errno = errno;
 +       } else {
 +               fd = open (db->filename,
 +                          (false ? O_RDONLY : O_RDWR)
-+                          | O_NOCTTY | O_NONBLOCK | O_NOFOLLOW);
++                          | O_NOCTTY | O_NONBLOCK | O_NOFOLLOW| O_CLOEXEC);
 +               saved_errno = errno;
 +       }
 +