mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-02 09:01:46 -05:00
a few FreeBSD fixes, from alexis
Signed-off-by: Lennart Poettering <lennart@poettering.net>
This commit is contained in:
parent
f04cfcd4f0
commit
644f39d261
4 changed files with 6 additions and 4 deletions
|
|
@ -2351,7 +2351,7 @@ int pa_reset_sigs(int except, ...) {
|
|||
int pa_reset_sigsv(const int except[]) {
|
||||
int sig;
|
||||
|
||||
for (sig = 1; sig < _NSIG; sig++) {
|
||||
for (sig = 1; sig < NSIG; sig++) {
|
||||
pa_bool_t reset = TRUE;
|
||||
|
||||
switch (sig) {
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@
|
|||
|
||||
void pa_init_proplist(pa_proplist *p) {
|
||||
int a, b;
|
||||
#ifndef HAVE_DECL_ENVIRON
|
||||
#if !HAVE_DECL_ENVIRON
|
||||
extern char **environ;
|
||||
#endif
|
||||
char **e;
|
||||
|
|
|
|||
|
|
@ -2192,6 +2192,7 @@ static void command_auth(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_ta
|
|||
if (c->version < 10 || (c->version >= 13 && !shm_on_remote))
|
||||
do_shm = FALSE;
|
||||
|
||||
#ifdef HAVE_CREDS
|
||||
if (do_shm) {
|
||||
/* Only enable SHM if both sides are owned by the same
|
||||
* user. This is a security measure because otherwise data
|
||||
|
|
@ -2201,6 +2202,7 @@ static void command_auth(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_ta
|
|||
if (!(creds = pa_pdispatch_creds(pd)) || getuid() != creds->uid)
|
||||
do_shm = FALSE;
|
||||
}
|
||||
#endif
|
||||
|
||||
pa_log_debug("Negotiated SHM: %s", pa_yes_no(do_shm));
|
||||
pa_pstream_enable_shm(c->pstream, do_shm);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue