Don't segfault if locking.tdb can't be opened

Thanks to Steve Langasek <vorlon@debian.org>
(This used to be commit 67328bd27b1e881a4bcdd5160133afa9a267eaac)

diff --git a/source3/utils/status.c b/source3/utils/status.c
index 8bf1de0e6170d1d6575a0cfe2f32be2a6fd47901..9a4b3a48351c2169e15307b378821e51fbbd1115 100644 (file)
--- 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");