Author: lslezak Date: Wed Mar 4 13:08:14 2009 New Revision: 55914 URL: http://svn.opensuse.org/viewcvs/yast?rev=55914&view=rev Log: - Dbus service - check the requested interface in autoimport (do not autoimport modules when the requested interface is not valid) Modified: branches/tmp/lslezak/core/dbus/namespace_service/src/DBusModulesServer.cc Modified: branches/tmp/lslezak/core/dbus/namespace_service/src/DBusModulesServer.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/dbus/namespace_service/src/DBusModulesServer.cc?rev=55914&r1=55913&r2=55914&view=diff ============================================================================== --- branches/tmp/lslezak/core/dbus/namespace_service/src/DBusModulesServer.cc (original) +++ branches/tmp/lslezak/core/dbus/namespace_service/src/DBusModulesServer.cc Wed Mar 4 13:08:14 2009 @@ -497,12 +497,15 @@ // return empty message for void functions if (!ret->isVoid()) { + y2internal("Interface: %s", interface.c_str()); if (interface == YAST_DBUS_RAW_INTERFACE) { + y2debug("Returning direct DBus value"); reply.addValue(ret); } else { + y2debug("Returning (bsv) encoded YCP value"); reply.addYCPValue(ret); } } @@ -649,7 +652,9 @@ DBusMsg reply; // subtree match - if (req_path.substr(0, sizeof(YAST_DBUS_OBJ_PREFIX) - 1) == YAST_DBUS_OBJ_PREFIX) + if (req_path.substr(0, sizeof(YAST_DBUS_OBJ_PREFIX) - 1) == YAST_DBUS_OBJ_PREFIX + && (request.interface() == YAST_DBUS_RAW_INTERFACE || request.interface() == YAST_DBUS_YCP_INTERFACE) + ) { y2debug("Found object prefix " YAST_DBUS_OBJ_PREFIX " in request"); std::string req_namespace(req_path, sizeof(YAST_DBUS_OBJ_PREFIX)); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org