--- /dev/null
+From 8368c6336f557220d6b2a088e291c5ce61f80f9e Mon Sep 17 00:00:00 2001
+From: Jeremy Allison <jra@samba.org>
+Date: Wed, 16 Dec 2015 11:04:20 -0800
+Subject: [PATCH] s3: libsmb: Correctly initialize the list head when keeping a
+ list of primary followed by DFS connections.
+
+Greatly helped by <shargagan@novell.com> to
+track down this issue.
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11624
+
+Signed-off-by: Jeremy Allison <jra@samba.org>
+Reviewed-by: Volker Lendecke <vl@samba.org>
+
+Autobuild-User(master): Volker Lendecke <vl@samba.org>
+Autobuild-Date(master): Fri Dec 18 01:02:55 CET 2015 on sn-devel-144
+
+(cherry picked from commit d7feb1879ee711598540049c2c5eccc80fd6f1e5)
+---
+ source3/libsmb/libsmb_server.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/source3/libsmb/libsmb_server.c b/source3/libsmb/libsmb_server.c
+index 45be660..e7416e0 100644
+--- a/source3/libsmb/libsmb_server.c
++++ b/source3/libsmb/libsmb_server.c
+@@ -634,7 +634,7 @@ again:
+ }
+
+ ZERO_STRUCTP(srv);
+- srv->cli = c;
++ DLIST_ADD(srv->cli, c);
+ srv->dev = (dev_t)(str_checksum(server) ^ str_checksum(share));
+ srv->no_pathinfo = False;
+ srv->no_pathinfo2 = False;
+@@ -821,7 +821,7 @@ SMBC_attr_server(TALLOC_CTX *ctx,
+ }
+
+ ZERO_STRUCTP(ipc_srv);
+- ipc_srv->cli = ipc_cli;
++ DLIST_ADD(ipc_srv->cli, ipc_cli);
+
+ nt_status = cli_rpc_pipe_open_noauth(
+ ipc_srv->cli, &ndr_table_lsarpc.syntax_id, &pipe_hnd);
+--
+2.7.4
+