bump version to 4.0.2-1

[lxc.git] / debian / patches / pve / 0003-PVE-Config-attach-always-use-getent.patch

diff --git a/debian/patches/pve/0003-PVE-Config-attach-always-use-getent.patch b/debian/patches/pve/0003-PVE-Config-attach-always-use-getent.patch
index 4c7c83f1ac8236cf4cbd088d554b4e4fcf280fdf..ce8960efc4733bbfe5754987192a070f0f8d2a11 100644 (file)
--- a/debian/patches/pve/0003-PVE-Config-attach-always-use-getent.patch
+++ b/debian/patches/pve/0003-PVE-Config-attach-always-use-getent.patch
@@ -1,7 +1,7 @@
-From 580f2f5423b975f2d6a19004139788758a34359f Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Wolfgang Bumiller <w.bumiller@proxmox.com>
 Date: Tue, 13 Aug 2019 13:57:22 +0200
-Subject: [PATCH lxc 3/3] PVE: [Config] attach: always use getent
+Subject: [PATCH lxc] PVE: [Config] attach: always use getent
 
 In debian buster, some libnss plugins (if installed) can
 cause getpwent to segfault instead of erroring out cleanly.
@@ -13,10 +13,10 @@ Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
  1 file changed, 2 insertions(+), 26 deletions(-)
 
 diff --git a/src/lxc/attach.c b/src/lxc/attach.c
-index 406b8ec74..0a82c0a5d 100644
+index bbf95bd5b..de3a98cf9 100644
 --- a/src/lxc/attach.c
 +++ b/src/lxc/attach.c
-@@ -1454,12 +1454,8 @@ int lxc_attach_run_command(void *payload)
+@@ -1456,12 +1456,8 @@ int lxc_attach_run_command(void *payload)
  
  int lxc_attach_run_shell(void* payload)
  {
@@ -29,7 +29,7 @@ index 406b8ec74..0a82c0a5d 100644
        int ret;
  
        /* Ignore payload parameter. */
-@@ -1467,32 +1463,13 @@ int lxc_attach_run_shell(void* payload)
+@@ -1469,32 +1465,13 @@ int lxc_attach_run_shell(void* payload)
  
        uid = getuid();
  
@@ -63,7 +63,7 @@ index 406b8ec74..0a82c0a5d 100644
        if (user_shell)
                execlp(user_shell, user_shell, (char *)NULL);
  
-@@ -1502,8 +1479,7 @@ int lxc_attach_run_shell(void* payload)
+@@ -1504,8 +1481,7 @@ int lxc_attach_run_shell(void* payload)
        execlp("/bin/sh", "/bin/sh", (char *)NULL);
  
        SYSERROR("Failed to execute shell");
@@ -73,6 +73,3 @@ index 406b8ec74..0a82c0a5d 100644
  
        return -1;
  }
--- 
-2.20.1
-