r23510: Tidy calls to smb_panic by removing trailing newlines. Print the

failed expression in SMB_ASSERT.
(This used to be commit 171dc060e2a576d724eed1ca65636bdafffd7713)

9 files changed, 15 insertions, 15 deletions

diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index 6a892b477d..924b99b113 100644
--- a/source3/smbd/blocking.c
+++ b/source3/smbd/blocking.c
@@ -841,13 +841,13 @@ static void process_blocking_lock_cancel_message(struct messaging_context *ctx,
 	blocking_lock_record *blr;
 
 	if (data->data == NULL) {
-		smb_panic("process_blocking_lock_cancel_message: null msg\n");
+		smb_panic("process_blocking_lock_cancel_message: null msg");
 	}
 
 	if (data->length != MSG_BLOCKING_LOCK_CANCEL_SIZE) {
 		DEBUG(0, ("process_blocking_lock_cancel_message: "
 			  "Got invalid msg len %d\n", (int)data->length));
-		smb_panic("process_blocking_lock_cancel_message: bad msg\n");
+		smb_panic("process_blocking_lock_cancel_message: bad msg");
         }
 
 	memcpy(&blr, msg, sizeof(blr));
diff --git a/source3/smbd/files.c b/source3/smbd/files.c
index 5ee0696ef9..590916011b 100644
--- a/source3/smbd/files.c
+++ b/source3/smbd/files.c
@@ -284,7 +284,7 @@ oplock_type = %u is a stat open with oplock type !\n", fsp->fsp_name,
 					 file_id_static_string(&fsp->file_id),
 					 (unsigned int)fsp->fh->gen_id,
 					 (unsigned int)fsp->oplock_type ));
-				smb_panic("file_find_dif\n");
+				smb_panic("file_find_dif");
 			}
 			return fsp;
 		}
diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c
index 92c392b366..3fdae1e06b 100644
--- a/source3/smbd/negprot.c
+++ b/source3/smbd/negprot.c
@@ -43,7 +43,7 @@ static void get_challenge(char buff[8])
 	DEBUG(10, ("get challenge: creating negprot_global_auth_context\n"));
 	if (!NT_STATUS_IS_OK(nt_status = make_auth_context_subsystem(&negprot_global_auth_context))) {
 		DEBUG(0, ("make_auth_context_subsystem returned %s", nt_errstr(nt_status)));
-		smb_panic("cannot make_negprot_global_auth_context!\n");
+		smb_panic("cannot make_negprot_global_auth_context!");
 	}
 	DEBUG(10, ("get challenge: getting challenge\n"));
 	cryptkey = negprot_global_auth_context->get_ntlm_challenge(negprot_global_auth_context);
diff --git a/source3/smbd/notify.c b/source3/smbd/notify.c
index 5491f8eaf8..9074990be7 100644
--- a/source3/smbd/notify.c
+++ b/source3/smbd/notify.c
@@ -261,7 +261,7 @@ static void change_notify_remove_request(struct notify_change_request *remove_re
 	}
 
 	if (req == NULL) {
-		smb_panic("notify_req not found in fsp's requests\n");
+		smb_panic("notify_req not found in fsp's requests");
 	}
 
 	DLIST_REMOVE(fsp->notify->requests, req);
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index e713922ecb..965da90a64 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -50,7 +50,7 @@ static const char *known_nt_pipes[] = {
 static char *nttrans_realloc(char **ptr, size_t size)
 {
 	if (ptr==NULL) {
-		smb_panic("nttrans_realloc() called with NULL ptr\n");
+		smb_panic("nttrans_realloc() called with NULL ptr");
 	}
 		
 	*ptr = (char *)SMB_REALLOC(*ptr, size);
diff --git a/source3/smbd/password.c b/source3/smbd/password.c
index ce03e6d85f..00f687dc27 100644
--- a/source3/smbd/password.c
+++ b/source3/smbd/password.c
@@ -147,7 +147,7 @@ int register_vuid(auth_serversupplied_info *server_info,
 
 	/* Paranoia check. */
 	if(lp_security() == SEC_SHARE) {
-		smb_panic("Tried to register uid in security=share\n");
+		smb_panic("Tried to register uid in security=share");
 	}
 
 	/* Limit allowed vuids to 16bits - VUID_OFFSET. */
diff --git a/source3/smbd/sec_ctx.c b/source3/smbd/sec_ctx.c
index 4d4e24407b..97842419d5 100644
--- a/source3/smbd/sec_ctx.c
+++ b/source3/smbd/sec_ctx.c
@@ -192,7 +192,7 @@ BOOL push_sec_ctx(void)
 
 	if (sec_ctx_stack_ndx == MAX_SEC_CTX_DEPTH) {
 		DEBUG(0, ("Security context stack overflow!\n"));
-		smb_panic("Security context stack overflow!\n");
+		smb_panic("Security context stack overflow!");
 	}
 
 	/* Store previous user context */
@@ -374,7 +374,7 @@ BOOL pop_sec_ctx(void)
 
 	if (sec_ctx_stack_ndx == 0) {
 		DEBUG(0, ("Security context stack underflow!\n"));
-		smb_panic("Security context stack underflow!\n");
+		smb_panic("Security context stack underflow!");
 	}
 
 	ctx_p = &sec_ctx_stack[sec_ctx_stack_ndx];
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 532de36bf8..edbd879847 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -67,7 +67,7 @@ struct event_context *smbd_event_context(void)
 	static struct event_context *ctx;
 
 	if (!ctx && !(ctx = event_context_init(NULL))) {
-		smb_panic("Could not init smbd event context\n");
+		smb_panic("Could not init smbd event context");
 	}
 	return ctx;
 }
@@ -78,7 +78,7 @@ struct messaging_context *smbd_messaging_context(void)
 
 	if (!ctx && !(ctx = messaging_init(NULL, server_id_self(),
 					   smbd_event_context()))) {
-		smb_panic("Could not init smbd messaging context\n");
+		smb_panic("Could not init smbd messaging context");
 	}
 	return ctx;
 }
@@ -539,7 +539,7 @@ static BOOL open_sockets_smbd(enum smb_server_mode server_mode, const char *smb_
 				 * CLEAR_IF_FIRST flags */
 				if (tdb_reopen_all(1) == -1) {
 					DEBUG(0,("tdb_reopen_all failed.\n"));
-					smb_panic("tdb_reopen_all failed.");
+					smb_panic("tdb_reopen_all failed");
 				}
 
 				return True; 
diff --git a/source3/smbd/share_access.c b/source3/smbd/share_access.c
index adb9d16964..b12d543f5a 100644
--- a/source3/smbd/share_access.c
+++ b/source3/smbd/share_access.c
@@ -86,7 +86,7 @@ static BOOL token_contains_name(TALLOC_CTX *mem_ctx,
 	if (name == NULL) {
 		/* This is too security sensitive, better panic than return a
 		 * result that might be interpreted in a wrong way. */
-		smb_panic("substitutions failed\n");
+		smb_panic("substitutions failed");
 	}
 	
 	/* check to see is we already have a SID */
@@ -136,7 +136,7 @@ static BOOL token_contains_name(TALLOC_CTX *mem_ctx,
 			}
 			continue;
 		}
-		smb_panic("got invalid prefix from do_groups_check\n");
+		smb_panic("got invalid prefix from do_groups_check");
 	}
 	return False;
 }
@@ -164,7 +164,7 @@ BOOL token_contains_name_in_list(const char *username,
 	}
 
 	if ( (mem_ctx = talloc_new(NULL)) == NULL ) {
-		smb_panic("talloc_new failed\n");
+		smb_panic("talloc_new failed");
 	}
 
 	while (*list != NULL) {