svn commit: samba r4508 - in
branches/SAMBA_4_0/source/rpc_server/dssetup: .
metze at samba.org
metze at samba.org
Mon Jan 3 14:45:18 GMT 2005
Author: metze
Date: 2005-01-03 14:45:17 +0000 (Mon, 03 Jan 2005)
New Revision: 4508
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=4508
Log:
- simplify the code and allocate only in one place
- the ZERO_STRUCT(r->out) is useless and wrong if we would have a [ref,out] parameter
also note the r->out is already initialized by the pidl generated code
metze
Modified:
branches/SAMBA_4_0/source/rpc_server/dssetup/dcesrv_dssetup.c
Changeset:
Modified: branches/SAMBA_4_0/source/rpc_server/dssetup/dcesrv_dssetup.c
===================================================================
--- branches/SAMBA_4_0/source/rpc_server/dssetup/dcesrv_dssetup.c 2005-01-03 14:42:59 UTC (rev 4507)
+++ branches/SAMBA_4_0/source/rpc_server/dssetup/dcesrv_dssetup.c 2005-01-03 14:45:17 UTC (rev 4508)
@@ -33,8 +33,11 @@
TALLOC_CTX *mem_ctx,
struct dssetup_DsRoleGetPrimaryDomainInformation *r)
{
- ZERO_STRUCT(r->out);
+ union dssetup_DsRoleInfo *info;
+ info = talloc_p(mem_ctx, union dssetup_DsRoleInfo);
+ W_ERROR_HAVE_NO_MEMORY(info);
+
switch (r->in.level) {
case DS_ROLE_BASIC_INFORMATION:
{
@@ -42,7 +45,6 @@
const char * const attrs[] = { "dnsDomain", "nTMixedDomain", "objectGUID", "name", NULL };
int ret;
struct ldb_message **res;
- union dssetup_DsRoleInfo *info;
enum dssetup_DsRole role = DS_ROLE_STANDALONE_SERVER;
uint32 flags = 0;
const char *domain = NULL;
@@ -52,9 +54,6 @@
ZERO_STRUCT(domain_guid);
- info = talloc_p(mem_ctx, union dssetup_DsRoleInfo);
- W_ERROR_HAVE_NO_MEMORY(info);
-
switch (lp_server_role()) {
case ROLE_STANDALONE:
role = DS_ROLE_STANDALONE_SERVER;
@@ -120,11 +119,6 @@
}
case DS_ROLE_UPGRADE_STATUS:
{
- union dssetup_DsRoleInfo *info;
-
- info = talloc_p(mem_ctx, union dssetup_DsRoleInfo);
- W_ERROR_HAVE_NO_MEMORY(info);
-
info->upgrade.upgrading = DS_ROLE_NOT_UPGRADING;
info->upgrade.previous_role = DS_ROLE_PREVIOUS_UNKNOWN;
@@ -133,11 +127,6 @@
}
case DS_ROLE_OP_STATUS:
{
- union dssetup_DsRoleInfo *info;
-
- info = talloc_p(mem_ctx, union dssetup_DsRoleInfo);
- W_ERROR_HAVE_NO_MEMORY(info);
-
info->opstatus.status = DS_ROLE_OP_IDLE;
r->out.info = info;
More information about the samba-cvs
mailing list