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)

3 files changed, 12 insertions, 7 deletions

diff --git a/source3/rpc_parse/parse_lsa.c b/source3/rpc_parse/parse_lsa.c
index 6bd916ed321..f32ff58efba 100644
--- a/source3/rpc_parse/parse_lsa.c
+++ b/source3/rpc_parse/parse_lsa.c
@@ -140,7 +140,7 @@ void lsa_io_obj_attr(char *desc,  LSA_OBJ_ATTR *attr, prs_struct *ps, int depth)
 
 	if (attr->len != ps->offset - start)
 	{
-		DEBUG(3,("lsa_io_obj_attr: length %lx does not match size %lx\n",
+		DEBUG(3,("lsa_io_obj_attr: length %x does not match size %x\n",
 		         attr->len, ps->offset - start));
 	}
 }
diff --git a/source3/rpc_parse/parse_samr.c b/source3/rpc_parse/parse_samr.c
index a85b6a692d3..44503ee8c93 100644
--- a/source3/rpc_parse/parse_samr.c
+++ b/source3/rpc_parse/parse_samr.c
@@ -721,7 +721,8 @@ void make_samr_r_enum_dom_users(SAMR_R_ENUM_DOM_USERS *r_u,
 	if (num_sam_entries >= MAX_SAM_ENTRIES)
 	{
 		num_sam_entries = MAX_SAM_ENTRIES;
-		DEBUG(5,("limiting number of entries to %d %s\n", num_sam_entries));
+		DEBUG(5,("limiting number of entries to %d\n",
+			 num_sam_entries));
 	}
 
 	r_u->total_num_entries = total_num_entries;
@@ -853,7 +854,8 @@ void make_samr_r_enum_dom_aliases(SAMR_R_ENUM_DOM_ALIASES *r_u,
 	if (num_sam_entries >= MAX_SAM_ENTRIES)
 	{
 		num_sam_entries = MAX_SAM_ENTRIES;
-		DEBUG(5,("limiting number of entries to %d %s\n", num_sam_entries));
+		DEBUG(5,("limiting number of entries to %d\n", 
+			 num_sam_entries));
 	}
 
 	r_u->num_entries  = num_sam_entries;
@@ -988,7 +990,8 @@ void make_sam_info_2(SAM_INFO_2 *sam, uint32 acb_mask,
 	if (num_sam_entries >= MAX_SAM_ENTRIES)
 	{
 		num_sam_entries = MAX_SAM_ENTRIES;
-		DEBUG(5,("limiting number of entries to %d %s\n", num_sam_entries));
+		DEBUG(5,("limiting number of entries to %d\n", 
+			 num_sam_entries));
 	}
 
 	for (i = start_idx, entries_added = 0; i < num_sam_entries; i++)
@@ -1065,7 +1068,8 @@ void make_sam_info_1(SAM_INFO_1 *sam, uint32 acb_mask,
 	if (num_sam_entries >= MAX_SAM_ENTRIES)
 	{
 		num_sam_entries = MAX_SAM_ENTRIES;
-		DEBUG(5,("limiting number of entries to %d %s\n", num_sam_entries));
+		DEBUG(5,("limiting number of entries to %d\n", 
+			 num_sam_entries));
 	}
 
 	for (i = start_idx, entries_added = 0; i < num_sam_entries; i++)
@@ -1261,7 +1265,8 @@ void make_samr_r_enum_dom_groups(SAMR_R_ENUM_DOM_GROUPS *r_u,
 	if (num_sam_entries >= MAX_SAM_ENTRIES)
 	{
 		num_sam_entries = MAX_SAM_ENTRIES;
-		DEBUG(5,("limiting number of entries to %d %s\n", num_sam_entries));
+		DEBUG(5,("limiting number of entries to %d\n", 
+			 num_sam_entries));
 	}
 
 	if (status == 0x0)
diff --git a/source3/rpc_parse/parse_srv.c b/source3/rpc_parse/parse_srv.c
index 592aece4395..72cc34da9ee 100644
--- a/source3/rpc_parse/parse_srv.c
+++ b/source3/rpc_parse/parse_srv.c
@@ -1364,7 +1364,7 @@ void srv_io_info_ctr(char *desc,  SRV_INFO_CTR *ctr, prs_struct *ps, int depth)
 			}
 			default:
 			{
-				DEBUG(5,("%s% no server info at switch_value %d\n",
+				DEBUG(5,("%s no server info at switch_value %d\n",
 						 tab_depth(depth), ctr->switch_value));
 				break;
 			}