diff options
| author | Alexander Bokovoy <ab@samba.org> | 2008-01-30 12:00:15 +0300 |
|---|---|---|
| committer | Alexander Bokovoy <ab@samba.org> | 2008-01-30 12:00:15 +0300 |
| commit | 2763b90d242119d25d9f5afa91a403e85425da06 (patch) | |
| tree | 693290ff129af0f5dc0710a592e135ce1ae49932 /source3/rpc_server/srv_netlog_nt.c | |
| parent | 77a3e46a4c5667e5a458e9931ed7129625a23d60 (diff) | |
| parent | af92bf934ed7614ab0aa41015e296924823a0a5f (diff) | |
| download | samba-2763b90d242119d25d9f5afa91a403e85425da06.tar.gz samba-2763b90d242119d25d9f5afa91a403e85425da06.tar.bz2 samba-2763b90d242119d25d9f5afa91a403e85425da06.zip | |
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into dmapi-integration
(This used to be commit d841a3fc999c5ebd9e9d54b2bd5099b1b50402b1)
Diffstat (limited to 'source3/rpc_server/srv_netlog_nt.c')
| -rw-r--r-- | source3/rpc_server/srv_netlog_nt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/rpc_server/srv_netlog_nt.c b/source3/rpc_server/srv_netlog_nt.c index 904ee17f51..5003af8ce7 100644 --- a/source3/rpc_server/srv_netlog_nt.c +++ b/source3/rpc_server/srv_netlog_nt.c @@ -1130,7 +1130,7 @@ NTSTATUS _net_sam_logon_ex(pipes_struct *p, NET_Q_SAM_LOGON_EX *q_u, NET_R_SAM_L _ds_enum_dom_trusts *************************************************************************/ #if 0 /* JERRY -- not correct */ -NTSTATUS _ds_enum_dom_trusts(pipes_struct *p, DS_Q_ENUM_DOM_TRUSTS *q_u, + 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; |