Imported Upstream version 1.0.0upstream/1.0.0

7 files changed, 74 insertions, 168 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index 770f97d..3a31ec5 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -34,16 +34,7 @@ endif
 # DBus Activation file
 dbusactivationdir = $(datadir)/dbus-1/system-services
 dbusactivation_DATA = org.freedesktop.ModemManager1.service
-dbusactivation_in_files_systemd = org.freedesktop.ModemManager1.service.systemd.in
-dbusactivation_in_files_nosystemd = org.freedesktop.ModemManager1.service.nosystemd.in
-if HAVE_SYSTEMD
-org.freedesktop.ModemManager1.service: org.freedesktop.ModemManager1.service.systemd.in
-	$(edit) $< >$@
-else
-org.freedesktop.ModemManager1.service: org.freedesktop.ModemManager1.service.nosystemd.in
-	$(edit) $< >$@
-endif
-
+dbusactivation_in_files = org.freedesktop.ModemManager1.service.in
 
 # Icon
 icondir=${datadir}/icons/hicolor/22x22/apps
@@ -65,10 +56,10 @@ diagrams = \
 
 
 # Polkit
-dist_polkit_policy_in_files = org.freedesktop.ModemManager1.policy.in
+polkit_policy_in_in_files = org.freedesktop.ModemManager1.policy.in.in
 if WITH_POLKIT
 polkit_policydir = $(datadir)/polkit-1/actions
-dist_polkit_policy_DATA = $(dist_polkit_policy_in_files:.policy.in=.policy)
+polkit_policy_DATA = $(polkit_policy_in_in_files:.policy.in.in=.policy)
 @INTLTOOL_POLICY_RULE@
 endif
 
@@ -82,7 +73,8 @@ pkgconfig_DATA = \
 
 DISTCLEANFILES = \
 	$(dbusactivation_DATA) \
-	$(dbusservice_DATA)
+	$(dbusservice_DATA) \
+	$(polkit_policy_DATA)
 
 if HAVE_SYSTEMD
 DISTCLEANFILES += $(systemdsystemunit_DATA)
@@ -91,11 +83,10 @@ endif
 
 EXTRA_DIST = \
 	$(systemdsystemunit_in_files) \
-	$(dbusactivation_in_files_systemd) \
-	$(dbusactivation_in_files_nosystemd) \
+	$(dbusactivation_in_files) \
 	$(dbusservice_file_polkit) \
 	$(dbusservice_file_nopolkit) \
 	$(icon_DATA) \
-	$(dist_polkit_policy_in_files) \
+	$(polkit_policy_in_in_files) \
 	$(logos) \
 	$(diagrams)
diff --git a/data/Makefile.in b/data/Makefile.in
index f1a4d8b..34889fd 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.2 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -82,8 +82,8 @@ host_triplet = @host@
 subdir = data
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(srcdir)/ModemManager.pc.in $(srcdir)/mm-glib.pc.in \
-	$(srcdir)/org.freedesktop.ModemManager1.policy.in \
-	$(am__dist_polkit_policy_DATA_DIST)
+	$(srcdir)/org.freedesktop.ModemManager1.policy.in.in \
+	$(srcdir)/org.freedesktop.ModemManager1.service.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
 	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
@@ -100,7 +100,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = ModemManager.pc mm-glib.pc \
-	org.freedesktop.ModemManager1.policy
+	org.freedesktop.ModemManager1.policy.in \
+	org.freedesktop.ModemManager1.service
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -149,13 +150,11 @@ am__uninstall_files_from_dir = { \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
 am__installdirs = "$(DESTDIR)$(dbusactivationdir)" \
-	"$(DESTDIR)$(dbusservicedir)" "$(DESTDIR)$(polkit_policydir)" \
-	"$(DESTDIR)$(icondir)" "$(DESTDIR)$(pkgconfigdir)" \
+	"$(DESTDIR)$(dbusservicedir)" "$(DESTDIR)$(icondir)" \
+	"$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(polkit_policydir)" \
 	"$(DESTDIR)$(systemdsystemunitdir)"
-am__dist_polkit_policy_DATA_DIST =  \
-	org.freedesktop.ModemManager1.policy
-DATA = $(dbusactivation_DATA) $(dbusservice_DATA) \
-	$(dist_polkit_policy_DATA) $(icon_DATA) $(pkgconfig_DATA) \
+DATA = $(dbusactivation_DATA) $(dbusservice_DATA) $(icon_DATA) \
+	$(pkgconfig_DATA) $(polkit_policy_DATA) \
 	$(systemdsystemunit_DATA)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -168,8 +167,6 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -193,7 +190,6 @@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_MKENUMS = @GLIB_MKENUMS@
-GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -210,7 +206,6 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
@@ -242,14 +237,20 @@ MANIFEST_TOOL = @MANIFEST_TOOL@
 MBIM_CFLAGS = @MBIM_CFLAGS@
 MBIM_LIBS = @MBIM_LIBS@
 MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
 MMCLI_CFLAGS = @MMCLI_CFLAGS@
 MMCLI_LIBS = @MMCLI_LIBS@
 MM_CFLAGS = @MM_CFLAGS@
+MM_DEFAULT_USER_POLICY = @MM_DEFAULT_USER_POLICY@
+MM_GLIB_LT_AGE = @MM_GLIB_LT_AGE@
+MM_GLIB_LT_CURRENT = @MM_GLIB_LT_CURRENT@
+MM_GLIB_LT_REVISION = @MM_GLIB_LT_REVISION@
 MM_LIBS = @MM_LIBS@
+MM_MAJOR_VERSION = @MM_MAJOR_VERSION@
+MM_MICRO_VERSION = @MM_MICRO_VERSION@
+MM_MINOR_VERSION = @MM_MINOR_VERSION@
+MM_VERSION = @MM_VERSION@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
-MSGFMT_OPTS = @MSGFMT_OPTS@
 MSGMERGE = @MSGMERGE@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -268,13 +269,9 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POFILES = @POFILES@
 POLKIT_CFLAGS = @POLKIT_CFLAGS@
 POLKIT_LIBS = @POLKIT_LIBS@
 POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
-PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 QMI_CFLAGS = @QMI_CFLAGS@
 QMI_LIBS = @QMI_LIBS@
 RANLIB = @RANLIB@
@@ -364,8 +361,7 @@ systemdsystemunit_in_files = ModemManager.service.in
 # DBus Activation file
 dbusactivationdir = $(datadir)/dbus-1/system-services
 dbusactivation_DATA = org.freedesktop.ModemManager1.service
-dbusactivation_in_files_systemd = org.freedesktop.ModemManager1.service.systemd.in
-dbusactivation_in_files_nosystemd = org.freedesktop.ModemManager1.service.nosystemd.in
+dbusactivation_in_files = org.freedesktop.ModemManager1.service.in
 
 # Icon
 icondir = ${datadir}/icons/hicolor/22x22/apps
@@ -386,9 +382,9 @@ diagrams = \
 
 
 # Polkit
-dist_polkit_policy_in_files = org.freedesktop.ModemManager1.policy.in
+polkit_policy_in_in_files = org.freedesktop.ModemManager1.policy.in.in
 @WITH_POLKIT_TRUE@polkit_policydir = $(datadir)/polkit-1/actions
-@WITH_POLKIT_TRUE@dist_polkit_policy_DATA = $(dist_polkit_policy_in_files:.policy.in=.policy)
+@WITH_POLKIT_TRUE@polkit_policy_DATA = $(polkit_policy_in_in_files:.policy.in.in=.policy)
 
 # Set up pkg-config .pc files for exported libraries
 pkgconfigdir = $(libdir)/pkgconfig
@@ -397,15 +393,14 @@ pkgconfig_DATA = \
 	mm-glib.pc
 
 DISTCLEANFILES = $(dbusactivation_DATA) $(dbusservice_DATA) \
-	$(am__append_1)
+	$(polkit_policy_DATA) $(am__append_1)
 EXTRA_DIST = \
 	$(systemdsystemunit_in_files) \
-	$(dbusactivation_in_files_systemd) \
-	$(dbusactivation_in_files_nosystemd) \
+	$(dbusactivation_in_files) \
 	$(dbusservice_file_polkit) \
 	$(dbusservice_file_nopolkit) \
 	$(icon_DATA) \
-	$(dist_polkit_policy_in_files) \
+	$(polkit_policy_in_in_files) \
 	$(logos) \
 	$(diagrams)
 
@@ -446,7 +441,9 @@ ModemManager.pc: $(top_builddir)/config.status $(srcdir)/ModemManager.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 mm-glib.pc: $(top_builddir)/config.status $(srcdir)/mm-glib.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-org.freedesktop.ModemManager1.policy: $(top_builddir)/config.status $(srcdir)/org.freedesktop.ModemManager1.policy.in
+org.freedesktop.ModemManager1.policy.in: $(top_builddir)/config.status $(srcdir)/org.freedesktop.ModemManager1.policy.in.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+org.freedesktop.ModemManager1.service: $(top_builddir)/config.status $(srcdir)/org.freedesktop.ModemManager1.service.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
 mostlyclean-libtool:
@@ -496,27 +493,6 @@ uninstall-dbusserviceDATA:
 	@list='$(dbusservice_DATA)'; test -n "$(dbusservicedir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(dbusservicedir)'; $(am__uninstall_files_from_dir)
-install-dist_polkit_policyDATA: $(dist_polkit_policy_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(dist_polkit_policy_DATA)'; test -n "$(polkit_policydir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(polkit_policydir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(polkit_policydir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(polkit_policydir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(polkit_policydir)" || exit $$?; \
-	done
-
-uninstall-dist_polkit_policyDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_polkit_policy_DATA)'; test -n "$(polkit_policydir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(polkit_policydir)'; $(am__uninstall_files_from_dir)
 install-iconDATA: $(icon_DATA)
 	@$(NORMAL_INSTALL)
 	@list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
@@ -559,6 +535,27 @@ uninstall-pkgconfigDATA:
 	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
+install-polkit_policyDATA: $(polkit_policy_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(polkit_policy_DATA)'; test -n "$(polkit_policydir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(polkit_policydir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(polkit_policydir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(polkit_policydir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(polkit_policydir)" || exit $$?; \
+	done
+
+uninstall-polkit_policyDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(polkit_policy_DATA)'; test -n "$(polkit_policydir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(polkit_policydir)'; $(am__uninstall_files_from_dir)
 install-systemdsystemunitDATA: $(systemdsystemunit_DATA)
 	@$(NORMAL_INSTALL)
 	@list='$(systemdsystemunit_DATA)'; test -n "$(systemdsystemunitdir)" || list=; \
@@ -621,7 +618,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(dbusactivationdir)" "$(DESTDIR)$(dbusservicedir)" "$(DESTDIR)$(polkit_policydir)" "$(DESTDIR)$(icondir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(systemdsystemunitdir)"; do \
+	for dir in "$(DESTDIR)$(dbusactivationdir)" "$(DESTDIR)$(dbusservicedir)" "$(DESTDIR)$(icondir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(polkit_policydir)" "$(DESTDIR)$(systemdsystemunitdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -676,8 +673,8 @@ info: info-am
 info-am:
 
 install-data-am: install-dbusactivationDATA install-dbusserviceDATA \
-	install-dist_polkit_policyDATA install-iconDATA \
-	install-pkgconfigDATA install-systemdsystemunitDATA
+	install-iconDATA install-pkgconfigDATA \
+	install-polkit_policyDATA install-systemdsystemunitDATA
 
 install-dvi: install-dvi-am
 
@@ -722,8 +719,8 @@ ps: ps-am
 ps-am:
 
 uninstall-am: uninstall-dbusactivationDATA uninstall-dbusserviceDATA \
-	uninstall-dist_polkit_policyDATA uninstall-iconDATA \
-	uninstall-pkgconfigDATA uninstall-systemdsystemunitDATA
+	uninstall-iconDATA uninstall-pkgconfigDATA \
+	uninstall-polkit_policyDATA uninstall-systemdsystemunitDATA
 
 .MAKE: install-am install-strip
 
@@ -731,18 +728,18 @@ uninstall-am: uninstall-dbusactivationDATA uninstall-dbusserviceDATA \
 	cscopelist-am ctags-am distclean distclean-generic \
 	distclean-libtool distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
-	install-dbusactivationDATA install-dbusserviceDATA \
-	install-dist_polkit_policyDATA install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-iconDATA install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkgconfigDATA install-ps \
-	install-ps-am install-strip install-systemdsystemunitDATA \
-	installcheck installcheck-am installdirs maintainer-clean \
+	install-dbusactivationDATA install-dbusserviceDATA install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-iconDATA install-info install-info-am \
+	install-man install-pdf install-pdf-am install-pkgconfigDATA \
+	install-polkit_policyDATA install-ps install-ps-am \
+	install-strip install-systemdsystemunitDATA installcheck \
+	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
 	uninstall-am uninstall-dbusactivationDATA \
-	uninstall-dbusserviceDATA uninstall-dist_polkit_policyDATA \
-	uninstall-iconDATA uninstall-pkgconfigDATA \
+	uninstall-dbusserviceDATA uninstall-iconDATA \
+	uninstall-pkgconfigDATA uninstall-polkit_policyDATA \
 	uninstall-systemdsystemunitDATA
 
 
@@ -752,10 +749,6 @@ uninstall-am: uninstall-dbusactivationDATA uninstall-dbusserviceDATA \
 @WITH_POLKIT_FALSE@	cp -f $(top_srcdir)/data/$(dbusservice_file_nopolkit) $(dbusservice_DATA)
 @HAVE_SYSTEMD_TRUE@ModemManager.service: ModemManager.service.in
 @HAVE_SYSTEMD_TRUE@	$(edit) $< >$@
-@HAVE_SYSTEMD_TRUE@org.freedesktop.ModemManager1.service: org.freedesktop.ModemManager1.service.systemd.in
-@HAVE_SYSTEMD_TRUE@	$(edit) $< >$@
-@HAVE_SYSTEMD_FALSE@org.freedesktop.ModemManager1.service: org.freedesktop.ModemManager1.service.nosystemd.in
-@HAVE_SYSTEMD_FALSE@	$(edit) $< >$@
 @WITH_POLKIT_TRUE@@INTLTOOL_POLICY_RULE@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/data/ModemManager.service.in b/data/ModemManager.service.in
index b59caea..9fe3a3b 100644
--- a/data/ModemManager.service.in
+++ b/data/ModemManager.service.in
@@ -7,6 +7,7 @@ Type=dbus
 BusName=org.freedesktop.ModemManager1
 ExecStart=@sbindir@/ModemManager
 StandardError=null
+Restart=on-abort
 
 [Install]
 WantedBy=multi-user.target
diff --git a/data/org.freedesktop.ModemManager1.policy.in b/data/org.freedesktop.ModemManager1.policy.in
deleted file mode 100644
index 9f58e6a..0000000
--- a/data/org.freedesktop.ModemManager1.policy.in
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE policyconfig PUBLIC
- "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
-
-<policyconfig>
-
-  <vendor>ModemManager</vendor>
-  <vendor_url>http://www.freedesktop.org/wiki/ModemManager</vendor_url>
-  <icon_name>ModemManager</icon_name>
-
-  <action id="org.freedesktop.ModemManager1.Control">
-    <_description>Control the Modem Manager daemon</_description>
-    <_message>System policy prevents controlling the Modem Manager.</_message>
-    <defaults>
-      <allow_inactive>no</allow_inactive>
-      <allow_active>auth_admin</allow_active>
-    </defaults>
-  </action>
-
-  <action id="org.freedesktop.ModemManager1.Device.Control">
-    <_description>Unlock and control a mobile broadband device</_description>
-    <_message>System policy prevents unlocking or controlling the mobile broadband device.</_message>
-    <defaults>
-      <allow_inactive>no</allow_inactive>
-      <allow_active>auth_self_keep</allow_active>
-    </defaults>
-  </action>
-
-  <action id="org.freedesktop.ModemManager1.Contacts">
-    <_description>Add, modify, and delete mobile broadband contacts</_description>
-    <_message>System policy prevents adding, modifying, or deleting this device's contacts.</_message>
-    <defaults>
-      <allow_inactive>no</allow_inactive>
-      <allow_active>auth_self_keep</allow_active>
-    </defaults>
-  </action>
-
-  <action id="org.freedesktop.ModemManager1.Messaging">
-    <_description>Send, save, modify, and delete text messages</_description>
-    <_message>System policy prevents sending or maniuplating this device's text messages.</_message>
-    <defaults>
-      <allow_inactive>no</allow_inactive>
-      <allow_active>auth_self_keep</allow_active>
-    </defaults>
-  </action>
-
-  <action id="org.freedesktop.ModemManager1.Location">
-    <_description>Enable and view geographic location and positioning information</_description>
-    <_message>System policy prevents enabling or viewing geographic location information.</_message>
-    <defaults>
-      <allow_inactive>no</allow_inactive>
-      <allow_active>auth_self_keep</allow_active>
-    </defaults>
-  </action>
-
-  <action id="org.freedesktop.ModemManager1.USSD">
-    <_description>Query and utilize network information and services</_description>
-    <_message>System policy prevents querying or utilizing network information and services.</_message>
-    <defaults>
-      <allow_inactive>no</allow_inactive>
-      <allow_active>yes</allow_active>
-    </defaults>
-  </action>
-
-  <action id="org.freedesktop.ModemManager1.Firmware">
-    <_description>Query and manage firmware on a mobile broadband device</_description>
-    <_message>System policy prevents querying or managing this device's firmware.</_message>
-    <defaults>
-      <allow_inactive>no</allow_inactive>
-      <allow_active>auth_admin</allow_active>
-    </defaults>
-  </action>
-
-</policyconfig>
diff --git a/data/org.freedesktop.ModemManager1.policy b/data/org.freedesktop.ModemManager1.policy.in.in
index 9f58e6a..7b3a22a 100644
--- a/data/org.freedesktop.ModemManager1.policy
+++ b/data/org.freedesktop.ModemManager1.policy.in.in
@@ -23,7 +23,7 @@
     <_message>System policy prevents unlocking or controlling the mobile broadband device.</_message>
     <defaults>
       <allow_inactive>no</allow_inactive>
-      <allow_active>auth_self_keep</allow_active>
+      <allow_active>@MM_DEFAULT_USER_POLICY@</allow_active>
     </defaults>
   </action>
 
@@ -32,7 +32,7 @@
     <_message>System policy prevents adding, modifying, or deleting this device's contacts.</_message>
     <defaults>
       <allow_inactive>no</allow_inactive>
-      <allow_active>auth_self_keep</allow_active>
+      <allow_active>@MM_DEFAULT_USER_POLICY@</allow_active>
     </defaults>
   </action>
 
@@ -41,7 +41,7 @@
     <_message>System policy prevents sending or maniuplating this device's text messages.</_message>
     <defaults>
       <allow_inactive>no</allow_inactive>
-      <allow_active>auth_self_keep</allow_active>
+      <allow_active>@MM_DEFAULT_USER_POLICY@</allow_active>
     </defaults>
   </action>
 
@@ -50,7 +50,7 @@
     <_message>System policy prevents enabling or viewing geographic location information.</_message>
     <defaults>
       <allow_inactive>no</allow_inactive>
-      <allow_active>auth_self_keep</allow_active>
+      <allow_active>@MM_DEFAULT_USER_POLICY@</allow_active>
     </defaults>
   </action>
 
diff --git a/data/org.freedesktop.ModemManager1.service.systemd.in b/data/org.freedesktop.ModemManager1.service.in
index f4e2b26..175f3dd 100644
--- a/data/org.freedesktop.ModemManager1.service.systemd.in
+++ b/data/org.freedesktop.ModemManager1.service.in
@@ -6,6 +6,6 @@
 
 [D-BUS Service]
 Name=org.freedesktop.ModemManager1
-Exec=/bin/false
+Exec=@sbindir@/ModemManager
 User=root
 SystemdService=dbus-org.freedesktop.ModemManager1.service
diff --git a/data/org.freedesktop.ModemManager1.service.nosystemd.in b/data/org.freedesktop.ModemManager1.service.nosystemd.in
deleted file mode 100644
index 4e3a273..0000000
--- a/data/org.freedesktop.ModemManager1.service.nosystemd.in
+++ /dev/null
@@ -1,4 +0,0 @@
-[D-BUS Service]
-Name=org.freedesktop.ModemManager1
-Exec=@sbindir@/ModemManager
-User=root