Merge "Optional autogen.sh flag --enable-kdbus-transport added allowing to compile...

[platform/upstream/dbus.git] / dbus / dbus-auth.c

diff --git a/dbus/dbus-auth.c b/dbus/dbus-auth.c
index de96382..86e3223 100644 (file)
--- a/dbus/dbus-auth.c
+++ b/dbus/dbus-auth.c
@@ -2,6 +2,7 @@
 /* dbus-auth.c Authentication
  *
  * Copyright (C) 2002, 2003, 2004 Red Hat Inc.
+ * Copyright (C) 2013  Samsung Electronics
  *
  * Licensed under the Academic Free License version 2.1
  * 
@@ -2238,8 +2239,8 @@ process_command (DBusAuth *auth)
 
 /**
  * Creates a new auth conversation object for the server side.
- * See doc/dbus-sasl-profile.txt for full details on what
- * this object does.
+ * See http://dbus.freedesktop.org/doc/dbus-specification.html#auth-protocol
+ * for full details on what this object does.
  *
  * @returns the new object or #NULL if no memory
  */
@@ -2284,8 +2285,8 @@ _dbus_auth_server_new (const DBusString *guid)
 
 /**
  * Creates a new auth conversation object for the client side.
- * See doc/dbus-sasl-profile.txt for full details on what
- * this object does.
+ * See http://dbus.freedesktop.org/doc/dbus-specification.html#auth-protocol
+ * for full details on what this object does.
  *
  * @returns the new object or #NULL if no memory
  */
@@ -2321,6 +2322,7 @@ _dbus_auth_client_new (void)
   return auth;
 }
 
+#ifdef ENABLE_KDBUS_TRANSPORT
 /**
  * Creates a new auth conversation object for the client side of kdbus.
  * In fact it only initialize structures and sets authenticated state
@@ -2349,6 +2351,7 @@ _dbus_auth_client_new_kdbus (void)
 
   auth->side = auth_side_client;
   auth->state = &common_state_authenticated;
+  auth->unix_fd_negotiated = TRUE;
 
   /* Start the auth conversation by sending AUTH for our default
    * mechanism */
@@ -2360,6 +2363,7 @@ _dbus_auth_client_new_kdbus (void)
 
   return auth;
 }
+#endif
 
 /**
  * Increments the refcount of an auth object.