[SCM] Samba Shared Repository - branch v3-2-test updated -
initial-v3-2-test-1849-g86d0032
Günther Deschner
gd at samba.org
Mon Feb 4 18:18:38 GMT 2008
The branch, v3-2-test has been updated
via 86d00328aead337026a1550ee888ee3f646f62b2 (commit)
via 7e0e74ff541167cb3862e544b7e964006d2eb93c (commit)
via c05b5709e4943345f5d2a35fad5155c79650686d (commit)
from 83d1b7429ea902742c9c1f42fca57fb1757fc2b4 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 86d00328aead337026a1550ee888ee3f646f62b2
Author: Günther Deschner <gd at samba.org>
Date: Mon Feb 4 19:17:41 2008 +0100
Remove unused marshalling for SAMR_CONNECT_4.
Guenther
commit 7e0e74ff541167cb3862e544b7e964006d2eb93c
Author: Günther Deschner <gd at samba.org>
Date: Mon Feb 4 19:13:57 2008 +0100
Add note about "unknown" in samr_Connect4 (from Samba3 rpc_parse).
Guenther
commit c05b5709e4943345f5d2a35fad5155c79650686d
Author: Günther Deschner <gd at samba.org>
Date: Mon Feb 4 19:13:15 2008 +0100
Use rpccli_samr_Connect4() in rpcclient.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source/include/rpc_samr.h | 13 -------
source/librpc/idl/samr.idl | 1 +
source/rpc_client/cli_samr.c | 36 -------------------
source/rpc_parse/parse_samr.c | 76 -----------------------------------------
source/rpcclient/cmd_samr.c | 8 +++-
5 files changed, 7 insertions(+), 127 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/include/rpc_samr.h b/source/include/rpc_samr.h
index 432f900..76e359a 100644
--- a/source/include/rpc_samr.h
+++ b/source/include/rpc_samr.h
@@ -1488,19 +1488,6 @@ typedef struct r_samr_connect_info
} SAMR_R_CONNECT;
-/* SAMR_Q_CONNECT4 */
-typedef struct q_samr_connect4_info
-{
- uint32 ptr_srv_name; /* pointer to server name */
- UNISTR2 uni_srv_name;
-
- uint32 unk_0; /* possible server name type, 1 for IP num, 2 for name */
- uint32 access_mask;
-} SAMR_Q_CONNECT4;
-
-/* SAMR_R_CONNECT4 - same format as connect */
-typedef struct r_samr_connect_info SAMR_R_CONNECT4;
-
/* SAMR_ENC_PASSWD */
typedef struct enc_passwd_info
{
diff --git a/source/librpc/idl/samr.idl b/source/librpc/idl/samr.idl
index 9d659af..8f1db59 100644
--- a/source/librpc/idl/samr.idl
+++ b/source/librpc/idl/samr.idl
@@ -1229,6 +1229,7 @@ import "misc.idl", "lsa.idl", "security.idl";
/************************/
/* Function 0x3e */
+ /* Only value we've seen for unknown is "2", possibly an address type ? */
NTSTATUS samr_Connect4(
[in,unique,string,charset(UTF16)] uint16 *system_name,
[in] uint32 unknown,
diff --git a/source/rpc_client/cli_samr.c b/source/rpc_client/cli_samr.c
index 1534b14..9970c8d 100644
--- a/source/rpc_client/cli_samr.c
+++ b/source/rpc_client/cli_samr.c
@@ -59,42 +59,6 @@ NTSTATUS rpccli_samr_connect(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
return result;
}
-/* Connect to SAMR database */
-
-NTSTATUS rpccli_samr_connect4(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
- uint32 access_mask, POLICY_HND *connect_pol)
-{
- prs_struct qbuf, rbuf;
- SAMR_Q_CONNECT4 q;
- SAMR_R_CONNECT4 r;
- NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-
- ZERO_STRUCT(q);
- ZERO_STRUCT(r);
-
- /* Marshall data and send request */
-
- init_samr_q_connect4(&q, cli->cli->desthost, access_mask);
-
- CLI_DO_RPC(cli, mem_ctx, PI_SAMR, SAMR_CONNECT4,
- q, r,
- qbuf, rbuf,
- samr_io_q_connect4,
- samr_io_r_connect4,
- NT_STATUS_UNSUCCESSFUL);
-
- /* Return output parameters */
-
- if (NT_STATUS_IS_OK(result = r.status)) {
- *connect_pol = r.connect_pol;
-#ifdef __INSURE__
- connect_pol->marker = malloc(1);
-#endif
- }
-
- return result;
-}
-
/* Query user info */
NTSTATUS rpccli_samr_query_userinfo(struct rpc_pipe_client *cli,
diff --git a/source/rpc_parse/parse_samr.c b/source/rpc_parse/parse_samr.c
index 97f70f6..cb9ec5e 100644
--- a/source/rpc_parse/parse_samr.c
+++ b/source/rpc_parse/parse_samr.c
@@ -5995,82 +5995,6 @@ bool samr_io_r_connect(const char *desc, SAMR_R_CONNECT * r_u,
}
/*******************************************************************
-inits a SAMR_Q_CONNECT4 structure.
-********************************************************************/
-
-void init_samr_q_connect4(SAMR_Q_CONNECT4 * q_u,
- char *srv_name, uint32 access_mask)
-{
- DEBUG(5, ("init_samr_q_connect4\n"));
-
- /* make PDC server name \\server */
- q_u->ptr_srv_name = (srv_name != NULL && *srv_name) ? 1 : 0;
- init_unistr2(&q_u->uni_srv_name, srv_name, UNI_STR_TERMINATE);
-
- /* Only value we've seen, possibly an address type ? */
- q_u->unk_0 = 2;
-
- /* example values: 0x0000 0002 */
- q_u->access_mask = access_mask;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-bool samr_io_q_connect4(const char *desc, SAMR_Q_CONNECT4 * q_u,
- prs_struct *ps, int depth)
-{
- if (q_u == NULL)
- return False;
-
- prs_debug(ps, depth, desc, "samr_io_q_connect4");
- depth++;
-
- if(!prs_align(ps))
- return False;
-
- if(!prs_uint32("ptr_srv_name", ps, depth, &q_u->ptr_srv_name))
- return False;
- if(!smb_io_unistr2("", &q_u->uni_srv_name, q_u->ptr_srv_name, ps, depth))
- return False;
-
- if(!prs_align(ps))
- return False;
- if(!prs_uint32("unk_0", ps, depth, &q_u->unk_0))
- return False;
- if(!prs_uint32("access_mask", ps, depth, &q_u->access_mask))
- return False;
-
- return True;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-bool samr_io_r_connect4(const char *desc, SAMR_R_CONNECT4 * r_u,
- prs_struct *ps, int depth)
-{
- if (r_u == NULL)
- return False;
-
- prs_debug(ps, depth, desc, "samr_io_r_connect4");
- depth++;
-
- if(!prs_align(ps))
- return False;
-
- if(!smb_io_pol_hnd("connect_pol", &r_u->connect_pol, ps, depth))
- return False;
-
- if(!prs_ntstatus("status", ps, depth, &r_u->status))
- return False;
-
- return True;
-}
-
-/*******************************************************************
make a SAMR_ENC_PASSWD structure.
********************************************************************/
diff --git a/source/rpcclient/cmd_samr.c b/source/rpcclient/cmd_samr.c
index 2799e46..b0c6213 100644
--- a/source/rpcclient/cmd_samr.c
+++ b/source/rpcclient/cmd_samr.c
@@ -332,8 +332,12 @@ static NTSTATUS try_samr_connects(struct rpc_pipe_client *cli, TALLOC_CTX *mem_c
uint32 access_mask, POLICY_HND *connect_pol)
{
NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-
- result = rpccli_samr_connect4(cli, mem_ctx, access_mask, connect_pol);
+
+ result = rpccli_samr_Connect4(cli, mem_ctx,
+ cli->cli->desthost,
+ 2, /* unknown */
+ access_mask,
+ connect_pol);
if (!NT_STATUS_IS_OK(result)) {
result = rpccli_samr_connect(cli, mem_ctx, access_mask,
connect_pol);
--
Samba Shared Repository
More information about the samba-cvs
mailing list