Order switch statements

Signed-off-by: Samuel Cabrero <scabrero@zentyal.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Kamen Mazdrashki <kamenim@samba.org>

Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Mon Jul  7 07:47:44 CEST 2014 on sn-devel-104

6 files changed, 50 insertions, 50 deletions

diff --git a/source4/dsdb/repl/drepl_out_helpers.c b/source4/dsdb/repl/drepl_out_helpers.c
index 22d44f056c..3054323957 100644
--- a/source4/dsdb/repl/drepl_out_helpers.c
+++ b/source4/dsdb/repl/drepl_out_helpers.c
@@ -176,16 +176,6 @@ static void dreplsrv_out_drsuapi_bind_done(struct tevent_req *subreq)
 			info28->repl_epoch		= 0;
 			break;
 		}
-		case 48: {
-			struct drsuapi_DsBindInfo48 *info48;
-			info48 = &state->bind_r.out.bind_info->info.info48;
-
-			info28->supported_extensions	= info48->supported_extensions;
-			info28->site_guid		= info48->site_guid;
-			info28->pid			= info48->pid;
-			info28->repl_epoch		= info48->repl_epoch;
-			break;
-		}
 		case 28: {
 			*info28 = state->bind_r.out.bind_info->info.info28;
 			break;
@@ -200,6 +190,16 @@ static void dreplsrv_out_drsuapi_bind_done(struct tevent_req *subreq)
 			info28->repl_epoch		= info32->repl_epoch;
 			break;
 		}
+		case 48: {
+			struct drsuapi_DsBindInfo48 *info48;
+			info48 = &state->bind_r.out.bind_info->info.info48;
+
+			info28->supported_extensions	= info48->supported_extensions;
+			info28->site_guid		= info48->site_guid;
+			info28->pid			= info48->pid;
+			info28->repl_epoch		= info48->repl_epoch;
+			break;
+		}
 		case 52: {
 			struct drsuapi_DsBindInfo52 *info52;
 			info52 = &state->bind_r.out.bind_info->info.info52;
diff --git a/source4/libnet/libnet_become_dc.c b/source4/libnet/libnet_become_dc.c
index 55ac48cfdb..36e70c5228 100644
--- a/source4/libnet/libnet_become_dc.c
+++ b/source4/libnet/libnet_become_dc.c
@@ -1703,15 +1703,6 @@ static WERROR becomeDC_drsuapi_bind_recv(struct libnet_BecomeDC_state *s,
 			drsuapi->remote_info28.repl_epoch		= 0;
 			break;
 		}
-		case 48: {
-			struct drsuapi_DsBindInfo48 *info48;
-			info48 = &drsuapi->bind_r.out.bind_info->info.info48;
-			drsuapi->remote_info28.supported_extensions	= info48->supported_extensions;
-			drsuapi->remote_info28.site_guid		= info48->site_guid;
-			drsuapi->remote_info28.pid			= info48->pid;
-			drsuapi->remote_info28.repl_epoch		= info48->repl_epoch;
-			break;
-		}
 		case 28: {
 			drsuapi->remote_info28 = drsuapi->bind_r.out.bind_info->info.info28;
 			break;
@@ -1725,6 +1716,15 @@ static WERROR becomeDC_drsuapi_bind_recv(struct libnet_BecomeDC_state *s,
 			drsuapi->remote_info28.repl_epoch		= info32->repl_epoch;
 			break;
 		}
+		case 48: {
+			struct drsuapi_DsBindInfo48 *info48;
+			info48 = &drsuapi->bind_r.out.bind_info->info.info48;
+			drsuapi->remote_info28.supported_extensions	= info48->supported_extensions;
+			drsuapi->remote_info28.site_guid		= info48->site_guid;
+			drsuapi->remote_info28.pid			= info48->pid;
+			drsuapi->remote_info28.repl_epoch		= info48->repl_epoch;
+			break;
+		}
 		case 52: {
 			struct drsuapi_DsBindInfo52 *info52;
 			info52 = &drsuapi->bind_r.out.bind_info->info.info52;
diff --git a/source4/libnet/libnet_unbecome_dc.c b/source4/libnet/libnet_unbecome_dc.c
index 2ff7b1cb2a..38d6a94b23 100644
--- a/source4/libnet/libnet_unbecome_dc.c
+++ b/source4/libnet/libnet_unbecome_dc.c
@@ -640,15 +640,6 @@ static void unbecomeDC_drsuapi_bind_recv(struct tevent_req *subreq)
 			s->drsuapi.remote_info28.repl_epoch		= 0;
 			break;
 		}
-		case 48: {
-			struct drsuapi_DsBindInfo48 *info48;
-			info48 = &s->drsuapi.bind_r.out.bind_info->info.info48;
-			s->drsuapi.remote_info28.supported_extensions	= info48->supported_extensions;
-			s->drsuapi.remote_info28.site_guid		= info48->site_guid;
-			s->drsuapi.remote_info28.pid			= info48->pid;
-			s->drsuapi.remote_info28.repl_epoch		= info48->repl_epoch;
-			break;
-		}
 		case 28: {
 			s->drsuapi.remote_info28 = s->drsuapi.bind_r.out.bind_info->info.info28;
 			break;
@@ -662,6 +653,15 @@ static void unbecomeDC_drsuapi_bind_recv(struct tevent_req *subreq)
 			s->drsuapi.remote_info28.repl_epoch		= info32->repl_epoch;
 			break;
 		}
+		case 48: {
+			struct drsuapi_DsBindInfo48 *info48;
+			info48 = &s->drsuapi.bind_r.out.bind_info->info.info48;
+			s->drsuapi.remote_info28.supported_extensions	= info48->supported_extensions;
+			s->drsuapi.remote_info28.site_guid		= info48->site_guid;
+			s->drsuapi.remote_info28.pid			= info48->pid;
+			s->drsuapi.remote_info28.repl_epoch		= info48->repl_epoch;
+			break;
+		}
 		case 52: {
 			struct drsuapi_DsBindInfo52 *info52;
 			info52 = &s->drsuapi.bind_r.out.bind_info->info.info52;
diff --git a/source4/torture/drs/rpc/dssync.c b/source4/torture/drs/rpc/dssync.c
index 0f13ea58f2..80e237b802 100644
--- a/source4/torture/drs/rpc/dssync.c
+++ b/source4/torture/drs/rpc/dssync.c
@@ -237,15 +237,6 @@ static bool _test_DsBind(struct torture_context *tctx,
 			b->peer_bind_info28.repl_epoch		= 0;
 			break;
 		}
-		case 48: {
-			struct drsuapi_DsBindInfo48 *info48;
-			info48 = &b->req.out.bind_info->info.info48;
-			b->peer_bind_info28.supported_extensions= info48->supported_extensions;
-			b->peer_bind_info28.site_guid		= info48->site_guid;
-			b->peer_bind_info28.pid			= info48->pid;
-			b->peer_bind_info28.repl_epoch		= info48->repl_epoch;
-			break;
-		}
 		case 28: {
 			b->peer_bind_info28 = b->req.out.bind_info->info.info28;
 			break;
@@ -259,6 +250,15 @@ static bool _test_DsBind(struct torture_context *tctx,
 			b->peer_bind_info28.repl_epoch		= info32->repl_epoch;
 			break;
 		}
+		case 48: {
+			struct drsuapi_DsBindInfo48 *info48;
+			info48 = &b->req.out.bind_info->info.info48;
+			b->peer_bind_info28.supported_extensions= info48->supported_extensions;
+			b->peer_bind_info28.site_guid		= info48->site_guid;
+			b->peer_bind_info28.pid			= info48->pid;
+			b->peer_bind_info28.repl_epoch		= info48->repl_epoch;
+			break;
+		}
 		case 52: {
 			struct drsuapi_DsBindInfo52 *info52;
 			info52 = &b->req.out.bind_info->info.info52;
diff --git a/source4/torture/drs/rpc/msds_intid.c b/source4/torture/drs/rpc/msds_intid.c
index b93f70a9a6..9d84047f07 100644
--- a/source4/torture/drs/rpc/msds_intid.c
+++ b/source4/torture/drs/rpc/msds_intid.c
@@ -244,10 +244,6 @@ static bool _test_DsaBind(struct torture_context *tctx,
 		bi->srv_info48.repl_epoch		= info28->repl_epoch;
 		break;
 	}
-	case 48: {
-		bi->srv_info48 = r.out.bind_info->info.info48;
-		break;
-	}
 	case 32: {
 		struct drsuapi_DsBindInfo32 *info32;
 		info32 = &r.out.bind_info->info.info32;
@@ -257,6 +253,10 @@ static bool _test_DsaBind(struct torture_context *tctx,
 		bi->srv_info48.repl_epoch		= info32->repl_epoch;
 		break;
 	}
+	case 48: {
+		bi->srv_info48 = r.out.bind_info->info.info48;
+		break;
+	}
 	case 52: {
 		struct drsuapi_DsBindInfo52 *info52;
 		info52 = &r.out.bind_info->info.info52;
diff --git a/source4/torture/rpc/dsgetinfo.c b/source4/torture/rpc/dsgetinfo.c
index 93c8b2dc95..bbe7a3b0ea 100644
--- a/source4/torture/rpc/dsgetinfo.c
+++ b/source4/torture/rpc/dsgetinfo.c
@@ -195,15 +195,6 @@ static bool _test_DsBind(struct torture_context *tctx,
 			b->peer_bind_info28.repl_epoch		= 0;
 			break;
 		}
-		case 48: {
-			struct drsuapi_DsBindInfo48 *info48;
-			info48 = &b->req.out.bind_info->info.info48;
-			b->peer_bind_info28.supported_extensions= info48->supported_extensions;
-			b->peer_bind_info28.site_guid		= info48->site_guid;
-			b->peer_bind_info28.pid			= info48->pid;
-			b->peer_bind_info28.repl_epoch		= info48->repl_epoch;
-			break;
-		}
 		case 28: {
 			b->peer_bind_info28 = b->req.out.bind_info->info.info28;
 			break;
@@ -217,6 +208,15 @@ static bool _test_DsBind(struct torture_context *tctx,
 			b->peer_bind_info28.repl_epoch		= info32->repl_epoch;
 			break;
 		}
+		case 48: {
+			struct drsuapi_DsBindInfo48 *info48;
+			info48 = &b->req.out.bind_info->info.info48;
+			b->peer_bind_info28.supported_extensions= info48->supported_extensions;
+			b->peer_bind_info28.site_guid		= info48->site_guid;
+			b->peer_bind_info28.pid			= info48->pid;
+			b->peer_bind_info28.repl_epoch		= info48->repl_epoch;
+			break;
+		}
 		case 52: {
 			struct drsuapi_DsBindInfo52 *info52;
 			info52 = &b->req.out.bind_info->info.info52;