mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-23 00:11:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deal with LD_LIBRARY_PATH

Browse source
This commit is contained in:
Drew DeVault 2016-12-02 10:23:30 -05:00
parent 1a143e601b
commit a4e92ad272
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -48,6 +48,9 @@ option(enable-gdk-pixbuf "Use Pixbuf to support more image formats" YES)
option(enable-binding-event "Enables binding event subscription" YES) option(enable-binding-event "Enables binding event subscription" YES)
option(zsh-completions "Zsh shell completions" NO) option(zsh-completions "Zsh shell completions" NO)
option(default-wallpaper "Installs the default wallpaper" YES) option(default-wallpaper "Installs the default wallpaper" YES)
option(ld-library-path "Configures sway's default LD_LIBRARY_PATH" "/usr/lib")
add_definitions(-D_LD_LIBRARY_PATH="${ld-library-path}")
find_package(JsonC REQUIRED) find_package(JsonC REQUIRED)
find_package(PCRE REQUIRED) find_package(PCRE REQUIRED)

4
sway/main.c
View file

@ -220,7 +220,9 @@ int main(int argc, char **argv) {
" --get-socketpath Gets the IPC socket path and prints it, then exits.\n" " --get-socketpath Gets the IPC socket path and prints it, then exits.\n"
"\n"; "\n";
unsetenv("LD_PRELOAD"); // Security // Security:
unsetenv("LD_PRELOAD");
setenv("LD_LIBRARY_PATH", _LD_LIBRARY_PATH, 1);
int c; int c;
while (1) { while (1) {

3
sway/sway-security.7.txt
View file

@ -62,6 +62,9 @@ compromised by LD_PRELOAD. It probably isn't, but you can be sure by setting
permit LD_PRELOAD for it (and will also run it as root, which sway will shortly permit LD_PRELOAD for it (and will also run it as root, which sway will shortly
drop). You could also statically link sway itself. drop). You could also statically link sway itself.
Note that LD_LIBRARY_PATH has all of the same problems, and all of the same
solutions.
Read your log Read your log
------------- -------------