Merge remote-tracking branch 'origin'

Webconverger · Feb 25, 2015 · 4d89023 · 4d89023
2 parents 47c1242 + e72258a
commit 4d89023
Show file tree

Hide file tree

Showing 91 changed files with 556 additions and 2,031 deletions.
diff --git a/etc/dbus-1/system.conf b/etc/dbus-1/system.conf
@@ -68,6 +68,14 @@
     <deny send_destination="org.freedesktop.DBus"
           send_interface="org.freedesktop.DBus"
           send_member="UpdateActivationEnvironment"/>
+    <deny send_destination="org.freedesktop.DBus"
+          send_interface="org.freedesktop.systemd1.Activator"/>
+  </policy>
+
+  <!-- Only systemd, which runs as root, may report activation failures. -->
+  <policy user="root">
+    <allow send_destination="org.freedesktop.DBus"
+           send_interface="org.freedesktop.systemd1.Activator"/>
   </policy>
 
   <!-- Config files are placed here that among other things, punch 

diff --git a/etc/sudoers b/etc/sudoers
@@ -7,7 +7,6 @@
 # See the man page for details on how to write a sudoers file.
 #
 Defaults	env_reset
-Defaults	lecture=never
 Defaults	mail_badpass
 Defaults	secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 

diff --git a/etc/webc/extensions/neon/chrome.manifest b/etc/webc/extensions/neon/chrome.manifest
@@ -18,7 +18,6 @@ override chrome://mozapps/content/downloads/unknownContentType.xul chrome://webc
 #override chrome://mozapps/content/update/update.xul about:blank
 component {be1472ad-6f60-4dc1-bc62-9145fe220879} components/noHelperAppDlg.js
 contract @mozilla.org/helperapplauncherdialog;1 {be1472ad-6f60-4dc1-bc62-9145fe220879}
-override chrome://global/content/netError.xhtml chrome://webconverger/content/netError.xhtml
 override chrome://global/content/about.xhtml chrome://webconverger/content/about.xhtml
 
 component {607c1749-dc0a-463c-96cf-8ec6c3901319} components/fileBlockService.js