From 22dbd67708f1651a2341d70ce576fac360affccf Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Mon, 10 Apr 2006 15:33:04 +0000
Subject: r15018: Merge Volker's ipc/trans2/nttrans changes over into 3.0. Also
 merge the new POSIX lock code - this is not enabled unless -DDEVELOPER is
 defined. This doesn't yet map onto underlying system POSIX locks. Updates vfs
 to allow lock queries. Jeremy. (This used to be commit
 08e52ead03304ff04229e1bfe544ff40e2564fc7)

---
 source3/utils/net_sam.c |  1 +
 source3/utils/status.c  | 10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_sam.c b/source3/utils/net_sam.c
index fc7dfea02c..945afb3a21 100644
--- a/source3/utils/net_sam.c
+++ b/source3/utils/net_sam.c
@@ -1203,6 +1203,7 @@ failed:
 	talloc_free(tc);
 	return -1;
 }
+
 #endif
 
 /***********************************************************
diff --git a/source3/utils/status.c b/source3/utils/status.c
index c334fe6982..bc26be1ec9 100644
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -159,9 +159,13 @@ static void print_share_mode(const struct share_mode_entry *e, const char *share
 	}
 }
 
-static void print_brl(SMB_DEV_T dev, SMB_INO_T ino, struct process_id pid, 
-		      enum brl_type lock_type,
-		      br_off start, br_off size)
+static void print_brl(SMB_DEV_T dev,
+			SMB_INO_T ino,
+			struct process_id pid, 
+			enum brl_type lock_type,
+			enum brl_flavour lock_flav,
+			br_off start,
+			br_off size)
 {
 	static int count;
 	if (count==0) {
-- 
cgit