summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJames Peach <jpeach@samba.org>2006-05-10 22:33:10 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:16:56 -0500
commit8de0dcb3d917956d3f8a32664d0fec57e5559753 (patch)
tree53ee6f2845ea0ac48467d2bc3fd3d2193bea2c9f /source3
parentf65ff9d637d6d7c6fa005d77d1ea2844c0c87ce4 (diff)
downloadsamba-8de0dcb3d917956d3f8a32664d0fec57e5559753.tar.gz
samba-8de0dcb3d917956d3f8a32664d0fec57e5559753.tar.bz2
samba-8de0dcb3d917956d3f8a32664d0fec57e5559753.zip
r15529: Initialise our saved uid and gid so that we can tell when
we created the profiling shmem segment and don't bogusly refuse to look at it. (This used to be commit eb31ef3a0e5e7c3b4029a3c2e124d2df646f10a2)
Diffstat (limited to 'source3')
-rw-r--r--source3/profile/profile.c8
-rw-r--r--source3/utils/status.c1
2 files changed, 7 insertions, 2 deletions
diff --git a/source3/profile/profile.c b/source3/profile/profile.c
index bacf00eb01..ba9596301c 100644
--- a/source3/profile/profile.c
+++ b/source3/profile/profile.c
@@ -158,8 +158,12 @@ BOOL profile_setup(BOOL rdonly)
return False;
}
- if (shm_ds.shm_perm.cuid != sec_initial_uid() || shm_ds.shm_perm.cgid != sec_initial_gid()) {
- DEBUG(0,("ERROR: we did not create the shmem (owned by another user)\n"));
+ if (shm_ds.shm_perm.cuid != sec_initial_uid() ||
+ shm_ds.shm_perm.cgid != sec_initial_gid()) {
+ DEBUG(0,("ERROR: we did not create the shmem "
+ "(owned by another user, uid %u, gid %u)\n",
+ shm_ds.shm_perm.cuid,
+ shm_ds.shm_perm.cgid));
return False;
}
diff --git a/source3/utils/status.c b/source3/utils/status.c
index bc26be1ec9..05075da444 100644
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -622,6 +622,7 @@ static int traverse_sessionid(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, vo
POPT_TABLEEND
};
+ sec_init();
load_case_tables();
setup_logging(argv[0],True);