[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1873-ge1c7939
The branch, v3-2-test has been updated
via e1c79397fc5e1ffee80618150f7e4052e01323e8 (commit)
via 4e7236c10e5a1cbea2e961e196729603c66f37d6 (commit)
from 3442abd26d7c86f6abd9c3ca3593ac3b1170e826 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit e1c79397fc5e1ffee80618150f7e4052e01323e8
Author: Günther Deschner [EMAIL PROTECTED]
Date: Mon Feb 4 23:09:15 2008 +0100
Remove unused marshalling for SAMR_GET_USRDOM_PWINFO.
Guenther
commit 4e7236c10e5a1cbea2e961e196729603c66f37d6
Author: Günther Deschner [EMAIL PROTECTED]
Date: Mon Feb 4 22:53:03 2008 +0100
Use pidl for _samr_GetUserPwInfo().
Guenther
---
Summary of changes:
source/include/rpc_samr.h | 26
source/rpc_parse/parse_samr.c | 83 ---
source/rpc_server/srv_samr.c| 23 +--
source/rpc_server/srv_samr_nt.c | 27 -
4 files changed, 9 insertions(+), 150 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/include/rpc_samr.h b/source/include/rpc_samr.h
index 45e9677..5e3642d 100644
--- a/source/include/rpc_samr.h
+++ b/source/include/rpc_samr.h
@@ -446,32 +446,6 @@ typedef struct sam_user_info_9
/
-SAMR_Q_GET_USRDOM_PWINFO - a set user info occurs just after this
-*/
-
-/* SAMR_Q_GET_USRDOM_PWINFO */
-typedef struct q_samr_usrdom_pwinfo_info
-{
- POLICY_HND user_pol; /* policy handle */
-
-} SAMR_Q_GET_USRDOM_PWINFO;
-
-
-/
-SAMR_R_GET_USRDOM_PWINFO - a set user info occurs just after this
-*/
-
-/* SAMR_R_GET_USRDOM_PWINFO */
-typedef struct r_samr_usrdom_pwinfo_info
-{
- uint16 min_pwd_length;
- uint16 unknown_1; /* 0x0016 or 0x0015 */
- uint32 password_properties;
- NTSTATUS status;
-
-} SAMR_R_GET_USRDOM_PWINFO;
-
-/
SAMR_Q_SET_SEC_OBJ - info level 4.
*/
diff --git a/source/rpc_parse/parse_samr.c b/source/rpc_parse/parse_samr.c
index a1e7f63..4e41d29 100644
--- a/source/rpc_parse/parse_samr.c
+++ b/source/rpc_parse/parse_samr.c
@@ -185,89 +185,6 @@ bool samr_io_r_remove_sid_foreign_domain(const char *desc,
SAMR_R_REMOVE_SID_FOR
reads or writes a structure.
/
-void init_samr_q_get_usrdom_pwinfo(SAMR_Q_GET_USRDOM_PWINFO * q_u,
- POLICY_HND *user_pol)
-{
- DEBUG(5, (samr_init_samr_q_get_usrdom_pwinfo\n));
-
- q_u-user_pol = *user_pol;
-}
-
-/***
-reads or writes a structure.
-/
-
-bool samr_io_q_get_usrdom_pwinfo(const char *desc, SAMR_Q_GET_USRDOM_PWINFO *
q_u,
-prs_struct *ps, int depth)
-{
- if (q_u == NULL)
- return False;
-
- prs_debug(ps, depth, desc, samr_io_q_get_usrdom_pwinfo);
- depth++;
-
- if(!prs_align(ps))
- return False;
-
- return smb_io_pol_hnd(user_pol, q_u-user_pol, ps, depth);
-}
-
-/***
- Init.
-/
-
-void init_samr_r_get_usrdom_pwinfo(SAMR_R_GET_USRDOM_PWINFO *r_u, NTSTATUS
status)
-{
- DEBUG(5, (init_samr_r_get_usrdom_pwinfo\n));
-
- r_u-min_pwd_length = 0x;
-
- /*
-* used to be
-* r_u-unknown_1 = 0x0015;
-* but for trusts.
-*/
- r_u-unknown_1 = 0x01D1;
- r_u-unknown_1 = 0x0015;
-
- r_u-password_properties = 0x;
-
- r_u-status = status;
-}
-
-/***
-reads or writes a structure.
-/
-
-bool samr_io_r_get_usrdom_pwinfo(const char *desc, SAMR_R_GET_USRDOM_PWINFO *
r_u,
-prs_struct *ps, int depth)
-{
- if (r_u == NULL)
- return False;
-
- prs_debug(ps, depth, desc, samr_io_r_get_usrdom_pwinfo);
- depth++;
-
- if(!prs_align(ps))
- return False;
-
- if(!prs_uint16(min_pwd_length, ps, depth, r_u-min_pwd_length))
- return False;
- if(!prs_uint16(unknown_1, ps, depth, r_u-unknown_1))
- return False;
-
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1892-g4b06895
The branch, v3-2-test has been updated
via 4b068954671143a7c94884e169f1d0ba420dccb7 (commit)
via 8bcbf8cccdbd14a1c7a446828605c7235b63ff56 (commit)
via 4cd7f7a8e797e00fc6b03496e23d384bb7085884 (commit)
from 5c167162856fd1e13a3e04423cfc0cc936ae26b0 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 4b068954671143a7c94884e169f1d0ba420dccb7
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Feb 5 03:17:12 2008 +0100
Use idl for _samr_QueryGroupMember().
Guenther
commit 8bcbf8cccdbd14a1c7a446828605c7235b63ff56
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Feb 5 03:19:35 2008 +0100
Re-run make idl.
Guenther
commit 4cd7f7a8e797e00fc6b03496e23d384bb7085884
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Feb 5 03:17:36 2008 +0100
Fix IDL for samr_QueryGroupMember().
Guenther
---
Summary of changes:
source/librpc/gen_ndr/cli_samr.c |2 +-
source/librpc/gen_ndr/cli_samr.h |2 +-
source/librpc/gen_ndr/ndr_samr.c | 22 +++--
source/librpc/gen_ndr/samr.h |2 +-
source/librpc/gen_ndr/srv_samr.c |2 +-
source/librpc/idl/samr.idl |2 +-
source/rpc_server/srv_samr.c | 23 +--
source/rpc_server/srv_samr_nt.c | 46 +++--
8 files changed, 49 insertions(+), 52 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/librpc/gen_ndr/cli_samr.c b/source/librpc/gen_ndr/cli_samr.c
index a688e67..627c448 100644
--- a/source/librpc/gen_ndr/cli_samr.c
+++ b/source/librpc/gen_ndr/cli_samr.c
@@ -1120,7 +1120,7 @@ NTSTATUS rpccli_samr_DeleteGroupMember(struct
rpc_pipe_client *cli,
NTSTATUS rpccli_samr_QueryGroupMember(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
struct policy_handle *group_handle,
- struct samr_RidTypeArray *rids)
+ struct samr_RidTypeArray **rids)
{
struct samr_QueryGroupMember r;
NTSTATUS status;
diff --git a/source/librpc/gen_ndr/cli_samr.h b/source/librpc/gen_ndr/cli_samr.h
index d1e262c..86396be 100644
--- a/source/librpc/gen_ndr/cli_samr.h
+++ b/source/librpc/gen_ndr/cli_samr.h
@@ -143,7 +143,7 @@ NTSTATUS rpccli_samr_DeleteGroupMember(struct
rpc_pipe_client *cli,
NTSTATUS rpccli_samr_QueryGroupMember(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
struct policy_handle *group_handle,
- struct samr_RidTypeArray *rids);
+ struct samr_RidTypeArray **rids);
NTSTATUS rpccli_samr_SetMemberAttributesOfGroup(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
struct policy_handle
*group_handle,
diff --git a/source/librpc/gen_ndr/ndr_samr.c b/source/librpc/gen_ndr/ndr_samr.c
index 1d003f2..fbb6c64 100644
--- a/source/librpc/gen_ndr/ndr_samr.c
+++ b/source/librpc/gen_ndr/ndr_samr.c
@@ -7642,7 +7642,11 @@ static enum ndr_err_code
ndr_push_samr_QueryGroupMember(struct ndr_push *ndr, in
if (r-out.rids == NULL) {
return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
NULL [ref] pointer);
}
- NDR_CHECK(ndr_push_samr_RidTypeArray(ndr,
NDR_SCALARS|NDR_BUFFERS, r-out.rids));
+ if (*r-out.rids == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
NULL [ref] pointer);
+ }
+ NDR_CHECK(ndr_push_ref_ptr(ndr));
+ NDR_CHECK(ndr_push_samr_RidTypeArray(ndr,
NDR_SCALARS|NDR_BUFFERS, *r-out.rids));
NDR_CHECK(ndr_push_NTSTATUS(ndr, NDR_SCALARS, r-out.result));
}
return NDR_ERR_SUCCESS;
@@ -7650,8 +7654,10 @@ static enum ndr_err_code
ndr_push_samr_QueryGroupMember(struct ndr_push *ndr, in
static enum ndr_err_code ndr_pull_samr_QueryGroupMember(struct ndr_pull *ndr,
int flags, struct samr_QueryGroupMember *r)
{
+ uint32_t _ptr_rids;
TALLOC_CTX *_mem_save_group_handle_0;
TALLOC_CTX *_mem_save_rids_0;
+ TALLOC_CTX *_mem_save_rids_1;
if (flags NDR_IN) {
ZERO_STRUCT(r-out);
@@ -7671,7 +7677,14 @@ static enum ndr_err_code
ndr_pull_samr_QueryGroupMember(struct ndr_pull *ndr, in
}
_mem_save_rids_0 = NDR_PULL_GET_MEM_CTX(ndr);
NDR_PULL_SET_MEM_CTX(ndr, r-out.rids, LIBNDR_FLAG_REF_ALLOC);
- NDR_CHECK(ndr_pull_samr_RidTypeArray(ndr,
NDR_SCALARS|NDR_BUFFERS, r-out.rids));
+ NDR_CHECK(ndr_pull_ref_ptr(ndr, _ptr_rids));
+ if
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1889-g5c16716
The branch, v3-2-test has been updated
via 5c167162856fd1e13a3e04423cfc0cc936ae26b0 (commit)
via b573f677239fbf176468796bb05c4b43dce47262 (commit)
from e03fd629171b625a42f02bdd6660b2ba75d27a4b (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 5c167162856fd1e13a3e04423cfc0cc936ae26b0
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Feb 5 02:45:51 2008 +0100
Use rpccli_samr_GetAliasMembership() in winbindd and rpcclient.
Guenther
commit b573f677239fbf176468796bb05c4b43dce47262
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Feb 5 02:04:56 2008 +0100
Use pidl for _samr_GetAliasMembership().
Guenther
---
Summary of changes:
source/rpc_server/srv_samr.c| 23 +---
source/rpc_server/srv_samr_nt.c | 44 +++---
source/rpcclient/cmd_samr.c | 30 +++---
source/winbindd/winbindd_rpc.c | 37 ++--
4 files changed, 56 insertions(+), 78 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/rpc_server/srv_samr.c b/source/rpc_server/srv_samr.c
index 8c71e5e..6375d6d 100644
--- a/source/rpc_server/srv_samr.c
+++ b/source/rpc_server/srv_samr.c
@@ -619,28 +619,7 @@ static bool api_samr_set_userinfo2(pipes_struct *p)
static bool api_samr_query_useraliases(pipes_struct *p)
{
- SAMR_Q_QUERY_USERALIASES q_u;
- SAMR_R_QUERY_USERALIASES r_u;
-
- prs_struct *data = p-in_data.data;
- prs_struct *rdata = p-out_data.rdata;
-
- ZERO_STRUCT(q_u);
- ZERO_STRUCT(r_u);
-
- if (!samr_io_q_query_useraliases(, q_u, data, 0)) {
- DEBUG(0,(api_samr_query_useraliases: Unable to unmarshall
SAMR_Q_QUERY_USERALIASES.\n));
- return False;
- }
-
- r_u.status = _samr_query_useraliases(p, q_u, r_u);
-
- if (! samr_io_r_query_useraliases(, r_u, rdata, 0)) {
- DEBUG(0,(api_samr_query_useraliases: Unable to nmarshall
SAMR_R_QUERY_USERALIASES.\n));
- return False;
- }
-
- return True;
+ return proxy_samr_call(p, NDR_SAMR_GETALIASMEMBERSHIP);
}
/***
diff --git a/source/rpc_server/srv_samr_nt.c b/source/rpc_server/srv_samr_nt.c
index 10a3267..2f85270 100644
--- a/source/rpc_server/srv_samr_nt.c
+++ b/source/rpc_server/srv_samr_nt.c
@@ -3781,10 +3781,11 @@ NTSTATUS _samr_set_userinfo2(pipes_struct *p,
SAMR_Q_SET_USERINFO2 *q_u, SAMR_R_
}
/*
- _samr_query_aliasmem
+ _samr_GetAliasMembership
*/
-NTSTATUS _samr_query_useraliases(pipes_struct *p, SAMR_Q_QUERY_USERALIASES
*q_u, SAMR_R_QUERY_USERALIASES *r_u)
+NTSTATUS _samr_GetAliasMembership(pipes_struct *p,
+ struct samr_GetAliasMembership *r)
{
size_t num_alias_rids;
uint32 *alias_rids;
@@ -3796,17 +3797,15 @@ NTSTATUS _samr_query_useraliases(pipes_struct *p,
SAMR_Q_QUERY_USERALIASES *q_u,
DOM_SID *members;
- r_u-status = NT_STATUS_OK;
-
- DEBUG(5,(_samr_query_useraliases: %d\n, __LINE__));
+ DEBUG(5,(_samr_GetAliasMembership: %d\n, __LINE__));
/* find the policy handle. open a policy on it. */
- if (!find_policy_by_hnd(p, q_u-pol, (void **)(void *)info))
+ if (!find_policy_by_hnd(p, r-in.domain_handle, (void **)(void *)info))
return NT_STATUS_INVALID_HANDLE;
-
- ntstatus1 = access_check_samr_function(info-acc_granted,
SA_RIGHT_DOMAIN_LOOKUP_ALIAS_BY_MEM, _samr_query_useraliases);
- ntstatus2 = access_check_samr_function(info-acc_granted,
SA_RIGHT_DOMAIN_OPEN_ACCOUNT, _samr_query_useraliases);
-
+
+ ntstatus1 = access_check_samr_function(info-acc_granted,
SA_RIGHT_DOMAIN_LOOKUP_ALIAS_BY_MEM, _samr_GetAliasMembership);
+ ntstatus2 = access_check_samr_function(info-acc_granted,
SA_RIGHT_DOMAIN_OPEN_ACCOUNT, _samr_GetAliasMembership);
+
if (!NT_STATUS_IS_OK(ntstatus1) || !NT_STATUS_IS_OK(ntstatus2)) {
if (!(NT_STATUS_EQUAL(ntstatus1,NT_STATUS_ACCESS_DENIED)
NT_STATUS_IS_OK(ntstatus2))
!(NT_STATUS_EQUAL(ntstatus1,NT_STATUS_ACCESS_DENIED)
NT_STATUS_IS_OK(ntstatus1))) {
@@ -3818,8 +3817,8 @@ NTSTATUS _samr_query_useraliases(pipes_struct *p,
SAMR_Q_QUERY_USERALIASES *q_u,
!sid_check_is_builtin(info-sid))
return NT_STATUS_OBJECT_TYPE_MISMATCH;
- if (q_u-num_sids1) {
- members = TALLOC_ARRAY(p-mem_ctx, DOM_SID, q_u-num_sids1);
+ if (r-in.sids-num_sids) {
+ members = TALLOC_ARRAY(p-mem_ctx, DOM_SID,
r-in.sids-num_sids);
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1887-ge03fd62
The branch, v3-2-test has been updated
via e03fd629171b625a42f02bdd6660b2ba75d27a4b (commit)
via 2d4d052257d3a051b022f58da84d40019b74dd86 (commit)
via 9bc106ba56d3a965a5fcd76ce18ccd30baa06eb4 (commit)
via 9ecb72183571af80cbcb56c57a09087eb0479f93 (commit)
via 4b4ccc86800f6a700354139aa7515757a255b601 (commit)
from 1b1f9ee2e931a9c2608e4fd4bc37b877c52b1dcb (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit e03fd629171b625a42f02bdd6660b2ba75d27a4b
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Feb 5 01:36:19 2008 +0100
Remove marshalling for SAMR_LOOKUP_DOMAIN.
Guenther
commit 2d4d052257d3a051b022f58da84d40019b74dd86
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Feb 5 01:34:30 2008 +0100
Use rpccli_samr_LookupDomain() in rpcclient.
Guenther
commit 9bc106ba56d3a965a5fcd76ce18ccd30baa06eb4
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Feb 5 01:29:49 2008 +0100
Use pidl for _samr_LookupDomain().
Guenther
commit 9ecb72183571af80cbcb56c57a09087eb0479f93
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Feb 5 01:27:46 2008 +0100
Re-run make idl.
Guenther
commit 4b4ccc86800f6a700354139aa7515757a255b601
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Feb 5 01:28:16 2008 +0100
Fix IDL for samr_LookupDomain().
Guenther
---
Summary of changes:
source/include/rpc_samr.h| 22 -
source/librpc/gen_ndr/cli_samr.c |2 +-
source/librpc/gen_ndr/cli_samr.h |2 +-
source/librpc/gen_ndr/ndr_samr.c | 22 -
source/librpc/gen_ndr/samr.h |2 +-
source/librpc/gen_ndr/srv_samr.c |2 +-
source/librpc/idl/samr.idl |4 +-
source/rpc_client/cli_samr.c | 37 ---
source/rpc_parse/parse_samr.c| 91 --
source/rpc_server/srv_samr.c | 22 +-
source/rpc_server/srv_samr_nt.c | 53 ++
source/rpcclient/cmd_samr.c | 25 ++-
12 files changed, 63 insertions(+), 221 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/include/rpc_samr.h b/source/include/rpc_samr.h
index e9c9efd..affd1f2 100644
--- a/source/include/rpc_samr.h
+++ b/source/include/rpc_samr.h
@@ -613,28 +613,6 @@ typedef struct r_samr_query_domain_info
} SAMR_R_QUERY_DOMAIN_INFO;
-/* SAMR_Q_LOOKUP_DOMAIN - obtain SID for a local domain */
-typedef struct q_samr_lookup_domain_info
-{
- POLICY_HND connect_pol;
-
- UNIHDR hdr_domain;
- UNISTR2 uni_domain;
-
-} SAMR_Q_LOOKUP_DOMAIN;
-
-
-/* SAMR_R_LOOKUP_DOMAIN */
-typedef struct r_samr_lookup_domain_info
-{
- uint32 ptr_sid;
- DOM_SID2 dom_sid;
-
- NTSTATUS status;
-
-} SAMR_R_LOOKUP_DOMAIN;
-
-
#define MAX_SAM_ENTRIES_W2K 0x400
#define MAX_SAM_ENTRIES_W95 50
/* The following should be the greater of the preceeding two. */
diff --git a/source/librpc/gen_ndr/cli_samr.c b/source/librpc/gen_ndr/cli_samr.c
index 1c71645..a688e67 100644
--- a/source/librpc/gen_ndr/cli_samr.c
+++ b/source/librpc/gen_ndr/cli_samr.c
@@ -218,7 +218,7 @@ NTSTATUS rpccli_samr_LookupDomain(struct rpc_pipe_client
*cli,
TALLOC_CTX *mem_ctx,
struct policy_handle *connect_handle,
struct lsa_String *domain_name,
- struct dom_sid2 *sid)
+ struct dom_sid2 **sid)
{
struct samr_LookupDomain r;
NTSTATUS status;
diff --git a/source/librpc/gen_ndr/cli_samr.h b/source/librpc/gen_ndr/cli_samr.h
index 14f47ea..d1e262c 100644
--- a/source/librpc/gen_ndr/cli_samr.h
+++ b/source/librpc/gen_ndr/cli_samr.h
@@ -26,7 +26,7 @@ NTSTATUS rpccli_samr_LookupDomain(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
struct policy_handle *connect_handle,
struct lsa_String *domain_name,
- struct dom_sid2 *sid);
+ struct dom_sid2 **sid);
NTSTATUS rpccli_samr_EnumDomains(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
struct policy_handle *connect_handle,
diff --git a/source/librpc/gen_ndr/ndr_samr.c b/source/librpc/gen_ndr/ndr_samr.c
index d6f51b9..1d003f2 100644
--- a/source/librpc/gen_ndr/ndr_samr.c
+++ b/source/librpc/gen_ndr/ndr_samr.c
@@ -5581,7 +5581,11 @@ static enum ndr_err_code
ndr_push_samr_LookupDomain(struct ndr_push *ndr, int fl
if (r-out.sid == NULL) {
return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
NULL [ref] pointer);
}
-
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1882-g1b1f9ee
The branch, v3-2-test has been updated
via 1b1f9ee2e931a9c2608e4fd4bc37b877c52b1dcb (commit)
via 3f48f9e671698235a4152102cf73a694b94542e0 (commit)
via f6db8a51c8858e48567a819f18a7215e7ad8f6b4 (commit)
from 27e0b6a1aa94294588b2c18ed7929edb0289e746 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 1b1f9ee2e931a9c2608e4fd4bc37b877c52b1dcb
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Feb 5 01:22:10 2008 +0100
Remove unused marshalling for SAMR_QUERY_ALIASMEM.
Guenther
commit 3f48f9e671698235a4152102cf73a694b94542e0
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Feb 5 01:18:56 2008 +0100
Use rpccli_samr_GetMembersInAlias() in net and rpcclient.
Guenther
commit f6db8a51c8858e48567a819f18a7215e7ad8f6b4
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Feb 5 00:29:11 2008 +0100
Use pidl for _samr_GetMembersInAlias().
Guenther
---
Summary of changes:
source/include/rpc_samr.h | 22 ---
source/rpc_client/cli_samr.c| 56 -
source/rpc_parse/parse_samr.c | 130 ---
source/rpc_server/srv_samr.c| 23 +---
source/rpc_server/srv_samr_nt.c | 50 +++
source/rpcclient/cmd_samr.c | 13 ++--
source/utils/net_rpc.c | 32 +++---
7 files changed, 54 insertions(+), 272 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/include/rpc_samr.h b/source/include/rpc_samr.h
index 57c7831..e9c9efd 100644
--- a/source/include/rpc_samr.h
+++ b/source/include/rpc_samr.h
@@ -1385,28 +1385,6 @@ typedef struct r_samr_query_groupmem_info
} SAMR_R_QUERY_GROUPMEM;
-/* SAMR_Q_QUERY_ALIASMEM - query alias members */
-typedef struct q_samr_query_aliasmem_info
-{
- POLICY_HND alias_pol;/* policy handle */
-
-} SAMR_Q_QUERY_ALIASMEM;
-
-
-/* SAMR_R_QUERY_ALIASMEM - query alias members */
-typedef struct r_samr_query_aliasmem_info
-{
- uint32 num_sids;
- uint32 ptr;
- uint32 num_sids1;
-
- DOM_SID2 *sid;
-
- NTSTATUS status;
-
-} SAMR_R_QUERY_ALIASMEM;
-
-
/* SAMR_ENC_PASSWD */
typedef struct enc_passwd_info
{
diff --git a/source/rpc_client/cli_samr.c b/source/rpc_client/cli_samr.c
index 4f29397..8b4ad1e 100644
--- a/source/rpc_client/cli_samr.c
+++ b/source/rpc_client/cli_samr.c
@@ -518,62 +518,6 @@ NTSTATUS rpccli_samr_enum_als_groups(struct
rpc_pipe_client *cli,
return result;
}
-/* Query alias members */
-
-NTSTATUS rpccli_samr_query_aliasmem(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx,
- POLICY_HND *alias_pol, uint32 *num_mem,
- DOM_SID **sids)
-{
- prs_struct qbuf, rbuf;
- SAMR_Q_QUERY_ALIASMEM q;
- SAMR_R_QUERY_ALIASMEM r;
- NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
- uint32 i;
-
- DEBUG(10,(cli_samr_query_aliasmem\n));
-
- ZERO_STRUCT(q);
- ZERO_STRUCT(r);
-
- /* Marshall data and send request */
-
- init_samr_q_query_aliasmem(q, alias_pol);
-
- CLI_DO_RPC(cli, mem_ctx, PI_SAMR, SAMR_QUERY_ALIASMEM,
- q, r,
- qbuf, rbuf,
- samr_io_q_query_aliasmem,
- samr_io_r_query_aliasmem,
- NT_STATUS_UNSUCCESSFUL);
-
- /* Return output parameters */
-
- if (!NT_STATUS_IS_OK(result = r.status)) {
- goto done;
- }
-
- *num_mem = r.num_sids;
-
- if (*num_mem == 0) {
- *sids = NULL;
- result = NT_STATUS_OK;
- goto done;
- }
-
- if (!(*sids = TALLOC_ARRAY(mem_ctx, DOM_SID, *num_mem))) {
- result = NT_STATUS_UNSUCCESSFUL;
- goto done;
- }
-
- for (i = 0; i *num_mem; i++) {
- (*sids)[i] = r.sid[i].sid;
- }
-
- done:
- return result;
-}
-
/* Query alias info */
NTSTATUS rpccli_samr_query_alias_info(struct rpc_pipe_client *cli, TALLOC_CTX
*mem_ctx,
diff --git a/source/rpc_parse/parse_samr.c b/source/rpc_parse/parse_samr.c
index fb3994a..1dc1ff0 100644
--- a/source/rpc_parse/parse_samr.c
+++ b/source/rpc_parse/parse_samr.c
@@ -3599,136 +3599,6 @@ bool samr_io_r_lookup_rids(const char *desc,
SAMR_R_LOOKUP_RIDS * r_u,
}
/***
-inits a SAMR_Q_QUERY_ALIASMEM structure.
-/
-
-void init_samr_q_query_aliasmem(SAMR_Q_QUERY_ALIASMEM * q_c,
- POLICY_HND *hnd)
-{
- DEBUG(5, (init_samr_q_query_aliasmem\n));
-
- q_c-alias_pol = *hnd;
-}
-
-/***
-reads or writes a
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1879-g27e0b6a
The branch, v3-2-test has been updated
via 27e0b6a1aa94294588b2c18ed7929edb0289e746 (commit)
via 390597c96c6ee6da249ea61eea574d434c168fbe (commit)
via 98d8482bae0c9500ab4a1f6c07acd327b894af66 (commit)
from 99d80ada6d72bea427cece3e759206eb067bc206 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 27e0b6a1aa94294588b2c18ed7929edb0289e746
Author: Günther Deschner [EMAIL PROTECTED]
Date: Mon Feb 4 23:44:11 2008 +0100
Remove unused marshalling for SAMR_ADD_ALIASMEM.
Guenther
commit 390597c96c6ee6da249ea61eea574d434c168fbe
Author: Günther Deschner [EMAIL PROTECTED]
Date: Mon Feb 4 23:42:05 2008 +0100
Use rpccli_samr_AddAliasMember() in net.
Guenther
commit 98d8482bae0c9500ab4a1f6c07acd327b894af66
Author: Günther Deschner [EMAIL PROTECTED]
Date: Mon Feb 4 23:40:19 2008 +0100
Use pidl for _samr_AddAliasMember().
Guenther
---
Summary of changes:
source/include/rpc_samr.h | 18
source/rpc_client/cli_samr.c| 31
source/rpc_parse/parse_samr.c | 59 ---
source/rpc_server/srv_samr.c| 23 +--
source/rpc_server/srv_samr_nt.c | 34 --
source/utils/net_rpc.c |4 ++-
6 files changed, 17 insertions(+), 152 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/include/rpc_samr.h b/source/include/rpc_samr.h
index 4cee736..57c7831 100644
--- a/source/include/rpc_samr.h
+++ b/source/include/rpc_samr.h
@@ -1407,24 +1407,6 @@ typedef struct r_samr_query_aliasmem_info
} SAMR_R_QUERY_ALIASMEM;
-/* SAMR_Q_ADD_ALIASMEM - add alias member */
-typedef struct q_samr_add_alias_mem_info
-{
- POLICY_HND alias_pol; /* policy handle */
-
- DOM_SID2 sid; /* member sid to be added to the alias */
-
-} SAMR_Q_ADD_ALIASMEM;
-
-
-/* SAMR_R_ADD_ALIASMEM - add alias member */
-typedef struct r_samr_add_alias_mem_info
-{
- NTSTATUS status; /* return status */
-
-} SAMR_R_ADD_ALIASMEM;
-
-
/* SAMR_ENC_PASSWD */
typedef struct enc_passwd_info
{
diff --git a/source/rpc_client/cli_samr.c b/source/rpc_client/cli_samr.c
index a1824a4..4f29397 100644
--- a/source/rpc_client/cli_samr.c
+++ b/source/rpc_client/cli_samr.c
@@ -574,37 +574,6 @@ NTSTATUS rpccli_samr_query_aliasmem(struct rpc_pipe_client
*cli,
return result;
}
-/* Add an alias member */
-
-NTSTATUS rpccli_samr_add_aliasmem(struct rpc_pipe_client *cli, TALLOC_CTX
*mem_ctx,
- POLICY_HND *alias_pol, DOM_SID *member)
-{
- prs_struct qbuf, rbuf;
- SAMR_Q_ADD_ALIASMEM q;
- SAMR_R_ADD_ALIASMEM r;
- NTSTATUS result;
-
- DEBUG(10,(cli_samr_add_aliasmem));
-
- ZERO_STRUCT(q);
- ZERO_STRUCT(r);
-
- /* Marshall data and send request */
-
- init_samr_q_add_aliasmem(q, alias_pol, member);
-
- CLI_DO_RPC(cli, mem_ctx, PI_SAMR, SAMR_ADD_ALIASMEM,
- q, r,
- qbuf, rbuf,
- samr_io_q_add_aliasmem,
- samr_io_r_add_aliasmem,
- NT_STATUS_UNSUCCESSFUL);
-
- result = r.status;
-
- return result;
-}
-
/* Query alias info */
NTSTATUS rpccli_samr_query_alias_info(struct rpc_pipe_client *cli, TALLOC_CTX
*mem_ctx,
diff --git a/source/rpc_parse/parse_samr.c b/source/rpc_parse/parse_samr.c
index aafb49e..fb3994a 100644
--- a/source/rpc_parse/parse_samr.c
+++ b/source/rpc_parse/parse_samr.c
@@ -3599,65 +3599,6 @@ bool samr_io_r_lookup_rids(const char *desc,
SAMR_R_LOOKUP_RIDS * r_u,
}
/***
-inits a SAMR_Q_ADD_ALIASMEM structure.
-/
-
-void init_samr_q_add_aliasmem(SAMR_Q_ADD_ALIASMEM * q_u, POLICY_HND *hnd,
- DOM_SID *sid)
-{
- DEBUG(5, (init_samr_q_add_aliasmem\n));
-
- q_u-alias_pol = *hnd;
- init_dom_sid2(q_u-sid, sid);
-}
-
-/***
-reads or writes a structure.
-/
-
-bool samr_io_q_add_aliasmem(const char *desc, SAMR_Q_ADD_ALIASMEM * q_u,
- prs_struct *ps, int depth)
-{
- if (q_u == NULL)
- return False;
-
- prs_debug(ps, depth, desc, samr_io_q_add_aliasmem);
- depth++;
-
- if(!prs_align(ps))
- return False;
-
- if(!smb_io_pol_hnd(alias_pol, q_u-alias_pol, ps, depth))
- return False;
- if(!smb_io_dom_sid2(sid , q_u-sid, ps, depth))
- return False;
-
- return True;
-}
-
-/***
-reads or writes a
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1876-g99d80ad
The branch, v3-2-test has been updated
via 99d80ada6d72bea427cece3e759206eb067bc206 (commit)
via b04bf5c1258e4695b8544aa02c894f9941375e0c (commit)
via 51f5bcfd39b169866a13bb5b7878f99dc2b89462 (commit)
from e1c79397fc5e1ffee80618150f7e4052e01323e8 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 99d80ada6d72bea427cece3e759206eb067bc206
Author: Günther Deschner [EMAIL PROTECTED]
Date: Mon Feb 4 23:31:08 2008 +0100
Remove unused marshalling for SAMR_DEL_ALIASMEM.
Guenther
commit b04bf5c1258e4695b8544aa02c894f9941375e0c
Author: Günther Deschner [EMAIL PROTECTED]
Date: Mon Feb 4 23:28:38 2008 +0100
Use rpccli_samr_DeleteAliasMember() in net.
Guenther
commit 51f5bcfd39b169866a13bb5b7878f99dc2b89462
Author: Günther Deschner [EMAIL PROTECTED]
Date: Mon Feb 4 23:27:22 2008 +0100
Use pidl for _samr_DeleteAliasMember().
Guenther
---
Summary of changes:
source/include/rpc_samr.h | 18
source/rpc_client/cli_samr.c| 31
source/rpc_parse/parse_samr.c | 59 ---
source/rpc_server/srv_samr.c| 23 +--
source/rpc_server/srv_samr_nt.c | 30 +++
source/utils/net_rpc.c |4 ++-
6 files changed, 15 insertions(+), 150 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/include/rpc_samr.h b/source/include/rpc_samr.h
index 5e3642d..4cee736 100644
--- a/source/include/rpc_samr.h
+++ b/source/include/rpc_samr.h
@@ -1425,24 +1425,6 @@ typedef struct r_samr_add_alias_mem_info
} SAMR_R_ADD_ALIASMEM;
-/* SAMR_Q_DEL_ALIASMEM - add an add alias member */
-typedef struct q_samr_del_alias_mem_info
-{
- POLICY_HND alias_pol; /* policy handle */
-
- DOM_SID2 sid; /* member sid to be added to alias */
-
-} SAMR_Q_DEL_ALIASMEM;
-
-
-/* SAMR_R_DEL_ALIASMEM - delete alias member */
-typedef struct r_samr_del_alias_mem_info
-{
- NTSTATUS status; /* return status */
-
-} SAMR_R_DEL_ALIASMEM;
-
-
/* SAMR_ENC_PASSWD */
typedef struct enc_passwd_info
{
diff --git a/source/rpc_client/cli_samr.c b/source/rpc_client/cli_samr.c
index a35b5dc..a1824a4 100644
--- a/source/rpc_client/cli_samr.c
+++ b/source/rpc_client/cli_samr.c
@@ -605,37 +605,6 @@ NTSTATUS rpccli_samr_add_aliasmem(struct rpc_pipe_client
*cli, TALLOC_CTX *mem_c
return result;
}
-/* Delete an alias member */
-
-NTSTATUS rpccli_samr_del_aliasmem(struct rpc_pipe_client *cli, TALLOC_CTX
*mem_ctx,
- POLICY_HND *alias_pol, DOM_SID *member)
-{
- prs_struct qbuf, rbuf;
- SAMR_Q_DEL_ALIASMEM q;
- SAMR_R_DEL_ALIASMEM r;
- NTSTATUS result;
-
- DEBUG(10,(cli_samr_del_aliasmem));
-
- ZERO_STRUCT(q);
- ZERO_STRUCT(r);
-
- /* Marshall data and send request */
-
- init_samr_q_del_aliasmem(q, alias_pol, member);
-
- CLI_DO_RPC(cli, mem_ctx, PI_SAMR, SAMR_DEL_ALIASMEM,
- q, r,
- qbuf, rbuf,
- samr_io_q_del_aliasmem,
- samr_io_r_del_aliasmem,
- NT_STATUS_UNSUCCESSFUL);
-
- result = r.status;
-
- return result;
-}
-
/* Query alias info */
NTSTATUS rpccli_samr_query_alias_info(struct rpc_pipe_client *cli, TALLOC_CTX
*mem_ctx,
diff --git a/source/rpc_parse/parse_samr.c b/source/rpc_parse/parse_samr.c
index 4e41d29..aafb49e 100644
--- a/source/rpc_parse/parse_samr.c
+++ b/source/rpc_parse/parse_samr.c
@@ -3658,65 +3658,6 @@ bool samr_io_r_add_aliasmem(const char *desc,
SAMR_R_ADD_ALIASMEM * r_u,
}
/***
-inits a SAMR_Q_DEL_ALIASMEM structure.
-/
-
-void init_samr_q_del_aliasmem(SAMR_Q_DEL_ALIASMEM * q_u, POLICY_HND *hnd,
- DOM_SID *sid)
-{
- DEBUG(5, (init_samr_q_del_aliasmem\n));
-
- q_u-alias_pol = *hnd;
- init_dom_sid2(q_u-sid, sid);
-}
-
-/***
-reads or writes a structure.
-/
-
-bool samr_io_q_del_aliasmem(const char *desc, SAMR_Q_DEL_ALIASMEM * q_u,
- prs_struct *ps, int depth)
-{
- if (q_u == NULL)
- return False;
-
- prs_debug(ps, depth, desc, samr_io_q_del_aliasmem);
- depth++;
-
- if(!prs_align(ps))
- return False;
-
- if(!smb_io_pol_hnd(alias_pol, q_u-alias_pol, ps, depth))
- return False;
- if(!smb_io_dom_sid2(sid , q_u-sid, ps, depth))
- return False;
-
- return True;
-}
-
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1871-g3442abd
The branch, v3-2-test has been updated
via 3442abd26d7c86f6abd9c3ca3593ac3b1170e826 (commit)
via 2b1bc8ab68a0ed8fb77030d421618cf4a664f5e3 (commit)
from 3a32082ef5bb0152545b391ce4cb8ca3a28939da (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 3442abd26d7c86f6abd9c3ca3593ac3b1170e826
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Feb 5 09:37:32 2008 +0100
Remove unused marshalling for SAMR_CONNECT.
Guenther
commit 2b1bc8ab68a0ed8fb77030d421618cf4a664f5e3
Author: Günther Deschner [EMAIL PROTECTED]
Date: Mon Feb 4 22:16:21 2008 +0100
Remove unused marshalling for SAMR_CONNECT.
Guenther
---
Summary of changes:
source/include/rpc_samr.h | 19 ---
source/nsswitch/wbinfo.c |2 +-
source/rpc_client/cli_samr.c | 37 -
source/rpc_parse/parse_samr.c | 71 -
4 files changed, 1 insertions(+), 128 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/include/rpc_samr.h b/source/include/rpc_samr.h
index 76e359a..45e9677 100644
--- a/source/include/rpc_samr.h
+++ b/source/include/rpc_samr.h
@@ -1469,25 +1469,6 @@ typedef struct r_samr_del_alias_mem_info
} SAMR_R_DEL_ALIASMEM;
-/* SAMR_Q_CONNECT - probably an open */
-typedef struct q_samr_connect_info
-{
- uint32 ptr_srv_name; /* pointer (to server name?) */
- UNISTR2 uni_srv_name;/* unicode server name starting with '\\'
*/
-
- uint32 access_mask;
-
-} SAMR_Q_CONNECT;
-
-
-/* SAMR_R_CONNECT - probably an open */
-typedef struct r_samr_connect_info
-{
- POLICY_HND connect_pol; /* policy handle */
- NTSTATUS status; /* return status */
-
-} SAMR_R_CONNECT;
-
/* SAMR_ENC_PASSWD */
typedef struct enc_passwd_info
{
diff --git a/source/nsswitch/wbinfo.c b/source/nsswitch/wbinfo.c
index 106163b..9d1a565 100644
--- a/source/nsswitch/wbinfo.c
+++ b/source/nsswitch/wbinfo.c
@@ -865,7 +865,7 @@ static bool wbinfo_auth(char *username)
wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
char *s = NULL;
char *p = NULL;
- char *password = NULL;
+ const char *password = NULL;
char *name = NULL;
if ((s = SMB_STRDUP(username)) == NULL) {
diff --git a/source/rpc_client/cli_samr.c b/source/rpc_client/cli_samr.c
index 9970c8d..a35b5dc 100644
--- a/source/rpc_client/cli_samr.c
+++ b/source/rpc_client/cli_samr.c
@@ -22,43 +22,6 @@
#include includes.h
-/* Connect to SAMR database */
-
-NTSTATUS rpccli_samr_connect(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
-uint32 access_mask, POLICY_HND *connect_pol)
-{
- prs_struct qbuf, rbuf;
- SAMR_Q_CONNECT q;
- SAMR_R_CONNECT r;
- NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-
- DEBUG(10,(cli_samr_connect to %s\n, cli-cli-desthost));
-
- ZERO_STRUCT(q);
- ZERO_STRUCT(r);
-
- /* Marshall data and send request */
-
- init_samr_q_connect(q, cli-cli-desthost, access_mask);
-
- CLI_DO_RPC(cli, mem_ctx, PI_SAMR, SAMR_CONNECT,
- q, r,
- qbuf, rbuf,
- samr_io_q_connect,
- samr_io_r_connect,
- 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 cb9ec5e..a1e7f63 100644
--- a/source/rpc_parse/parse_samr.c
+++ b/source/rpc_parse/parse_samr.c
@@ -5924,77 +5924,6 @@ bool samr_io_r_set_userinfo2(const char *desc,
SAMR_R_SET_USERINFO2 * r_u,
}
/***
-inits a SAMR_Q_CONNECT structure.
-/
-
-void init_samr_q_connect(SAMR_Q_CONNECT * q_u,
-char *srv_name, uint32 access_mask)
-{
- DEBUG(5, (init_samr_q_connect\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);
-
- /* example values: 0x 0002 */
- q_u-access_mask = access_mask;
-}
-
-/***
-reads or writes a structure.
-/
-
-bool samr_io_q_connect(const char *desc, SAMR_Q_CONNECT * q_u,
- prs_struct *ps, int depth)
-{
- if (q_u == NULL)
-
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1893-ga3d0450
The branch, v3-2-test has been updated via a3d0450e0a054bdb8997db544a7efc8aa67f074d (commit) from 4b068954671143a7c94884e169f1d0ba420dccb7 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit a3d0450e0a054bdb8997db544a7efc8aa67f074d Author: Volker Lendecke [EMAIL PROTECTED] Date: Tue Feb 5 10:34:00 2008 +0100 Fix bug 5421 -- thanks to MJ Anthony --- Summary of changes: source/rpcclient/cmd_spoolss.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/rpcclient/cmd_spoolss.c b/source/rpcclient/cmd_spoolss.c index b5282d2..e923302 100644 --- a/source/rpcclient/cmd_spoolss.c +++ b/source/rpcclient/cmd_spoolss.c @@ -1483,7 +1483,7 @@ static WERROR cmd_spoolss_setdriver(struct rpc_pipe_client *cli, goto done;; } - printf(Succesfully set %s to driver %s.\n, argv[1], argv[2]); + printf(Successfully set %s to driver %s.\n, argv[1], argv[2]); done: /* Cleanup */ -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-631-g16466b5
The branch, v4-0-test has been updated
via 16466b543bf8dd35bc79a030696f78598ca82f54 (commit)
from 7fc3669b9dc34514d8749d3941514fdae7d0f700 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -
commit 16466b543bf8dd35bc79a030696f78598ca82f54
Author: Kai Blin [EMAIL PROTECTED]
Date: Tue Feb 5 11:40:23 2008 +0100
sidmap: Some source code cleanups.
---
Summary of changes:
source/dsdb/common/sidmap.c | 22 --
1 files changed, 12 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/dsdb/common/sidmap.c b/source/dsdb/common/sidmap.c
index 5c17046..088dc6b 100644
--- a/source/dsdb/common/sidmap.c
+++ b/source/dsdb/common/sidmap.c
@@ -123,10 +123,10 @@ static NTSTATUS sidmap_primary_domain_sid(struct
sidmap_context *sidmap,
/*
map a sid to a unix uid
*/
-_PUBLIC_ NTSTATUS sidmap_sid_to_unixuid(struct sidmap_context *sidmap,
- struct dom_sid *sid, uid_t *uid)
+_PUBLIC_ NTSTATUS sidmap_sid_to_unixuid(struct sidmap_context *sidmap,
+ const struct dom_sid *sid, uid_t *uid)
{
- const char *attrs[] = { sAMAccountName, uidNumber,
+ const char *attrs[] = { sAMAccountName, uidNumber,
sAMAccountType, unixName, NULL };
int ret;
const char *s;
@@ -137,15 +137,17 @@ _PUBLIC_ NTSTATUS sidmap_sid_to_unixuid(struct
sidmap_context *sidmap,
tmp_ctx = talloc_new(sidmap);
- ret = gendb_search(sidmap-samctx, tmp_ctx, NULL, res, attrs,
- objectSid=%s, ldap_encode_ndr_dom_sid(tmp_ctx,
sid));
+ ret = gendb_search(sidmap-samctx, tmp_ctx, NULL, res, attrs,
+ objectSid=%s,
+ ldap_encode_ndr_dom_sid(tmp_ctx, sid));
+
if (ret != 1) {
goto allocated_sid;
}
/* make sure its a user, not a group */
if (!is_user_account(res[0])) {
- DEBUG(0,(sid_to_unixuid: sid %s is not an account!\n,
+ DEBUG(0,(sid_to_unixuid: sid %s is not an account!\n,
dom_sid_string(tmp_ctx, sid)));
talloc_free(tmp_ctx);
return NT_STATUS_INVALID_SID;
@@ -261,9 +263,9 @@ _PUBLIC_ bool sidmap_sid_is_group(struct sidmap_context
*sidmap, struct dom_sid
map a sid to a unix gid
*/
_PUBLIC_ NTSTATUS sidmap_sid_to_unixgid(struct sidmap_context *sidmap,
- struct dom_sid *sid, gid_t *gid)
+ const struct dom_sid *sid, gid_t *gid)
{
- const char *attrs[] = { sAMAccountName, gidNumber,
+ const char *attrs[] = { sAMAccountName, gidNumber,
unixName, sAMAccountType, NULL };
int ret;
const char *s;
@@ -355,7 +357,7 @@ allocated_sid:
*/
_PUBLIC_ NTSTATUS sidmap_uid_to_sid(struct sidmap_context *sidmap,
TALLOC_CTX *mem_ctx,
- uid_t uid, struct dom_sid **sid)
+ const uid_t uid, struct dom_sid **sid)
{
const char *attrs[] = { sAMAccountName, objectSid,
sAMAccountType, NULL };
int ret, i;
@@ -453,7 +455,7 @@ allocate_sid:
*/
_PUBLIC_ NTSTATUS sidmap_gid_to_sid(struct sidmap_context *sidmap,
TALLOC_CTX *mem_ctx,
- gid_t gid, struct dom_sid **sid)
+ const gid_t gid, struct dom_sid **sid)
{
const char *attrs[] = { sAMAccountName, objectSid,
sAMAccountType, NULL };
int ret, i;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1894-gefb6d24
The branch, v3-2-test has been updated
via efb6d24e97e489e44991091b10196b6ac582485b (commit)
from a3d0450e0a054bdb8997db544a7efc8aa67f074d (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit efb6d24e97e489e44991091b10196b6ac582485b
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Feb 5 12:54:19 2008 +0100
Remove trailing while space, just couldn't resist. No code change.
Guenther
---
Summary of changes:
source/rpc_server/srv_samr.c| 30 +-
source/rpc_server/srv_samr_nt.c | 652 +++---
2 files changed, 341 insertions(+), 341 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/rpc_server/srv_samr.c b/source/rpc_server/srv_samr.c
index d41d828..bc7fd0e 100644
--- a/source/rpc_server/srv_samr.c
+++ b/source/rpc_server/srv_samr.c
@@ -1,4 +1,4 @@
-/*
+/*
* Unix SMB/CIFS implementation.
* RPC Pipe client / server routines
* Copyright (C) Andrew Tridgell 1992-1997,
@@ -7,21 +7,21 @@
* Copyright (C) Marc Jacobsen1999,
* Copyright (C) Jean François Micouleau 1998-2001,
* Copyright (C) Jim McDonough [EMAIL PROTECTED] 2002-2003.
- *
- * Split into interface and implementation modules by,
+ *
+ * Split into interface and implementation modules by,
*
* Copyright (C) Jeremy Allison2001.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, see http://www.gnu.org/licenses/.
*/
@@ -173,7 +173,7 @@ static bool api_samr_enum_dom_aliases(pipes_struct *p)
SAMR_R_ENUM_DOM_ALIASES r_u;
prs_struct *data = p-in_data.data;
prs_struct *rdata = p-out_data.rdata;
-
+
ZERO_STRUCT(q_u);
ZERO_STRUCT(r_u);
@@ -251,7 +251,7 @@ static bool api_samr_query_aliasinfo(pipes_struct *p)
DEBUG(0,(api_samr_query_aliasinfo: unable to marshall
SAMR_R_QUERY_ALIASINFO.\n));
return False;
}
-
+
return True;
}
@@ -520,7 +520,7 @@ static bool api_samr_enum_domains(pipes_struct *p)
SAMR_R_ENUM_DOMAINS r_u;
prs_struct *data = p-in_data.data;
prs_struct *rdata = p-out_data.rdata;
-
+
ZERO_STRUCT(q_u);
ZERO_STRUCT(r_u);
@@ -535,7 +535,7 @@ static bool api_samr_enum_domains(pipes_struct *p)
DEBUG(0,(api_samr_enum_domains: Unable to marshall
SAMR_R_ENUM_DOMAINS.\n));
return False;
}
-
+
return True;
}
@@ -930,7 +930,7 @@ static struct api_struct api_samr_cmds [] =
{SAMR_CONNECT_ANON , SAMR_CONNECT_ANON ,
api_samr_connect_anon },
{SAMR_ENUM_DOMAINS , SAMR_ENUM_DOMAINS ,
api_samr_enum_domains },
{SAMR_ENUM_DOM_USERS, SAMR_ENUM_DOM_USERS ,
api_samr_enum_dom_users },
-
+
{SAMR_ENUM_DOM_GROUPS , SAMR_ENUM_DOM_GROUPS ,
api_samr_enum_dom_groups },
{SAMR_ENUM_DOM_ALIASES , SAMR_ENUM_DOM_ALIASES ,
api_samr_enum_dom_aliases },
{SAMR_QUERY_USERALIASES , SAMR_QUERY_USERALIASES,
api_samr_query_useraliases},
@@ -940,7 +940,7 @@ static struct api_struct api_samr_cmds [] =
{SAMR_DEL_ALIASMEM , SAMR_DEL_ALIASMEM ,
api_samr_del_aliasmem },
{SAMR_ADD_GROUPMEM , SAMR_ADD_GROUPMEM ,
api_samr_add_groupmem },
{SAMR_DEL_GROUPMEM , SAMR_DEL_GROUPMEM ,
api_samr_del_groupmem },
-
+
{SAMR_DELETE_DOM_USER , SAMR_DELETE_DOM_USER ,
api_samr_delete_dom_user },
{SAMR_DELETE_DOM_GROUP , SAMR_DELETE_DOM_GROUP ,
api_samr_delete_dom_group },
{SAMR_DELETE_DOM_ALIAS , SAMR_DELETE_DOM_ALIAS ,
api_samr_delete_dom_alias },
@@ -951,13 +951,13 @@ static struct api_struct api_samr_cmds [] =
{SAMR_QUERY_USERINFO, SAMR_QUERY_USERINFO ,
api_samr_query_userinfo },
{SAMR_SET_USERINFO , SAMR_SET_USERINFO ,
api_samr_set_userinfo },
{SAMR_SET_USERINFO2 , SAMR_SET_USERINFO2,
api_samr_set_userinfo2},
-
+
{SAMR_QUERY_DOMAIN_INFO , SAMR_QUERY_DOMAIN_INFO,
api_samr_query_domain_info},
{SAMR_QUERY_USERGROUPS , SAMR_QUERY_USERGROUPS ,
api_samr_query_usergroups },
{SAMR_QUERY_DISPINFO,
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1895-g5a9cb4c
The branch, v3-2-test has been updated
via 5a9cb4cda9ac71ca8b01d21201bf2348e7f3f24f (commit)
from efb6d24e97e489e44991091b10196b6ac582485b (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 5a9cb4cda9ac71ca8b01d21201bf2348e7f3f24f
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Tue Feb 5 13:21:46 2008 +0100
Augment the samr_Connect4 call
---
Summary of changes:
source/librpc/idl/samr.idl | 12 +---
1 files changed, 9 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/librpc/idl/samr.idl b/source/librpc/idl/samr.idl
index 92e4011..2242116 100644
--- a/source/librpc/idl/samr.idl
+++ b/source/librpc/idl/samr.idl
@@ -1229,10 +1229,16 @@ import misc.idl, lsa.idl, security.idl;
//
/* Function0x3e */
- /* Only value we've seen for unknown is 2, possibly an address type ?
*/
+
+ typedef enum {
+ SAMR_CONNECT_PRE_W2K= 1,
+ SAMR_CONNECT_W2K= 2,
+ SAMR_CONNECT_AFTER_W2K = 3
+ } samr_ConnectVersion;
+
NTSTATUS samr_Connect4(
[in,unique,string,charset(UTF16)] uint16 *system_name,
- [in] uint32 unknown,
+ [in] samr_ConnectVersion client_version,
[in] samr_ConnectAccessMask access_mask,
[out,ref] policy_handle *connect_handle
);
@@ -1265,7 +1271,7 @@ import misc.idl, lsa.idl, security.idl;
/* Function0x40 */
typedef struct {
- uint32 unknown1; /* w2k3 gives 3 */
+ samr_ConnectVersion client_version; /* w2k3 gives 3 */
uint32 unknown2; /* w2k3 gives 0 */
} samr_ConnectInfo1;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1901-g2e2b80b
The branch, v3-2-test has been updated
via 2e2b80bd03133dcf7a9c8a54f60eba7d07b7038a (commit)
via 91c48ae15bea2235f8170170c2964bb1bae016ac (commit)
via ab344dea9689ffc191110de0eca0d43b7221f7ee (commit)
via fc55433aeecac40af780d61b23c0b80c38190cab (commit)
via 48e74f77529ca8d75d99b1f415b9417ff0cf0679 (commit)
via 1793ed10df7f403b85a4e52c67cbfb277b23b30b (commit)
from 5a9cb4cda9ac71ca8b01d21201bf2348e7f3f24f (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 2e2b80bd03133dcf7a9c8a54f60eba7d07b7038a
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Feb 5 11:23:04 2008 +0100
Remove unused marshalling for SAMR_REMOVE_SID_FOREIGN_DOMAIN.
Guenther
commit 91c48ae15bea2235f8170170c2964bb1bae016ac
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Feb 5 11:21:07 2008 +0100
Use rpccli_samr_RemoveMemberFromForeignDomain() in net.
Guenther
commit ab344dea9689ffc191110de0eca0d43b7221f7ee
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Feb 5 11:16:58 2008 +0100
Use pidl for _samr_RemoveMemberFromForeignDomain().
Guenther
commit fc55433aeecac40af780d61b23c0b80c38190cab
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Feb 5 11:17:45 2008 +0100
Remove unused marshalling for SAMR_QUERY_USERALIASES.
Guenther
commit 48e74f77529ca8d75d99b1f415b9417ff0cf0679
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Feb 5 11:00:56 2008 +0100
Remove unused marshalling for SAMR_QUERY_GROUPMEM.
Guenther
commit 1793ed10df7f403b85a4e52c67cbfb277b23b30b
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Feb 5 10:58:37 2008 +0100
Use rpccli_samr_QueryGroupMember() all over the place.
Guenther
---
Summary of changes:
source/include/rpc_samr.h | 83 -
source/rpc_client/cli_samr.c| 126 -
source/rpc_parse/parse_samr.c | 374 ---
source/rpc_server/srv_samr.c| 23 +---
source/rpc_server/srv_samr_nt.c | 29 +--
source/rpcclient/cmd_samr.c | 17 +-
source/utils/net_rpc.c | 51 +++---
source/winbindd/winbindd_rpc.c | 10 +-
8 files changed, 55 insertions(+), 658 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/include/rpc_samr.h b/source/include/rpc_samr.h
index affd1f2..4ee2dae 100644
--- a/source/include/rpc_samr.h
+++ b/source/include/rpc_samr.h
@@ -1216,42 +1216,6 @@ typedef struct r_samr_query_user_info
/
-SAMR_Q_QUERY_USERALIASES - do a conversion from name to RID.
-
-the policy handle allocated by an samr open secret call is associated
-with a SID. this policy handle is what is queried here, *not* the SID
-itself. the response to the lookup rids is relative to this SID.
-*/
-/* SAMR_Q_QUERY_USERALIASES */
-typedef struct q_samr_query_useraliases_info
-{
- POLICY_HND pol; /* policy handle */
-
- uint32 num_sids1; /* number of rids being looked up */
- uint32 ptr;/* buffer pointer */
- uint32 num_sids2; /* number of rids being looked up */
-
- uint32 *ptr_sid; /* pointers to sids to be looked up */
- DOM_SID2 *sid; /* sids to be looked up. */
-
-} SAMR_Q_QUERY_USERALIASES;
-
-
-/* SAMR_R_QUERY_USERALIASES */
-typedef struct r_samr_query_useraliases_info
-{
- uint32 num_entries;
- uint32 ptr; /* undocumented buffer pointer */
-
- uint32 num_entries2;
- uint32 *rid; /* domain RIDs being looked up */
-
- NTSTATUS status; /* return code */
-
-} SAMR_R_QUERY_USERALIASES;
-
-
-/
SAMR_Q_LOOKUP_NAMES - do a conversion from Names to RIDs+types.
*/
/* SAMR_Q_LOOKUP_NAMES */
@@ -1335,34 +1299,6 @@ typedef struct r_samr_lookup_rids_info
} SAMR_R_LOOKUP_RIDS;
-/* SAMR_Q_QUERY_GROUPMEM - query group members */
-typedef struct q_samr_query_groupmem_info
-{
- POLICY_HND group_pol;/* policy handle */
-
-} SAMR_Q_QUERY_GROUPMEM;
-
-
-/* SAMR_R_QUERY_GROUPMEM - query group members */
-typedef struct r_samr_query_groupmem_info
-{
- uint32 ptr;
- uint32 num_entries;
-
- uint32 ptr_rids;
- uint32 ptr_attrs;
-
- uint32 num_rids;
- uint32 *rid;
-
- uint32 num_attrs;
- uint32 *attr;
-
- NTSTATUS status;
-
-} SAMR_R_QUERY_GROUPMEM;
-
-
/* SAMR_ENC_PASSWD */
typedef struct enc_passwd_info
{
@@ -1451,25 +1387,6 @@ typedef struct r_samr_chgpasswd_user3
} SAMR_R_CHGPASSWD_USER3;
-
-/* SAMR_Q_REMOVE_SID_FOREIGN_DOMAIN */
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1903-gc0ebdb5
The branch, v3-2-test has been updated
via c0ebdb555d0ef04d49bb88c312b52bd1b0398f82 (commit)
from 47dd4baae7f6c4f78ef058eabba9ac4e9d8151f5 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit c0ebdb555d0ef04d49bb88c312b52bd1b0398f82
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Feb 5 13:23:56 2008 +0100
Use SAMR_CONNECT_W2K for samr_Connect4 in rpcclient.
Guenther
---
Summary of changes:
source/rpcclient/cmd_samr.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/rpcclient/cmd_samr.c b/source/rpcclient/cmd_samr.c
index 4ea436d..332a67e 100644
--- a/source/rpcclient/cmd_samr.c
+++ b/source/rpcclient/cmd_samr.c
@@ -335,7 +335,7 @@ static NTSTATUS try_samr_connects(struct rpc_pipe_client
*cli, TALLOC_CTX *mem_c
result = rpccli_samr_Connect4(cli, mem_ctx,
cli-cli-desthost,
- 2, /* unknown */
+ SAMR_CONNECT_W2K,
access_mask,
connect_pol);
if (!NT_STATUS_IS_OK(result)) {
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1902-g47dd4ba
The branch, v3-2-test has been updated
via 47dd4baae7f6c4f78ef058eabba9ac4e9d8151f5 (commit)
from 2e2b80bd03133dcf7a9c8a54f60eba7d07b7038a (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 47dd4baae7f6c4f78ef058eabba9ac4e9d8151f5
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Feb 5 13:23:18 2008 +0100
Re-run make idl.
Guenther
---
Summary of changes:
source/librpc/gen_ndr/cli_samr.c |4 ++--
source/librpc/gen_ndr/cli_samr.h |2 +-
source/librpc/gen_ndr/ndr_samr.c | 38 --
source/librpc/gen_ndr/ndr_samr.h |1 +
source/librpc/gen_ndr/samr.h | 19 +--
5 files changed, 53 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/librpc/gen_ndr/cli_samr.c b/source/librpc/gen_ndr/cli_samr.c
index 627c448..cabb05f 100644
--- a/source/librpc/gen_ndr/cli_samr.c
+++ b/source/librpc/gen_ndr/cli_samr.c
@@ -2751,7 +2751,7 @@ NTSTATUS rpccli_samr_Connect3(struct rpc_pipe_client *cli,
NTSTATUS rpccli_samr_Connect4(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
const char *system_name,
- uint32_t unknown,
+ enum samr_ConnectVersion client_version,
uint32_t access_mask,
struct policy_handle *connect_handle)
{
@@ -2760,7 +2760,7 @@ NTSTATUS rpccli_samr_Connect4(struct rpc_pipe_client *cli,
/* In parameters */
r.in.system_name = system_name;
- r.in.unknown = unknown;
+ r.in.client_version = client_version;
r.in.access_mask = access_mask;
if (DEBUGLEVEL = 10) {
diff --git a/source/librpc/gen_ndr/cli_samr.h b/source/librpc/gen_ndr/cli_samr.h
index 86396be..a878b50 100644
--- a/source/librpc/gen_ndr/cli_samr.h
+++ b/source/librpc/gen_ndr/cli_samr.h
@@ -347,7 +347,7 @@ NTSTATUS rpccli_samr_Connect3(struct rpc_pipe_client *cli,
NTSTATUS rpccli_samr_Connect4(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
const char *system_name,
- uint32_t unknown,
+ enum samr_ConnectVersion client_version,
uint32_t access_mask,
struct policy_handle *connect_handle);
NTSTATUS rpccli_samr_ChangePasswordUser3(struct rpc_pipe_client *cli,
diff --git a/source/librpc/gen_ndr/ndr_samr.c b/source/librpc/gen_ndr/ndr_samr.c
index fbb6c64..300f8e0 100644
--- a/source/librpc/gen_ndr/ndr_samr.c
+++ b/source/librpc/gen_ndr/ndr_samr.c
@@ -4380,6 +4380,32 @@ _PUBLIC_ void ndr_print_samr_PwInfo(struct ndr_print
*ndr, const char *name, con
ndr-depth--;
}
+static enum ndr_err_code ndr_push_samr_ConnectVersion(struct ndr_push *ndr,
int ndr_flags, enum samr_ConnectVersion r)
+{
+ NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r));
+ return NDR_ERR_SUCCESS;
+}
+
+static enum ndr_err_code ndr_pull_samr_ConnectVersion(struct ndr_pull *ndr,
int ndr_flags, enum samr_ConnectVersion *r)
+{
+ uint16_t v;
+ NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, v));
+ *r = v;
+ return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ void ndr_print_samr_ConnectVersion(struct ndr_print *ndr, const char
*name, enum samr_ConnectVersion r)
+{
+ const char *val = NULL;
+
+ switch (r) {
+ case SAMR_CONNECT_PRE_W2K: val = SAMR_CONNECT_PRE_W2K; break;
+ case SAMR_CONNECT_W2K: val = SAMR_CONNECT_W2K; break;
+ case SAMR_CONNECT_AFTER_W2K: val = SAMR_CONNECT_AFTER_W2K;
break;
+ }
+ ndr_print_enum(ndr, name, ENUM, val, r);
+}
+
static enum ndr_err_code ndr_push_samr_ChangeReject(struct ndr_push *ndr, int
ndr_flags, const struct samr_ChangeReject *r)
{
if (ndr_flags NDR_SCALARS) {
@@ -4420,7 +4446,7 @@ static enum ndr_err_code
ndr_push_samr_ConnectInfo1(struct ndr_push *ndr, int nd
{
if (ndr_flags NDR_SCALARS) {
NDR_CHECK(ndr_push_align(ndr, 4));
- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r-unknown1));
+ NDR_CHECK(ndr_push_samr_ConnectVersion(ndr, NDR_SCALARS,
r-client_version));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r-unknown2));
}
if (ndr_flags NDR_BUFFERS) {
@@ -4432,7 +4458,7 @@ static enum ndr_err_code
ndr_pull_samr_ConnectInfo1(struct ndr_pull *ndr, int nd
{
if (ndr_flags NDR_SCALARS) {
NDR_CHECK(ndr_pull_align(ndr, 4));
- NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r-unknown1));
+ NDR_CHECK(ndr_pull_samr_ConnectVersion(ndr, NDR_SCALARS,
r-client_version));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS,
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1904-ga407feb
The branch, v3-2-test has been updated via a407feb65301408f91a346ca9c01c511f95556c9 (commit) from c0ebdb555d0ef04d49bb88c312b52bd1b0398f82 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit a407feb65301408f91a346ca9c01c511f95556c9 Author: Günther Deschner [EMAIL PROTECTED] Date: Tue Feb 5 13:38:48 2008 +0100 Fix _samr_Connect5(). Yes we do pretend to be w2k all the time :) Guenther --- Summary of changes: source/rpc_server/srv_samr_nt.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/rpc_server/srv_samr_nt.c b/source/rpc_server/srv_samr_nt.c index e321d75..ff50f5d 100644 --- a/source/rpc_server/srv_samr_nt.c +++ b/source/rpc_server/srv_samr_nt.c @@ -2837,7 +2837,7 @@ NTSTATUS _samr_Connect5(pipes_struct *p, DEBUG(5,(_samr_Connect5: %d\n, __LINE__)); - info1.unknown1 = 3; + info1.client_version = SAMR_CONNECT_AFTER_W2K; info1.unknown2 = 0; *r-out.level_out = 1; -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1906-g906e19b
The branch, v3-2-test has been updated via 906e19bad40ba0c0a473ec2601e9eb0fff169f83 (commit) via 3745e398b1cc4d1b76a7cb4ee9c998ff16b454b9 (commit) from a407feb65301408f91a346ca9c01c511f95556c9 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit 906e19bad40ba0c0a473ec2601e9eb0fff169f83 Author: Karolin Seeger [EMAIL PROTECTED] Date: Tue Feb 5 15:51:27 2008 +0100 Fix typo. Karolin commit 3745e398b1cc4d1b76a7cb4ee9c998ff16b454b9 Author: Karolin Seeger [EMAIL PROTECTED] Date: Tue Feb 5 15:32:14 2008 +0100 Fix typo. Karolin --- Summary of changes: source/auth/auth_sam.c |2 +- source/smbd/lanman.c |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source/auth/auth_sam.c b/source/auth/auth_sam.c index 1ab0c8b..66504a8 100644 --- a/source/auth/auth_sam.c +++ b/source/auth/auth_sam.c @@ -122,7 +122,7 @@ static bool logon_hours_ok(struct samu *sampass) } / - Do a specific test for a struct samu being vaild for this connection + Do a specific test for a struct samu being valid for this connection (ie not disabled, expired and the like). / diff --git a/source/smbd/lanman.c b/source/smbd/lanman.c index 5a6df1f..18e6bf9 100644 --- a/source/smbd/lanman.c +++ b/source/smbd/lanman.c @@ -3175,7 +3175,7 @@ static bool api_NetWkstaGetInfo(connection_struct *conn,uint16 vuid, where: - usri11_name specifies the user name for which information is retireved + usri11_name specifies the user name for which information is retrieved usri11_pad aligns the next data structure element to a word boundary -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1907-g24aa351
The branch, v3-2-test has been updated via 24aa3518aef7e36fde03d58f36487cbf29c027c9 (commit) from 906e19bad40ba0c0a473ec2601e9eb0fff169f83 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit 24aa3518aef7e36fde03d58f36487cbf29c027c9 Author: Volker Lendecke [EMAIL PROTECTED] Date: Tue Feb 5 22:17:20 2008 +0100 Fix a debug message --- Summary of changes: source/lib/util_sock.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/lib/util_sock.c b/source/lib/util_sock.c index 25d539c..71d48d6 100644 --- a/source/lib/util_sock.c +++ b/source/lib/util_sock.c @@ -1130,7 +1130,7 @@ NTSTATUS read_smb_length_return_keepalive(int fd, char *inbuf, DEBUG(5,(Got keepalive packet\n)); } - DEBUG(10,(got smb length of %lu\n,(unsigned long)len)); + DEBUG(10,(got smb length of %lu\n,(unsigned long)(*len))); return NT_STATUS_OK; } -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1908-gb3ac807
The branch, v3-2-test has been updated
via b3ac8073a23afbba19d045302aa0700197c58bd5 (commit)
from 24aa3518aef7e36fde03d58f36487cbf29c027c9 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit b3ac8073a23afbba19d045302aa0700197c58bd5
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Tue Feb 5 13:36:17 2008 -0800
Fix a couple of might be used uninitialized warnings.
Jeremy.
---
Summary of changes:
source/smbd/process.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/smbd/process.c b/source/smbd/process.c
index 2a64386..68bec78 100644
--- a/source/smbd/process.c
+++ b/source/smbd/process.c
@@ -324,7 +324,7 @@ static NTSTATUS receive_smb_talloc(TALLOC_CTX *mem_ctx,
int fd,
size_t *p_unread, bool *p_encrypted,
size_t *p_len)
{
- size_t len;
+ size_t len = 0;
NTSTATUS status;
*p_encrypted = false;
@@ -719,7 +719,7 @@ static NTSTATUS receive_message_or_smb(TALLOC_CTX *mem_ctx,
char **buffer,
int selrtn;
struct timeval to;
int maxfd = 0;
- size_t len;
+ size_t len = 0;
NTSTATUS status;
*p_unread = 0;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1909-ga769acc
The branch, v3-2-test has been updated via a769acc0ba72ddd751e70558e0c2d9b2e6d71164 (commit) from b3ac8073a23afbba19d045302aa0700197c58bd5 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit a769acc0ba72ddd751e70558e0c2d9b2e6d71164 Author: Jeremy Allison [EMAIL PROTECTED] Date: Tue Feb 5 13:44:22 2008 -0800 The krb5 locator should now be correctly able to handle IPV6, so (a) use the correct #ifdef (it's HAVE_IPV6, not HAVE_IPv6) and (b) don't deliberately terminate on an IPv6 address family. Jeremy. --- Summary of changes: source/nsswitch/winbind_krb5_locator.c |8 1 files changed, 4 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/source/nsswitch/winbind_krb5_locator.c b/source/nsswitch/winbind_krb5_locator.c index eef57ca..33a68f0 100644 --- a/source/nsswitch/winbind_krb5_locator.c +++ b/source/nsswitch/winbind_krb5_locator.c @@ -90,7 +90,7 @@ static const char *family_name(int family) return AF_UNSPEC; case AF_INET: return AF_INET; -#if defined(HAVE_IPv6) +#if defined(HAVE_IPV6) case AF_INET6: return AF_INET6; #endif @@ -137,9 +137,9 @@ static int smb_krb5_locator_lookup_sanity_check(enum locate_service_type svc, case AF_UNSPEC: case AF_INET: break; -#if defined(HAVE_IPv6) - case AF_INET6: /* not yet */ - return KRB5_PLUGIN_NO_HANDLE; +#if defined(HAVE_IPV6) + case AF_INET6: + break; #endif default: return EINVAL; -- Samba Shared Repository
svn commit: samba-docs r1234 - in trunk/manpages-3: .
Author: sfrench Date: 2008-02-05 21:45:56 + (Tue, 05 Feb 2008) New Revision: 1234 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=1234 Log: Man page updates for mount.cifs, including adding in the missing description for the mount option for the servernetbiosname Modified: trunk/manpages-3/mount.cifs.8.xml Changeset: Modified: trunk/manpages-3/mount.cifs.8.xml === --- trunk/manpages-3/mount.cifs.8.xml 2008-02-04 09:13:23 UTC (rev 1233) +++ trunk/manpages-3/mount.cifs.8.xml 2008-02-05 21:45:56 UTC (rev 1234) @@ -87,7 +87,7 @@ listitemparaspecifies the CIFS password. If this option is not given then the environment variable emphasisPASSWD/emphasis is used. If the password is not specified -directly or indirectly via an argument to mount emphasismount.cifs/emphasis will prompt +directly or indirectly via an argument to mount, emphasismount.cifs/emphasis will prompt for a password, unless the guest option is specified. /para @@ -124,18 +124,44 @@ listitemparasets the uid that will own all files on the mounted filesystem. It may be specified as either a username or a numeric uid. - This parameter is ignored when the target server supports - the CIFS Unix extensions./para/listitem + For mounts to servers which do support the CIFS Unix extensions, +such as a properly configured Samba server, the server provides +the uid, gid and mode so this parameter should not be +specified unless the server and client uid and gid +numbering differ. If the server and client are in the +same domain (e.g. running winbind or nss_ldap) and +the server supports the Unix Extensions then the uid +and gid can be retrieved from the server (and uid +and gid would not have to be specifed on the mount. +For servers which do not support the CIFS Unix +extensions, the default uid (and gid) returned on lookup +of existing files will be the uid (gid) of the person +who executed the mount (root, except when mount.cifs +is configured setuid for user mounts) unless the uid= +(gid) mount option is specified. For the uid (gid) of newly +created files and directories, ie files created since +the last mount of the server share, the expected uid +(gid) is cached as long as the inode remains in +memory on the client. Also note that permission +checks (authorization checks) on accesses to a file occur +at the server, but there are cases in which an administrator +may want to restrict at the client as well. For those +servers which do not report a uid/gid owner +(such as Windows), permissions can also be checked at the +client, and a crude form of client side permission checking +can be enabled by specifying file_mode and dir_mode on +the client. Note that the mount.cifs helper must be +at version 1.10 or higher to support specifying the uid +(or gid) in non-numeric form. + /para/listitem /varlistentry varlistentry termgid=replaceablearg/replaceable/term listitemparasets the gid that will own all files on -the mounted filesystem. -It may be specified as either a groupname or a numeric -gid. This parameter is ignored when the target server supports -the CIFS Unix extensions. +the mounted filesystem. It may be specified as either a groupname or a numeric +gid. For other considerations see the description of uid above. /para/listitem /varlistentry @@ -150,6 +176,21 @@ /varlistentry varlistentry +termservern=replaceablearg/replaceable/term + +listitempara + Specify the server netbios name (RFC1001 name) to use +when attempting to setup a session to the server. Although + rarely needed for mounting to newer servers, this option +is needed for mounting to some older servers (such +as OS/2 or Windows 98 and Windows ME) since when connecting + over port 139 they, unlike most newer servers, do not +support a default server name. A server name can be up +to 15 characters long and is usually uppercased. +/para/listitem +/varlistentry + +varlistentry termnetbiosname=replaceablearg/replaceable/term listitemparaWhen mounting to servers via port 139, specifies the RFC1001 @@ -175,7 +216,7 @@ varlistentry
Build status as of Wed Feb 6 00:00:02 2008
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2008-02-05 00:00:53.0 + +++ /home/build/master/cache/broken_results.txt 2008-02-06 00:00:26.0 + @@ -1,4 +1,4 @@ -Build status as of Tue Feb 5 00:00:01 2008 +Build status as of Wed Feb 6 00:00:02 2008 Build counts: Tree Total Broken Panic @@ -14,9 +14,9 @@ rsync30 13 0 samba-docs 0 0 0 samba-gtk4 4 0 -samba_3_2_test 30 17 0 -samba_4_0_test 28 25 6 +samba_3_2_test 30 16 0 +samba_4_0_test 28 25 2 smb-build28 3 0 -talloc 29 8 0 +talloc 30 8 0 tdb 30 18 0
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1910-g654484b
The branch, v3-2-test has been updated
via 654484b9a2d8d2be20f02d228d53a23936d1703b (commit)
from a769acc0ba72ddd751e70558e0c2d9b2e6d71164 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 654484b9a2d8d2be20f02d228d53a23936d1703b
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Tue Feb 5 16:51:46 2008 -0800
Small whitespace cleanup + check for null returns on talloc_strdup.
Jeremy.
---
Summary of changes:
source/winbindd/winbindd_async.c | 20
1 files changed, 12 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/winbindd/winbindd_async.c b/source/winbindd/winbindd_async.c
index ab32ee0..2ff5ef2 100644
--- a/source/winbindd/winbindd_async.c
+++ b/source/winbindd/winbindd_async.c
@@ -283,9 +283,8 @@ static void lookupname_recv2(TALLOC_CTX *mem_ctx, bool
success,
enum lsa_SidType type) =
(void (*)(void *, bool, const DOM_SID *, enum lsa_SidType))c;
DOM_SID sid;
- struct lookupname_state *s = talloc_get_type_abort( private_data,
+ struct lookupname_state *s = talloc_get_type_abort( private_data,
struct
lookupname_state );
-
if (!success) {
DEBUG(5, (Could not trigger lookup_name\n));
@@ -311,7 +310,7 @@ static void lookupname_recv2(TALLOC_CTX *mem_ctx, bool
success,
}
/
- This is the first callback after contacting our own domain
+ This is the first callback after contacting our own domain
/
static void lookupname_recv(TALLOC_CTX *mem_ctx, bool success,
@@ -322,7 +321,7 @@ static void lookupname_recv(TALLOC_CTX *mem_ctx, bool
success,
enum lsa_SidType type) =
(void (*)(void *, bool, const DOM_SID *, enum lsa_SidType))c;
DOM_SID sid;
- struct lookupname_state *s = talloc_get_type_abort( private_data,
+ struct lookupname_state *s = talloc_get_type_abort( private_data,
struct
lookupname_state );
if (!success) {
@@ -334,8 +333,8 @@ static void lookupname_recv(TALLOC_CTX *mem_ctx, bool
success,
if (response-result != WINBINDD_OK) {
/* Try again using the forest root */
struct winbindd_domain *root_domain = find_root_domain();
- struct winbindd_request request;
-
+ struct winbindd_request request;
+
if ( !root_domain ) {
DEBUG(5,(lookupname_recv: unable to determine forest
root\n));
cont(s-caller_private_data, False, NULL,
SID_NAME_UNKNOWN);
@@ -346,7 +345,7 @@ static void lookupname_recv(TALLOC_CTX *mem_ctx, bool
success,
request.cmd = WINBINDD_LOOKUPNAME;
fstrcpy( request.data.name.dom_name, s-dom_name );
- fstrcpy( request.data.name.name, s-name );
+ fstrcpy( request.data.name.name, s-name );
do_async_domain(mem_ctx, root_domain, request,
lookupname_recv2,
(void *)cont, s);
@@ -381,7 +380,7 @@ void winbindd_lookupname_async(TALLOC_CTX *mem_ctx,
{
struct winbindd_request request;
struct winbindd_domain *domain;
- struct lookupname_state *s;
+ struct lookupname_state *s;
if ( (domain = find_lookup_domain_from_name(dom_name)) == NULL ) {
DEBUG(5, (Could not find domain for name '%s'\n, dom_name));
@@ -403,6 +402,11 @@ void winbindd_lookupname_async(TALLOC_CTX *mem_ctx,
s-dom_name = talloc_strdup( s, dom_name );
s-name = talloc_strdup( s, name );
+ if (!s-dom_name || !s-name) {
+ cont(private_data, False, NULL, SID_NAME_UNKNOWN);
+ return;
+ }
+
s-caller_private_data = private_data;
do_async_domain(mem_ctx, domain, request, lookupname_recv,
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1913-gbc047ee
The branch, v3-2-test has been updated
via bc047ee520ef9c74cb0c5a3b6b6877b4ed7fd62b (commit)
via 383e2861f5cf8965ce728b990a027b7601eb56ac (commit)
via 977ceff259d14b9a536d60cc9347356dcd3dcc73 (commit)
from 654484b9a2d8d2be20f02d228d53a23936d1703b (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit bc047ee520ef9c74cb0c5a3b6b6877b4ed7fd62b
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Feb 5 14:42:01 2008 +0100
Re-run make idl.
Guenther
commit 383e2861f5cf8965ce728b990a027b7601eb56ac
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Feb 5 14:40:54 2008 +0100
Fix IDL for samr_QueryDomainInfo and samr_QueryDomainInfo2.
Guenther
commit 977ceff259d14b9a536d60cc9347356dcd3dcc73
Author: Günther Deschner [EMAIL PROTECTED]
Date: Mon Feb 4 23:13:31 2008 +0100
Remove unused headers for SAMR_SET_SEC_OBJ.
Guenther
---
Summary of changes:
source/include/rpc_samr.h| 21 --
source/librpc/gen_ndr/cli_samr.c |4 +-
source/librpc/gen_ndr/cli_samr.h |4 +-
source/librpc/gen_ndr/ndr_samr.c | 56 +
source/librpc/gen_ndr/samr.h |4 +-
source/librpc/gen_ndr/srv_samr.c |4 +-
source/librpc/idl/samr.idl |4 +-
7 files changed, 54 insertions(+), 43 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/include/rpc_samr.h b/source/include/rpc_samr.h
index 4ee2dae..6c0639b 100644
--- a/source/include/rpc_samr.h
+++ b/source/include/rpc_samr.h
@@ -446,27 +446,6 @@ typedef struct sam_user_info_9
/
-SAMR_Q_SET_SEC_OBJ - info level 4.
-*/
-
-/* SAMR_Q_SET_SEC_OBJ - */
-typedef struct q_samr_set_sec_obj_info
-{
- POLICY_HND pol; /* policy handle */
- uint32 sec_info; /* _SECURITY_INFORMATION 0x 0004 */
- SEC_DESC_BUF *buf;
-
-} SAMR_Q_SET_SEC_OBJ;
-
-/* SAMR_R_SET_SEC_OBJ - */
-typedef struct r_samr_set_sec_obj_info
-{
- NTSTATUS status; /* return status */
-
-} SAMR_R_SET_SEC_OBJ;
-
-
-/
SAMR_Q_QUERY_DOMAIN_INFO - probably a query on domain group info.
*/
diff --git a/source/librpc/gen_ndr/cli_samr.c b/source/librpc/gen_ndr/cli_samr.c
index cabb05f..a0441fc 100644
--- a/source/librpc/gen_ndr/cli_samr.c
+++ b/source/librpc/gen_ndr/cli_samr.c
@@ -354,7 +354,7 @@ NTSTATUS rpccli_samr_QueryDomainInfo(struct rpc_pipe_client
*cli,
TALLOC_CTX *mem_ctx,
struct policy_handle *domain_handle,
uint16_t level,
-union samr_DomainInfo *info)
+union samr_DomainInfo **info)
{
struct samr_QueryDomainInfo r;
NTSTATUS status;
@@ -2028,7 +2028,7 @@ NTSTATUS rpccli_samr_QueryDomainInfo2(struct
rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
struct policy_handle *domain_handle,
uint16_t level,
- union samr_DomainInfo *info)
+ union samr_DomainInfo **info)
{
struct samr_QueryDomainInfo2 r;
NTSTATUS status;
diff --git a/source/librpc/gen_ndr/cli_samr.h b/source/librpc/gen_ndr/cli_samr.h
index a878b50..52e6b13 100644
--- a/source/librpc/gen_ndr/cli_samr.h
+++ b/source/librpc/gen_ndr/cli_samr.h
@@ -44,7 +44,7 @@ NTSTATUS rpccli_samr_QueryDomainInfo(struct rpc_pipe_client
*cli,
TALLOC_CTX *mem_ctx,
struct policy_handle *domain_handle,
uint16_t level,
-union samr_DomainInfo *info);
+union samr_DomainInfo **info);
NTSTATUS rpccli_samr_SetDomainInfo(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
struct policy_handle *domain_handle,
@@ -250,7 +250,7 @@ NTSTATUS rpccli_samr_QueryDomainInfo2(struct
rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
struct policy_handle *domain_handle,
uint16_t level,
- union samr_DomainInfo *info);
+ union samr_DomainInfo **info);
NTSTATUS rpccli_samr_QueryUserInfo2(struct rpc_pipe_client
[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-28-120-g55c7aaf
The branch, v3-0-test has been updated
via 55c7aaff897cde9dc9a40a07c96297a232539e81 (commit)
from d15d99da3a1a6bcb1be196de0a193b75151006e9 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test
- Log -
commit 55c7aaff897cde9dc9a40a07c96297a232539e81
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Tue Feb 5 17:06:25 2008 -0800
Back-ported fix from 3.2 (mainly from Bo Yang [EMAIL PROTECTED])
to fix bad private_data pointer in winbindd_lookupname_async().
Jeremy.
---
Summary of changes:
source/nsswitch/winbindd_async.c | 57 +
1 files changed, 38 insertions(+), 19 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/nsswitch/winbindd_async.c b/source/nsswitch/winbindd_async.c
index 32d4e66..ad136bd 100644
--- a/source/nsswitch/winbindd_async.c
+++ b/source/nsswitch/winbindd_async.c
@@ -782,6 +782,12 @@ enum winbindd_result winbindd_dual_lookupsid(struct
winbindd_domain *domain,
This is the second callback after contacting the forest root
/
+struct lookupname_state {
+ char *dom_name;
+ char *name;
+ void *caller_private_data;
+};
+
static void lookupname_recv2(TALLOC_CTX *mem_ctx, BOOL success,
struct winbindd_response *response,
void *c, void *private_data)
@@ -790,27 +796,28 @@ static void lookupname_recv2(TALLOC_CTX *mem_ctx, BOOL
success,
enum lsa_SidType type) =
(void (*)(void *, BOOL, const DOM_SID *, enum lsa_SidType))c;
DOM_SID sid;
+ struct lookupname_state *s = talloc_get_type_abort(private_data, struct
lookupname_state);
if (!success) {
DEBUG(5, (Could not trigger lookup_name\n));
- cont(private_data, False, NULL, SID_NAME_UNKNOWN);
+ cont(s-caller_private_data, False, NULL, SID_NAME_UNKNOWN);
return;
}
if (response-result != WINBINDD_OK) {
DEBUG(5, (lookup_name returned an error\n));
- cont(private_data, False, NULL, SID_NAME_UNKNOWN);
+ cont(s-caller_private_data, False, NULL, SID_NAME_UNKNOWN);
return;
}
if (!string_to_sid(sid, response-data.sid.sid)) {
DEBUG(0, (Could not convert string %s to sid\n,
response-data.sid.sid));
- cont(private_data, False, NULL, SID_NAME_UNKNOWN);
+ cont(s-caller_private_data, False, NULL, SID_NAME_UNKNOWN);
return;
}
- cont(private_data, True, sid,
+ cont(s-caller_private_data, True, sid,
(enum lsa_SidType)response-data.sid.type);
}
@@ -826,36 +833,32 @@ static void lookupname_recv(TALLOC_CTX *mem_ctx, BOOL
success,
enum lsa_SidType type) =
(void (*)(void *, BOOL, const DOM_SID *, enum lsa_SidType))c;
DOM_SID sid;
+ struct lookupname_state *s = talloc_get_type_abort(private_data, struct
lookupname_state);
if (!success) {
DEBUG(5, (lookupname_recv: lookup_name() failed!\n));
- cont(private_data, False, NULL, SID_NAME_UNKNOWN);
+ cont(s-caller_private_data, False, NULL, SID_NAME_UNKNOWN);
return;
}
if (response-result != WINBINDD_OK) {
/* Try again using the forest root */
struct winbindd_domain *root_domain = find_root_domain();
- struct winbindd_cli_state *state = (struct
winbindd_cli_state*)private_data;
- struct winbindd_request request;
- char *name_domain, *name_account;
-
+ struct winbindd_request request;
+
if ( !root_domain ) {
DEBUG(5,(lookupname_recv: unable to determine forest
root\n));
- cont(private_data, False, NULL, SID_NAME_UNKNOWN);
+ cont(s-caller_private_data, False, NULL,
SID_NAME_UNKNOWN);
return;
}
- name_domain = state-request.data.name.dom_name;
- name_account = state-request.data.name.name;
-
ZERO_STRUCT(request);
request.cmd = WINBINDD_LOOKUPNAME;
- fstrcpy(request.data.name.dom_name, name_domain);
- fstrcpy(request.data.name.name, name_account);
+ fstrcpy(request.data.name.dom_name, s-dom_name);
+ fstrcpy(request.data.name.name, s-name);
do_async_domain(mem_ctx, root_domain, request,
lookupname_recv2,
- (void *)cont, private_data);
+
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1916-gd4dc278
The branch, v3-2-test has been updated
via d4dc2781add71712705f4f244e8896683b701e77 (commit)
from 1ac767b0d8b42d2f804b0a7e93e5e859f9c25aae (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit d4dc2781add71712705f4f244e8896683b701e77
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Feb 5 15:06:46 2008 +0100
Remove unused marshalling for SAMR_QUERY_DOMAIN_INFO2.
Guenther
---
Summary of changes:
source/include/rpc_samr.h | 18 -
source/rpc_client/cli_samr.c | 42
source/rpc_parse/parse_samr.c | 147 -
3 files changed, 0 insertions(+), 207 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/include/rpc_samr.h b/source/include/rpc_samr.h
index 6c0639b..1b95b23 100644
--- a/source/include/rpc_samr.h
+++ b/source/include/rpc_samr.h
@@ -1380,24 +1380,6 @@ typedef struct sid_info_3
} DOM_SID3;
-/* SAMR_Q_QUERY_DOMAIN_INFO2 */
-typedef struct q_samr_query_domain_info2
-{
- POLICY_HND domain_pol; /* policy handle */
- uint16 switch_value;
-
-} SAMR_Q_QUERY_DOMAIN_INFO2;
-
-/* SAMR_R_QUERY_DOMAIN_INFO2 */
-typedef struct r_samr_query_domain_info2
-{
- uint32 ptr_0;
- uint16 switch_value;
- SAM_UNK_CTR *ctr;
- NTSTATUS status; /* return status */
-
-} SAMR_R_QUERY_DOMAIN_INFO2;
-
/* SAMR_Q_SET_DOMAIN_INFO */
typedef struct q_samr_set_domain_info
{
diff --git a/source/rpc_client/cli_samr.c b/source/rpc_client/cli_samr.c
index 21e44e0..d9427e3 100644
--- a/source/rpc_client/cli_samr.c
+++ b/source/rpc_client/cli_samr.c
@@ -509,48 +509,6 @@ NTSTATUS rpccli_samr_query_dom_info(struct rpc_pipe_client
*cli,
return result;
}
-/* Query domain info2 */
-
-NTSTATUS rpccli_samr_query_dom_info2(struct rpc_pipe_client *cli,
-TALLOC_CTX *mem_ctx,
-POLICY_HND *domain_pol,
-uint16 switch_value,
-SAM_UNK_CTR *ctr)
-{
- prs_struct qbuf, rbuf;
- SAMR_Q_QUERY_DOMAIN_INFO2 q;
- SAMR_R_QUERY_DOMAIN_INFO2 r;
- NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-
- DEBUG(10,(cli_samr_query_dom_info2\n));
-
- ZERO_STRUCT(q);
- ZERO_STRUCT(r);
-
- /* Marshall data and send request */
-
- init_samr_q_query_domain_info2(q, domain_pol, switch_value);
-
- r.ctr = ctr;
-
- CLI_DO_RPC(cli, mem_ctx, PI_SAMR, SAMR_QUERY_DOMAIN_INFO2,
- q, r,
- qbuf, rbuf,
- samr_io_q_query_domain_info2,
- samr_io_r_query_domain_info2,
- NT_STATUS_UNSUCCESSFUL);
-
- /* Return output parameters */
-
- if (!NT_STATUS_IS_OK(result = r.status)) {
- goto done;
- }
-
- done:
-
- return result;
-}
-
/* Set domain info */
NTSTATUS rpccli_samr_set_domain_info(struct rpc_pipe_client *cli,
diff --git a/source/rpc_parse/parse_samr.c b/source/rpc_parse/parse_samr.c
index da7f04a..9947f58 100644
--- a/source/rpc_parse/parse_samr.c
+++ b/source/rpc_parse/parse_samr.c
@@ -5652,153 +5652,6 @@ bool samr_io_r_chgpasswd_user3(const char *desc,
SAMR_R_CHGPASSWD_USER3 *r_u,
reads or writes a structure.
/
-void init_samr_q_query_domain_info2(SAMR_Q_QUERY_DOMAIN_INFO2 *q_u,
- POLICY_HND *domain_pol, uint16 switch_value)
-{
- DEBUG(5, (init_samr_q_query_domain_info2\n));
-
- q_u-domain_pol = *domain_pol;
- q_u-switch_value = switch_value;
-}
-
-/***
-reads or writes a structure.
-/
-
-bool samr_io_q_query_domain_info2(const char *desc, SAMR_Q_QUERY_DOMAIN_INFO2
*q_u,
- prs_struct *ps, int depth)
-{
- if (q_u == NULL)
- return False;
-
- prs_debug(ps, depth, desc, samr_io_q_query_domain_info2);
- depth++;
-
- if(!prs_align(ps))
- return False;
-
- if(!smb_io_pol_hnd(domain_pol, q_u-domain_pol, ps, depth))
- return False;
-
- if(!prs_uint16(switch_value, ps, depth, q_u-switch_value))
- return False;
-
- return True;
-}
-
-/***
-inits a SAMR_R_QUERY_DOMAIN_INFO structure.
-/
-
-void init_samr_r_query_domain_info2(SAMR_R_QUERY_DOMAIN_INFO2 * r_u,
- uint16 switch_value, SAM_UNK_CTR * ctr,
- NTSTATUS status)
-{
- DEBUG(5, (init_samr_r_query_domain_info2\n));
-
-
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1918-ged16b2f
The branch, v3-2-test has been updated
via ed16b2f63b532a7b1a3c227a6045326a2e57a344 (commit)
via 370973c101a59546bb50dcc82ae4419da2119279 (commit)
from d4dc2781add71712705f4f244e8896683b701e77 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit ed16b2f63b532a7b1a3c227a6045326a2e57a344
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Feb 5 15:54:52 2008 +0100
Use rpccli_samr_QueryDomainInfo() in rpcclient.
Guenther
commit 370973c101a59546bb50dcc82ae4419da2119279
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Feb 5 15:08:31 2008 +0100
Use pidl for _samr_SetDomainInfo().
Guenther
---
Summary of changes:
source/rpc_server/srv_samr.c| 23 +---
source/rpc_server/srv_samr_nt.c | 50 +-
source/rpcclient/cmd_samr.c | 132 ++
3 files changed, 82 insertions(+), 123 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/rpc_server/srv_samr.c b/source/rpc_server/srv_samr.c
index 2508ed4..1d6c1a3 100644
--- a/source/rpc_server/srv_samr.c
+++ b/source/rpc_server/srv_samr.c
@@ -832,28 +832,7 @@ static bool api_samr_query_domain_info2(pipes_struct *p)
static bool api_samr_set_dom_info(pipes_struct *p)
{
- SAMR_Q_SET_DOMAIN_INFO q_u;
- SAMR_R_SET_DOMAIN_INFO r_u;
- prs_struct *data = p-in_data.data;
- prs_struct *rdata = p-out_data.rdata;
-
- ZERO_STRUCT(q_u);
- ZERO_STRUCT(r_u);
-
- if(!samr_io_q_set_domain_info(, q_u, data, 0)) {
- DEBUG(0,(api_samr_set_dom_info: unable to unmarshall
SAMR_Q_SET_DOMAIN_INFO.\n));
- return False;
- }
-
- r_u.status = _samr_set_dom_info(p, q_u, r_u);
-
- /* store the response in the SMB stream */
- if(!samr_io_r_set_domain_info(, r_u, rdata, 0)) {
- DEBUG(0,(api_samr_set_dom_info: unable to marshall
SAMR_R_SET_DOMAIN_INFO.\n));
- return False;
- }
-
- return True;
+ return proxy_samr_call(p, NDR_SAMR_SETDOMAININFO);
}
/***
diff --git a/source/rpc_server/srv_samr_nt.c b/source/rpc_server/srv_samr_nt.c
index 16b7064..652f66c 100644
--- a/source/rpc_server/srv_samr_nt.c
+++ b/source/rpc_server/srv_samr_nt.c
@@ -5045,40 +5045,38 @@ NTSTATUS _samr_QueryDomainInfo2(pipes_struct *p,
}
/***
- _samr_set_dom_info
+ _samr_SetDomainInfo
/
-NTSTATUS _samr_set_dom_info(pipes_struct *p, SAMR_Q_SET_DOMAIN_INFO *q_u,
SAMR_R_SET_DOMAIN_INFO *r_u)
+NTSTATUS _samr_SetDomainInfo(pipes_struct *p,
+struct samr_SetDomainInfo *r)
{
time_t u_expire, u_min_age;
time_t u_logout;
time_t u_lock_duration, u_reset_time;
- r_u-status = NT_STATUS_OK;
-
- DEBUG(5,(_samr_set_dom_info: %d\n, __LINE__));
+ DEBUG(5,(_samr_SetDomainInfo: %d\n, __LINE__));
/* find the policy handle. open a policy on it. */
- if (!find_policy_by_hnd(p, q_u-domain_pol, NULL))
+ if (!find_policy_by_hnd(p, r-in.domain_handle, NULL))
return NT_STATUS_INVALID_HANDLE;
- DEBUG(5,(_samr_set_dom_info: switch_value: %d\n, q_u-switch_value));
+ DEBUG(5,(_samr_SetDomainInfo: level: %d\n, r-in.level));
- switch (q_u-switch_value) {
+ switch (r-in.level) {
case 0x01:
-
u_expire=nt_time_to_unix_abs(q_u-ctr-info.inf1.expire);
-
u_min_age=nt_time_to_unix_abs(q_u-ctr-info.inf1.min_passwordage);
-
- pdb_set_account_policy(AP_MIN_PASSWORD_LEN,
(uint32)q_u-ctr-info.inf1.min_length_password);
- pdb_set_account_policy(AP_PASSWORD_HISTORY,
(uint32)q_u-ctr-info.inf1.password_history);
- pdb_set_account_policy(AP_USER_MUST_LOGON_TO_CHG_PASS,
(uint32)q_u-ctr-info.inf1.password_properties);
+ u_expire=nt_time_to_unix_abs((NTTIME
*)r-in.info-info1.max_password_age);
+ u_min_age=nt_time_to_unix_abs((NTTIME
*)r-in.info-info1.min_password_age);
+ pdb_set_account_policy(AP_MIN_PASSWORD_LEN,
(uint32)r-in.info-info1.min_password_length);
+ pdb_set_account_policy(AP_PASSWORD_HISTORY,
(uint32)r-in.info-info1.password_history_length);
+ pdb_set_account_policy(AP_USER_MUST_LOGON_TO_CHG_PASS,
(uint32)r-in.info-info1.password_properties);
pdb_set_account_policy(AP_MAX_PASSWORD_AGE,
(int)u_expire);
pdb_set_account_policy(AP_MIN_PASSWORD_AGE,
(int)u_min_age);
break;
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1920-g65e978e
The branch, v3-2-test has been updated
via 65e978eacc30e6c400c8b76ba5f861883ff1c16a (commit)
via 82073db9f717249ccf108b238ed64170163fc4a7 (commit)
from ed16b2f63b532a7b1a3c227a6045326a2e57a344 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 65e978eacc30e6c400c8b76ba5f861883ff1c16a
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Feb 5 15:56:05 2008 +0100
Use rpccli_samr_QueryDomainInfo() in net_rpc_sh_acct.c.
Guenther
commit 82073db9f717249ccf108b238ed64170163fc4a7
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Feb 5 15:55:11 2008 +0100
Use rpccli_samr_QueryDomainInfo() in net rpc.
Guenther
---
Summary of changes:
source/utils/net_rpc.c | 22 +++---
source/utils/net_rpc_sh_acct.c | 144 +++-
2 files changed, 94 insertions(+), 72 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/utils/net_rpc.c b/source/utils/net_rpc.c
index 2d4302f..a1e093a 100644
--- a/source/utils/net_rpc.c
+++ b/source/utils/net_rpc.c
@@ -445,7 +445,7 @@ NTSTATUS rpc_info_internals(const DOM_SID *domain_sid,
{
POLICY_HND connect_pol, domain_pol;
NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
- SAM_UNK_CTR ctr;
+ union samr_DomainInfo *info = NULL;
fstring sid_str;
sid_to_fstring(sid_str, domain_sid);
@@ -471,18 +471,18 @@ NTSTATUS rpc_info_internals(const DOM_SID *domain_sid,
goto done;
}
- ZERO_STRUCT(ctr);
- result = rpccli_samr_query_dom_info(pipe_hnd, mem_ctx, domain_pol,
-2, ctr);
+ result = rpccli_samr_QueryDomainInfo(pipe_hnd, mem_ctx,
+domain_pol,
+2,
+info);
if (NT_STATUS_IS_OK(result)) {
- TALLOC_CTX *ctx = talloc_init(rpc_info_internals);
- d_printf(Domain Name: %s\n, unistr2_to_ascii_talloc(ctx,
ctr.info.inf2.uni_domain));
+ d_printf(Domain Name: %s\n, info-info2.domain_name.string);
d_printf(Domain SID: %s\n, sid_str);
- d_printf(Sequence number: %llu\n, (unsigned long
long)ctr.info.inf2.seq_num);
- d_printf(Num users: %u\n, ctr.info.inf2.num_domain_usrs);
- d_printf(Num domain groups: %u\n,
ctr.info.inf2.num_domain_grps);
- d_printf(Num local groups: %u\n,
ctr.info.inf2.num_local_grps);
- talloc_destroy(ctx);
+ d_printf(Sequence number: %llu\n,
+ (unsigned long long)info-info2.sequence_num);
+ d_printf(Num users: %u\n, info-info2.num_users);
+ d_printf(Num domain groups: %u\n, info-info2.num_groups);
+ d_printf(Num local groups: %u\n, info-info2.num_aliases);
}
done:
diff --git a/source/utils/net_rpc_sh_acct.c b/source/utils/net_rpc_sh_acct.c
index 5d5f7ad..57640ca 100644
--- a/source/utils/net_rpc_sh_acct.c
+++ b/source/utils/net_rpc_sh_acct.c
@@ -31,14 +31,16 @@ static NTSTATUS rpc_sh_acct_do(TALLOC_CTX *mem_ctx,
int argc, const char **argv,
int (*fn)(TALLOC_CTX *mem_ctx,
struct rpc_sh_ctx *ctx,
- SAM_UNK_INFO_1 *i1,
- SAM_UNK_INFO_3 *i3,
- SAM_UNK_INFO_12 *i12,
+ struct samr_DomInfo1 *i1,
+ struct samr_DomInfo3 *i3,
+ struct samr_DomInfo12 *i12,
int argc, const char **argv))
{
POLICY_HND connect_pol, domain_pol;
NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
- SAM_UNK_CTR ctr1, ctr3, ctr12;
+ union samr_DomainInfo *info1 = NULL;
+ union samr_DomainInfo *info3 = NULL;
+ union samr_DomainInfo *info12 = NULL;
int store;
ZERO_STRUCT(connect_pol);
@@ -65,8 +67,10 @@ static NTSTATUS rpc_sh_acct_do(TALLOC_CTX *mem_ctx,
goto done;
}
- result = rpccli_samr_query_dom_info(pipe_hnd, mem_ctx, domain_pol,
- 1, ctr1);
+ result = rpccli_samr_QueryDomainInfo(pipe_hnd, mem_ctx,
+domain_pol,
+1,
+info1);
if (!NT_STATUS_IS_OK(result)) {
d_fprintf(stderr, query_domain_info level 1 failed: %s\n,
@@ -74,8 +78,10 @@ static NTSTATUS rpc_sh_acct_do(TALLOC_CTX *mem_ctx,
goto done;
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1921-gdd9fa33
The branch, v3-2-test has been updated
via dd9fa33e968d4e641460fe1c6beb05dfe12fa918 (commit)
from 65e978eacc30e6c400c8b76ba5f861883ff1c16a (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit dd9fa33e968d4e641460fe1c6beb05dfe12fa918
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Feb 5 17:25:07 2008 +0100
Use rpccli_samr_QueryDomainInfo() in winbindd.
Guenther
---
Summary of changes:
source/winbindd/winbindd.h | 12 +++---
source/winbindd/winbindd_cache.c | 83 ++
source/winbindd/winbindd_dual.c |2 +-
source/winbindd/winbindd_pam.c | 22 +-
source/winbindd/winbindd_passdb.c| 14 --
source/winbindd/winbindd_reconnect.c |4 +-
source/winbindd/winbindd_rpc.c | 54 +-
7 files changed, 106 insertions(+), 85 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/winbindd/winbindd.h b/source/winbindd/winbindd.h
index c4c1278..b812d69 100644
--- a/source/winbindd/winbindd.h
+++ b/source/winbindd/winbindd.h
@@ -301,15 +301,15 @@ struct winbindd_methods {
NTSTATUS (*sequence_number)(struct winbindd_domain *domain, uint32
*seq);
/* return the lockout policy */
- NTSTATUS (*lockout_policy)(struct winbindd_domain *domain,
+ NTSTATUS (*lockout_policy)(struct winbindd_domain *domain,
TALLOC_CTX *mem_ctx,
- SAM_UNK_INFO_12 *lockout_policy);
-
+ struct samr_DomInfo12 *lockout_policy);
+
/* return the lockout policy */
- NTSTATUS (*password_policy)(struct winbindd_domain *domain,
+ NTSTATUS (*password_policy)(struct winbindd_domain *domain,
TALLOC_CTX *mem_ctx,
- SAM_UNK_INFO_1 *password_policy);
-
+ struct samr_DomInfo1 *password_policy);
+
/* enumerate trusted domains */
NTSTATUS (*trusted_domains)(struct winbindd_domain *domain,
TALLOC_CTX *mem_ctx,
diff --git a/source/winbindd/winbindd_cache.c b/source/winbindd/winbindd_cache.c
index c293861..f235e40 100644
--- a/source/winbindd/winbindd_cache.c
+++ b/source/winbindd/winbindd_cache.c
@@ -908,7 +908,9 @@ static void wcache_save_user(struct winbindd_domain
*domain, NTSTATUS status, WI
centry_free(centry);
}
-static void wcache_save_lockout_policy(struct winbindd_domain *domain,
NTSTATUS status, SAM_UNK_INFO_12 *lockout_policy)
+static void wcache_save_lockout_policy(struct winbindd_domain *domain,
+ NTSTATUS status,
+ struct samr_DomInfo12 *lockout_policy)
{
struct cache_entry *centry;
@@ -916,18 +918,20 @@ static void wcache_save_lockout_policy(struct
winbindd_domain *domain, NTSTATUS
if (!centry)
return;
- centry_put_nttime(centry, lockout_policy-duration);
- centry_put_nttime(centry, lockout_policy-reset_count);
- centry_put_uint16(centry, lockout_policy-bad_attempt_lockout);
+ centry_put_nttime(centry, lockout_policy-lockout_duration);
+ centry_put_nttime(centry, lockout_policy-lockout_window);
+ centry_put_uint16(centry, lockout_policy-lockout_threshold);
centry_end(centry, LOC_POL/%s, domain-name);
-
+
DEBUG(10,(wcache_save_lockout_policy: %s\n, domain-name));
centry_free(centry);
}
-static void wcache_save_password_policy(struct winbindd_domain *domain,
NTSTATUS status, SAM_UNK_INFO_1 *policy)
+static void wcache_save_password_policy(struct winbindd_domain *domain,
+ NTSTATUS status,
+ struct samr_DomInfo1 *policy)
{
struct cache_entry *centry;
@@ -935,14 +939,14 @@ static void wcache_save_password_policy(struct
winbindd_domain *domain, NTSTATUS
if (!centry)
return;
- centry_put_uint16(centry, policy-min_length_password);
- centry_put_uint16(centry, policy-password_history);
+ centry_put_uint16(centry, policy-min_password_length);
+ centry_put_uint16(centry, policy-password_history_length);
centry_put_uint32(centry, policy-password_properties);
- centry_put_nttime(centry, policy-expire);
- centry_put_nttime(centry, policy-min_passwordage);
+ centry_put_nttime(centry, policy-max_password_age);
+ centry_put_nttime(centry, policy-min_password_age);
centry_end(centry, PWD_POL/%s, domain-name);
-
+
DEBUG(10,(wcache_save_password_policy: %s\n, domain-name));
centry_free(centry);
@@ -2131,55 +2135,56 @@ skip_save:
/* get lockout
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1924-ga114577
The branch, v3-2-test has been updated
via a1145770d1c3bfcddb687a08e3e57a566c80fb73 (commit)
via c67581e1e49f7049d2ff25efe310593d19b1a0fb (commit)
via 28ef04437c1e575944e392d83f014d77998ec3ff (commit)
from dd9fa33e968d4e641460fe1c6beb05dfe12fa918 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit a1145770d1c3bfcddb687a08e3e57a566c80fb73
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Feb 5 17:46:46 2008 +0100
Remove most of SAM_UNK_INFO marshalling.
Guenther
commit c67581e1e49f7049d2ff25efe310593d19b1a0fb
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Feb 5 17:42:15 2008 +0100
Remove unused marshalling for SAMR_SET_DOMAIN_INFO.
Guenther
commit 28ef04437c1e575944e392d83f014d77998ec3ff
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Feb 5 17:35:11 2008 +0100
Remove unused marshalling for SAMR_QUERY_DOMAIN_INFO.
Guenther
---
Summary of changes:
source/include/rpc_samr.h | 146 --
source/rpc_client/cli_samr.c | 82 --
source/rpc_parse/parse_samr.c | 634 -
3 files changed, 0 insertions(+), 862 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/include/rpc_samr.h b/source/include/rpc_samr.h
index 1b95b23..971a1a7 100644
--- a/source/include/rpc_samr.h
+++ b/source/include/rpc_samr.h
@@ -445,18 +445,6 @@ typedef struct sam_user_info_9
} SAM_USER_INFO_9;
-/
-SAMR_Q_QUERY_DOMAIN_INFO - probably a query on domain group info.
-*/
-
-/* SAMR_Q_QUERY_DOMAIN_INFO - */
-typedef struct q_samr_query_domain_info
-{
- POLICY_HND domain_pol; /* policy handle */
- uint16 switch_value; /* 0x0002, 0x0001 */
-
-} SAMR_Q_QUERY_DOMAIN_INFO;
-
typedef struct sam_unknown_info_1_inf
{
uint16 min_length_password;
@@ -467,32 +455,6 @@ typedef struct sam_unknown_info_1_inf
} SAM_UNK_INFO_1;
-typedef struct sam_unknown_info_2_inf
-{
- NTTIME logout; /* whether users are forcibly disconnected when logon
hours expire */
- UNIHDR hdr_comment; /* comment according to samba4 idl */
- UNIHDR hdr_domain; /* domain name unicode header */
- UNIHDR hdr_server; /* server name unicode header */
-
- /* put all the data in here, at the moment, including what the above
- pointer is referring to
-*/
-
- uint64 seq_num;
-
- uint32 unknown_4; /* 0x 0001 */
- uint32 server_role;
- uint32 unknown_6; /* 0x 0001 */
- uint32 num_domain_usrs; /* number of users in domain */
- uint32 num_domain_grps; /* number of domain groups in domain */
- uint32 num_local_grps; /* number of local groups in domain */
-
- UNISTR2 uni_comment; /* comment unicode string */
- UNISTR2 uni_domain; /* domain name unicode string */
- UNISTR2 uni_server; /* server name unicode string */
-
-} SAM_UNK_INFO_2;
-
typedef struct sam_unknown_info_3_info
{
NTTIME logout;
@@ -501,97 +463,6 @@ typedef struct sam_unknown_info_3_info
} SAM_UNK_INFO_3;
-typedef struct sam_unknown_info_4_inf
-{
- UNIHDR hdr_comment; /* comment according to samba4 idl */
- UNISTR2 uni_comment; /* comment unicode string */
-
-} SAM_UNK_INFO_4;
-
-typedef struct sam_unknown_info_5_inf
-{
- UNIHDR hdr_domain; /* domain name unicode header */
- UNISTR2 uni_domain; /* domain name unicode string */
-
-} SAM_UNK_INFO_5;
-
-typedef struct sam_unknown_info_6_info
-{
- UNIHDR hdr_server; /* server name unicode header */
- UNISTR2 uni_server; /* server name unicode string */
-
-} SAM_UNK_INFO_6;
-
-typedef struct sam_unknown_info_7_info
-{
- uint16 server_role;
-
-} SAM_UNK_INFO_7;
-
-typedef struct sam_unknown_info_8_info
-{
- uint64 seq_num;
- NTTIME domain_create_time;
-
-} SAM_UNK_INFO_8;
-
-typedef struct sam_unknown_info_9_info
-{
- uint32 unknown;
-
-} SAM_UNK_INFO_9;
-
-typedef struct sam_unknown_info_12_inf
-{
- NTTIME duration;
- NTTIME reset_count;
- uint16 bad_attempt_lockout;
-
-} SAM_UNK_INFO_12;
-
-typedef struct sam_unknown_info_13_info
-{
- uint64 seq_num;
- NTTIME domain_create_time;
- uint32 unknown1;
- uint32 unknown2;
-
-} SAM_UNK_INFO_13;
-
-typedef struct sam_unknown_ctr_info
-{
- union
- {
- SAM_UNK_INFO_1 inf1;
- SAM_UNK_INFO_2 inf2;
- SAM_UNK_INFO_3 inf3;
- SAM_UNK_INFO_4 inf4;
- SAM_UNK_INFO_5 inf5;
- SAM_UNK_INFO_6 inf6;
- SAM_UNK_INFO_7 inf7;
- SAM_UNK_INFO_8 inf8;
- SAM_UNK_INFO_9 inf9;
-
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1915-g1ac767b
The branch, v3-2-test has been updated
via 1ac767b0d8b42d2f804b0a7e93e5e859f9c25aae (commit)
via 0e1386f74824878f01146a1fe219c3cd1ed555b5 (commit)
from bc047ee520ef9c74cb0c5a3b6b6877b4ed7fd62b (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 1ac767b0d8b42d2f804b0a7e93e5e859f9c25aae
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Feb 5 15:03:54 2008 +0100
Use pidl for _samr_QueryDomainInfo() and _samr_QueryDomainInfo2().
Guenther
commit 0e1386f74824878f01146a1fe219c3cd1ed555b5
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Feb 5 14:56:28 2008 +0100
Add some helper init routines for samr_DomInfo structures.
They will probably move to another place later.
Guenther
---
Summary of changes:
source/rpc_parse/parse_samr.c | 143 ++
source/rpc_server/srv_samr.c| 46 +
source/rpc_server/srv_samr_nt.c | 144 ---
3 files changed, 219 insertions(+), 114 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/rpc_parse/parse_samr.c b/source/rpc_parse/parse_samr.c
index ed12927..da7f04a 100644
--- a/source/rpc_parse/parse_samr.c
+++ b/source/rpc_parse/parse_samr.c
@@ -67,6 +67,149 @@ bool samr_io_q_query_domain_info(const char *desc,
SAMR_Q_QUERY_DOMAIN_INFO * q_
}
/***
+ inits a structure.
+/
+
+static void init_lsa_String(struct lsa_String *name, const char *s)
+{
+ name-string = s;
+}
+
+/***
+ inits a structure.
+/
+
+void init_samr_DomInfo1(struct samr_DomInfo1 *r,
+ uint16_t min_password_length,
+ uint16_t password_history_length,
+ uint32_t password_properties,
+ int64_t max_password_age,
+ int64_t min_password_age)
+{
+ r-min_password_length = min_password_length;
+ r-password_history_length = password_history_length;
+ r-password_properties = password_properties;
+ r-max_password_age = max_password_age;
+ r-min_password_age = min_password_age;
+}
+
+/***
+ inits a structure.
+/
+
+void init_samr_DomInfo2(struct samr_DomInfo2 *r,
+ NTTIME force_logoff_time,
+ const char *comment,
+ const char *domain_name,
+ const char *primary,
+ uint64_t sequence_num,
+ uint32_t unknown2,
+ enum samr_Role role,
+ uint32_t unknown3,
+ uint32_t num_users,
+ uint32_t num_groups,
+ uint32_t num_aliases)
+{
+ r-force_logoff_time = force_logoff_time;
+ init_lsa_String(r-comment, comment);
+ init_lsa_String(r-domain_name, domain_name);
+ init_lsa_String(r-primary, primary);
+ r-sequence_num = sequence_num;
+ r-unknown2 = unknown2;
+ r-role = role;
+ r-unknown3 = unknown3;
+ r-num_users = num_users;
+ r-num_groups = num_groups;
+ r-num_aliases = num_aliases;
+}
+
+/***
+ inits a structure.
+/
+
+void init_samr_DomInfo3(struct samr_DomInfo3 *r,
+ NTTIME force_logoff_time)
+{
+ r-force_logoff_time = force_logoff_time;
+}
+
+/***
+ inits a structure.
+/
+
+void init_samr_DomInfo4(struct samr_DomInfo4 *r,
+ const char *comment)
+{
+ init_lsa_String(r-comment, comment);
+}
+
+/***
+ inits a structure.
+/
+
+void init_samr_DomInfo5(struct samr_DomInfo5 *r,
+ const char *domain_name)
+{
+ init_lsa_String(r-domain_name, domain_name);
+}
+
+/***
+ inits a structure.
+/
+
+void init_samr_DomInfo6(struct samr_DomInfo6 *r,
+ const char *primary)
+{
+ init_lsa_String(r-primary, primary);
+}
+
[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-633-g594ff92
The branch, v4-0-test has been updated
via 594ff923295c7420167aa899ec6030de07038625 (commit)
via 07590d893e993919cf6cb7582310777f534e756f (commit)
from 16466b543bf8dd35bc79a030696f78598ca82f54 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -
commit 594ff923295c7420167aa899ec6030de07038625
Merge: 07590d893e993919cf6cb7582310777f534e756f
16466b543bf8dd35bc79a030696f78598ca82f54
Author: Andrew Bartlett [EMAIL PROTECTED]
Date: Wed Feb 6 16:14:09 2008 +1100
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
commit 07590d893e993919cf6cb7582310777f534e756f
Author: Andrew Bartlett [EMAIL PROTECTED]
Date: Tue Feb 5 14:51:01 2008 +1100
Clarify nomaclature of socket names in process_single and process_prefork
Fix talloc_steal in both cases to steal connected socket (from accept)
onto it's private structure, rather than stealing the bound socket.
Remove termination code from the prefork modal, we want the process to
still stay around, to serve future clients.
Andrew Bartlett and David Disseldorp
---
Summary of changes:
source/smbd/process_prefork.c | 24 ++--
source/smbd/process_single.c | 11 ++-
2 files changed, 12 insertions(+), 23 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/smbd/process_prefork.c b/source/smbd/process_prefork.c
index 9f975b4..ab4a89b 100644
--- a/source/smbd/process_prefork.c
+++ b/source/smbd/process_prefork.c
@@ -58,26 +58,26 @@ static void prefork_model_init(struct event_context *ev)
called when a listening socket becomes readable.
*/
static void prefork_accept_connection(struct event_context *ev,
- struct loadparm_context *lp_ctx,
- struct socket_context *sock,
+ struct loadparm_context *lp_ctx,
+ struct socket_context *listen_socket,
void (*new_conn)(struct event_context *,
struct loadparm_context
*, struct socket_context *,
struct server_id , void
*),
void *private)
{
NTSTATUS status;
- struct socket_context *sock2;
+ struct socket_context *connected_socket;
pid_t pid = getpid();
/* accept an incoming connection. */
- status = socket_accept(sock, sock2);
+ status = socket_accept(listen_socket, connected_socket);
if (!NT_STATUS_IS_OK(status)) {
return;
}
- talloc_steal(private, sock);
+ talloc_steal(private, connected_socket);
- new_conn(ev, lp_ctx, sock2, cluster_id(pid, socket_get_fd(sock2)),
private);
+ new_conn(ev, lp_ctx, connected_socket, cluster_id(pid,
socket_get_fd(connected_socket)), private);
}
/*
@@ -184,18 +184,6 @@ static void prefork_new_task(struct event_context *ev,
_NORETURN_ static void prefork_terminate(struct event_context *ev, const char
*reason)
{
DEBUG(2,(prefork_terminate: reason[%s]\n,reason));
-
- /* this reload_charcnv() has the effect of freeing the iconv context
memory,
- which makes leak checking easier */
- reload_charcnv(global_loadparm);
-
- /* the secrets db should really hang off the connection structure */
- secrets_shutdown();
-
- talloc_free(ev);
-
- /* terminate this process */
- exit(0);
}
/* called to set a title of a task or connection */
diff --git a/source/smbd/process_single.c b/source/smbd/process_single.c
index 2d3c94c..a7a27ef 100644
--- a/source/smbd/process_single.c
+++ b/source/smbd/process_single.c
@@ -38,7 +38,7 @@ static void single_model_init(struct event_context *ev)
*/
static void single_accept_connection(struct event_context *ev,
struct loadparm_context *lp_ctx,
-struct socket_context *sock,
+struct socket_context *listen_socket,
void (*new_conn)(struct event_context *,
struct loadparm_context *,
struct socket_context *,
@@ -46,10 +46,10 @@ static void single_accept_connection(struct event_context
*ev,
void *private)
{
NTSTATUS status;
- struct socket_context *sock2;
+ struct socket_context *connected_socket;
/* accept an incoming connection. */
- status = socket_accept(sock, sock2);
+ status = socket_accept(listen_socket, connected_socket);
if
svn commit: samba-docs r1235 - in trunk/smbdotconf/logging: .
Author: kseeger Date: 2008-02-06 07:30:40 + (Wed, 06 Feb 2008) New Revision: 1235 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=1235 Log: Add list of currently implemented debug classes. Karolin Modified: trunk/smbdotconf/logging/loglevel.xml Changeset: Modified: trunk/smbdotconf/logging/loglevel.xml === --- trunk/smbdotconf/logging/loglevel.xml 2008-02-05 21:45:56 UTC (rev 1234) +++ trunk/smbdotconf/logging/loglevel.xml 2008-02-06 07:30:40 UTC (rev 1235) @@ -7,15 +7,39 @@ description para The value of the parameter (a astring) allows the debug level (logging level) to be specified in the -filename moreinfo=nonesmb.conf/filename file. This parameter has been extended since the 2.2.x -series, now it allows to specify the debug level for multiple debug classes. This is to give greater -flexibility in the configuration of the system. +filename moreinfo=nonesmb.conf/filename file. /para -para -The default will be the log level specified on the command line or level zero if none was specified. +paraThis parameter has been extended since the 2.2.x +series, now it allows to specify the debug level for multiple +debug classes. This is to give greater flexibility in the configuration +of the system. The following debug classes are currently implemented: /para +itemizedlist + listitemparaparameter moreinfo=noneall/parameter/para/listitem + listitemparaparameter moreinfo=nonetdb/parameter/para/listitem + listitemparaparameter moreinfo=noneprintdrivers/parameter/para/listitem + listitemparaparameter moreinfo=nonelanman/parameter/para/listitem + listitemparaparameter moreinfo=nonesmb/parameter/para/listitem + listitemparaparameter moreinfo=nonerpc_parse/parameter/para/listitem + listitemparaparameter moreinfo=nonerpc_srv/parameter/para/listitem + listitemparaparameter moreinfo=nonerpc_cli/parameter/para/listitem + listitemparaparameter moreinfo=nonepassdb/parameter/para/listitem + listitemparaparameter moreinfo=nonesam/parameter/para/listitem + listitemparaparameter moreinfo=noneauth/parameter/para/listitem + listitemparaparameter moreinfo=nonewinbind/parameter/para/listitem + listitemparaparameter moreinfo=nonevfs/parameter/para/listitem + listitemparaparameter moreinfo=noneidmap/parameter/para/listitem + listitemparaparameter moreinfo=nonequota/parameter/para/listitem + listitemparaparameter moreinfo=noneacls/parameter/para/listitem + listitemparaparameter moreinfo=nonelocking/parameter/para/listitem + listitemparaparameter moreinfo=nonemsdfs/parameter/para/listitem + listitemparaparameter moreinfo=nonedmapi/parameter/para/listitem + listitemparaparameter moreinfo=noneregistry/parameter/para/listitem +/itemizedlist + /description +value type=default0/value value type=example3 passdb:5 auth:10 winbind:2/value /samba:parameter
svn commit: samba-docs r1236 - in trunk/smbdotconf/printing: .
Author: kseeger Date: 2008-02-06 07:57:54 + (Wed, 06 Feb 2008) New Revision: 1236 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=1236 Log: Change default value for 'lpresume command' to an example as the default value depends on the printing system. Karolin Modified: trunk/smbdotconf/printing/lpresumecommand.xml Changeset: Modified: trunk/smbdotconf/printing/lpresumecommand.xml === --- trunk/smbdotconf/printing/lpresumecommand.xml 2008-02-06 07:30:40 UTC (rev 1235) +++ trunk/smbdotconf/printing/lpresumecommand.xml 2008-02-06 07:57:54 UTC (rev 1236) @@ -24,7 +24,7 @@ paraDefault: Currently no default value is given to this string, unless the value of the parameter moreinfo=noneprinting/parameter -parameter is constantSYSV/constant, in which case the default is :/para +parameter is constantSYSV/constant, in which case the default is:/para paracommand moreinfo=nonelp -i %p-%j -H resume/command/para @@ -34,5 +34,5 @@ paracommand moreinfo=noneqstat -s -j%j -r/command/para /description -value type=defaultlpresume command = /usr/bin/lpalt %p-%j -p2/value +value type=example/usr/bin/lpalt %p-%j -p2/value /samba:parameter
