summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2005-01-28 21:55:45 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:55:13 -0500
commit8ac31b503433ae6150da9523e58c338aff27e561 (patch)
tree902e07b16bba109c1e3f4c741e4ea11a229a828d
parentde728fa81ae549b496f2ff26ebb082092aae2204 (diff)
downloadsamba-8ac31b503433ae6150da9523e58c338aff27e561.tar.gz
samba-8ac31b503433ae6150da9523e58c338aff27e561.tar.bz2
samba-8ac31b503433ae6150da9523e58c338aff27e561.zip
r5066: A couple of small fixes from James Peach @ SGI.
Jeremy. (This used to be commit 9d131e94195df79e07c8fad20e12ba1b67441a81)
-rw-r--r--source3/lib/util.c5
-rw-r--r--source3/lib/util_str.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/source3/lib/util.c b/source3/lib/util.c
index 455f87aaab..d910dff547 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 6b6581b4a7..394c8e27cf 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;
}