[SCM] Samba Shared Repository - branch v3-2-test updated -
initial-v3-2-unstable-591-g3954313
Günther Deschner
gd at samba.org
Tue Dec 11 14:27:33 GMT 2007
The branch, v3-2-test has been updated
via 3954313d4e3d3a782f0ba41afa5d81b7cc5adac9 (commit)
via cfc6e7a2e657ee55364b739d9fe0093e4f7c8b27 (commit)
from 4ab9a8aab72a8406659a72e87b2d2a1ec2a2eabf (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 3954313d4e3d3a782f0ba41afa5d81b7cc5adac9
Author: Günther Deschner <gd at samba.org>
Date: Tue Dec 11 14:57:30 2007 +0100
When building nsswitch, make sure to also build smbcontrol.
Guenther
commit cfc6e7a2e657ee55364b739d9fe0093e4f7c8b27
Author: Günther Deschner <gd at samba.org>
Date: Tue Dec 11 12:28:10 2007 +0100
Replace "unknown" with access_mask when calling samr_CreateUser2().
Guenther
-----------------------------------------------------------------------
Summary of changes:
source/Makefile.in | 3 ++-
source/rpc_client/cli_samr.c | 4 ++--
source/rpcclient/cmd_samr.c | 6 +++---
source/utils/net_rpc.c | 6 +++---
4 files changed, 10 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/Makefile.in b/source/Makefile.in
index 20dba0c..285255e 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -1009,7 +1009,8 @@ replacetort : SHOWFLAGS bin/replacetort at EXEEXT@
timelimit : SHOWFLAGS bin/timelimit at EXEEXT@
nsswitch : SHOWFLAGS bin/winbindd at EXEEXT@ bin/wbinfo at EXEEXT@ @WINBIND_NSS@ \
- @WINBIND_WINS_NSS@ bin/pam_winbind. at SHLIBEXT@ @WINBIND_KRB5_LOCATOR@
+ @WINBIND_WINS_NSS@ bin/pam_winbind. at SHLIBEXT@ bin/smbcontrol at EXEEXT@ \
+ @WINBIND_KRB5_LOCATOR@
wins : SHOWFLAGS @WINBIND_WINS_NSS@
diff --git a/source/rpc_client/cli_samr.c b/source/rpc_client/cli_samr.c
index 8eaf20a..b316896 100644
--- a/source/rpc_client/cli_samr.c
+++ b/source/rpc_client/cli_samr.c
@@ -1642,7 +1642,7 @@ NTSTATUS rpccli_samr_lookup_names(struct rpc_pipe_client *cli, TALLOC_CTX *mem_c
NTSTATUS rpccli_samr_create_dom_user(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
POLICY_HND *domain_pol, const char *acct_name,
- uint32 acb_info, uint32 unknown,
+ uint32 acb_info, uint32 access_mask,
POLICY_HND *user_pol, uint32 *rid)
{
prs_struct qbuf, rbuf;
@@ -1657,7 +1657,7 @@ NTSTATUS rpccli_samr_create_dom_user(struct rpc_pipe_client *cli, TALLOC_CTX *me
/* Marshall data and send request */
- init_samr_q_create_user(&q, domain_pol, acct_name, acb_info, unknown);
+ init_samr_q_create_user(&q, domain_pol, acct_name, acb_info, access_mask);
CLI_DO_RPC(cli, mem_ctx, PI_SAMR, SAMR_CREATE_USER,
q, r,
diff --git a/source/rpcclient/cmd_samr.c b/source/rpcclient/cmd_samr.c
index 931baf3..6a3c92a 100644
--- a/source/rpcclient/cmd_samr.c
+++ b/source/rpcclient/cmd_samr.c
@@ -1449,7 +1449,7 @@ static NTSTATUS cmd_samr_create_dom_user(struct rpc_pipe_client *cli,
NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
const char *acct_name;
uint32 acb_info;
- uint32 unknown, user_rid;
+ uint32 user_rid;
uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
if ((argc < 2) || (argc > 3)) {
@@ -1482,10 +1482,10 @@ static NTSTATUS cmd_samr_create_dom_user(struct rpc_pipe_client *cli,
/* Create domain user */
acb_info = ACB_NORMAL;
- unknown = 0xe005000b; /* No idea what this is - a permission mask? */
+ access_mask = 0xe005000b;
result = rpccli_samr_create_dom_user(cli, mem_ctx, &domain_pol,
- acct_name, acb_info, unknown,
+ acct_name, acb_info, access_mask,
&user_pol, &user_rid);
if (!NT_STATUS_IS_OK(result))
diff --git a/source/utils/net_rpc.c b/source/utils/net_rpc.c
index 3f78d6c..4db0967 100644
--- a/source/utils/net_rpc.c
+++ b/source/utils/net_rpc.c
@@ -587,7 +587,7 @@ static NTSTATUS rpc_user_add_internals(const DOM_SID *domain_sid,
NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
const char *acct_name;
uint32 acb_info;
- uint32 unknown, user_rid;
+ uint32 access_mask, user_rid;
if (argc < 1) {
d_printf("User must be specified\n");
@@ -617,10 +617,10 @@ static NTSTATUS rpc_user_add_internals(const DOM_SID *domain_sid,
/* Create domain user */
acb_info = ACB_NORMAL;
- unknown = 0xe005000b; /* No idea what this is - a permission mask? */
+ access_mask = 0xe005000b;
result = rpccli_samr_create_dom_user(pipe_hnd, mem_ctx, &domain_pol,
- acct_name, acb_info, unknown,
+ acct_name, acb_info, access_mask,
&user_pol, &user_rid);
if (!NT_STATUS_IS_OK(result)) {
goto done;
--
Samba Shared Repository
More information about the samba-cvs
mailing list