merge of working dsrolegetprimdominfo() client code from APP_HEAD

(This used to be commit 028477e35208e76fedbc7c743426fd9be94b7cf0)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 32c2e3f70f3b80751fcb610b6909269f0d06fbc8..26afe6107cfe81db1c82039507e81b62ac14b7f2 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -177,7 +177,8 @@ LIBMSRPC_OBJ = rpc_client/cli_lsarpc.o rpc_client/cli_samr.o \
               rpc_client/cli_netlogon.o rpc_client/cli_srvsvc.o \
               rpc_client/cli_wkssvc.o rpc_client/cli_dfs.o \
               rpc_client/cli_reg.o rpc_client/cli_pipe.o \
-              rpc_client/cli_spoolss.o rpc_client/cli_spoolss_notify.o 
+              rpc_client/cli_spoolss.o rpc_client/cli_spoolss_notify.o  \
+               rpc_client/cli_ds.o
 
 LIBMSRPC_SERVER_OBJ = libsmb/trust_passwd.o
 
@@ -204,7 +205,7 @@ RPC_PARSE_OBJ1 = rpc_parse/parse_prs.o rpc_parse/parse_sec.o \
 RPC_PARSE_OBJ = rpc_parse/parse_lsa.o rpc_parse/parse_net.o \
                 rpc_parse/parse_reg.o rpc_parse/parse_rpc.o \
                 rpc_parse/parse_samr.o rpc_parse/parse_srv.o \
-                rpc_parse/parse_wks.o \
+                rpc_parse/parse_wks.o rpc_parse/parse_ds.o \
                rpc_parse/parse_spoolss.o rpc_parse/parse_dfs.o \
                $(REGOBJS_OBJ)
 
@@ -351,7 +352,7 @@ RPCCLIENT_OBJ1 = rpcclient/rpcclient.o rpcclient/cmd_lsarpc.o \
                 rpcclient/cmd_samr.o rpcclient/cmd_spoolss.o \
                 rpcclient/cmd_netlogon.o rpcclient/cmd_srvsvc.o \
                 rpcclient/cmd_dfs.o rpcclient/cmd_reg.o \
-                rpcclient/display_sec.o
+                rpcclient/display_sec.o rpcclient/cmd_ds.o
 
 RPCCLIENT_OBJ = $(RPCCLIENT_OBJ1) \
              $(PARAM_OBJ) $(LIBSMB_OBJ) $(UBIQX_OBJ) $(LIB_OBJ) \

diff --git a/source3/include/ntdomain.h b/source3/include/ntdomain.h
index ffb9c96b72528ba04a4a9fca6f75f6600be1946e..628035885e18f088abe4c4f93e4363f80a933057 100644 (file)
--- a/source3/include/ntdomain.h
+++ b/source3/include/ntdomain.h
@@ -374,5 +374,6 @@ struct acct_info
 #include "rpc_wkssvc.h"
 #include "rpc_spoolss.h"
 #include "rpc_dfs.h"
+#include "rpc_ds.h"
 
 #endif /* _NT_DOMAIN_H */

diff --git a/source3/include/rpc_dce.h b/source3/include/rpc_dce.h
index 61316de89ca1b85b6dcee248935507e2aafbea51..3e615dab80ade69f859f2d8df183c7bc80e99cd3 100644 (file)
--- a/source3/include/rpc_dce.h
+++ b/source3/include/rpc_dce.h
@@ -89,6 +89,7 @@ enum NTLM_MESSAGE_TYPE
 
 /* Maximum PDU fragment size. */
 #define MAX_PDU_FRAG_LEN 0x1630
+/* #define MAX_PDU_FRAG_LEN 0x10b8             this is what w2k sets */
 
 /*
  * Actual structure of a DCE UUID

diff --git a/source3/include/smb.h b/source3/include/smb.h
index 5bf79b75fe6462446ef81a2b26c500b669f4d18f..b5ab504415fd3c786936a948f8ea4215ddd293ce 100644 (file)
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -188,7 +188,7 @@ typedef smb_ucs2_t wfstring[FSTRING_LEN];
 #define PIPE_NETDFS   "\\PIPE\\netdfs"
 
 #define PI_LSARPC              0
-#define PI_LSARPC_V2           1
+#define PI_LSARPC_DS           1
 #define PI_SAMR                        2
 #define PI_NETLOGON            3
 #define PI_SRVSVC              4

diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 3951e3c7762ebe3254f1d46f15701148bbd510c5..f005ac21f39ee332d646d73adf953aa96771ec0a 100644 (file)
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -344,7 +344,7 @@ static BOOL cli_session_setup_nt1(struct cli_state *cli, char *user,
                /* Have plaintext orginal */
                set_signing_on_cli(cli, pass, ntpword);
        }
-
+       
        return True;
 }
 

diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index b6b58d223786e48c362bdcf730535a5958b7c82a..2732c53e5ca7632124faa82191999fa30f9fcb74 100644 (file)
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -599,7 +599,7 @@ static BOOL create_rpc_bind_req(prs_struct *rpc_out, BOOL do_auth, uint32 rpc_ca
        }
 
        /* create the request RPC_HDR */
-       init_rpc_hdr(&hdr, RPC_BIND, 0x0, rpc_call_id, 
+       init_rpc_hdr(&hdr, RPC_BIND, 0x3, rpc_call_id, 
                RPC_HEADER_LEN + RPC_HDR_RB_LEN + prs_offset(&auth_info),
                auth_len);
 

diff --git a/source3/rpc_parse/parse_rpc.c b/source3/rpc_parse/parse_rpc.c
index 590268bed5501a204f398dc0dadeb7a939fa3860..247c83aecd55fd3417abfd9eb0379863bd227530 100644 (file)
--- a/source3/rpc_parse/parse_rpc.c
+++ b/source3/rpc_parse/parse_rpc.c
@@ -75,7 +75,7 @@ interface/version dce/rpc pipe identification
        }, 0x00                             \
 }
 
-#define SYNT_LSARPC_V0_WIN2K                \
+#define SYNT_LSARPC_V0_DS                \
 {                                           \
        {                                   \
                0x3919286a, 0xb10c, 0x11d0, \
@@ -147,7 +147,7 @@ struct pipe_id_info pipe_names [] =
 {
        /* client pipe , abstract syntax       , server pipe   , transfer syntax */
        { PIPE_LSARPC  , SYNT_LSARPC_V0        , PIPE_LSASS    , TRANS_SYNT_V2 },
-       { PIPE_LSARPC  , SYNT_LSARPC_V0_WIN2K  , PIPE_LSASS    , TRANS_SYNT_V2 },
+       { PIPE_LSARPC  , SYNT_LSARPC_V0_DS     , PIPE_LSASS    , TRANS_SYNT_V2 },
        { PIPE_SAMR    , SYNT_SAMR_V1          , PIPE_LSASS    , TRANS_SYNT_V2 },
        { PIPE_NETLOGON, SYNT_NETLOGON_V1      , PIPE_LSASS    , TRANS_SYNT_V2 },
        { PIPE_SRVSVC  , SYNT_SRVSVC_V3        , PIPE_NTSVCS   , TRANS_SYNT_V2 },

diff --git a/source3/rpcclient/cmd_lsarpc.c b/source3/rpcclient/cmd_lsarpc.c
index af5bb2066bd7439ea726c9fc895e8a0d518282ce..8eb8ce8754778f46bc70b6f8a120b996585b9943 100644 (file)
--- a/source3/rpcclient/cmd_lsarpc.c
+++ b/source3/rpcclient/cmd_lsarpc.c
@@ -525,13 +525,6 @@ static NTSTATUS cmd_lsa_query_secobj(struct cli_state *cli,
 }
 
 
-static NTSTATUS cmd_lsa_dsrole_getprimarydominfo(struct cli_state *cli,
-                                       TALLOC_CTX *mem_ctx, int argc,
-                                       char **argv)
-{
-       return NT_STATUS_OK;
-}
-
 /* List of commands exported by this module */
 
 struct cmd_set lsarpc_commands[] = {
@@ -548,7 +541,6 @@ struct cmd_set lsarpc_commands[] = {
        { "lsaenumprivsaccount", cmd_lsa_enum_privsaccounts, PI_LSARPC, "Enumerate the privileges of an SID",   "" },
        { "lsalookupprivvalue",  cmd_lsa_lookupprivvalue,    PI_LSARPC, "Get a privilege value given its name", "" },
        { "lsaquerysecobj",      cmd_lsa_query_secobj,       PI_LSARPC, "Query LSA security object", "" },
-       { "lsarpcbind",         cmd_lsa_dsrole_getprimarydominfo,       PI_LSARPC_V2, "Test 2k UUID in rpc bind", "" },
 
        { NULL }
 };

diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c
index 9c6cd3794b4be473af3db6b814c94b69a7a6418e..c34f3b08ad90619d75a63e55ed8ae608e02c6e73 100644 (file)
--- a/source3/rpcclient/rpcclient.c
+++ b/source3/rpcclient/rpcclient.c
@@ -402,10 +402,12 @@ extern struct cmd_set netlogon_commands[];
 extern struct cmd_set srvsvc_commands[];
 extern struct cmd_set dfs_commands[];
 extern struct cmd_set reg_commands[];
+extern struct cmd_set ds_commands[];
 
 static struct cmd_set *rpcclient_command_list[] = {
        rpcclient_commands,
        lsarpc_commands,
+       ds_commands,
        samr_commands,
        spoolss_commands,
        netlogon_commands,