mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-08 13:29:59 -05:00
Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio
This commit is contained in:
Lennart Poettering
commit
51fc1763a1
4 changed files with 34 additions and 223 deletions
|
|
@ -177,8 +177,8 @@ pulseaudio_SOURCES = \
|
|||
daemon/ltdl-bind-now.c daemon/ltdl-bind-now.h \
|
||||
daemon/main.c
|
||||
|
||||
pulseaudio_CFLAGS = $(AM_CFLAGS) $(LIBOIL_CFLAGS) $(LIBSAMPLERATE_CFLAGS) $(LIBSPEEX_CFLAGS) $(LIBSNDFILE_CFLAGS) $(CAP_CFLAGS) $(LIBOIL_CFLAGS) $(DBUS_CFLAGS)
|
||||
pulseaudio_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSPEEX_LIBS) $(LIBSNDFILE_LIBS) $(CAP_LIBS) $(LIBOIL_LIBS) $(DBUS_LIBS)
|
||||
pulseaudio_CFLAGS = $(AM_CFLAGS) $(LIBSAMPLERATE_CFLAGS) $(LIBSPEEX_CFLAGS) $(LIBSNDFILE_CFLAGS) $(CAP_CFLAGS) $(DBUS_CFLAGS)
|
||||
pulseaudio_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSPEEX_LIBS) $(LIBSNDFILE_LIBS) $(CAP_LIBS) $(DBUS_LIBS)
|
||||
# This is needed because automake doesn't properly expand the foreach below
|
||||
pulseaudio_DEPENDENCIES = libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la $(PREOPEN_LIBS)
|
||||
|
||||
|
|
@ -496,18 +496,18 @@ sig2str_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
|
|||
|
||||
resampler_test_SOURCES = tests/resampler-test.c
|
||||
resampler_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la
|
||||
resampler_test_CFLAGS = $(AM_CFLAGS) $(LIBOIL_CFLAGS)
|
||||
resampler_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBOIL_LIBS)
|
||||
resampler_test_CFLAGS = $(AM_CFLAGS)
|
||||
resampler_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
|
||||
|
||||
mix_test_SOURCES = tests/mix-test.c
|
||||
mix_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la
|
||||
mix_test_CFLAGS = $(AM_CFLAGS) $(LIBOIL_CFLAGS)
|
||||
mix_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBOIL_LIBS)
|
||||
mix_test_CFLAGS = $(AM_CFLAGS)
|
||||
mix_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
|
||||
|
||||
remix_test_SOURCES = tests/remix-test.c
|
||||
remix_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la
|
||||
remix_test_CFLAGS = $(AM_CFLAGS) $(LIBOIL_CFLAGS)
|
||||
remix_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBOIL_LIBS)
|
||||
remix_test_CFLAGS = $(AM_CFLAGS)
|
||||
remix_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
|
||||
|
||||
smoother_test_SOURCES = tests/smoother-test.c
|
||||
smoother_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la
|
||||
|
|
@ -516,38 +516,38 @@ smoother_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
|
|||
|
||||
envelope_test_SOURCES = tests/envelope-test.c
|
||||
envelope_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la
|
||||
envelope_test_CFLAGS = $(AM_CFLAGS) $(LIBOIL_CFLAGS)
|
||||
envelope_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBOIL_LIBS)
|
||||
envelope_test_CFLAGS = $(AM_CFLAGS)
|
||||
envelope_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
|
||||
|
||||
proplist_test_SOURCES = tests/proplist-test.c
|
||||
proplist_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la
|
||||
proplist_test_CFLAGS = $(AM_CFLAGS) $(LIBOIL_CFLAGS)
|
||||
proplist_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBOIL_LIBS)
|
||||
proplist_test_CFLAGS = $(AM_CFLAGS)
|
||||
proplist_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
|
||||
|
||||
rtstutter_SOURCES = tests/rtstutter.c
|
||||
rtstutter_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la
|
||||
rtstutter_CFLAGS = $(AM_CFLAGS) $(LIBOIL_CFLAGS)
|
||||
rtstutter_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBOIL_LIBS)
|
||||
rtstutter_CFLAGS = $(AM_CFLAGS)
|
||||
rtstutter_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
|
||||
|
||||
stripnul_SOURCES = tests/stripnul.c
|
||||
stripnul_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la
|
||||
stripnul_CFLAGS = $(AM_CFLAGS) $(LIBOIL_CFLAGS)
|
||||
stripnul_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBOIL_LIBS)
|
||||
stripnul_CFLAGS = $(AM_CFLAGS)
|
||||
stripnul_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
|
||||
|
||||
lock_autospawn_test_SOURCES = tests/lock-autospawn-test.c
|
||||
lock_autospawn_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la
|
||||
lock_autospawn_test_CFLAGS = $(AM_CFLAGS) $(LIBOIL_CFLAGS)
|
||||
lock_autospawn_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBOIL_LIBS)
|
||||
lock_autospawn_test_CFLAGS = $(AM_CFLAGS)
|
||||
lock_autospawn_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
|
||||
|
||||
prioq_test_SOURCES = tests/prioq-test.c
|
||||
prioq_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la
|
||||
prioq_test_CFLAGS = $(AM_CFLAGS) $(LIBOIL_CFLAGS)
|
||||
prioq_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBOIL_LIBS)
|
||||
prioq_test_CFLAGS = $(AM_CFLAGS)
|
||||
prioq_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
|
||||
|
||||
sigbus_test_SOURCES = tests/sigbus-test.c
|
||||
sigbus_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la
|
||||
sigbus_test_CFLAGS = $(AM_CFLAGS) $(LIBOIL_CFLAGS)
|
||||
sigbus_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBOIL_LIBS)
|
||||
sigbus_test_CFLAGS = $(AM_CFLAGS)
|
||||
sigbus_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
|
||||
|
||||
gtk_test_SOURCES = tests/gtk-test.c
|
||||
gtk_test_LDADD = $(AM_LDADD) libpulse.la libpulse-mainloop-glib.la
|
||||
|
|
@ -858,9 +858,9 @@ libpulsecore_@PA_MAJORMINORMICRO@_la_SOURCES = \
|
|||
pulsecore/time-smoother.c pulsecore/time-smoother.h \
|
||||
pulsecore/database.h
|
||||
|
||||
libpulsecore_@PA_MAJORMINORMICRO@_la_CFLAGS = $(AM_CFLAGS) $(LIBSAMPLERATE_CFLAGS) $(LIBSPEEX_CFLAGS) $(WINSOCK_CFLAGS) $(LIBOIL_CFLAGS)
|
||||
libpulsecore_@PA_MAJORMINORMICRO@_la_CFLAGS = $(AM_CFLAGS) $(LIBSAMPLERATE_CFLAGS) $(LIBSPEEX_CFLAGS) $(WINSOCK_CFLAGS)
|
||||
libpulsecore_@PA_MAJORMINORMICRO@_la_LDFLAGS = -avoid-version
|
||||
libpulsecore_@PA_MAJORMINORMICRO@_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSPEEX_LIBS) $(WINSOCK_LIBS) $(LIBOIL_LIBS) $(LTLIBICONV) libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la libpulsecore-foreign.la
|
||||
libpulsecore_@PA_MAJORMINORMICRO@_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSPEEX_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la libpulsecore-foreign.la
|
||||
|
||||
if HAVE_X11
|
||||
libpulsecore_@PA_MAJORMINORMICRO@_la_SOURCES += pulsecore/x11wrap.c pulsecore/x11wrap.h
|
||||
|
|
|
|||
|
|
@ -1,172 +0,0 @@
|
|||
/***
|
||||
This file is part of PulseAudio.
|
||||
|
||||
Copyright 2004-2006 Lennart Poettering
|
||||
Copyright 2006 Pierre Ossman <ossman@cendio.se> for Cendio AB
|
||||
|
||||
PulseAudio is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU Lesser General Public License as published
|
||||
by the Free Software Foundation; either version 2.1 of the License,
|
||||
or (at your option) any later version.
|
||||
|
||||
PulseAudio is distributed in the hope that it will be useful, but
|
||||
WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public License
|
||||
along with PulseAudio; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
|
||||
USA.
|
||||
***/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#include <unistd.h>
|
||||
#include <stdlib.h>
|
||||
#include <inttypes.h>
|
||||
|
||||
#include <dbus/dbus.h>
|
||||
#include <polkit-dbus/polkit-dbus.h>
|
||||
|
||||
#include <pulse/i18n.h>
|
||||
|
||||
#include <pulsecore/log.h>
|
||||
#include <pulsecore/macro.h>
|
||||
|
||||
#include "polkit.h"
|
||||
|
||||
int pa_polkit_check(const char *action_id) {
|
||||
int ret = -1;
|
||||
DBusError dbus_error;
|
||||
DBusConnection *bus = NULL;
|
||||
PolKitCaller *caller = NULL;
|
||||
PolKitAction *action = NULL;
|
||||
PolKitContext *context = NULL;
|
||||
PolKitError *polkit_error = NULL;
|
||||
PolKitSession *session = NULL;
|
||||
PolKitResult polkit_result;
|
||||
|
||||
dbus_error_init(&dbus_error);
|
||||
|
||||
if (!(bus = dbus_bus_get(DBUS_BUS_SYSTEM, &dbus_error))) {
|
||||
pa_log_error(_("Cannot connect to system bus: %s"), dbus_error.message);
|
||||
goto finish;
|
||||
}
|
||||
|
||||
/* There seems to be a bug in some versions of D-Bus that causes
|
||||
* dbus_shutdown() to call exit() when a connection without this
|
||||
* flag disabled was created during runtime.*/
|
||||
dbus_connection_set_exit_on_disconnect(bus, FALSE);
|
||||
|
||||
if (!(caller = polkit_caller_new_from_pid(bus, getpid(), &dbus_error))) {
|
||||
pa_log_error(_("Cannot get caller from PID: %s"), dbus_error.message);
|
||||
goto finish;
|
||||
}
|
||||
|
||||
/* This function is called when PulseAudio is called SUID root. We
|
||||
* want to authenticate the real user that called us and not the
|
||||
* effective user we gained through being SUID root. Hence we
|
||||
* overwrite the UID caller data here explicitly, just for
|
||||
* paranoia. In fact PolicyKit should fill in the UID here anyway
|
||||
* -- an not the EUID or any other user id. */
|
||||
|
||||
if (!(polkit_caller_set_uid(caller, getuid()))) {
|
||||
pa_log_error(_("Cannot set UID on caller object."));
|
||||
goto finish;
|
||||
}
|
||||
|
||||
if (!(polkit_caller_get_ck_session(caller, &session))) {
|
||||
pa_log_error(_("Failed to get CK session."));
|
||||
goto finish;
|
||||
}
|
||||
|
||||
/* We need to overwrite the UID in both the caller and the session
|
||||
* object */
|
||||
|
||||
if (!(polkit_session_set_uid(session, getuid()))) {
|
||||
pa_log_error(_("Cannot set UID on session object."));
|
||||
goto finish;
|
||||
}
|
||||
|
||||
if (!(action = polkit_action_new())) {
|
||||
pa_log_error(_("Cannot allocate PolKitAction."));
|
||||
goto finish;
|
||||
}
|
||||
|
||||
if (!polkit_action_set_action_id(action, action_id)) {
|
||||
pa_log_error(_("Cannot set action_id"));
|
||||
goto finish;
|
||||
}
|
||||
|
||||
if (!(context = polkit_context_new())) {
|
||||
pa_log_error(_("Cannot allocate PolKitContext."));
|
||||
goto finish;
|
||||
}
|
||||
|
||||
if (!polkit_context_init(context, &polkit_error)) {
|
||||
pa_log_error(_("Cannot initialize PolKitContext: %s"), polkit_error_get_error_message(polkit_error));
|
||||
goto finish;
|
||||
}
|
||||
|
||||
for (;;) {
|
||||
|
||||
polkit_result = polkit_context_is_caller_authorized(context, action, caller, TRUE, &polkit_error);
|
||||
|
||||
if (polkit_error_is_set(polkit_error)) {
|
||||
pa_log_error(_("Could not determine whether caller is authorized: %s"), polkit_error_get_error_message(polkit_error));
|
||||
goto finish;
|
||||
}
|
||||
|
||||
if (polkit_result == POLKIT_RESULT_ONLY_VIA_ADMIN_AUTH ||
|
||||
polkit_result == POLKIT_RESULT_ONLY_VIA_ADMIN_AUTH_KEEP_SESSION ||
|
||||
polkit_result == POLKIT_RESULT_ONLY_VIA_ADMIN_AUTH_KEEP_ALWAYS ||
|
||||
polkit_result == POLKIT_RESULT_ONLY_VIA_ADMIN_AUTH_ONE_SHOT ||
|
||||
polkit_result == POLKIT_RESULT_ONLY_VIA_SELF_AUTH ||
|
||||
polkit_result == POLKIT_RESULT_ONLY_VIA_SELF_AUTH_KEEP_SESSION ||
|
||||
polkit_result == POLKIT_RESULT_ONLY_VIA_SELF_AUTH_KEEP_ALWAYS ||
|
||||
polkit_result == POLKIT_RESULT_ONLY_VIA_SELF_AUTH_ONE_SHOT
|
||||
) {
|
||||
|
||||
if (polkit_auth_obtain(action_id, 0, getpid(), &dbus_error)) {
|
||||
polkit_result = POLKIT_RESULT_YES;
|
||||
break;
|
||||
}
|
||||
|
||||
if (dbus_error_is_set(&dbus_error)) {
|
||||
pa_log_error(_("Cannot obtain auth: %s"), dbus_error.message);
|
||||
goto finish;
|
||||
}
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
if (polkit_result != POLKIT_RESULT_YES && polkit_result != POLKIT_RESULT_NO)
|
||||
pa_log_warn(_("PolicyKit responded with '%s'"), polkit_result_to_string_representation(polkit_result));
|
||||
|
||||
ret = polkit_result == POLKIT_RESULT_YES;
|
||||
|
||||
finish:
|
||||
|
||||
if (caller)
|
||||
polkit_caller_unref(caller);
|
||||
|
||||
if (action)
|
||||
polkit_action_unref(action);
|
||||
|
||||
if (context)
|
||||
polkit_context_unref(context);
|
||||
|
||||
if (bus)
|
||||
dbus_connection_unref(bus);
|
||||
|
||||
dbus_error_free(&dbus_error);
|
||||
|
||||
if (polkit_error)
|
||||
polkit_error_free(polkit_error);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
#ifndef foopolkithfoo
|
||||
#define foopolkithfoo
|
||||
|
||||
/***
|
||||
This file is part of PulseAudio.
|
||||
|
||||
Copyright 2007 Lennart Poettering
|
||||
|
||||
PulseAudio is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU Lesser General Public License as published
|
||||
by the Free Software Foundation; either version 2.1 of the License,
|
||||
or (at your option) any later version.
|
||||
|
||||
PulseAudio is distributed in the hope that it will be useful, but
|
||||
WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public License
|
||||
along with PulseAudio; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
|
||||
USA.
|
||||
***/
|
||||
|
||||
int pa_polkit_check(const char *action);
|
||||
|
||||
#endif
|
||||
|
|
@ -612,6 +612,11 @@ static int set_scheduler(int rtprio) {
|
|||
return -1;
|
||||
}
|
||||
|
||||
/* We need to disable exit on disconnect because otherwise
|
||||
* dbus_shutdown will kill us. See
|
||||
* https://bugs.freedesktop.org/show_bug.cgi?id=16924 */
|
||||
dbus_connection_set_exit_on_disconnect(bus, FALSE);
|
||||
|
||||
r = rtkit_make_realtime(bus, 0, rtprio);
|
||||
dbus_connection_unref(bus);
|
||||
|
||||
|
|
@ -680,6 +685,11 @@ static int set_nice(int nice_level) {
|
|||
return -1;
|
||||
}
|
||||
|
||||
/* We need to disable exit on disconnect because otherwise
|
||||
* dbus_shutdown will kill us. See
|
||||
* https://bugs.freedesktop.org/show_bug.cgi?id=16924 */
|
||||
dbus_connection_set_exit_on_disconnect(bus, FALSE);
|
||||
|
||||
r = rtkit_make_high_priority(bus, 0, nice_level);
|
||||
dbus_connection_unref(bus);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue