[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-28-25-gc2583c0

[Jeremy Allison]

The branch, v3-0-test has been updated
       via  c2583c01982197221e4dc054eea12872b1d2ba99 (commit)
      from  eaaf5c7ad00a821d1c4c2fb17295d8d51809707e (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test


- Log -----------------------------------------------------------------
commit c2583c01982197221e4dc054eea12872b1d2ba99
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Dec 12 18:17:34 2007 -0800

    Merge debian fix for smbstatus locking error message.
    Already fixed differently for 3.2.
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source/utils/status.c |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/utils/status.c b/source/utils/status.c
index df742f7..0dc1253 100644
--- a/source/utils/status.c
+++ b/source/utils/status.c
@@ -367,6 +367,16 @@ static int traverse_sessionid(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, vo
 	if ( show_locks ) {
 		int ret;
 
+		tdb = tdb_open_log(lock_path("locking.tdb"), 0, TDB_DEFAULT, O_RDONLY, 0);
+
+		if (!tdb) {
+			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 {
+			tdb_close(tdb);
+		}
+
 		if (!locking_init(1)) {
 			d_printf("Can't initialise locking module - exiting\n");
 			exit(1);


-- 
Samba Shared Repository