Remove references to FreeIPA from D-BUS interfaces

Per discussion with the desktop team, using the org.freedesktop
interface name will simplify adoption, as potential users won't
feel like they're pulling in a FreeIPA dependency.

9 files changed, 39 insertions, 39 deletions

diff --git a/server/Makefile.in b/server/Makefile.in
index 46b6abd40..0e091de02 100644
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -110,8 +110,8 @@ DBUS_SYSBUS_POLICY_DIR = @sysconfdir@/dbus-1/system.d
 LIBEXECBINS =  sbin/sssd_nss sbin/sssd_dp sbin/sssd_be sbin/sssd_pam
 ifneq (x$(HAVE_INFOPIPE), x)
     LIBEXECBINS += sbin/sssd_info
-    DBUS_SYSBUS_POLICIES = infopipe/org.freeipa.sssd.infopipe.conf
-    INFP_INTROSPECT_XML = infopipe/org.freeipa.sssd.infopipe.Introspect.xml
+    DBUS_SYSBUS_POLICIES = infopipe/org.freedesktop.sssd.infopipe.conf
+    INFP_INTROSPECT_XML = infopipe/org.freedesktop.sssd.infopipe.Introspect.xml
 endif
 ifneq (x$(HAVE_POLICYKIT), x)
     LIBEXECBINS += sbin/sssd_pk
diff --git a/server/infopipe/infopipe.h b/server/infopipe/infopipe.h
index 7a127eb41..516703762 100644
--- a/server/infopipe/infopipe.h
+++ b/server/infopipe/infopipe.h
@@ -25,17 +25,17 @@
 #include <dbus/dbus.h>
 #include "sbus/sssd_dbus.h"
 
-#define INFP_INTROSPECT_XML "infopipe/org.freeipa.sssd.infopipe.Introspect.xml"
+#define INFP_INTROSPECT_XML "infopipe/org.freedesktop.sssd.infopipe.Introspect.xml"
 
-#define INFOPIPE_DBUS_NAME "org.freeipa.sssd.infopipe1"
-#define INFOPIPE_INTERFACE "org.freeipa.sssd.infopipe1"
-#define INFOPIPE_PATH "/org/freeipa/sssd/infopipe1"
+#define INFOPIPE_DBUS_NAME "org.freedesktop.sssd.infopipe1"
+#define INFOPIPE_INTERFACE "org.freedesktop.sssd.infopipe1"
+#define INFOPIPE_PATH "/org/freedesktop/sssd/infopipe1"
 #define INFOPIPE_VERSION 0x0001
 #define INFOPIPE_SERVICE_NAME "info"
 
 /* InfoPipe Methods
  * NOTE: Any changes to the method names and arguments for these calls
- * must also be updated in the org.freeipa.sssd.infopipe.Introspect.xml
+ * must also be updated in the org.freedesktop.sssd.infopipe.Introspect.xml
  * or clients may not behave properly.
  */
 
diff --git a/server/infopipe/org.freeipa.sssd.infopipe.Introspect.xml b/server/infopipe/org.freedesktop.sssd.infopipe.Introspect.xml
index 5656d42ce..0ff397b39 100644
--- a/server/infopipe/org.freeipa.sssd.infopipe.Introspect.xml
+++ b/server/infopipe/org.freedesktop.sssd.infopipe.Introspect.xml
@@ -1,13 +1,13 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
     "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node name="/org/freeipa/sssd/infopipe1">
-    <interface name="org.freeipa.sssd.infopipe">
+<node name="/org/freedesktop/sssd/infopipe1">
+    <interface name="org.freedesktop.sssd.infopipe">
         <annotation
-            name="org.freeipa.sssd.infopipe.DocString.Summary"
+            name="org.freedesktop.sssd.infopipe.DocString.Summary"
             value="InfoPipe Interface version 1"
         />
         <annotation
-            name="org.freeipa.sssd.infopipe.DocString"
+            name="org.freedesktop.sssd.infopipe.DocString"
             value="This is a D-BUS interface used for reading and writing POSIX and extended user attributes within the System Security Services Daemon."
         />
 
@@ -18,7 +18,7 @@
 -->
         <method name="CheckPermissions1">
             <annotation
-                name="org.freeipa.sssd.infopipe.DocString"
+                name="org.freedesktop.sssd.infopipe.DocString"
                 value="Determine whether the caller has permissions on one or more instances of domain objects
                        @param domain The domain to query
                        @param object An object type in the domain
@@ -63,7 +63,7 @@
 -->
         <method name="GetCachedUsers1">
             <annotation
-                name="org.freeipa.sssd.infopipe.DocString"
+                name="org.freedesktop.sssd.infopipe.DocString"
                 value="Get a list of users stored locally in SSSD for this system. This is not a complete user listing for remote domains, only a listing of domain members that have logged in locally.
                        @param domain The domain to query.
                        @param minlastlogin Return only users who have logged in successfully since this UNIX timestamp. For all cached users in a domain, set to 0.
@@ -72,12 +72,12 @@
             />
             <arg name="domain" type="s" direction="in" />
             <arg name="minlastlogin" type="t" direction="in" />
-            <arg name="users" type="as" />
+            <arg name="users" type="as" direction="out"/>
         </method>
 
         <method name="CreateUser1">
             <annotation
-                name="org.freeipa.sssd.infopipe.DocString"
+                name="org.freedesktop.sssd.infopipe.DocString"
                 value="Create a new user in a particular domain. User will initially have a disabled password.
                        @param username Username for the new user. Must be unique within a domain.
                        @param domain The domain in which to add the user
@@ -99,7 +99,7 @@
 
         <method name="DeleteUser1">
             <annotation
-                name="org.freeipa.sssd.infopipe.DocString"
+                name="org.freedesktop.sssd.infopipe.DocString"
                 value="Delete a user by UID from a specified domain.
                        @param username The user to delete.
                        @param domain The domain from which to delete the user.
@@ -113,7 +113,7 @@
 
         <method name="GetUserAttributes1">
             <annotation
-                name="org.freeipa.sssd.infopipe.DocString"
+                name="org.freedesktop.sssd.infopipe.DocString"
                 value="Get user information
                        @param usernames An array of unique usernames.
                        @param domain The domain from which to query user information.
@@ -142,7 +142,7 @@
 
         <method name="SetUserAttributes1">
             <annotation
-                name="org.freeipa.sssd.infopipe.DocString"
+                name="org.freedesktop.sssd.infopipe.DocString"
                 value="Set user attributes for one or more users
                        @param usernames An array of unique usernames.
                        @param domain The domain of the users to edit.
@@ -169,7 +169,7 @@
 
         <method name="Set_YouReallyDoNotWantToUseThisFunction_UserUID1">
             <annotation
-                name="org.freeipa.sssd.infopipe.DocString"
+                name="org.freedesktop.sssd.infopipe.DocString"
                 value="Change the User ID for a user.
                        @param username The username
                        @param domain The user's domain
@@ -191,7 +191,7 @@
 -->
         <method name="CreateGroup1">
              <annotation
-                 name="org.freeipa.sssd.infopipe.DocString"
+                 name="org.freedesktop.sssd.infopipe.DocString"
                  value="Create new user groups
                         @param groupnames A list of new groups to add.
                         @param domain The domain in which to create the groups.
@@ -207,7 +207,7 @@
 
         <method name="DeleteGroup1">
              <annotation
-                 name="org.freeipa.sssd.infopipe.DocString"
+                 name="org.freedesktop.sssd.infopipe.DocString"
                  value="Delete a user group
                         @param groupname A group to delete.
                         @param domain The domain from which to delete the group.
@@ -222,7 +222,7 @@
 
         <method name="AddGroupMembers1">
             <annotation
-                 name="org.freeipa.sssd.infopipe.DocString"
+                 name="org.freedesktop.sssd.infopipe.DocString"
                  value="Add members to a group
                         @param group Group being modified.
                         @param domain The domain the group belongs to.
@@ -240,7 +240,7 @@
 
         <method name="RemoveGroupMembers1">
             <annotation
-                 name="org.freeipa.sssd.infopipe.DocString"
+                 name="org.freedesktop.sssd.infopipe.DocString"
                  value="Remove members from a group
                         @param group Group being modified.
                         @param domain The domain the group belongs to.
@@ -257,7 +257,7 @@
 
         <method name="Set_YouReallyDoNotWantToUseThisFunction_GroupGID1">
             <annotation
-                name="org.freeipa.sssd.infopipe.DocString"
+                name="org.freedesktop.sssd.infopipe.DocString"
                 value="Change the User ID for a user.
                        @param group The group name
                        @param domain The group's domain
diff --git a/server/infopipe/org.freeipa.sssd.infopipe.conf b/server/infopipe/org.freedesktop.sssd.infopipe.conf
index 2ed3cf1b5..ab623208f 100644
--- a/server/infopipe/org.freeipa.sssd.infopipe.conf
+++ b/server/infopipe/org.freedesktop.sssd.infopipe.conf
@@ -8,16 +8,16 @@
 
   <!-- Only root can own the SSSD service -->
   <policy user="root">
-    <allow own="org.freeipa.sssd.infopipe1"/>
-    <allow send_interface="org.freeipa.sssd.infopipe1"/>
+    <allow own="org.freedesktop.sssd.infopipe1"/>
+    <allow send_interface="org.freedesktop.sssd.infopipe1"/>
   </policy>
 
   <!-- Allow all methods on the interface -->
   <!-- Right now, this will be handled by a limited ACL
        within the InfoPipe Daemon. -->
   <policy context="default">
-    <allow own="org.freeipa.sssd.infopipe1.test"/>
-    <allow send_interface="org.freeipa.sssd.infopipe1"/>
+    <allow own="org.freedesktop.sssd.infopipe1.test"/>
+    <allow send_interface="org.freedesktop.sssd.infopipe1"/>
   </policy>
 
 </busconfig>
diff --git a/server/monitor/monitor_interfaces.h b/server/monitor/monitor_interfaces.h
index 1b91c25a0..c3ddb336e 100644
--- a/server/monitor/monitor_interfaces.h
+++ b/server/monitor/monitor_interfaces.h
@@ -22,8 +22,8 @@
 /*** Monitor ***/
 
 #define MONITOR_VERSION "0.1"
-#define MONITOR_DBUS_INTERFACE "org.freeipa.sssd.monitor"
-#define MONITOR_DBUS_PATH "/org/freeipa/sssd/monitor"
+#define MONITOR_DBUS_INTERFACE "org.freedesktop.sssd.monitor"
+#define MONITOR_DBUS_PATH "/org/freedesktop/sssd/monitor"
 
 /* Monitor Methods */
 #define MONITOR_METHOD_VERSION "getVersion"
@@ -31,8 +31,8 @@
 
 /*** Services ***/
 
-#define SERVICE_PATH "/org/freeipa/sssd/service"
-#define SERVICE_INTERFACE "org.freeipa.sssd.service"
+#define SERVICE_PATH "/org/freedesktop/sssd/service"
+#define SERVICE_INTERFACE "org.freedesktop.sssd.service"
 
 /* Service Methods */
 #define SERVICE_METHOD_IDENTITY "getIdentity"
diff --git a/server/providers/data_provider.h b/server/providers/data_provider.h
index 2d0e37e17..4b68a0bd7 100644
--- a/server/providers/data_provider.h
+++ b/server/providers/data_provider.h
@@ -45,8 +45,8 @@
 #define MOD_OFFLINE 0x0000
 #define MOD_ONLINE  0x0001
 
-#define DP_CLI_INTERFACE "org.freeipa.sssd.dataprovider"
-#define DP_CLI_PATH "/org/freeipa/sssd/dataprovider"
+#define DP_CLI_INTERFACE "org.freedesktop.sssd.dataprovider"
+#define DP_CLI_PATH "/org/freedesktop/sssd/dataprovider"
 
 #define DP_CLI_BACKEND 0x0001
 #define DP_CLI_FRONTEND 0x0002
diff --git a/server/providers/dp_interfaces.h b/server/providers/dp_interfaces.h
index 8d85eb36d..faba00c55 100644
--- a/server/providers/dp_interfaces.h
+++ b/server/providers/dp_interfaces.h
@@ -24,8 +24,8 @@
 
 /* Data Provider */
 
-#define DATA_PROVIDER_INTERFACE "org.freeipa.sssd.dataprovider"
-#define DATA_PROVIDER_PATH "/org/freeipa/sssd/dataprovider"
+#define DATA_PROVIDER_INTERFACE "org.freedesktop.sssd.dataprovider"
+#define DATA_PROVIDER_PATH "/org/freedesktop/sssd/dataprovider"
 
 #define DP_METHOD_CHECK_ONLINE "isOnline"
 
diff --git a/server/tests/infopipe-tests.c b/server/tests/infopipe-tests.c
index cc75215ad..171e58d46 100644
--- a/server/tests/infopipe-tests.c
+++ b/server/tests/infopipe-tests.c
@@ -31,7 +31,7 @@
 #include "infopipe/infopipe.h"
 #include "db/sysdb.h"
 
-#define INFP_TEST_DBUS_NAME "org.freeipa.sssd.infopipe1.test"
+#define INFP_TEST_DBUS_NAME "org.freedesktop.sssd.infopipe1.test"
 #define TEST_TIMEOUT 30000 /* 30 seconds */
 
 static int setup_infp_tests(DBusConnection **bus)
diff --git a/sssd.spec b/sssd.spec
index a9d08ae96..e052966c1 100644
--- a/sssd.spec
+++ b/sssd.spec
@@ -95,8 +95,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/
 %{_libdir}/ldb/memberof.so*
 %{_sharedstatedir}/sss/
-%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freeipa.sssd.infopipe.conf
-%{_datadir}/%{name}/introspect/infopipe/org.freeipa.sssd.infopipe.Introspect.xml
+%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.sssd.infopipe.conf
+%{_datadir}/%{name}/introspect/infopipe/org.freedesktop.sssd.infopipe.Introspect.xml
 /%{_lib}/libnss_sss.so
 /%{_lib}/libnss_sss.so.2
 /%{_lib}/security/pam_sss.so