got rid of USE_TDB_MMAP_FLAG as its not needed any more

(This used to be commit c26e0d3f27a05ecc8bd2390f9aab7f9451524e47)

19 files changed, 27 insertions, 28 deletions

diff --git a/source3/groupdb/mapping.c b/source3/groupdb/mapping.c
index 268a1b1bd47..129f0940a23 100644
--- a/source3/groupdb/mapping.c
+++ b/source3/groupdb/mapping.c
@@ -130,7 +130,7 @@ BOOL init_group_mapping(void)
 	char *vstring = "INFO/version";
 
 	if (tdb && local_pid == sys_getpid()) return True;
-	tdb = tdb_open_log(lock_path("group_mapping.tdb"), 0, USE_TDB_MMAP_FLAG, O_RDWR|O_CREAT, 0600);
+	tdb = tdb_open_log(lock_path("group_mapping.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
 	if (!tdb) {
 		DEBUG(0,("Failed to open group mapping database\n"));
 		return False;
diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h
index f6d547ea53b..315cb5e5ee7 100644
--- a/source3/include/smb_macros.h
+++ b/source3/include/smb_macros.h
@@ -252,5 +252,4 @@ copy an IP address from one buffer to another
 
 #define vfs_chdir(conn,fname) ((conn)->vfs_ops.chdir((conn),fname))
 
-#define USE_TDB_MMAP_FLAG (!lp_use_mmap() ? TDB_NOMMAP : TDB_DEFAULT)
 #endif /* _SMB_MACROS_H */
diff --git a/source3/lib/messages.c b/source3/lib/messages.c
index 54f6321041a..18f9d0c1d50 100644
--- a/source3/lib/messages.c
+++ b/source3/lib/messages.c
@@ -90,7 +90,7 @@ BOOL message_init(void)
 	if (tdb) return True;
 
 	tdb = tdb_open_log(lock_path("messages.tdb"), 
-		       0, TDB_CLEAR_IF_FIRST|USE_TDB_MMAP_FLAG,
+		       0, TDB_CLEAR_IF_FIRST|TDB_DEFAULT,
 		       O_RDWR|O_CREAT,0600);
 
 	if (!tdb) {
diff --git a/source3/libsmb/unexpected.c b/source3/libsmb/unexpected.c
index 41249aba56f..7d221e173e8 100644
--- a/source3/libsmb/unexpected.c
+++ b/source3/libsmb/unexpected.c
@@ -50,7 +50,7 @@ void unexpected_packet(struct packet_struct *p)
 
 	if (!tdbd) {
 		tdbd = tdb_open_log(lock_path("unexpected.tdb"), 1, 
-			       TDB_CLEAR_IF_FIRST|USE_TDB_MMAP_FLAG,
+			       TDB_CLEAR_IF_FIRST|TDB_DEFAULT,
 			       O_RDWR | O_CREAT, 0644);
 		if (!tdbd) {
 			DEBUG(0,("Failed to open unexpected.tdb\n"));
diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index f4c41d03490..2b21761cb22 100644
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -229,7 +229,7 @@ void brl_init(int read_only)
 
 	if (tdb)
 		return;
-	tdb = tdb_open_log(lock_path("brlock.tdb"), 0,  USE_TDB_MMAP_FLAG|(read_only?0x0:TDB_CLEAR_IF_FIRST),
+	tdb = tdb_open_log(lock_path("brlock.tdb"), 0,  TDB_DEFAULT|(read_only?0x0:TDB_CLEAR_IF_FIRST),
 		       read_only?O_RDONLY:(O_RDWR|O_CREAT), 0644);
 	if (!tdb) {
 		DEBUG(0,("Failed to open byte range locking database\n"));
diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index a1e4ba6d6c7..4092c989d05 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -284,7 +284,7 @@ BOOL locking_init(int read_only)
 		return True;
 
 	tdb = tdb_open_log(lock_path("locking.tdb"), 
-		       0, USE_TDB_MMAP_FLAG|(read_only?0x0:TDB_CLEAR_IF_FIRST), 
+		       0, TDB_DEFAULT|(read_only?0x0:TDB_CLEAR_IF_FIRST), 
 		       read_only?O_RDONLY:O_RDWR|O_CREAT,
 		       0644);
 
diff --git a/source3/nmbd/nmbd_incomingdgrams.c b/source3/nmbd/nmbd_incomingdgrams.c
index 5ee051e98b3..eaafd63f1ad 100644
--- a/source3/nmbd/nmbd_incomingdgrams.c
+++ b/source3/nmbd/nmbd_incomingdgrams.c
@@ -780,7 +780,7 @@ request from %s IP %s state=0x%X\n",
   /* Request to stop browsing altogether. */
   if (state & 0x4)
     DEBUG(1,("process_reset_browser: ignoring request to stop being a browser.\n"));
-done:
+
   END_PROFILE(reset_browser);
 }
 
diff --git a/source3/nmbd/nmbd_processlogon.c b/source3/nmbd/nmbd_processlogon.c
index 3d117b1615d..4f98a23584c 100644
--- a/source3/nmbd/nmbd_processlogon.c
+++ b/source3/nmbd/nmbd_processlogon.c
@@ -45,7 +45,7 @@ static void send_repl_message(uint32 low_serial)
         TDB_CONTEXT *tdb;
 
         tdb = tdb_open_log(lock_path("connections.tdb"), 0,
-                           USE_TDB_MMAP_FLAG, O_RDONLY, 0);
+                           TDB_DEFAULT, O_RDONLY, 0);
 
         if (!tdb) {
                 DEBUG(3, ("send_repl_message(): failed to open connections "
diff --git a/source3/passdb/pdb_tdb.c b/source3/passdb/pdb_tdb.c
index 909a5d809f1..6da6215c79c 100644
--- a/source3/passdb/pdb_tdb.c
+++ b/source3/passdb/pdb_tdb.c
@@ -349,10 +349,10 @@ BOOL pdb_setsampwent(BOOL update)
 	pstrcat (tdbfile, PASSDB_FILE_NAME);
 	
 	/* Open tdb passwd */
-	if (!(global_tdb_ent.passwd_tdb = tdb_open_log(tdbfile, 0, USE_TDB_MMAP_FLAG, update ? O_RDWR : O_RDONLY, 0600)))
+	if (!(global_tdb_ent.passwd_tdb = tdb_open_log(tdbfile, 0, TDB_DEFAULT, update ? O_RDWR : O_RDONLY, 0600)))
 	{
 		DEBUG(0, ("Unable to open TDB passwd, trying create new!\n"));
-		if (!(global_tdb_ent.passwd_tdb = tdb_open_log(tdbfile, 0, USE_TDB_MMAP_FLAG, O_RDWR | O_CREAT | O_EXCL, 0600)))
+		if (!(global_tdb_ent.passwd_tdb = tdb_open_log(tdbfile, 0, TDB_DEFAULT, O_RDWR | O_CREAT | O_EXCL, 0600)))
 		{
 			DEBUG(0, ("Unable to create TDB passwd (passdb.tdb) !!!"));
 			return False;
@@ -481,7 +481,7 @@ BOOL pdb_getsampwnam (SAM_ACCOUNT *user, char *sname)
 	key.dsize = strlen (keystr) + 1;
 
 	/* open the accounts TDB */
-	if (!(pwd_tdb = tdb_open_log(tdbfile, 0, USE_TDB_MMAP_FLAG, O_RDONLY, 0600)))
+	if (!(pwd_tdb = tdb_open_log(tdbfile, 0, TDB_DEFAULT, O_RDONLY, 0600)))
 	{
 		DEBUG(0, ("pdb_getsampwnam: Unable to open TDB passwd!\n"));
 		return False;
@@ -582,7 +582,7 @@ BOOL pdb_getsampwrid (SAM_ACCOUNT *user, uint32 rid)
 	key.dsize = strlen (keystr) + 1;
 
 	/* open the accounts TDB */
-	if (!(pwd_tdb = tdb_open_log(tdbfile, 0, USE_TDB_MMAP_FLAG, O_RDONLY, 0600)))
+	if (!(pwd_tdb = tdb_open_log(tdbfile, 0, TDB_DEFAULT, O_RDONLY, 0600)))
 	{
 		DEBUG(0, ("pdb_getsampwrid: Unable to open TDB rid database!\n"));
 		return False;
@@ -627,7 +627,7 @@ BOOL pdb_delete_sam_account(char *sname)
 	pstrcat (tdbfile, PASSDB_FILE_NAME);
 
 	/* open the TDB */
-	if (!(pwd_tdb = tdb_open_log(tdbfile, 0, USE_TDB_MMAP_FLAG, O_RDWR, 0600)))
+	if (!(pwd_tdb = tdb_open_log(tdbfile, 0, TDB_DEFAULT, O_RDWR, 0600)))
 	{
 		DEBUG(0, ("Unable to open TDB passwd!"));
 		return False;
@@ -749,13 +749,13 @@ static BOOL tdb_update_sam(SAM_ACCOUNT* newpwd, BOOL override, int flag)
 	}
 
  	/* open the account TDB passwd*/
-  	if (!(pwd_tdb = tdb_open_log(tdbfile, 0, USE_TDB_MMAP_FLAG, O_RDWR, 0600)))
+  	if (!(pwd_tdb = tdb_open_log(tdbfile, 0, TDB_DEFAULT, O_RDWR, 0600)))
 	{
      		DEBUG(0, ("tdb_update_sam: Unable to open TDB passwd!\n"));
 		if (flag == TDB_INSERT)
 		{
 			DEBUG(0, ("Unable to open TDB passwd, trying create new!\n"));
-			if (!(pwd_tdb = tdb_open_log(tdbfile, 0, USE_TDB_MMAP_FLAG, O_RDWR | O_CREAT | O_EXCL, 0600)))
+			if (!(pwd_tdb = tdb_open_log(tdbfile, 0, TDB_DEFAULT, O_RDWR | O_CREAT | O_EXCL, 0600)))
 			{
 				DEBUG(0, ("Unable to create TDB passwd (passdb.tdb) !!!\n"));
 				return False;
diff --git a/source3/passdb/secrets.c b/source3/passdb/secrets.c
index 3b2d0b8d4bd..e69b7204e10 100644
--- a/source3/passdb/secrets.c
+++ b/source3/passdb/secrets.c
@@ -36,7 +36,7 @@ BOOL secrets_init(void)
 	pstrcpy(fname, lp_private_dir());
 	pstrcat(fname,"/secrets.tdb");
 
-	tdb = tdb_open_log(fname, 0, USE_TDB_MMAP_FLAG, O_RDWR|O_CREAT, 0600);
+	tdb = tdb_open_log(fname, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
 
 	if (!tdb) {
 		DEBUG(0,("Failed to open %s\n", fname));
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index cfdf6955d77..b678f583d78 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -239,21 +239,21 @@ BOOL nt_printing_init(void)
 	if (tdb_drivers && tdb_printers && tdb_forms && local_pid == sys_getpid())
 		return True;
  
-	tdb_drivers = tdb_open_log(lock_path("ntdrivers.tdb"), 0, USE_TDB_MMAP_FLAG, O_RDWR|O_CREAT, 0600);
+	tdb_drivers = tdb_open_log(lock_path("ntdrivers.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
 	if (!tdb_drivers) {
 		DEBUG(0,("nt_printing_init: Failed to open nt drivers database %s (%s)\n",
 			lock_path("ntdrivers.tdb"), strerror(errno) ));
 		return False;
 	}
  
-	tdb_printers = tdb_open_log(lock_path("ntprinters.tdb"), 0, USE_TDB_MMAP_FLAG, O_RDWR|O_CREAT, 0600);
+	tdb_printers = tdb_open_log(lock_path("ntprinters.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
 	if (!tdb_printers) {
 		DEBUG(0,("nt_printing_init: Failed to open nt printers database %s (%s)\n",
 			lock_path("ntprinters.tdb"), strerror(errno) ));
 		return False;
 	}
  
-	tdb_forms = tdb_open_log(lock_path("ntforms.tdb"), 0, USE_TDB_MMAP_FLAG, O_RDWR|O_CREAT, 0600);
+	tdb_forms = tdb_open_log(lock_path("ntforms.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
 	if (!tdb_forms) {
 		DEBUG(0,("nt_printing_init: Failed to open nt forms database %s (%s)\n",
 			lock_path("ntforms.tdb"), strerror(errno) ));
diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index e0eb2a06d76..301422c1c2a 100644
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -55,7 +55,7 @@ BOOL print_backend_init(void)
 	char *sversion = "INFO/version";
 
 	if (tdb && local_pid == sys_getpid()) return True;
-	tdb = tdb_open_log(lock_path("printing.tdb"), 0, USE_TDB_MMAP_FLAG, O_RDWR|O_CREAT, 0600);
+	tdb = tdb_open_log(lock_path("printing.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
 	if (!tdb) {
 		DEBUG(0,("print_backend_init: Failed to open printing backend database. Error = [%s]\n",
 				 tdb_errorstr(tdb)));
diff --git a/source3/rpc_server/srv_netlog_nt.c b/source3/rpc_server/srv_netlog_nt.c
index 455f8d8be58..fd137e60380 100644
--- a/source3/rpc_server/srv_netlog_nt.c
+++ b/source3/rpc_server/srv_netlog_nt.c
@@ -84,7 +84,7 @@ static void send_sync_message(void)
         TDB_CONTEXT *tdb;
 
         tdb = tdb_open_log(lock_path("connections.tdb"), 0,
-                           USE_TDB_MMAP_FLAG, O_RDONLY, 0);
+                           TDB_DEFAULT, O_RDONLY, 0);
 
         if (!tdb) {
                 DEBUG(3, ("send_sync_message(): failed to open connections "
diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c
index 5ba460b607e..a0ae9050e2d 100644
--- a/source3/rpc_server/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srv_srvsvc_nt.c
@@ -125,7 +125,7 @@ BOOL share_info_db_init(void)
     char *vstring = "INFO/version";
  
     if (share_tdb && local_pid == sys_getpid()) return True;
-    share_tdb = tdb_open_log(lock_path("share_info.tdb"), 0, USE_TDB_MMAP_FLAG, O_RDWR|O_CREAT, 0600);
+    share_tdb = tdb_open_log(lock_path("share_info.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
     if (!share_tdb) {
         DEBUG(0,("Failed to open share info database %s (%s)\n",
 				lock_path("share_info.tdb"), strerror(errno) ));
diff --git a/source3/smbd/connection.c b/source3/smbd/connection.c
index df586979171..399851302c7 100644
--- a/source3/smbd/connection.c
+++ b/source3/smbd/connection.c
@@ -119,7 +119,7 @@ BOOL claim_connection(connection_struct *conn,char *name,int max_connections,BOO
 	BOOL ret = True;
 
 	if (!tdb) {
-		tdb = tdb_open_log(lock_path("connections.tdb"), 0, TDB_CLEAR_IF_FIRST|USE_TDB_MMAP_FLAG, 
+		tdb = tdb_open_log(lock_path("connections.tdb"), 0, TDB_CLEAR_IF_FIRST|TDB_DEFAULT, 
 			       O_RDWR | O_CREAT, 0644);
 	}
 	if (!tdb)
diff --git a/source3/smbd/session.c b/source3/smbd/session.c
index eaff78c6854..6a27cd7326c 100644
--- a/source3/smbd/session.c
+++ b/source3/smbd/session.c
@@ -52,7 +52,7 @@ BOOL session_claim(uint16 vuid)
 	}
 
 	if (!tdb) {
-		tdb = tdb_open_log(lock_path("sessionid.tdb"), 0, TDB_CLEAR_IF_FIRST|USE_TDB_MMAP_FLAG, 
+		tdb = tdb_open_log(lock_path("sessionid.tdb"), 0, TDB_CLEAR_IF_FIRST|TDB_DEFAULT, 
 			       O_RDWR | O_CREAT, 0644);
 		if (!tdb) {
 			DEBUG(1,("session_claim: failed to open sessionid tdb\n"));
diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index 377f7a148b0..40892ba1c0e 100644
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -133,7 +133,7 @@ static BOOL send_message(char *dest, int msg_type, void *buf, int len, BOOL dupl
 		TDB_CONTEXT *tdb;
 		BOOL ret;
 
-		tdb = tdb_open_log(lock_path("connections.tdb"), 0, USE_TDB_MMAP_FLAG, O_RDWR, 0);
+		tdb = tdb_open_log(lock_path("connections.tdb"), 0, TDB_DEFAULT, O_RDWR, 0);
 		if (!tdb) {
 			fprintf(stderr,"Failed to open connections database in send_message.\n");
 			return False;
diff --git a/source3/utils/status.c b/source3/utils/status.c
index 77e76a34e8b..27c6d9b51b2 100644
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -619,7 +619,7 @@ static int traverse_sessionid(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, vo
 		return profile_dump();
 	}
 	
-	tdb = tdb_open_log(lock_path("sessionid.tdb"), 0, USE_TDB_MMAP_FLAG, O_RDONLY, 0);
+	tdb = tdb_open_log(lock_path("sessionid.tdb"), 0, TDB_DEFAULT, O_RDONLY, 0);
 	if (!tdb) {
 		printf("sessionid.tdb not initialised\n");
 	}
@@ -633,7 +633,7 @@ static int traverse_sessionid(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, vo
 	tdb_traverse(tdb, traverse_sessionid, NULL);
 	tdb_close(tdb);
   
-	tdb = tdb_open_log(lock_path("connections.tdb"), 0, USE_TDB_MMAP_FLAG, O_RDONLY, 0);
+	tdb = tdb_open_log(lock_path("connections.tdb"), 0, TDB_DEFAULT, O_RDONLY, 0);
 	if (!tdb) {
 		printf("connections.tdb not initialised\n");
 	}  else if (verbose) {
diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index c112deb224a..e930629eee5 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -187,7 +187,7 @@ void status_page(void)
 		refresh_interval = atoi(v);
 	}
 
-	tdb = tdb_open_log(lock_path("connections.tdb"), 0, USE_TDB_MMAP_FLAG, O_RDONLY, 0);
+	tdb = tdb_open_log(lock_path("connections.tdb"), 0, TDB_DEFAULT, O_RDONLY, 0);
 	if (tdb) tdb_traverse(tdb, traverse_fn1, NULL);
 
 	printf("<H2>Server Status</H2>\n");