From f1fcb2d9c7954136f7bf8c76c8f052abc70d963d Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Wed, 18 Mar 2009 09:42:22 -0400
Subject: [PATCH] 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.
---
 server/Makefile.in                                 |    4 +-
 server/infopipe/infopipe.h                         |   10 +-
 .../org.freedesktop.sssd.infopipe.Introspect.xml   |  275 ++++++++++++++++++++
 server/infopipe/org.freedesktop.sssd.infopipe.conf |   24 ++
 .../org.freeipa.sssd.infopipe.Introspect.xml       |  275 --------------------
 server/infopipe/org.freeipa.sssd.infopipe.conf     |   24 --
 server/monitor/monitor_interfaces.h                |    8 +-
 server/providers/data_provider.h                   |    4 +-
 server/providers/dp_interfaces.h                   |    4 +-
 server/tests/infopipe-tests.c                      |    2 +-
 sssd.spec                                          |    4 +-
 11 files changed, 317 insertions(+), 317 deletions(-)
 create mode 100644 server/infopipe/org.freedesktop.sssd.infopipe.Introspect.xml
 create mode 100644 server/infopipe/org.freedesktop.sssd.infopipe.conf
 delete mode 100644 server/infopipe/org.freeipa.sssd.infopipe.Introspect.xml
 delete mode 100644 server/infopipe/org.freeipa.sssd.infopipe.conf

diff --git a/server/Makefile.in b/server/Makefile.in
index 46b6abd..0e091de 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 7a127eb..5167037 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.freedesktop.sssd.infopipe.Introspect.xml b/server/infopipe/org.freedesktop.sssd.infopipe.Introspect.xml
new file mode 100644
index 0000000..0ff397b
--- /dev/null
+++ b/server/infopipe/org.freedesktop.sssd.infopipe.Introspect.xml
@@ -0,0 +1,275 @@
+<!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/freedesktop/sssd/infopipe1">
+    <interface name="org.freedesktop.sssd.infopipe">
+        <annotation
+            name="org.freedesktop.sssd.infopipe.DocString.Summary"
+            value="InfoPipe Interface version 1"
+        />
+        <annotation
+            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."
+        />
+
+<!--
+**************************************************************************
+* Permission Methods                                                     *
+**************************************************************************
+-->
+        <method name="CheckPermissions1">
+            <annotation
+                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
+                           Object Types:
+                            user
+                            group
+                       @param instance A particular instance of an object (a username or group name). An empty string will be interpreted as all instances.
+                       @param actions A list of actions to check the permissions of. Each action is described as a pair of (action_type, attribute). If attribute is left as an empty string, the query is for a global value (such as create or delete user) If the attribute value does not make sense for a particular object/instance/action, it will be ignored. Action types not applicable to an object/instance will return false (such as addmember on users).
+                           Available action types:
+                            read
+                            create
+                            delete
+                            modify
+                            addmember
+                            removemember
+                       @return permissions A list of boolean values returned in the same order as the action list, one for each requested action. True means permission on that action is granted.
+                       @note some examples:
+                           Can I create new users in domain LOCAL?:
+                               CheckPermissions(domain=>'LOCAL', object=>'user', instance=>'', actions=>[('create','')])
+                               returns permissions=>[0]
+                           Can I create new groups in domain LOCAL?
+                               CheckPermissions(domain=>'LOCAL', object=>'group', instance=>'', actions=>[('create','')])
+                               returns permissions=>[0]
+                           Can I modify user testuser1's userpic and full name?
+                               CheckPermissions(domain=>'LOCAL', object=>'user', instance=>'testuser1', actions=>[('modify','userpic'),('modify','fullname')])
+                               returns permissions=>[1,0]
+                           Can I add members to group wheel?
+                               CheckPermissions(domain=>'LOCAL', object=>'group', instance=>'wheel', actions=>[('addmember','somearg')])
+                               returns permissions=>[1]
+                               The argument 'somearg' is ignored, since it does not apply to addmember."
+            />
+            <arg name="domain" type="s" direction="in" />
+            <arg name="object" type="s" direction="in" />
+            <arg name="instance" type="s" direction="in" />
+            <arg name="actions" type="a(ss)" direction="in" />
+            <arg name="permissions" type="ab" direction="out" />
+        </method>
+<!--
+**************************************************************************
+* User Methods                                                           *
+**************************************************************************
+-->
+        <method name="GetCachedUsers1">
+            <annotation
+                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.
+                       @return users Returns a string array of usernames.
+                       @error DBUS_ERROR_INVALID_ARGS One or more specified domains do not exist."
+            />
+            <arg name="domain" type="s" direction="in" />
+            <arg name="minlastlogin" type="t" direction="in" />
+            <arg name="users" type="as" direction="out"/>
+        </method>
+
+        <method name="CreateUser1">
+            <annotation
+                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
+                       @param fullname Full (display) name for the user. Will set both 'fullname' and 'gecos' to this value initially.
+                       @param homedir Home directory path for the user. Must be a parsable path, but does not need to exist or be mounted.
+                       @param shell Login shell. Must exist in /etc/shells.
+                       @return Returns an empty D-BUS reply to indicate success. Failure will return an error.
+                       @error DBUS_ERROR_INVALID_ARGS See parameter requirements. Reason will be included in the error message.
+                       @error DBUS_ERROR_ACCESS_DENIED Caller did not have permission to create a new user on the specified domain
+                       @note CreateUser will ignore users that already exist.
+                       @note This function will automatically generate an appropriate UID for the user."
+            />
+            <arg name="username" type="s" direction="in" />
+            <arg name="domain" type="s" direction="in" />
+            <arg name="fullname" type="s" direction="in" />
+            <arg name="homedir" type="s" direction="in" />
+            <arg name="shell" type="s" direction="in" />
+        </method>
+
+        <method name="DeleteUser1">
+            <annotation
+                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.
+                       @return Returns an empty D-BUS reply if the deletion was successful. Failure will return an error.
+                       @error DBUS_ERROR_INVALID_ARGS No such username or domain. See error message for details.
+                       @error DBUS_ACCESS_DENIED Caller did not have permission to delete this user."
+            />
+            <arg name="username" type="s" direction="in" />
+            <arg name="domain" type="s" direction="in" />
+        </method>
+
+        <method name="GetUserAttributes1">
+            <annotation
+                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.
+                       @param filter An array of strings containing a list of requested attributes. A zero-length array will indicate to return all authorized parameters.
+                              attributes(value type):
+                               defaultgroup(STRING)
+                               gecos(STRING)
+                               homedir(STRING)
+                               shell(STRING)
+                               fullname(STRING)
+                               locale(STRING)
+                               keyboard(STRING)
+                               session(STRING)
+                               last_login(UINT64)
+                               userpic(BYTE ARRAY)
+                       @return attributes An array of extended user information dicts, one for each requested username. Only attributes that the caller had read authorization for will be returned.
+                       @error DBUS_ERROR_INVALID_ARGS Usernames or filter entries were not unique or one or more filter entries were invalid.
+                       @note For standard POSIX attributes, use getpwnam().
+                       @note The attribute userpic may contain very large binary data. It is advisable to request this data separately from other attributes to avoid D-BUS message size limits."
+            />
+            <arg name="usernames" type="as" direction="in" />
+            <arg name="domain" type="s" direction="in" />
+            <arg name="filter" type="as" direction="in" />
+            <arg name="attributes" type="aa{sv}" direction="out" />
+        </method>
+
+        <method name="SetUserAttributes1">
+            <annotation
+                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.
+                       @param attributes An array of dict(string, variant), either exactly one dict (meaning use the same values for all UIDs), or one dict for each username. An empty value for the variant means delete the attribute.
+                              attributes(value type):
+                               defaultgroup(STRING)
+                               gecos(STRING)
+                               homedir(STRING)
+                               shell(STRING)
+                               fullname(STRING)
+                               locale(STRING)
+                               keyboard(STRING)
+                               session(STRING)
+                               last_login(UINT64)
+                               userpic(BYTE ARRAY)
+                       @return Returns an empty D-BUS reply on success. Will return an error on failure.
+                       @error DBUS_ERROR_INVALID_ARGS Usernames were not unique
+                       @note The attribute userpic may contain very large binary data. It is advisable to set this data separately from other attributes to avoid D-BUS message size limits."
+            />
+            <arg name="usernames" type="as" direction="in" />
+            <arg name="domain" type="s" direction="in" />
+            <arg name="attributes" type="aa{sv}" direction="in" />
+        </method>
+
+        <method name="Set_YouReallyDoNotWantToUseThisFunction_UserUID1">
+            <annotation
+                name="org.freedesktop.sssd.infopipe.DocString"
+                value="Change the User ID for a user.
+                       @param username The username
+                       @param domain The user's domain
+                       @param uid The new UID
+                       @return Returns an empty D-BUS reply on success. Will return an error on failure.
+                       @error DBUS_ERROR_INVALID_ARGS Domain or user did not exist
+                       @error DBUS_ERROR_ACCESS_DENIED Caller did not have permission to edit this user
+                       @note This function should be used sparingly. The automatically-generated user id from CreateUser should be sufficient for most cases."
+            />
+            <arg name="username" type="s" direction="in" />
+            <arg name="domain" type="s" direction="in" />
+            <arg name="uid" type="u" direction="in" />
+        </method>
+
+<!--
+**************************************************************************
+* Group Methods                                                          *
+**************************************************************************
+-->
+        <method name="CreateGroup1">
+             <annotation
+                 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.
+                        @return Returns an empty D-BUS reply on success. Will return an error on failure.
+                        @error DBUS_ERROR_INVALID_ARGS Domain does not exist.
+                        @error DBUS_ERROR_ACCESS_DENIED The caller does not have authorization to create groups in the specified domain.
+                        @note CreateGroup ignores groups that already exist.
+                        @note This function will automatically generate an appropriate group ID for this group."
+             />
+             <arg name="groupnames" type="as" direction="in" />
+             <arg name="domain" type="s" direction="in" />
+        </method>
+
+        <method name="DeleteGroup1">
+             <annotation
+                 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.
+                        @return Returns an empty D-BUS reply on success. Will return an error on failure.
+                        @error DBUS_ERROR_INVALID_ARGS Domain does not exist.
+                        @error DBUS_ERROR_ACCESS_DENIED The caller does not have authorization to delete groups from the specified domain.
+                        @note DeleteGroup ignores groups that don't exist."
+             />
+             <arg name="groupname" type="s" direction="in" />
+             <arg name="domain" type="s" direction="out" />
+        </method>
+
+        <method name="AddGroupMembers1">
+            <annotation
+                 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.
+                        @param members Array of member strings to add to the group.
+                        @param membertype 0: Users, 1: Groups
+                        @return Returns an empty D-BUS reply on success. Will return an error on failure.
+                        @error DBUS_ERROR_INVALID_ARGS The domain does not exist
+                        @error DBUS_ERROR_ACCESS_DENIED The caller does not have authorization to modify the group."
+            />
+            <arg name="group" type="s" direction="in" />
+            <arg name="domain" type="s" direction="in" />
+            <arg name="members" type="as" direction="in" />
+            <arg name="membertype" type="y" direction="in" />
+        </method>
+
+        <method name="RemoveGroupMembers1">
+            <annotation
+                 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.
+                        @param members Array of member strings to remove from the group.
+                        @param membertype 0: Users, 1: Groups
+                        @return Returns an empty D-BUS reply on success. Will return an error on failure.
+                        @error DBUS_ERROR_INVALID_ARGS The domain does not exist
+                        @error DBUS_ERROR_ACCESS_DENIED The caller does not have authorization to modify the group."
+            />
+            <arg name="group" type="s" direction="in" />
+            <arg name="domain" type="s" direction="in" />
+            <arg name="members" type="as" direction="in" />
+        </method>
+
+        <method name="Set_YouReallyDoNotWantToUseThisFunction_GroupGID1">
+            <annotation
+                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
+                       @param gid The new GID
+                       @return Returns an empty D-BUS reply on success. Will return an error on failure.
+                       @error DBUS_ERROR_INVALID_ARGS Domain or group did not exist
+                       @error DBUS_ERROR_ACCESS_DENIED Caller did not have permission to edit this group
+                       @note This function should be used sparingly. The automatically-generated group id from CreateGroup should be sufficient for most cases."
+            />
+            <arg name="group" type="s" direction="in" />
+            <arg name="domain" type="s" direction="in" />
+            <arg name="gid" type="t" direction="in" />
+        </method>
+    </interface>
+</node>
diff --git a/server/infopipe/org.freedesktop.sssd.infopipe.conf b/server/infopipe/org.freedesktop.sssd.infopipe.conf
new file mode 100644
index 0000000..ab62320
--- /dev/null
+++ b/server/infopipe/org.freedesktop.sssd.infopipe.conf
@@ -0,0 +1,24 @@
+<!DOCTYPE busconfig PUBLIC
+ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+
+  <!-- This configuration file specifies the required security policies
+       for the HAL to work. -->
+
+  <!-- Only root can own the SSSD service -->
+  <policy user="root">
+    <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.freedesktop.sssd.infopipe1.test"/>
+    <allow send_interface="org.freedesktop.sssd.infopipe1"/>
+  </policy>
+
+</busconfig>
+
diff --git a/server/infopipe/org.freeipa.sssd.infopipe.Introspect.xml b/server/infopipe/org.freeipa.sssd.infopipe.Introspect.xml
deleted file mode 100644
index 5656d42..0000000
--- a/server/infopipe/org.freeipa.sssd.infopipe.Introspect.xml
+++ /dev/null
@@ -1,275 +0,0 @@
-<!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">
-        <annotation
-            name="org.freeipa.sssd.infopipe.DocString.Summary"
-            value="InfoPipe Interface version 1"
-        />
-        <annotation
-            name="org.freeipa.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."
-        />
-
-<!--
-**************************************************************************
-* Permission Methods                                                     *
-**************************************************************************
--->
-        <method name="CheckPermissions1">
-            <annotation
-                name="org.freeipa.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
-                           Object Types:
-                            user
-                            group
-                       @param instance A particular instance of an object (a username or group name). An empty string will be interpreted as all instances.
-                       @param actions A list of actions to check the permissions of. Each action is described as a pair of (action_type, attribute). If attribute is left as an empty string, the query is for a global value (such as create or delete user) If the attribute value does not make sense for a particular object/instance/action, it will be ignored. Action types not applicable to an object/instance will return false (such as addmember on users).
-                           Available action types:
-                            read
-                            create
-                            delete
-                            modify
-                            addmember
-                            removemember
-                       @return permissions A list of boolean values returned in the same order as the action list, one for each requested action. True means permission on that action is granted.
-                       @note some examples:
-                           Can I create new users in domain LOCAL?:
-                               CheckPermissions(domain=>'LOCAL', object=>'user', instance=>'', actions=>[('create','')])
-                               returns permissions=>[0]
-                           Can I create new groups in domain LOCAL?
-                               CheckPermissions(domain=>'LOCAL', object=>'group', instance=>'', actions=>[('create','')])
-                               returns permissions=>[0]
-                           Can I modify user testuser1's userpic and full name?
-                               CheckPermissions(domain=>'LOCAL', object=>'user', instance=>'testuser1', actions=>[('modify','userpic'),('modify','fullname')])
-                               returns permissions=>[1,0]
-                           Can I add members to group wheel?
-                               CheckPermissions(domain=>'LOCAL', object=>'group', instance=>'wheel', actions=>[('addmember','somearg')])
-                               returns permissions=>[1]
-                               The argument 'somearg' is ignored, since it does not apply to addmember."
-            />
-            <arg name="domain" type="s" direction="in" />
-            <arg name="object" type="s" direction="in" />
-            <arg name="instance" type="s" direction="in" />
-            <arg name="actions" type="a(ss)" direction="in" />
-            <arg name="permissions" type="ab" direction="out" />
-        </method>
-<!--
-**************************************************************************
-* User Methods                                                           *
-**************************************************************************
--->
-        <method name="GetCachedUsers1">
-            <annotation
-                name="org.freeipa.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.
-                       @return users Returns a string array of usernames.
-                       @error DBUS_ERROR_INVALID_ARGS One or more specified domains do not exist."
-            />
-            <arg name="domain" type="s" direction="in" />
-            <arg name="minlastlogin" type="t" direction="in" />
-            <arg name="users" type="as" />
-        </method>
-
-        <method name="CreateUser1">
-            <annotation
-                name="org.freeipa.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
-                       @param fullname Full (display) name for the user. Will set both 'fullname' and 'gecos' to this value initially.
-                       @param homedir Home directory path for the user. Must be a parsable path, but does not need to exist or be mounted.
-                       @param shell Login shell. Must exist in /etc/shells.
-                       @return Returns an empty D-BUS reply to indicate success. Failure will return an error.
-                       @error DBUS_ERROR_INVALID_ARGS See parameter requirements. Reason will be included in the error message.
-                       @error DBUS_ERROR_ACCESS_DENIED Caller did not have permission to create a new user on the specified domain
-                       @note CreateUser will ignore users that already exist.
-                       @note This function will automatically generate an appropriate UID for the user."
-            />
-            <arg name="username" type="s" direction="in" />
-            <arg name="domain" type="s" direction="in" />
-            <arg name="fullname" type="s" direction="in" />
-            <arg name="homedir" type="s" direction="in" />
-            <arg name="shell" type="s" direction="in" />
-        </method>
-
-        <method name="DeleteUser1">
-            <annotation
-                name="org.freeipa.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.
-                       @return Returns an empty D-BUS reply if the deletion was successful. Failure will return an error.
-                       @error DBUS_ERROR_INVALID_ARGS No such username or domain. See error message for details.
-                       @error DBUS_ACCESS_DENIED Caller did not have permission to delete this user."
-            />
-            <arg name="username" type="s" direction="in" />
-            <arg name="domain" type="s" direction="in" />
-        </method>
-
-        <method name="GetUserAttributes1">
-            <annotation
-                name="org.freeipa.sssd.infopipe.DocString"
-                value="Get user information
-                       @param usernames An array of unique usernames.
-                       @param domain The domain from which to query user information.
-                       @param filter An array of strings containing a list of requested attributes. A zero-length array will indicate to return all authorized parameters.
-                              attributes(value type):
-                               defaultgroup(STRING)
-                               gecos(STRING)
-                               homedir(STRING)
-                               shell(STRING)
-                               fullname(STRING)
-                               locale(STRING)
-                               keyboard(STRING)
-                               session(STRING)
-                               last_login(UINT64)
-                               userpic(BYTE ARRAY)
-                       @return attributes An array of extended user information dicts, one for each requested username. Only attributes that the caller had read authorization for will be returned.
-                       @error DBUS_ERROR_INVALID_ARGS Usernames or filter entries were not unique or one or more filter entries were invalid.
-                       @note For standard POSIX attributes, use getpwnam().
-                       @note The attribute userpic may contain very large binary data. It is advisable to request this data separately from other attributes to avoid D-BUS message size limits."
-            />
-            <arg name="usernames" type="as" direction="in" />
-            <arg name="domain" type="s" direction="in" />
-            <arg name="filter" type="as" direction="in" />
-            <arg name="attributes" type="aa{sv}" direction="out" />
-        </method>
-
-        <method name="SetUserAttributes1">
-            <annotation
-                name="org.freeipa.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.
-                       @param attributes An array of dict(string, variant), either exactly one dict (meaning use the same values for all UIDs), or one dict for each username. An empty value for the variant means delete the attribute.
-                              attributes(value type):
-                               defaultgroup(STRING)
-                               gecos(STRING)
-                               homedir(STRING)
-                               shell(STRING)
-                               fullname(STRING)
-                               locale(STRING)
-                               keyboard(STRING)
-                               session(STRING)
-                               last_login(UINT64)
-                               userpic(BYTE ARRAY)
-                       @return Returns an empty D-BUS reply on success. Will return an error on failure.
-                       @error DBUS_ERROR_INVALID_ARGS Usernames were not unique
-                       @note The attribute userpic may contain very large binary data. It is advisable to set this data separately from other attributes to avoid D-BUS message size limits."
-            />
-            <arg name="usernames" type="as" direction="in" />
-            <arg name="domain" type="s" direction="in" />
-            <arg name="attributes" type="aa{sv}" direction="in" />
-        </method>
-
-        <method name="Set_YouReallyDoNotWantToUseThisFunction_UserUID1">
-            <annotation
-                name="org.freeipa.sssd.infopipe.DocString"
-                value="Change the User ID for a user.
-                       @param username The username
-                       @param domain The user's domain
-                       @param uid The new UID
-                       @return Returns an empty D-BUS reply on success. Will return an error on failure.
-                       @error DBUS_ERROR_INVALID_ARGS Domain or user did not exist
-                       @error DBUS_ERROR_ACCESS_DENIED Caller did not have permission to edit this user
-                       @note This function should be used sparingly. The automatically-generated user id from CreateUser should be sufficient for most cases."
-            />
-            <arg name="username" type="s" direction="in" />
-            <arg name="domain" type="s" direction="in" />
-            <arg name="uid" type="u" direction="in" />
-        </method>
-
-<!--
-**************************************************************************
-* Group Methods                                                          *
-**************************************************************************
--->
-        <method name="CreateGroup1">
-             <annotation
-                 name="org.freeipa.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.
-                        @return Returns an empty D-BUS reply on success. Will return an error on failure.
-                        @error DBUS_ERROR_INVALID_ARGS Domain does not exist.
-                        @error DBUS_ERROR_ACCESS_DENIED The caller does not have authorization to create groups in the specified domain.
-                        @note CreateGroup ignores groups that already exist.
-                        @note This function will automatically generate an appropriate group ID for this group."
-             />
-             <arg name="groupnames" type="as" direction="in" />
-             <arg name="domain" type="s" direction="in" />
-        </method>
-
-        <method name="DeleteGroup1">
-             <annotation
-                 name="org.freeipa.sssd.infopipe.DocString"
-                 value="Delete a user group
-                        @param groupname A group to delete.
-                        @param domain The domain from which to delete the group.
-                        @return Returns an empty D-BUS reply on success. Will return an error on failure.
-                        @error DBUS_ERROR_INVALID_ARGS Domain does not exist.
-                        @error DBUS_ERROR_ACCESS_DENIED The caller does not have authorization to delete groups from the specified domain.
-                        @note DeleteGroup ignores groups that don't exist."
-             />
-             <arg name="groupname" type="s" direction="in" />
-             <arg name="domain" type="s" direction="out" />
-        </method>
-
-        <method name="AddGroupMembers1">
-            <annotation
-                 name="org.freeipa.sssd.infopipe.DocString"
-                 value="Add members to a group
-                        @param group Group being modified.
-                        @param domain The domain the group belongs to.
-                        @param members Array of member strings to add to the group.
-                        @param membertype 0: Users, 1: Groups
-                        @return Returns an empty D-BUS reply on success. Will return an error on failure.
-                        @error DBUS_ERROR_INVALID_ARGS The domain does not exist
-                        @error DBUS_ERROR_ACCESS_DENIED The caller does not have authorization to modify the group."
-            />
-            <arg name="group" type="s" direction="in" />
-            <arg name="domain" type="s" direction="in" />
-            <arg name="members" type="as" direction="in" />
-            <arg name="membertype" type="y" direction="in" />
-        </method>
-
-        <method name="RemoveGroupMembers1">
-            <annotation
-                 name="org.freeipa.sssd.infopipe.DocString"
-                 value="Remove members from a group
-                        @param group Group being modified.
-                        @param domain The domain the group belongs to.
-                        @param members Array of member strings to remove from the group.
-                        @param membertype 0: Users, 1: Groups
-                        @return Returns an empty D-BUS reply on success. Will return an error on failure.
-                        @error DBUS_ERROR_INVALID_ARGS The domain does not exist
-                        @error DBUS_ERROR_ACCESS_DENIED The caller does not have authorization to modify the group."
-            />
-            <arg name="group" type="s" direction="in" />
-            <arg name="domain" type="s" direction="in" />
-            <arg name="members" type="as" direction="in" />
-        </method>
-
-        <method name="Set_YouReallyDoNotWantToUseThisFunction_GroupGID1">
-            <annotation
-                name="org.freeipa.sssd.infopipe.DocString"
-                value="Change the User ID for a user.
-                       @param group The group name
-                       @param domain The group's domain
-                       @param gid The new GID
-                       @return Returns an empty D-BUS reply on success. Will return an error on failure.
-                       @error DBUS_ERROR_INVALID_ARGS Domain or group did not exist
-                       @error DBUS_ERROR_ACCESS_DENIED Caller did not have permission to edit this group
-                       @note This function should be used sparingly. The automatically-generated group id from CreateGroup should be sufficient for most cases."
-            />
-            <arg name="group" type="s" direction="in" />
-            <arg name="domain" type="s" direction="in" />
-            <arg name="gid" type="t" direction="in" />
-        </method>
-    </interface>
-</node>
diff --git a/server/infopipe/org.freeipa.sssd.infopipe.conf b/server/infopipe/org.freeipa.sssd.infopipe.conf
deleted file mode 100644
index 2ed3cf1..0000000
--- a/server/infopipe/org.freeipa.sssd.infopipe.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE busconfig PUBLIC
- "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-
-  <!-- This configuration file specifies the required security policies
-       for the HAL to work. -->
-
-  <!-- Only root can own the SSSD service -->
-  <policy user="root">
-    <allow own="org.freeipa.sssd.infopipe1"/>
-    <allow send_interface="org.freeipa.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"/>
-  </policy>
-
-</busconfig>
-
diff --git a/server/monitor/monitor_interfaces.h b/server/monitor/monitor_interfaces.h
index 1b91c25..c3ddb33 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 2d0e37e..4b68a0b 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 8d85eb3..faba00c 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 cc75215..171e58d 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 a9d08ae..e052966 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
-- 
1.6.0.6