this is the bug change to using connection_struct* instead of cnum.

Connections[] is now a local array in server.c

I might have broken something with this change. In particular the
oplock code is suspect and some .dll files aren't being oplocked when
I expected them to be. I'll look at it after I've got some sleep.
(This used to be commit c7ee025ead4a85b6fa44a832047b878451845fb6)

6 files changed, 8 insertions, 6 deletions

diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index 9df30adc8c..24f4951612 100644
--- a/source3/nmbd/nmbd.c
+++ b/source3/nmbd/nmbd.c
@@ -153,7 +153,8 @@ static BOOL dump_core(void)
 #endif
 
 
-  DEBUG( 0, ( "Dumping core in %s\n",dname ) );
+  DEBUG(0,("Dumping core in %s\n",dname));
+  abort();
   return( True );
 } /* dump_core */
 #endif
diff --git a/source3/nmbd/nmbd_browserdb.c b/source3/nmbd/nmbd_browserdb.c
index 293a129d42..8e32dbd570 100644
--- a/source3/nmbd/nmbd_browserdb.c
+++ b/source3/nmbd/nmbd_browserdb.c
@@ -124,7 +124,7 @@ struct browse_cache_record *create_browser_in_lmb_cache( char *work_name,
     Debug1( "nmbd_browserdb:create_browser_in_lmb_cache()\n" );
     Debug1( "  Added lmb cache entry for workgroup %s ", browc->work_group );
     Debug1( "name %s IP %s ", browc->lmb_name, inet_ntoa(ip) );
-    Debug1( "ttl %d\n", browc->death_time );
+    Debug1( "ttl %d\n", (int)browc->death_time );
     }
   
   return( browc );
diff --git a/source3/nmbd/nmbd_nameregister.c b/source3/nmbd/nmbd_nameregister.c
index 270a3ef6a5..05b549d30f 100644
--- a/source3/nmbd/nmbd_nameregister.c
+++ b/source3/nmbd/nmbd_nameregister.c
@@ -207,7 +207,7 @@ responding.\n", inet_ntoa(rrec->packet->ip)));
       rrec->repeat_time = time(NULL) + rrec->repeat_interval;
 
       DEBUG(5,("register_name_timeout_response: increasing WINS timeout to %d seconds.\n",
-              rrec->repeat_interval));
+              (int)rrec->repeat_interval));
       return; /* Don't remove the response record. */
     }
   }
diff --git a/source3/nmbd/nmbd_namerelease.c b/source3/nmbd/nmbd_namerelease.c
index b58bab3a1d..558ab6ab16 100644
--- a/source3/nmbd/nmbd_namerelease.c
+++ b/source3/nmbd/nmbd_namerelease.c
@@ -165,7 +165,7 @@ responding.\n", inet_ntoa(rrec->packet->ip)));
       rrec->repeat_time = time(NULL) + rrec->repeat_interval;
 
       DEBUG(5,("release_name_timeout_response: increasing WINS timeout to %d seconds.\n",
-              rrec->repeat_interval));
+              (int)rrec->repeat_interval));
       return; /* Don't remove the response record. */
     }
   }
diff --git a/source3/nmbd/nmbd_packets.c b/source3/nmbd/nmbd_packets.c
index 1f216e3111..d557414a27 100644
--- a/source3/nmbd/nmbd_packets.c
+++ b/source3/nmbd/nmbd_packets.c
@@ -112,7 +112,7 @@ static void debug_browse_data(char *outbuf, int len)
       DEBUGADD( 4, ( "%c", x ) );
     }
 
-    DEBUGADD( 4, ( " hex ", i ) );
+    DEBUGADD( 4, ( " hex ") );
 
     for (j = 0; j < 16; j++)
     {
diff --git a/source3/nmbd/nmbd_sendannounce.c b/source3/nmbd/nmbd_sendannounce.c
index 3936b7e92e..6c9f67ab21 100644
--- a/source3/nmbd/nmbd_sendannounce.c
+++ b/source3/nmbd/nmbd_sendannounce.c
@@ -398,7 +398,8 @@ void announce_myself_to_domain_master_browser(time_t t)
   if ((t-announce_timer_last) < (CHECK_TIME_MST_ANNOUNCE * 60))
   {
     DEBUG(10,("announce_myself_to_domain_master_browser: t (%d) - last(%d) < %d\n",
-               t, announce_timer_last, CHECK_TIME_MST_ANNOUNCE * 60 ));
+	      (int)t, (int)announce_timer_last, 
+	      CHECK_TIME_MST_ANNOUNCE * 60 ));
     return;
   }