Addressing feedback and fixing a bug

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>

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

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);