2 files changed, 2 insertions, 46 deletions
diff --git a/source4/include/messages.h b/source4/include/messages.h
index ce167a772d..3453a52bf1 100644
--- a/source4/include/messages.h
+++ b/source4/include/messages.h
@@ -26,50 +26,6 @@
 #define MSG_DEBUG		1
 #define MSG_PING		2
 #define MSG_PONG		3
-#define MSG_PROFILE		4
-#define MSG_REQ_DEBUGLEVEL	5
-#define MSG_DEBUGLEVEL		6
-#define MSG_REQ_PROFILELEVEL	7
-#define MSG_PROFILELEVEL	8
-#define MSG_REQ_POOL_USAGE	9
-#define MSG_POOL_USAGE		10
-
-/* If dmalloc is included, set a steady-state mark */
-#define MSG_REQ_DMALLOC_MARK	11
-
-/* If dmalloc is included, dump to the dmalloc log a description of
- * what has changed since the last MARK */
-#define MSG_REQ_DMALLOC_LOG_CHANGED	12
-
-#define MSG_SHUTDOWN		13
-
-/* Dump out the talloc useage. */
-#define MSG_REQ_TALLOC_USAGE      14
-#define MSG_TALLOC_USAGE          15
-
-/* nmbd messages */
-#define MSG_FORCE_ELECTION 1001
-#define MSG_WINS_NEW_ENTRY 1002
-
-/* printing messages */
-/* #define MSG_PRINTER_NOTIFY  2001*/ /* Obsolete */
-#define MSG_PRINTER_DRVUPGRADE 2002
-#define MSG_PRINTER_NOTIFY2     2003
-#define MSG_PRINTERDATA_INIT_RESET	2004
-
-/* smbd messages */
-#define MSG_SMB_CONF_UPDATED 3001
-#define MSG_SMB_FORCE_TDIS   3002
-#define MSG_SMB_SAM_SYNC     3003
-#define MSG_SMB_SAM_REPL     3004
-#define MSG_SMB_UNLOCK       3005
-
-/* Flags to classify messages - used in message_send_all() */
-/* Sender will filter by flag. */
-
-#define FLAG_MSG_GENERAL 	0x0001
-#define FLAG_MSG_SMBD		0x0002
-#define FLAG_MSG_NMBD		0x0004
-#define FLAG_MSG_PRINTING	0x0008
+#define MSG_BRL_RETRY		4
 
 #endif
diff --git a/source4/include/smb.h b/source4/include/smb.h
index 745e90e4ff..a616f94ea1 100644
--- a/source4/include/smb.h
+++ b/source4/include/smb.h
@@ -611,6 +611,6 @@ typedef struct nt_user_token {
 #define REQ_CONTROL_ASYNC     (1<<2) /* the backend will answer this one later */
 
 /* passed to br lock code */
-enum brl_type {READ_LOCK, WRITE_LOCK};
+enum brl_type {READ_LOCK, WRITE_LOCK, PENDING_READ_LOCK, PENDING_WRITE_LOCK};
 
 #endif /* _SMB_H */