r26540: Revert my previous commit after concerns raised by Andrew.

(This used to be commit 6ac86f8be7d9a8c5ab396a93e6d1e6819e11f173)

1 files changed, 27 insertions, 27 deletions

diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c
index a0bd34b154..03f3601257 100644
--- a/source4/rpc_server/samr/dcesrv_samr.c
+++ b/source4/rpc_server/samr/dcesrv_samr.c
@@ -749,7 +749,7 @@ static NTSTATUS dcesrv_samr_QueryDomainInfo(struct dcesrv_call_state *dce_call,
 	switch (r->in.level) {
 	case 1: 
 	{
-		const char * const attrs2[] = { "minPwdLength", "pwdHistoryLength",
+		static const char * const attrs2[] = { "minPwdLength", "pwdHistoryLength",
 						       "pwdProperties", "maxPwdAge",
 						       "minPwdAge", NULL };
 		attrs = attrs2;
@@ -757,7 +757,7 @@ static NTSTATUS dcesrv_samr_QueryDomainInfo(struct dcesrv_call_state *dce_call,
 	}
 	case 2:
 	{
-		const char * const attrs2[] = {"forceLogoff",
+		static const char * const attrs2[] = {"forceLogoff",
 						      "comment", 
 						      "modifiedCount", 
 						      "fSMORoleOwner",
@@ -767,14 +767,14 @@ static NTSTATUS dcesrv_samr_QueryDomainInfo(struct dcesrv_call_state *dce_call,
 	}
 	case 3:
 	{
-		const char * const attrs2[] = {"forceLogoff", 
+		static const char * const attrs2[] = {"forceLogoff", 
 						      NULL};
 		attrs = attrs2;
 		break;
 	}
 	case 4:
 	{
-		const char * const attrs2[] = {"comment", 
+		static const char * const attrs2[] = {"comment", 
 						      NULL};
 		attrs = attrs2;
 		break;
@@ -786,7 +786,7 @@ static NTSTATUS dcesrv_samr_QueryDomainInfo(struct dcesrv_call_state *dce_call,
 	}
 	case 6:
 	{
-		const char * const attrs2[] = {"fSMORoleOwner", 
+		static const char * const attrs2[] = {"fSMORoleOwner", 
 						      NULL};
 		attrs = attrs2;
 		break;
@@ -798,7 +798,7 @@ static NTSTATUS dcesrv_samr_QueryDomainInfo(struct dcesrv_call_state *dce_call,
 	}
 	case 8:
 	{
-		const char * const attrs2[] = { "modifiedCount", 
+		static const char * const attrs2[] = { "modifiedCount", 
 						       "creationTime", 
 						       NULL };
 		attrs = attrs2;
@@ -809,7 +809,7 @@ static NTSTATUS dcesrv_samr_QueryDomainInfo(struct dcesrv_call_state *dce_call,
 		break;		
 	case 11:
 	{
-		const char * const attrs2[] = { "comment", "forceLogoff", 
+		static const char * const attrs2[] = { "comment", "forceLogoff", 
 						       "modifiedCount", 
 						       "lockoutDuration", 
 						       "lockOutObservationWindow", 
@@ -820,7 +820,7 @@ static NTSTATUS dcesrv_samr_QueryDomainInfo(struct dcesrv_call_state *dce_call,
 	}
 	case 12:
 	{
-		const char * const attrs2[] = { "lockoutDuration", 
+		static const char * const attrs2[] = { "lockoutDuration", 
 						       "lockOutObservationWindow", 
 						       "lockoutThreshold", 
 						       NULL};
@@ -829,7 +829,7 @@ static NTSTATUS dcesrv_samr_QueryDomainInfo(struct dcesrv_call_state *dce_call,
 	}
 	case 13:
 	{
-		const char * const attrs2[] = { "modifiedCount", 
+		static const char * const attrs2[] = { "modifiedCount", 
 						       "creationTime", 
 						       NULL };
 		attrs = attrs2;
@@ -2944,7 +2944,7 @@ static NTSTATUS dcesrv_samr_QueryUserInfo(struct dcesrv_call_state *dce_call, TA
 	switch (r->in.level) {
 	case 1:
 	{
-		const char * const attrs2[] = {"sAMAccountName", "displayName",
+		static const char * const attrs2[] = {"sAMAccountName", "displayName",
 						      "primaryGroupID", "description",
 						      "comment", NULL};
 		attrs = attrs2;
@@ -2952,13 +2952,13 @@ static NTSTATUS dcesrv_samr_QueryUserInfo(struct dcesrv_call_state *dce_call, TA
 	}
 	case 2:
 	{
-		const char * const attrs2[] = {"comment", "countryCode", "codePage", NULL};
+		static const char * const attrs2[] = {"comment", "countryCode", "codePage", NULL};
 		attrs = attrs2;
 		break;
 	}
 	case 3:
 	{
-		const char * const attrs2[] = {"sAMAccountName",
+		static const char * const attrs2[] = {"sAMAccountName",
 						      "displayName",
 						      "objectSid",
 						      "primaryGroupID",
@@ -2979,13 +2979,13 @@ static NTSTATUS dcesrv_samr_QueryUserInfo(struct dcesrv_call_state *dce_call, TA
 	}
 	case 4:
 	{
-		const char * const attrs2[] = {"logonHours", NULL};
+		static const char * const attrs2[] = {"logonHours", NULL};
 		attrs = attrs2;
 		break;
 	}
 	case 5:
 	{
-		const char * const attrs2[] = {"sAMAccountName", 
+		static const char * const attrs2[] = {"sAMAccountName", 
 						      "displayName",
 						      "objectSid",
 						      "primaryGroupID",
@@ -3009,79 +3009,79 @@ static NTSTATUS dcesrv_samr_QueryUserInfo(struct dcesrv_call_state *dce_call, TA
 	}
 	case 6:
 	{
-		const char * const attrs2[] = {"sAMAccountName", "displayName", NULL};
+		static const char * const attrs2[] = {"sAMAccountName", "displayName", NULL};
 		attrs = attrs2;
 		break;
 	}
 	case 7:
 	{
-		const char * const attrs2[] = {"sAMAccountName", NULL};
+		static const char * const attrs2[] = {"sAMAccountName", NULL};
 		attrs = attrs2;
 		break;
 	}
 	case 8:
 	{
-		const char * const attrs2[] = {"displayName", NULL};
+		static const char * const attrs2[] = {"displayName", NULL};
 		attrs = attrs2;
 		break;
 	}
 	case 9:
 	{
-		const char * const attrs2[] = {"primaryGroupID", NULL};
+		static const char * const attrs2[] = {"primaryGroupID", NULL};
 		attrs = attrs2;
 		break;
 	}
 	case 10:
 	{
-		const char * const attrs2[] = {"homeDirectory", "homeDrive", NULL};
+		static const char * const attrs2[] = {"homeDirectory", "homeDrive", NULL};
 		attrs = attrs2;
 		break;
 	}
 	case 11:
 	{
-		const char * const attrs2[] = {"scriptPath", NULL};
+		static const char * const attrs2[] = {"scriptPath", NULL};
 		attrs = attrs2;
 		break;
 	}
 	case 12:
 	{
-		const char * const attrs2[] = {"profilePath", NULL};
+		static const char * const attrs2[] = {"profilePath", NULL};
 		attrs = attrs2;
 		break;
 	}
 	case 13:
 	{
-		const char * const attrs2[] = {"description", NULL};
+		static const char * const attrs2[] = {"description", NULL};
 		attrs = attrs2;
 		break;
 	}
 	case 14:
 	{
-		const char * const attrs2[] = {"userWorkstations", NULL};
+		static const char * const attrs2[] = {"userWorkstations", NULL};
 		attrs = attrs2;
 		break;
 	}
 	case 16:
 	{
-		const char * const attrs2[] = {"userAccountControl", NULL};
+		static const char * const attrs2[] = {"userAccountControl", NULL};
 		attrs = attrs2;
 		break;
 	}
 	case 17:
 	{
-		const char * const attrs2[] = {"accountExpires", NULL};
+		static const char * const attrs2[] = {"accountExpires", NULL};
 		attrs = attrs2;
 		break;
 	}
 	case 20:
 	{
-		const char * const attrs2[] = {"userParameters", NULL};
+		static const char * const attrs2[] = {"userParameters", NULL};
 		attrs = attrs2;
 		break;
 	}
 	case 21:
 	{
-		const char * const attrs2[] = {"lastLogon",
+		static const char * const attrs2[] = {"lastLogon",
 						      "lastLogoff",
 						      "pwdLastSet",
 						      "accountExpires",