From: Ted Percival <ted.percival@quest.com>
Date: Tue, 3 Feb 2009 22:10:20 +0000 (-0800)
Subject: Probably fixes a crash during name resolution when log level >= 10
X-Git-Tag: samba-3.0.36~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba1b99243c70807a49d2e6f14d9a31a029144ff8;p=thirdparty%2Fsamba.git

Probably fixes a crash during name resolution when log level >= 10
and libc segfaults if printf is passed NULL for a "%s" arg
(eg. Solaris).
(cherry picked from commit d3220d9d58477f2a6ef7a78c3cf05cb232b57aff)
---

diff --git a/source/libsmb/namequery.c b/source/libsmb/namequery.c
index 023fd3f043b..62cb1bad24b 100644
--- a/source/libsmb/namequery.c
+++ b/source/libsmb/namequery.c
@@ -1225,7 +1225,7 @@ BOOL internal_resolve_name(const char *name, int name_type,
 	*return_count = 0;
 
 	DEBUG(10, ("internal_resolve_name: looking up %s#%x (sitename %s)\n",
-			name, name_type, sitename ? sitename : NULL));
+			name, name_type, sitename ? sitename : "(null)"));
 
 	if (allzeros || allones || is_address) {