summaryrefslogtreecommitdiff
path: root/dbus/dbus-auth-script.c
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-03-31 14:51:51 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-03-31 14:51:51 +0000
commitf2e4718bf42f507684949ebf484aa94df42abbbe (patch)
tree7f6266a7e45144490b18eb6c71a953e8e0196eb9 /dbus/dbus-auth-script.c
parenta0f3687d650c8c73134f318820f4978a4ff3e9e2 (diff)
parent6528b0973bb09b0b407a5e169fdcc519087cc58d (diff)
downloaddbus-baserock/v1.8.0.tar.gz
Merge tag 'dbus-1.8.0' into baserock/pedroalvarez/genivibaserock/v1.8.0
dbus-1.8.0
Diffstat (limited to 'dbus/dbus-auth-script.c')
-rw-r--r--dbus/dbus-auth-script.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/dbus/dbus-auth-script.c b/dbus/dbus-auth-script.c
index 6285e3ba..164743b0 100644
--- a/dbus/dbus-auth-script.c
+++ b/dbus/dbus-auth-script.c
@@ -22,7 +22,7 @@
*/
#include <config.h>
-#ifdef DBUS_BUILD_TESTS
+#ifdef DBUS_ENABLE_EMBEDDED_TESTS
#include "dbus-auth-script.h"
#include "dbus-auth.h"
@@ -223,7 +223,7 @@ auth_set_unix_credentials(DBusAuth *auth,
if (uid != DBUS_UID_UNSET)
_dbus_credentials_add_unix_uid (credentials, uid);
if (pid != DBUS_PID_UNSET)
- _dbus_credentials_add_unix_pid (credentials, pid);
+ _dbus_credentials_add_pid (credentials, pid);
_dbus_auth_set_credentials (auth, credentials);
@@ -584,11 +584,11 @@ _dbus_auth_script_run (const DBusString *filename)
{
_dbus_warn ("not enough memory to call bytes_received, or can't add bytes to auth object already in end state\n");
_dbus_string_free (&to_send);
- _dbus_auth_return_buffer (auth, buffer, 0);
+ _dbus_auth_return_buffer (auth, buffer);
goto out;
}
- _dbus_auth_return_buffer (auth, buffer, _dbus_string_get_length (&to_send));
+ _dbus_auth_return_buffer (auth, buffer);
}
_dbus_string_free (&to_send);
@@ -800,4 +800,4 @@ _dbus_auth_script_run (const DBusString *filename)
}
/** @} */
-#endif /* DBUS_BUILD_TESTS */
+#endif /* DBUS_ENABLE_EMBEDDED_TESTS */