summaryrefslogtreecommitdiff
path: root/source3/rpc_server
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2004-02-19 19:35:48 +0000
committerGerald Carter <jerry@samba.org>2004-02-19 19:35:48 +0000
commit130cf14673d36129637e286803b7e9e2771b7cdc (patch)
tree5302545eac740f446ce19037b56e123846ec7599 /source3/rpc_server
parentdb4623b2209a26e93ef0b7c95d8b1f4ee7328717 (diff)
downloadsamba-130cf14673d36129637e286803b7e9e2771b7cdc.tar.gz
samba-130cf14673d36129637e286803b7e9e2771b7cdc.tar.bz2
samba-130cf14673d36129637e286803b7e9e2771b7cdc.zip
comment out server portion of DsEnumerateDomainTrusts() since it causes 2k/xp clients to fail to join the domain (see comments in srv_netlog_nt.c for details)
(This used to be commit 981bd70a56094740daf6d144f7b802370c0d9056)
Diffstat (limited to 'source3/rpc_server')
-rw-r--r--source3/rpc_server/srv_netlog.c4
-rw-r--r--source3/rpc_server/srv_netlog_nt.c11
2 files changed, 11 insertions, 4 deletions
diff --git a/source3/rpc_server/srv_netlog.c b/source3/rpc_server/srv_netlog.c
index 0ef9b088a9..f06a2002e3 100644
--- a/source3/rpc_server/srv_netlog.c
+++ b/source3/rpc_server/srv_netlog.c
@@ -321,6 +321,7 @@ static BOOL api_net_logon_ctrl(pipes_struct *p)
api_ds_enum_dom_trusts:
*************************************************************************/
+#if 0 /* JERRY */
static BOOL api_ds_enum_dom_trusts(pipes_struct *p)
{
DS_Q_ENUM_DOM_TRUSTS q_u;
@@ -350,6 +351,7 @@ static BOOL api_ds_enum_dom_trusts(pipes_struct *p)
return True;
}
+#endif /* JERRY */
/*******************************************************************
array of \PIPE\NETLOGON operations
@@ -365,7 +367,9 @@ static struct api_struct api_net_cmds [] =
{ "NET_LOGON_CTRL2" , NET_LOGON_CTRL2 , api_net_logon_ctrl2 },
{ "NET_TRUST_DOM_LIST", NET_TRUST_DOM_LIST, api_net_trust_dom_list },
{ "NET_LOGON_CTRL" , NET_LOGON_CTRL , api_net_logon_ctrl },
+#if 0 /* JERRY */
{ "DS_ENUM_DOM_TRUSTS", DS_ENUM_DOM_TRUSTS, api_ds_enum_dom_trusts }
+#endif /* JERRY */
};
void netlog_get_pipe_fns( struct api_struct **fns, int *n_fns )
diff --git a/source3/rpc_server/srv_netlog_nt.c b/source3/rpc_server/srv_netlog_nt.c
index 65ebef8809..2f301a794c 100644
--- a/source3/rpc_server/srv_netlog_nt.c
+++ b/source3/rpc_server/srv_netlog_nt.c
@@ -770,15 +770,18 @@ NTSTATUS _net_sam_logon(pipes_struct *p, NET_Q_SAM_LOGON *q_u, NET_R_SAM_LOGON *
/*************************************************************************
_ds_enum_dom_trusts
*************************************************************************/
+#if 0 /* JERRY -- not correct */
NTSTATUS _ds_enum_dom_trusts(pipes_struct *p, DS_Q_ENUM_DOM_TRUSTS *q_u,
DS_R_ENUM_DOM_TRUSTS *r_u)
{
NTSTATUS status = NT_STATUS_OK;
- /* We just return zero trusts for now. At least that way we're
- consistent with NetTrustedDomainList which is what the fallback
- for this function is. Both of these functions need to be
- reworked. */
+ /* TODO: According to MSDN, the can only be executed against a
+ DC or domain member running Windows 2000 or later. Need
+ to test against a standalone 2k server and see what it
+ does. A windows 2000 DC includes its own domain in the
+ list. --jerry */
return status;
}
+#endif /* JERRY */