r5102: This is a major simplification of the logic for controlling top level

servers in smbd. The old code still contained a fairly bit of legacy
from the time when smbd was only handling SMB connection. The new code
gets rid of all of the smb_server specific code in smbd/, and creates
a much simpler infrastructures for new server code.

Major changes include:

 - simplified the process model code a lot.

 - got rid of the top level server and service structures
   completely. The top level context is now the event_context. This
   got rid of service.h and server.h completely (they were the most
   confusing parts of the old code)

 - added service_stream.[ch] for the helper functions that are
   specific to stream type services (services that handle streams, and
   use a logically separate process per connection)

 - got rid of the builtin idle_handler code in the service logic, as
   none of the servers were using it, and it can easily be handled by
   a server in future by adding its own timed_event to the event
   context.

 - fixed some major memory leaks in the rpc server code.

 - added registration of servers, rather than hard coding our list of
   possible servers. This allows for servers as modules in the future.

 - temporarily disabled the winbind code until I add the helper
   functions for that type of server

 - added error checking on service startup. If a configured server
   fails to startup then smbd doesn't startup.

 - cleaned up the command line handling in smbd, removing unused options
(This used to be commit cf6a46c3cbde7b1eb1b86bd3882b953a2de3a42e)

2 files changed, 6 insertions, 6 deletions

diff --git a/source4/ntvfs/common/brlock.c b/source4/ntvfs/common/brlock.c
index f51e3d0694..d521dc80d3 100644
--- a/source4/ntvfs/common/brlock.c
+++ b/source4/ntvfs/common/brlock.c
@@ -41,7 +41,7 @@
   lock is the same as another lock
 */
 struct lock_context {
-	servid_t server;
+	uint32_t server;
 	uint16_t smbpid;
 	uint16_t tid;
 };
@@ -60,7 +60,7 @@ struct lock_struct {
 
 struct brl_context {
 	struct tdb_wrap *w;
-	servid_t server;
+	uint32_t server;
 	uint16_t tid;
 	struct messaging_context *messaging_ctx;
 	struct lock_struct last_lock;
@@ -72,7 +72,7 @@ struct brl_context {
   talloc_free(). We need the messaging_ctx to allow for
   pending lock notifications.
 */
-struct brl_context *brl_init(TALLOC_CTX *mem_ctx, servid_t server, uint16_t tid, 
+struct brl_context *brl_init(TALLOC_CTX *mem_ctx, uint32_t server, uint16_t tid, 
 			     struct messaging_context *messaging_ctx)
 {
 	char *path;
diff --git a/source4/ntvfs/common/opendb.c b/source4/ntvfs/common/opendb.c
index 0aa257073d..3c206528dd 100644
--- a/source4/ntvfs/common/opendb.c
+++ b/source4/ntvfs/common/opendb.c
@@ -44,7 +44,7 @@
 
 struct odb_context {
 	struct tdb_wrap *w;
-	servid_t server;
+	uint32_t server;
 	struct messaging_context *messaging_ctx;
 };
 
@@ -53,7 +53,7 @@ struct odb_context {
    following form
 */
 struct odb_entry {
-	servid_t server;
+	uint32_t server;
 	void     *file_handle;
 	uint32_t stream_id;
 	uint32_t share_access;
@@ -78,7 +78,7 @@ struct odb_lock {
   talloc_free(). We need the messaging_ctx to allow for pending open
   notifications.
 */
-struct odb_context *odb_init(TALLOC_CTX *mem_ctx, servid_t server, 
+struct odb_context *odb_init(TALLOC_CTX *mem_ctx, uint32_t server, 
 			     struct messaging_context *messaging_ctx)
 {
 	char *path;