summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald (Jerry) Carter <jerry@samba.org>2007-10-21 12:39:15 -0500
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-21 12:39:15 -0500
commit6a1a83a85045f78162cbc8840c21dfe968e5cace (patch)
tree72746c1055b007fb9f8edd1595a163362629f18c
parent69c6f16e31d0adfc7efb077e09afbb8ff5fb2b0f (diff)
parentd1db41c05971b14b16a4dd27df2c5260fcaa5d7f (diff)
downloadsamba-6a1a83a85045f78162cbc8840c21dfe968e5cace.tar.gz
samba-6a1a83a85045f78162cbc8840c21dfe968e5cace.tar.bz2
samba-6a1a83a85045f78162cbc8840c21dfe968e5cace.zip
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
(This used to be commit 33f690b3de03dc300590c3f69718f608b104a529)
-rw-r--r--source3/utils/status.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/source3/utils/status.c b/source3/utils/status.c
index 8bf1de0e61..9a4b3a4835 100644
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -426,6 +426,19 @@ static int traverse_sessionid(struct db_record *db, void *state)
if ( show_locks ) {
int result;
+ struct db_context *db;
+ db = db_open(NULL, lock_path("locking.tdb"), 0,
+ TDB_DEFAULT, O_RDONLY, 0);
+
+ if (!db) {
+ d_printf("%s not initialised\n",
+ lock_path("locking.tdb"));
+ d_printf("This is normal if an SMB client has never "
+ "connected to your server.\n");
+ exit(0);
+ } else {
+ TALLOC_FREE(db);
+ }
if (!locking_init(1)) {
d_printf("Can't initialise locking module - exiting\n");