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

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

3 files changed, 9 insertions, 8 deletions

diff --git a/source3/nsswitch/winbindd.c b/source3/nsswitch/winbindd.c
index 94a4b7f115..c20f589434 100644
--- a/source3/nsswitch/winbindd.c
+++ b/source3/nsswitch/winbindd.c
@@ -39,7 +39,7 @@ struct event_context *winbind_event_context(void)
 	static struct event_context *ctx;
 
 	if (!ctx && !(ctx = event_context_init(NULL))) {
-		smb_panic("Could not init winbind event context\n");
+		smb_panic("Could not init winbind event context");
 	}
 	return ctx;
 }
@@ -50,7 +50,7 @@ struct messaging_context *winbind_messaging_context(void)
 
 	if (!ctx && !(ctx = messaging_init(NULL, server_id_self(),
 					   winbind_event_context()))) {
-		smb_panic("Could not init winbind messaging context\n");
+		smb_panic("Could not init winbind messaging context");
 	}
 	return ctx;
 }
diff --git a/source3/nsswitch/winbindd_cm.c b/source3/nsswitch/winbindd_cm.c
index cea2ff8445..c5e014192e 100644
--- a/source3/nsswitch/winbindd_cm.c
+++ b/source3/nsswitch/winbindd_cm.c
@@ -353,7 +353,7 @@ void set_domain_offline(struct winbindd_domain *domain)
 
 	/* The above *has* to succeed for winbindd to work. */
 	if (!domain->check_online_event) {
-		smb_panic("set_domain_offline: failed to add online handler.\n");
+		smb_panic("set_domain_offline: failed to add online handler");
 	}
 
 	DEBUG(10,("set_domain_offline: added event handler for domain %s\n",
@@ -496,7 +496,7 @@ void set_domain_online_request(struct winbindd_domain *domain)
 
 		/* The above *has* to succeed for winbindd to work. */
 		if (!domain->check_online_event) {
-			smb_panic("set_domain_online_request: failed to add online handler.\n");
+			smb_panic("set_domain_online_request: failed to add online handler");
 		}
 	}
 
diff --git a/source3/nsswitch/winbindd_util.c b/source3/nsswitch/winbindd_util.c
index 082ec4440b..83d915429f 100644
--- a/source3/nsswitch/winbindd_util.c
+++ b/source3/nsswitch/winbindd_util.c
@@ -56,7 +56,7 @@ struct winbindd_domain *domain_list(void)
 	/* Initialise list */
 
 	if ((!_domain_list) && (!init_domain_list())) {
-		smb_panic("Init_domain_list failed\n");
+		smb_panic("Init_domain_list failed");
 	}
 
 	return _domain_list;
@@ -857,7 +857,7 @@ struct winbindd_domain *find_our_domain(void)
 			return domain;
 	}
 
-	smb_panic("Could not find our domain\n");
+	smb_panic("Could not find our domain");
 	return NULL;
 }
 
@@ -882,8 +882,9 @@ struct winbindd_domain *find_builtin_domain(void)
 	string_to_sid(&sid, "S-1-5-32");
 	domain = find_domain_from_sid(&sid);
 
-	if (domain == NULL)
-		smb_panic("Could not find BUILTIN domain\n");
+	if (domain == NULL) {
+		smb_panic("Could not find BUILTIN domain");
+	}
 
 	return domain;
 }