Merge branch 'lukeshu/postmove' into lukeshu/master

# Conflicts:
#	src/libsystemd/libsystemd-internal/Makefile

1 files changed, 27 insertions, 0 deletions

diff --git a/src/libbus-proxy-core/driver.h b/src/libbus-proxy-core/driver.h
new file mode 100644
index 0000000000..cad7aa7851
--- /dev/null
+++ b/src/libbus-proxy-core/driver.h
@@ -0,0 +1,27 @@
+#pragma once
+
+/***
+  This file is part of systemd.
+
+  Copyright 2014 Lennart Poettering
+
+  systemd 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.
+
+  systemd 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
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include <systemd/sd-bus.h>
+
+#include "bus-xml-policy.h"
+#include "proxy.h"
+
+int bus_proxy_process_driver(Proxy *p, sd_bus *a, sd_bus *b, sd_bus_message *m, SharedPolicy *sp, const struct ucred *ucred, Set *owned_names);