From a17573b01f4dff47ba766238a9f88b23be0c1aca Mon Sep 17 00:00:00 2001
From: Johan Hedberg <johan.hedberg@nokia.com>
Date: Fri, 3 Jul 2009 16:51:34 +0300
Subject: [PATCH] obexd: Also apply the symlinks setting to the tty based
 server

---
 obexd/src/main.c | 8 +++++---
 obexd/src/obex.c | 3 ++-
 obexd/src/obex.h | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/obexd/src/main.c b/obexd/src/main.c
index d733cb4a5..0e7e604f5 100644
--- a/obexd/src/main.c
+++ b/obexd/src/main.c
@@ -70,7 +70,8 @@ static int signal_pipe[2];
 #define TTY_TX_MTU 65535
 
 int tty_init(int services, const gchar *root_path,
-		const gchar *capability, const gchar *devnode)
+		const gchar *capability, gboolean symlinks,
+		const gchar *devnode)
 {
 	struct server *server;
 	struct termios options;
@@ -114,6 +115,7 @@ int tty_init(int services, const gchar *root_path,
 	server->devnode = g_strdup(devnode);
 	server->rx_mtu = TTY_RX_MTU;
 	server->tx_mtu = TTY_TX_MTU;
+	server->symlinks = symlinks;
 
 	io = g_io_channel_unix_new(fd);
 	g_io_channel_set_close_on_unref(io, TRUE);
@@ -221,7 +223,7 @@ static gboolean handle_signal(GIOChannel *io, GIOCondition cond,
 		tty_open_allowed = TRUE;
 		if (tty_needs_reinit)
 			tty_init(services, option_root, option_capability,
-							option_devnode);
+					option_symlinks, option_devnode);
 		break;
 	case SIGHUP:
 		debug("SIGHUP");
@@ -257,7 +259,7 @@ static int devnode_setup(void)
 		tty_open_allowed = FALSE;
 
 	return tty_init(services, option_root, option_capability,
-			option_devnode);
+			option_symlinks, option_devnode);
 }
 
 static gboolean is_dir(const char *dir) {
diff --git a/obexd/src/obex.c b/obexd/src/obex.c
index 4f5d722b7..53ec9b92c 100644
--- a/obexd/src/obex.c
+++ b/obexd/src/obex.c
@@ -944,7 +944,8 @@ static gboolean tty_reinit(gpointer data)
 {
 	struct server *server = data;
 
-	tty_init(server->services, server->folder, server->capability, server->devnode);
+	tty_init(server->services, server->folder, server->capability,
+					server->symlinks, server->devnode);
 
 	server_free(server);
 
diff --git a/obexd/src/obex.h b/obexd/src/obex.h
index 2f3659715..94a273eab 100644
--- a/obexd/src/obex.h
+++ b/obexd/src/obex.h
@@ -112,5 +112,5 @@ gint os_prepare_put(struct obex_session *os);
 void server_free(struct server *server);
 
 int tty_init(gint service, const gchar *folder, const gchar *capability,
-		const gchar *devnode);
+		gboolean symlinks, const gchar *devnode);
 void tty_closed(void);
-- 
2.47.3