From fb6d13c01aa22cdaffe45597495f390ef2989eda Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Tue, 14 Feb 2017 07:38:45 -0600
Subject: [PATCH] Addressing feedback and fixing a bug

---
 nixos/doc/manual/release-notes/rl-1703.xml | 6 ++----
 nixos/modules/module-list.nix              | 2 +-
 nixos/modules/security/wrappers/wrapper.c  | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index 5d6053fcbf74..8f9694bad8bd 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -17,10 +17,8 @@ has the following highlights: </para>
   </listitem>
 
   <listitem>
-    <para>Setting capabilities on programs is now supported with a
-    <literal>setcap-wrapper</literal> functionality. This
-    functionality and the <literal>setuid-wrapper</literal> are merged
-    into a single "wrappers" module.</para>
+    <para>The setuid wrapper functionality now supports setting
+    capabilities.</para>
   </listitem>
 
   <listitem>
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 9dbc009a6e44..81597d91d89a 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -113,7 +113,7 @@
   ./security/prey.nix
   ./security/rngd.nix
   ./security/rtkit.nix
-  ./security/wrappers
+  ./security/wrappers/default.nix
   ./security/sudo.nix
   ./services/amqp/activemq/default.nix
   ./services/amqp/rabbitmq.nix
diff --git a/nixos/modules/security/wrappers/wrapper.c b/nixos/modules/security/wrappers/wrapper.c
index 4a656c54e3f9..7091e314bb22 100644
--- a/nixos/modules/security/wrappers/wrapper.c
+++ b/nixos/modules/security/wrappers/wrapper.c
@@ -165,7 +165,7 @@ int main(int argc, char * * argv)
     // should safely fit within the PATH_MAX system limit. Though I'm
     // not positive it's safe...
     char selfPath[PATH_MAX];
-    int selfPathSize = readlink("/proc/self/exe", selfPath, sizeof(selfPath) - 1);
+    int selfPathSize = readlink("/proc/self/exe", selfPath, sizeof(selfPath));
 
     assert(selfPathSize > 0);