4 files changed, 11 insertions, 3 deletions
diff --git a/source4/smbd/process.c b/source4/smbd/process.c
index b5138ac971..411ffef717 100644
--- a/source4/smbd/process.c
+++ b/source4/smbd/process.c
@@ -765,7 +765,7 @@ void init_smbsession(struct event_context *ev, struct model_ops *model_ops, int
 	event_add_fd(ev, &fde);
 
 	/* setup the DCERPC server subsystem */
-	dcesrv_init(&smb->dcesrv);
+	dcesrv_init_context(&smb->dcesrv);
 }
 
 
@@ -825,6 +825,10 @@ void smbd_process_init(void)
 	if (!ntvfs_init())
 		exit(1);
 
+	/* Setup the DCERPC subsystem */
+	if (!dcesrv_init())
+		exit(1);
+
 	/* re-initialise the timezone */
 	TimeInit();
 	
diff --git a/source4/smbd/process_thread.c b/source4/smbd/process_thread.c
index 523c38f521..9acd49916b 100644
--- a/source4/smbd/process_thread.c
+++ b/source4/smbd/process_thread.c
@@ -110,7 +110,7 @@ static void accept_rpc_connection(struct event_context *ev, struct fd_event *fde
 	
 	ev = event_context_init();
 	MUTEX_LOCK_BY_ID(MUTEX_SMBD);
-	init_rpcsession(ev, fde->private, accepted_fd);
+	init_rpc_session(ev, fde->private, accepted_fd);
 	MUTEX_UNLOCK_BY_ID(MUTEX_SMBD);
 	
 	pthread_attr_init(&thread_attr);
diff --git a/source4/smbd/reply.c b/source4/smbd/reply.c
index ce203cbf93..7d6450b395 100644
--- a/source4/smbd/reply.c
+++ b/source4/smbd/reply.c
@@ -249,7 +249,7 @@ void reply_ioctl(struct request_context *req)
 {
 	union smb_ioctl *io;
 
-	/* parse requst */
+	/* parse request */
 	REQ_CHECK_WCT(req, 3);
 	REQ_TALLOC(io, sizeof(*io));
 
diff --git a/source4/smbd/request.c b/source4/smbd/request.c
index 65bf71051f..065e63a8d2 100644
--- a/source4/smbd/request.c
+++ b/source4/smbd/request.c
@@ -62,6 +62,10 @@ struct request_context *init_smb_request(struct server_context *smb)
 	smb->socket.pkt_count++;
 
 	req = talloc(mem_ctx, sizeof(*req));
+	if (!req) {
+		return NULL;
+	}
+
 	ZERO_STRUCTP(req);
 
 	/* setup the request context */