summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2006-09-08 05:10:10 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:17:56 -0500
commitf09352781932116997fd6ff1471e34983dbccadc (patch)
treebb2a0b1fba361d8715b2df556024dd61886778e5
parent77d27a46356ec8df87831b27e09575d27d386c79 (diff)
downloadsamba-f09352781932116997fd6ff1471e34983dbccadc.tar.gz
samba-f09352781932116997fd6ff1471e34983dbccadc.tar.bz2
samba-f09352781932116997fd6ff1471e34983dbccadc.zip
r18252: Make sure to NULL terminate these lists of attributes.
Andrew Bartlett (This used to be commit 8cddcdb7c71963ed5fc30080c6bd4c48d114e321)
-rw-r--r--source4/rpc_server/samr/dcesrv_samr.c23
1 files changed, 16 insertions, 7 deletions
diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c
index f0f4a51d58..f1a1134238 100644
--- a/source4/rpc_server/samr/dcesrv_samr.c
+++ b/source4/rpc_server/samr/dcesrv_samr.c
@@ -690,19 +690,22 @@ static NTSTATUS samr_QueryDomainInfo(struct dcesrv_call_state *dce_call, TALLOC_
{
static const char * const attrs2[] = {"forceLogoff",
"comment",
- "modifiedCount"};
+ "modifiedCount",
+ NULL};
attrs = attrs2;
break;
}
case 3:
{
- static const char * const attrs2[] = {"forceLogoff"};
+ static const char * const attrs2[] = {"forceLogoff",
+ NULL};
attrs = attrs2;
break;
}
case 4:
{
- static const char * const attrs2[] = {"comment"};
+ static const char * const attrs2[] = {"comment",
+ NULL};
attrs = attrs2;
break;
}
@@ -715,7 +718,9 @@ static NTSTATUS samr_QueryDomainInfo(struct dcesrv_call_state *dce_call, TALLOC_
}
case 8:
{
- static const char * const attrs2[] = { "modifiedCount", "creationTime", NULL };
+ static const char * const attrs2[] = { "modifiedCount",
+ "creationTime",
+ NULL };
attrs = attrs2;
break;
}
@@ -728,7 +733,8 @@ static NTSTATUS samr_QueryDomainInfo(struct dcesrv_call_state *dce_call, TALLOC_
"modifiedCount",
"lockoutDuration",
"lockOutObservationWindow",
- "lockoutThreshold", NULL};
+ "lockoutThreshold",
+ NULL};
attrs = attrs2;
break;
}
@@ -736,13 +742,16 @@ static NTSTATUS samr_QueryDomainInfo(struct dcesrv_call_state *dce_call, TALLOC_
{
static const char * const attrs2[] = { "lockoutDuration",
"lockOutObservationWindow",
- "lockoutThreshold", NULL};
+ "lockoutThreshold",
+ NULL};
attrs = attrs2;
break;
}
case 13:
{
- static const char * const attrs2[] = { "modifiedCount", "creationTime", NULL };
+ static const char * const attrs2[] = { "modifiedCount",
+ "creationTime",
+ NULL };
attrs = attrs2;
break;
}