From: Jeremy Allison <jra@samba.org>
Date: Fri, 28 Jan 2005 21:55:45 +0000 (+0000)
Subject: r5066: A couple of small fixes from James Peach @ SGI.
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=8ac31b503433ae6150da9523e58c338aff27e561;p=kai%2Fsamba.git

r5066: A couple of small fixes from James Peach @ SGI.
Jeremy.
(This used to be commit 9d131e94195df79e07c8fad20e12ba1b67441a81)
---

diff --git a/source3/lib/util.c b/source3/lib/util.c
index 455f87aaab8..d910dff5477 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -1534,6 +1534,11 @@ void smb_panic2(const char *why, BOOL decrement_pid_count )
 		ZERO_ARRAY(names);
 		ZERO_ARRAY(namebuf);
 
+		/* We need to be root so we can open our /proc entry to walk
+		 * our stack. It also helps when we want to dump core.
+		 */
+		become_root();
+
 		for (i = 0; i < BACKTRACE_STACK_SIZE; i++) {
 			names[i] = namebuf + (i * NAMESIZE);
 		}
diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c
index 6b6581b4a7b..394c8e27cff 100644
--- a/source3/lib/util_str.c
+++ b/source3/lib/util_str.c
@@ -1558,8 +1558,8 @@ int fstr_sprintf(fstring s, const char *fmt, ...)
 
  size_t strnlen(const char *s, size_t n)
 {
-	int i;
-	for (i=0; s[i] && i<n; i++)
+	size_t i;
+	for (i=0; i<n && s[i] != '\0'; i++)
 		/* noop */ ;
 	return i;
 }