diff options
| author | Matthias Dieter Wallnöfer <mdw@samba.org> | 2010-09-19 10:50:28 +0200 |
|---|---|---|
| committer | Matthias Dieter Wallnöfer <mdw@samba.org> | 2010-10-29 09:55:18 +0000 |
| commit | 45cd2e445d75429fbd84a95ff4a0fa0852279cd3 (patch) | |
| tree | 46d232a6aed2a0b0164b7616c3a0fed55e2c0e05 /source4/rpc_server/samr | |
| parent | c5c69359d9d18c9b9be29b0442567cf19f7810a0 (diff) | |
| download | samba-45cd2e445d75429fbd84a95ff4a0fa0852279cd3.tar.gz samba-45cd2e445d75429fbd84a95ff4a0fa0852279cd3.tar.bz2 samba-45cd2e445d75429fbd84a95ff4a0fa0852279cd3.zip | |
s4:samr RPC server - remove wrong implementation of ReplicaSourceNodeName
This should represent a replication partner - never the DC iself
Diffstat (limited to 'source4/rpc_server/samr')
| -rw-r--r-- | source4/rpc_server/samr/dcesrv_samr.c | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c index e419485cdc..1c4e9ecada 100644 --- a/source4/rpc_server/samr/dcesrv_samr.c +++ b/source4/rpc_server/samr/dcesrv_samr.c @@ -483,14 +483,9 @@ static NTSTATUS dcesrv_samr_info_DomGeneralInformation(struct samr_domain_state struct ldb_message **dom_msgs, struct samr_DomGeneralInformation *info) { - /* This pulls the NetBIOS name from the - cn=NTDS Settings,cn=<NETBIOS name of PDC>,.... - string */ - info->primary.string = samdb_result_fsmo_name(state->sam_ctx, mem_ctx, dom_msgs[0], "fSMORoleOwner"); - - if (!info->primary.string) { - info->primary.string = lpcfg_netbios_name(state->lp_ctx); - } + /* FIXME: this has a completely different meaning + * MS-SAMR 2.2.4.1 - ReplicaSourceNodeName */ + info->primary.string = talloc_strdup(mem_ctx, ""); info->force_logoff_time = ldb_msg_find_attr_as_uint64(dom_msgs[0], "forceLogoff", 0x8000000000000000LL); @@ -584,15 +579,9 @@ static NTSTATUS dcesrv_samr_info_DomInfo6(struct samr_domain_state *state, struct ldb_message **dom_msgs, struct samr_DomInfo6 *info) { - /* This pulls the NetBIOS name from the - cn=NTDS Settings,cn=<NETBIOS name of PDC>,.... - string */ - info->primary.string = samdb_result_fsmo_name(state->sam_ctx, mem_ctx, - dom_msgs[0], "fSMORoleOwner"); - - if (!info->primary.string) { - info->primary.string = lpcfg_netbios_name(state->lp_ctx); - } + /* FIXME: this has a completely different meaning + * MS-SAMR 2.2.4.1 - ReplicaSourceNodeName */ + info->primary.string = talloc_strdup(mem_ctx, ""); return NT_STATUS_OK; } @@ -753,7 +742,6 @@ static NTSTATUS dcesrv_samr_QueryDomainInfo(struct dcesrv_call_state *dce_call, static const char * const attrs2[] = {"forceLogoff", "oEMInformation", "modifiedCount", - "fSMORoleOwner", NULL}; attrs = attrs2; break; @@ -779,8 +767,7 @@ static NTSTATUS dcesrv_samr_QueryDomainInfo(struct dcesrv_call_state *dce_call, } case 6: { - static const char * const attrs2[] = {"fSMORoleOwner", - NULL}; + static const char * const attrs2[] = { NULL }; attrs = attrs2; break; } |