BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "setuid-wrappers: Update wrapper dir atomically."

Browse source 
This reverts commit ee535056ce.

It doesn't work yet.
This commit is contained in:
Domen Kožar 2016-08-31 16:24:40 +02:00
parent 4499a505ed
commit d8d75ddec6
1 changed files with 6 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
nixos/modules/security/setuid-wrappers.nix
View file

@ -102,11 +102,11 @@ in
source=/nix/var/nix/profiles/default/bin/${program}
fi
cp ${setuidWrapper}/bin/setuid-wrapper $wrapperDir/${program}
echo -n "$source" > $wrapperDir/${program}.real
chmod 0000 $wrapperDir/${program} # to prevent races
chown ${owner}.${group} $wrapperDir/${program}
chmod "u${if setuid then "+" else "-"}s,g${if setgid then "+" else "-"}s,${permissions}" $wrapperDir/${program}
cp ${setuidWrapper}/bin/setuid-wrapper ${wrapperDir}/${program}
echo -n "$source" > ${wrapperDir}/${program}.real
chmod 0000 ${wrapperDir}/${program} # to prevent races
chown ${owner}.${group} ${wrapperDir}/${program}
chmod "u${if setuid then "+" else "-"}s,g${if setgid then "+" else "-"}s,${permissions}" ${wrapperDir}/${program}
'';
in stringAfter [ "users" ]
@ -115,23 +115,9 @@ in
# programs to be wrapped.
SETUID_PATH=${config.system.path}/bin:${config.system.path}/sbin
mkdir -p /run/setuid-wrapper-dirs
wrapperDir=$(mktemp --directory --tmpdir=/run/setuid-wrapper-dirs setuid-wrappers.XXXXXXXXXX)
rm -f ${wrapperDir}/* # */
${concatMapStrings makeSetuidWrapper setuidPrograms}
if [ -d ${wrapperDir} ]; then
mv --no-target-directory ${wrapperDir} ${wrapperDir}-old
ln --symbolic $wrapperDir ${wrapperDir}
rm --force --recursive ${wrapperDir}-old
elif [ -L ${wrapperDir} ]; then
ln --symbolic --force --no-dereference $wrapperDir ${wrapperDir}-tmp
old=$(readlink ${wrapperDir})
mv --no-target-directory ${wrapperDir}-tmp ${wrapperDir}
rm --force --recursive $old
else
ln --symbolic $wrapperDir ${wrapperDir}
fi
'';
};