[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-1070-g91980a2

[Jelmer Vernooij]

The branch, v4-0-test has been updated
       via  91980a2bd352f26cf6ddb058d0f330ca20fa6554 (commit)
       via  5193b383761129e59241cd2cc6000f0b038b49d4 (commit)
       via  5d274f19aedbb022d61b1493857dce66877dc809 (commit)
      from  a0decdf63e2f7ef6ee62a3fda5070b2fccee5682 (commit)

http://gitweb.samba.org/?samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 91980a2bd352f26cf6ddb058d0f330ca20fa6554
Merge: 5193b383761129e59241cd2cc6000f0b038b49d4 a0decdf63e2f7ef6ee62a3fda5070b2fccee5682
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Wed Feb 27 19:37:45 2008 +0100

    Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test

commit 5193b383761129e59241cd2cc6000f0b038b49d4
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Thu Feb 21 16:18:01 2008 +0100

    Clarify comments.

commit 5d274f19aedbb022d61b1493857dce66877dc809
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Wed Feb 27 17:36:49 2008 +0100

    Set lp_ctx properly.

-----------------------------------------------------------------------

Summary of changes:
 source/param/share.c         |    2 +-
 source/param/share_classic.c |    2 +-
 source/param/share_ldb.c     |    2 +-
 source/smbd/service_stream.c |    1 +
 4 files changed, 4 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/param/share.c b/source/param/share.c
index 2c97625..bc2999b 100644
--- a/source/param/share.c
+++ b/source/param/share.c
@@ -1,7 +1,7 @@
 /* 
    Unix SMB/CIFS implementation.
    
-   Modular services configuration system
+   Modular shares configuration system
    
    Copyright (C) Simo Sorce	2006
    
diff --git a/source/param/share_classic.c b/source/param/share_classic.c
index b517c9c..eb5e486 100644
--- a/source/param/share_classic.c
+++ b/source/param/share_classic.c
@@ -1,7 +1,7 @@
 /* 
    Unix SMB/CIFS implementation.
    
-   Classic file based services configuration
+   Classic file based shares configuration
    
    Copyright (C) Simo Sorce	2006
    
diff --git a/source/param/share_ldb.c b/source/param/share_ldb.c
index bdea94a..fb40f1e 100644
--- a/source/param/share_ldb.c
+++ b/source/param/share_ldb.c
@@ -1,7 +1,7 @@
 /* 
    Unix SMB/CIFS implementation.
    
-   LDB based services configuration
+   LDB based shares configuration
    
    Copyright (C) Simo Sorce	2006
    
diff --git a/source/smbd/service_stream.c b/source/smbd/service_stream.c
index 7e1f649..23cf830 100644
--- a/source/smbd/service_stream.c
+++ b/source/smbd/service_stream.c
@@ -174,6 +174,7 @@ static void stream_new_connection(struct event_context *ev,
 	srv_conn->server_id	= server_id;
 	srv_conn->ops           = stream_socket->ops;
 	srv_conn->event.ctx	= ev;
+	srv_conn->lp_ctx	= lp_ctx;
 	srv_conn->event.fde	= event_add_fd(ev, srv_conn, socket_get_fd(sock),
 					       0, stream_io_handler_fde, srv_conn);
 


-- 
Samba Shared Repository