svn commit: samba r3902 - in branches/SAMBA_4_0/source/libcli/raw: .
Author: metze
Date: 2004-11-22 08:15:27 + (Mon, 22 Nov 2004)
New Revision: 3902
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3902
Log:
fix compiler warnings
metze
Modified:
branches/SAMBA_4_0/source/libcli/raw/raweas.c
Changeset:
Modified: branches/SAMBA_4_0/source/libcli/raw/raweas.c
===
--- branches/SAMBA_4_0/source/libcli/raw/raweas.c 2004-11-22 07:59:14 UTC
(rev 3901)
+++ branches/SAMBA_4_0/source/libcli/raw/raweas.c 2004-11-22 08:15:27 UTC
(rev 3902)
@@ -57,7 +57,7 @@
put a ea_list into a pre-allocated buffer - buffer must be at least
of size ea_list_size()
*/
-void ea_put_list(char *data, uint_t num_eas, struct ea_struct *eas)
+void ea_put_list(void *data, uint_t num_eas, struct ea_struct *eas)
{
int i;
uint32_t ea_size;
@@ -83,7 +83,7 @@
put a chained ea_list into a pre-allocated buffer - buffer must be
at least of size ea_list_size()
*/
-void ea_put_list_chained(char *data, uint_t num_eas, struct ea_struct *eas)
+void ea_put_list_chained(void *data, uint_t num_eas, struct ea_struct *eas)
{
int i;
svn commit: samba r3903 - in branches/SAMBA_4_0/source/libcli/raw: .
Author: metze
Date: 2004-11-22 08:31:36 + (Mon, 22 Nov 2004)
New Revision: 3903
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3903
Log:
better fix for -r 3902
(not introduce new warnings:-)
metze
Modified:
branches/SAMBA_4_0/source/libcli/raw/raweas.c
Changeset:
Modified: branches/SAMBA_4_0/source/libcli/raw/raweas.c
===
--- branches/SAMBA_4_0/source/libcli/raw/raweas.c 2004-11-22 08:15:27 UTC
(rev 3902)
+++ branches/SAMBA_4_0/source/libcli/raw/raweas.c 2004-11-22 08:31:36 UTC
(rev 3903)
@@ -57,7 +57,7 @@
put a ea_list into a pre-allocated buffer - buffer must be at least
of size ea_list_size()
*/
-void ea_put_list(void *data, uint_t num_eas, struct ea_struct *eas)
+void ea_put_list(uint8_t *data, uint_t num_eas, struct ea_struct *eas)
{
int i;
uint32_t ea_size;
@@ -83,7 +83,7 @@
put a chained ea_list into a pre-allocated buffer - buffer must be
at least of size ea_list_size()
*/
-void ea_put_list_chained(void *data, uint_t num_eas, struct ea_struct *eas)
+void ea_put_list_chained(uint8_t *data, uint_t num_eas, struct ea_struct *eas)
{
int i;
svn commit: samba r3904 - in branches/SAMBA_4_0/source: librpc/idl rpc_server/lsa torture/rpc
Author: abartlet
Date: 2004-11-22 08:47:47 + (Mon, 22 Nov 2004)
New Revision: 3904
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3904
Log:
* Add new LSA calls to open trusted domains
* Add new tests for ACCOUNTs in SamSync
* Clean up names in NETLOGON and LSA
* Verify Security Descriptors against LSA, as well as SamR
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/librpc/idl/lsa.idl
branches/SAMBA_4_0/source/librpc/idl/netlogon.idl
branches/SAMBA_4_0/source/rpc_server/lsa/dcesrv_lsa.c
branches/SAMBA_4_0/source/torture/rpc/lsa.c
branches/SAMBA_4_0/source/torture/rpc/samlogon.c
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/lsa.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/lsa.idl2004-11-22 08:31:36 UTC
(rev 3903)
+++ branches/SAMBA_4_0/source/librpc/idl/lsa.idl2004-11-22 08:47:47 UTC
(rev 3904)
@@ -56,10 +56,10 @@
/**/
/* Function: 0x03 */
- NTSTATUS lsa_QuerySecObj (
+ NTSTATUS lsa_QuerySecurity (
[in,ref] policy_handle *handle,
[in] uint32 sec_info,
- [out]sec_desc_buf *sd
+ [out]sec_desc_buf *sdbuf
);
@@ -396,8 +396,15 @@
NTSTATUS lsa_GetSystemAccessAccount();
/* Function:0x18 */
NTSTATUS lsa_SetSystemAccessAccount();
+
/* Function:0x19 */
- NTSTATUS lsa_OpenTrustedDomain();
+ NTSTATUS lsa_OpenTrustedDomain(
+ [in,ref] policy_handle *handle,
+ [in,ref] dom_sid2 *sid,
+ [in] uint32 access_mask,
+ [out,ref]policy_handle *trustdom_handle
+ );
+
/* Function: 0x1a */
NTSTATUS lsa_QueryInfoTrustedDomain();
/* Function: 0x1b */
@@ -566,7 +573,12 @@
NTSTATUS lsa_SetDomInfoPolicy();
/* Function 0x37 */
- NTSTATUS lsa_OpenTrustedDomainByName();
+ NTSTATUS lsa_OpenTrustedDomainByName(
+ [in,ref] policy_handle *handle,
+ [in] lsa_Name name,
+ [in] uint32 access_mask,
+ [out,ref]policy_handle *trustdom_handle
+ );
/* Function 0x38 */
NTSTATUS lsa_TestCall();
Modified: branches/SAMBA_4_0/source/librpc/idl/netlogon.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/netlogon.idl 2004-11-22 08:31:36 UTC
(rev 3903)
+++ branches/SAMBA_4_0/source/librpc/idl/netlogon.idl 2004-11-22 08:47:47 UTC
(rev 3904)
@@ -255,6 +255,8 @@
/* Function 0x05 */
/* secure channel types */
+ /* Only SEC_CHAN_WKSTA can forward requests to other domains. */
+
const int SEC_CHAN_WKSTA = 2;
const int SEC_CHAN_DOMAIN = 4;
const int SEC_CHAN_BDC = 6;
@@ -527,7 +529,7 @@
uint32 unknown6;
uint32 unknown7;
uint32 unknown8;
- } netr_DELTA_ACCOUNTS;
+ } netr_DELTA_ACCOUNT;
typedef struct {
uint16 unknown;
@@ -574,9 +576,9 @@
NETR_DELTA_RENAME_ALIAS = 11,
NETR_DELTA_ALIAS_MEMBER = 12,
NETR_DELTA_POLICY = 13,
- NETR_DELTA_TRUSTED_DOMAIN = 14,
+ NETR_DELTA_TRUSTED_DOMAIN = 14,
NETR_DELTA_DELETE_TRUST = 15,
- NETR_DELTA_ACCOUNTS = 16,
+ NETR_DELTA_ACCOUNT = 16,
NETR_DELTA_DELETE_ACCOUNT = 17,
NETR_DELTA_SECRET = 18,
NETR_DELTA_DELETE_SECRET= 19,
@@ -599,9 +601,9 @@
[case(NETR_DELTA_RENAME_ALIAS)]netr_DELTA_RENAME
*rename_alias;
[case(NETR_DELTA_ALIAS_MEMBER)]netr_DELTA_ALIAS_MEMBER
*alias_member;
[case(NETR_DELTA_POLICY)] netr_DELTA_POLICY
*policy;
- [case(NETR_DELTA_TRUSTED_DOMAIN)] netr_DELTA_TRUSTED_DOMAIN
*trusted_domain;
+ [case(NETR_DELTA_TRUSTED_DOMAIN)] netr_DELTA_TRUSTED_DOMAIN
*trusted_domain;
[case(NETR_DELTA_DELETE_TRUST)]netr_DELTA_DELETE_TRUST
delete_trust;
- [case(NETR_DELTA_ACCOUNTS)]netr_DELTA_ACCOUNTS
*accounts;
+ [case(NETR_DELTA_ACCOUNT)] netr_DELTA_ACCOUNT
*account;
[case(NETR_DELTA_DELETE_ACCOUNT)] netr_DELTA_DELETE_ACCOUNT
delete_account;
[case(NETR_DELTA_SECRET)] netr_DELTA_SECRET
*secret;
[case(NETR_DELTA_DELETE_SECRET)] netr_DELTA_DELETE_SECRET
delete_secret;
@@ -626,7 +628,7 @@
[case(NETR_DELTA_POLICY)] dom_sid2 *sid;
svn commit: samba r3905 - in branches/SAMBA_4_0/source/torture/rpc: .
Author: abartlet Date: 2004-11-22 08:50:20 + (Mon, 22 Nov 2004) New Revision: 3905 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3905 Log: (oops, missing file: samsync.c) * Add new LSA calls to open trusted domains * Add new tests for ACCOUNTs in SamSync * Clean up names in NETLOGON and LSA * Verify Security Descriptors against LSA, as well as SamR Andrew Bartlett Modified: branches/SAMBA_4_0/source/torture/rpc/samsync.c Changeset: Sorry, the patch is too large (476 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3905
svn commit: samba r3906 - in branches/SAMBA_4_0/source/libcli/auth: .
Author: metze
Date: 2004-11-22 10:59:46 + (Mon, 22 Nov 2004)
New Revision: 3906
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3906
Log:
fix compiler warnings
metze
Modified:
branches/SAMBA_4_0/source/libcli/auth/credentials.c
Changeset:
Modified: branches/SAMBA_4_0/source/libcli/auth/credentials.c
===
--- branches/SAMBA_4_0/source/libcli/auth/credentials.c 2004-11-22 08:50:20 UTC
(rev 3905)
+++ branches/SAMBA_4_0/source/libcli/auth/credentials.c 2004-11-22 10:59:46 UTC
(rev 3906)
@@ -172,7 +172,7 @@
/*
ARCFOUR encrypt/decrypt a password buffer using the session key
*/
-void creds_arcfour_crypt(struct creds_CredentialState *creds, char *data,
size_t len)
+void creds_arcfour_crypt(struct creds_CredentialState *creds, uint8_t *data,
size_t len)
{
DATA_BLOB session_key = data_blob(creds-session_key, 16);
svn commit: samba r3907 - in branches/SAMBA_4_0/source: librpc/idl rpc_server/lsa torture/rpc
Author: abartlet Date: 2004-11-22 11:59:59 + (Mon, 22 Nov 2004) New Revision: 3907 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3907 Log: * Rename lsa_Name to lsa_String * Add new IDL to LSA, to query information about trusted domains (for cross-check with SamSync). Andrew Bartlett Modified: branches/SAMBA_4_0/source/librpc/idl/lsa.idl branches/SAMBA_4_0/source/rpc_server/lsa/dcesrv_lsa.c branches/SAMBA_4_0/source/torture/rpc/lsa.c branches/SAMBA_4_0/source/torture/rpc/samsync.c Changeset: Sorry, the patch is too large (502 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3907
svn commit: samba r3908 - in branches/SAMBA_4_0/source/librpc/idl: .
Author: abartlet Date: 2004-11-22 12:01:14 + (Mon, 22 Nov 2004) New Revision: 3908 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3908 Log: We know that this field is a flag of some kind, and matches the output on LSA. Andrew Bartlett Modified: branches/SAMBA_4_0/source/librpc/idl/netlogon.idl Changeset: Modified: branches/SAMBA_4_0/source/librpc/idl/netlogon.idl === --- branches/SAMBA_4_0/source/librpc/idl/netlogon.idl 2004-11-22 11:59:59 UTC (rev 3907) +++ branches/SAMBA_4_0/source/librpc/idl/netlogon.idl 2004-11-22 12:01:14 UTC (rev 3908) @@ -502,7 +502,7 @@ netr_String unknown2; netr_String unknown3; netr_String unknown4; - uint32 unknown5; + uint32 flags; uint32 unknown6; uint32 unknown7; uint32 unknown8;
svn commit: samba r3909 - in branches/SAMBA_4_0/source/torture/rpc: .
Author: abartlet
Date: 2004-11-22 12:34:34 + (Mon, 22 Nov 2004)
New Revision: 3909
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3909
Log:
Fix cross-reference test for trusted domains.
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/torture/rpc/samsync.c
Changeset:
Modified: branches/SAMBA_4_0/source/torture/rpc/samsync.c
===
--- branches/SAMBA_4_0/source/torture/rpc/samsync.c 2004-11-22 12:01:14 UTC
(rev 3908)
+++ branches/SAMBA_4_0/source/torture/rpc/samsync.c 2004-11-22 12:34:34 UTC
(rev 3909)
@@ -782,7 +782,7 @@
struct lsa_OpenTrustedDomain t;
struct policy_handle trustdom_handle;
struct lsa_QueryInfoTrustedDomain q;
- union lsa_TrustedDomainInfo info[4];
+ union lsa_TrustedDomainInfo *info[4];
int levels [] = {1, 3};
int i;
@@ -803,17 +803,17 @@
for (i=0; i ARRAY_SIZE(levels); i++) {
q.in.trustdom_handle = trustdom_handle;
q.in.level = levels[i];
- q.out.info = info[levels[i]];
status =
dcerpc_lsa_QueryInfoTrustedDomain(samsync_state-p_lsa, mem_ctx, q);
if (!NT_STATUS_IS_OK(status)) {
printf(QueryInfoTrustedDomain level %d failed - %s\n,
levels[i], nt_errstr(status));
return False;
}
+ info[levels[i]] = q.out.info;
}
- TEST_STRING_EQUAL(info[1].info1.domain_name,
trusted_domain-domain_name);
- TEST_INT_EQUAL(info[3].info3.flags, trusted_domain-flags);
+ TEST_STRING_EQUAL(info[1]-info1.domain_name,
trusted_domain-domain_name);
+ TEST_INT_EQUAL(info[3]-info3.flags, trusted_domain-flags);
TEST_SEC_DESC_EQUAL(trusted_domain-sdbuf, lsa, trustdom_handle);
DLIST_ADD(samsync_state-trusted_domains, new);
svn commit: samba r3910 - in branches/SAMBA_4_0/source: include libcli/util
Author: metze
Date: 2004-11-22 14:28:09 + (Mon, 22 Nov 2004)
New Revision: 3910
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3910
Log:
add some error codes
metze
Modified:
branches/SAMBA_4_0/source/include/doserr.h
branches/SAMBA_4_0/source/libcli/util/doserr.c
Changeset:
Modified: branches/SAMBA_4_0/source/include/doserr.h
===
--- branches/SAMBA_4_0/source/include/doserr.h 2004-11-22 12:34:34 UTC (rev
3909)
+++ branches/SAMBA_4_0/source/include/doserr.h 2004-11-22 14:28:09 UTC (rev
3910)
@@ -183,9 +183,12 @@
#define WERR_OBJECT_PATH_INVALID W_ERROR(161)
#define WERR_NO_MORE_ITEMS W_ERROR(259)
#define WERR_MORE_DATA W_ERROR(234)
+#define WERR_CAN_NOT_COMPLETE W_ERROR(1003)
+#define WERR_INVALID_DOMAINNAME W_ERROR(1212)
#define WERR_INVALID_OWNER W_ERROR(1307)
-#define WERR_CAN_NOT_COMPLETE W_ERROR(1003)
+#define WERR_NO_SUCH_USER W_ERROR(1317)
#define WERR_INVALID_SECURITY_DESCRIPTOR W_ERROR(1338)
+#define WERR_NO_SUCH_DOMAIN W_ERROR(1355)
#define WERR_SERVER_UNAVAILABLE W_ERROR(1722)
#define WERR_INVALID_FORM_NAME W_ERROR(1902)
#define WERR_INVALID_FORM_SIZE W_ERROR(1903)
@@ -232,6 +235,9 @@
#define WERR_DFS_CANT_CREATE_JUNCT W_ERROR(NERR_BASE+569)
/* DS errors */
+#define WERR_DS_SERVICE_BUSY W_ERROR(0x200e)
+#define WERR_DS_SERVICE_UNAVAILABLE W_ERROR(0x200f)
+#define WERR_DS_NO_SUCH_OBJECT W_ERROR(0x2030)
#define WERR_DS_OBJ_NOT_FOUND W_ERROR(0x208d)
Modified: branches/SAMBA_4_0/source/libcli/util/doserr.c
===
--- branches/SAMBA_4_0/source/libcli/util/doserr.c 2004-11-22 12:34:34 UTC
(rev 3909)
+++ branches/SAMBA_4_0/source/libcli/util/doserr.c 2004-11-22 14:28:09 UTC
(rev 3910)
@@ -67,6 +67,12 @@
{ WERR_DFS_CANT_CREATE_JUNCT, WERR_DFS_CANT_CREATE_JUNCT },
{ WERR_INVALID_SECURITY_DESCRIPTOR, WERR_INVALID_SECURITY_DESCRIPTOR
},
{ WERR_INVALID_OWNER, WERR_INVALID_OWNER },
+ { WERR_INVALID_DOMAINNAME, WERR_INVALID_DOMAINNAME },
+ { WERR_NO_SUCH_USER, WERR_NO_SUCH_USER },
+ { WERR_NO_SUCH_DOMAIN, WERR_NO_SUCH_DOMAIN },
+ { WERR_DS_SERVICE_BUSY, WERR_DS_SERVICE_BUSY },
+ { WERR_DS_SERVICE_UNAVAILABLE, WERR_DS_SERVICE_UNAVAILABLE },
+ { WERR_DS_NO_SUCH_OBJECT, WERR_DS_NO_SUCH_OBJECT },
{ WERR_DS_OBJ_NOT_FOUND, WERR_DS_OBJ_NOT_FOUND },
{ WERR_GENERAL_FAILURE, WERR_GENERAL_FAILURE },
{ WERR_PRINTQ_FULL, WERR_PRINTQ_FULL },
svn commit: samba r3911 - branches/SAMBA_3_0/source/nsswitch trunk/source/nsswitch
Author: gd Date: 2004-11-22 14:34:45 + (Mon, 22 Nov 2004) New Revision: 3911 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3911 Log: typo. Guenther Modified: branches/SAMBA_3_0/source/nsswitch/pam_winbind.c trunk/source/nsswitch/pam_winbind.c Changeset: Modified: branches/SAMBA_3_0/source/nsswitch/pam_winbind.c === --- branches/SAMBA_3_0/source/nsswitch/pam_winbind.c2004-11-22 14:28:09 UTC (rev 3910) +++ branches/SAMBA_3_0/source/nsswitch/pam_winbind.c2004-11-22 14:34:45 UTC (rev 3911) @@ -189,7 +189,7 @@ return retval; default: /* we don't know anything about this return value */ - _pam_log(LOG_ERR, internal module error (retval = %d, user = `%s', + _pam_log(LOG_ERR, internal module error (retval = %d, user = `%s'), retval, user); return retval; } Modified: trunk/source/nsswitch/pam_winbind.c === --- trunk/source/nsswitch/pam_winbind.c 2004-11-22 14:28:09 UTC (rev 3910) +++ trunk/source/nsswitch/pam_winbind.c 2004-11-22 14:34:45 UTC (rev 3911) @@ -189,7 +189,7 @@ return retval; default: /* we don't know anything about this return value */ - _pam_log(LOG_ERR, internal module error (retval = %d, user = `%s', + _pam_log(LOG_ERR, internal module error (retval = %d, user = `%s'), retval, user); return retval; }
svn commit: samba r3912 - branches/SAMBA_3_0/source/po trunk/source/po
Author: gd Date: 2004-11-22 15:20:38 + (Mon, 22 Nov 2004) New Revision: 3912 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3912 Log: More fixes to have proper german in swat. (The new german orthography is another story...) Thanks to Reiner Klaproth and Bj?\195?\182rn Jacke [EMAIL PROTECTED]. Guenther Modified: branches/SAMBA_3_0/source/po/de.msg trunk/source/po/de.msg Changeset: Sorry, the patch is too large (713 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3912
svn commit: samba r3913 - in branches/SAMBA_4_0/source/torture/rpc: .
Author: metze
Date: 2004-11-22 17:08:25 + (Mon, 22 Nov 2004)
New Revision: 3913
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3913
Log:
fix the build
metze
Modified:
branches/SAMBA_4_0/source/torture/rpc/xplogin.c
Changeset:
Modified: branches/SAMBA_4_0/source/torture/rpc/xplogin.c
===
--- branches/SAMBA_4_0/source/torture/rpc/xplogin.c 2004-11-22 15:20:38 UTC
(rev 3912)
+++ branches/SAMBA_4_0/source/torture/rpc/xplogin.c 2004-11-22 17:08:25 UTC
(rev 3913)
@@ -392,13 +392,13 @@
{
struct lsa_LookupNames l;
struct lsa_TransSidArray sids;
- struct lsa_Name lsaname;
+ struct lsa_String lsaname;
uint32_t count = 0;
sids.count = 0;
sids.sids = NULL;
- lsaname.name = name;
+ lsaname.string = name;
l.in.handle = handle;
l.in.num_names = 1;
svn commit: samba r3914 - in branches/SAMBA_4_0/source: librpc/idl rpc_server/netlogon torture/rpc
Author: metze
Date: 2004-11-22 17:14:57 + (Mon, 22 Nov 2004)
New Revision: 3914
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3914
Log:
add idl, torture test and simple server for netr_DrsGetDCNameEx2()
metze
Modified:
branches/SAMBA_4_0/source/librpc/idl/netlogon.idl
branches/SAMBA_4_0/source/rpc_server/netlogon/dcerpc_netlogon.c
branches/SAMBA_4_0/source/torture/rpc/netlogon.c
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/netlogon.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/netlogon.idl 2004-11-22 17:08:25 UTC
(rev 3913)
+++ branches/SAMBA_4_0/source/librpc/idl/netlogon.idl 2004-11-22 17:14:57 UTC
(rev 3914)
@@ -1007,8 +1007,29 @@
//
/* Function 0x22 */
- WERROR netr_DSRGETDCNAMEEX2();
+ typedef struct {
+ unistr *dc_unc;
+ unistr *dc_address;
+ int32 dc_address_type;
+ GUID domain_guid;
+ unistr *domain_name;
+ unistr *forest_name;
+ uint32 dc_flags;
+ unistr *dc_site_name;
+ unistr *client_site_name;
+ } netr_DrsGetDCNameEx2Info;
+ WERROR netr_DrsGetDCNameEx2(
+ [in] unistr *server_unc,
+ [in] unistr *client_account,
+ [in] uint32 mask,
+ [in] unistr *domain_name,
+ [in] GUID *domain_guid,
+ [in] unistr *site_name,
+ [in] uint32 flags,
+ [out] netr_DrsGetDCNameEx2Info *info
+ );
+
//
/* Function 0x23 */
WERROR netr_NETRLOGONGETTIMESERVICEPARENTDOMAIN();
Modified: branches/SAMBA_4_0/source/rpc_server/netlogon/dcerpc_netlogon.c
===
--- branches/SAMBA_4_0/source/rpc_server/netlogon/dcerpc_netlogon.c
2004-11-22 17:08:25 UTC (rev 3913)
+++ branches/SAMBA_4_0/source/rpc_server/netlogon/dcerpc_netlogon.c
2004-11-22 17:14:57 UTC (rev 3914)
@@ -1045,12 +1045,49 @@
/*
- netr_DSRGETDCNAMEEX2
+ netr_DrsGetDCNameEx2
*/
-static WERROR netr_DSRGETDCNAMEEX2(struct dcesrv_call_state *dce_call,
TALLOC_CTX *mem_ctx,
- struct netr_DSRGETDCNAMEEX2 *r)
+static WERROR netr_DrsGetDCNameEx2(struct dcesrv_call_state *dce_call,
TALLOC_CTX *mem_ctx,
+ struct netr_DrsGetDCNameEx2 *r)
{
- DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+ const char * const attrs[] = { dnsDomain, objectGUID, NULL };
+ void *sam_ctx;
+ struct ldb_message **res;
+ int ret;
+
+ ZERO_STRUCT(r-out);
+
+ sam_ctx = samdb_connect(mem_ctx);
+ if (sam_ctx == NULL) {
+ return WERR_DS_SERVICE_UNAVAILABLE;
+ }
+
+ ret = samdb_search(sam_ctx, mem_ctx, NULL, res, attrs,
+ ((objectClass=domainDNS)(dnsDomain=%s)),
+ r-in.domain_name);
+ if (ret != 1) {
+ return WERR_NO_SUCH_DOMAIN;
+ }
+
+ r-out.info = talloc_p(mem_ctx, struct netr_DrsGetDCNameEx2Info);
+ if (!r-out.info) {
+ return WERR_NOMEM;
+ }
+
+ /* TODO: - return real IP address
+* - check all r-in.* parameters (server_unc is ignored by w2k3!)
+*/
+ r-out.info-dc_unc = talloc_asprintf(mem_ctx, %s.%s,
lp_netbios_name(),lp_realm());
+ r-out.info-dc_address = talloc_strdup(mem_ctx, 0.0.0.0);
+ r-out.info-dc_address_type= 1;
+ r-out.info-domain_guid= samdb_result_guid(res[0],
objectGUID);
+ r-out.info-domain_name= samdb_result_string(res[0],
dnsDomain, NULL);
+ r-out.info-forest_name= samdb_result_string(res[0],
dnsDomain, NULL);
+ r-out.info-dc_flags = 0xE1FD;
+ r-out.info-dc_site_name = talloc_strdup(mem_ctx,
Default-First-Site-Name);
+ r-out.info-client_site_name = talloc_strdup(mem_ctx,
Default-First-Site-Name);
+
+ return WERR_OK;
}
Modified: branches/SAMBA_4_0/source/torture/rpc/netlogon.c
===
--- branches/SAMBA_4_0/source/torture/rpc/netlogon.c2004-11-22 17:08:25 UTC
(rev 3913)
+++ branches/SAMBA_4_0/source/torture/rpc/netlogon.c2004-11-22 17:14:57 UTC
(rev 3914)
@@ -887,7 +887,47 @@
return True;
}
+/*
+ try a netlogon netr_DrsGetDCNameEx2
+*/
+static BOOL test_netr_DrsGetDCNameEx2(struct dcerpc_pipe *p, TALLOC_CTX
*mem_ctx)
+{
+ NTSTATUS status;
+ struct netr_DrsGetDCNameEx2 r;
+ BOOL ret = True;
+ r.in.server_unc = talloc_asprintf(mem_ctx, %s,
dcerpc_server_name(p));
+ r.in.client_account = NULL;
+ r.in.mask = 0x;
+ r.in.domain_name= talloc_asprintf(mem_ctx, %s, lp_realm());
+
svn commit: samba r3915 - in branches/SAMBA_4_0/source/torture/rpc: .
Author: metze
Date: 2004-11-22 17:30:32 + (Mon, 22 Nov 2004)
New Revision: 3915
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3915
Log:
a few updates to the DsCrackNames() torture test
metze
Modified:
branches/SAMBA_4_0/source/torture/rpc/drsuapi.c
Changeset:
Modified: branches/SAMBA_4_0/source/torture/rpc/drsuapi.c
===
--- branches/SAMBA_4_0/source/torture/rpc/drsuapi.c 2004-11-22 17:14:57 UTC
(rev 3914)
+++ branches/SAMBA_4_0/source/torture/rpc/drsuapi.c 2004-11-22 17:30:32 UTC
(rev 3915)
@@ -26,11 +26,8 @@
struct DsPrivate {
struct policy_handle bind_handle;
- struct GUID domain_guid;
- struct GUID site_guid;
- struct GUID computer_guid;
- struct GUID server_guid;
- struct GUID ntds_guid;
+ const char *domain_guid_str;
+ struct drsuapi_DsGetDCInfo2 dcinfo;
};
static BOOL test_DsBind(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
@@ -110,6 +107,54 @@
dns_domain = r.out.ctr.ctr1-array[0].dns_domain_name;
nt4_domain = r.out.ctr.ctr1-array[0].result_name;
+ r.in.req.req1.format_desired= DRSUAPI_DS_NAME_FORMAT_GUID;
+
+ printf(testing DsCrackNames with name '%s' desired format:%d\n,
+ names[0].str, r.in.req.req1.format_desired);
+
+ status = dcerpc_drsuapi_DsCrackNames(p, mem_ctx, r);
+ if (!NT_STATUS_IS_OK(status)) {
+ const char *errstr = nt_errstr(status);
+ if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
+ errstr = dcerpc_errstr(mem_ctx, p-last_fault_code);
+ }
+ printf(dcerpc_drsuapi_DsCrackNames failed - %s\n, errstr);
+ ret = False;
+ } else if (!W_ERROR_IS_OK(r.out.result)) {
+ printf(DsCrackNames failed - %s\n, win_errstr(r.out.result));
+ ret = False;
+ }
+
+ if (!ret) {
+ return ret;
+ }
+
+ priv-domain_guid_str = r.out.ctr.ctr1-array[0].result_name;
+
+ r.in.req.req1.format_offered= DRSUAPI_DS_NAME_FORMAT_GUID;
+ r.in.req.req1.format_desired= DRSUAPI_DS_NAME_FORMAT_NT4_ACCOUNT;
+ names[0].str = priv-domain_guid_str;
+
+ printf(testing DsCrackNames with name '%s' desired format:%d\n,
+ names[0].str, r.in.req.req1.format_desired);
+
+ status = dcerpc_drsuapi_DsCrackNames(p, mem_ctx, r);
+ if (!NT_STATUS_IS_OK(status)) {
+ const char *errstr = nt_errstr(status);
+ if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
+ errstr = dcerpc_errstr(mem_ctx, p-last_fault_code);
+ }
+ printf(dcerpc_drsuapi_DsCrackNames failed - %s\n, errstr);
+ ret = False;
+ } else if (!W_ERROR_IS_OK(r.out.result)) {
+ printf(DsCrackNames failed - %s\n, win_errstr(r.out.result));
+ ret = False;
+ }
+
+ if (!ret) {
+ return ret;
+ }
+
r.in.req.req1.format_offered= DRSUAPI_DS_NAME_FORMAT_NT4_ACCOUNT;
r.in.req.req1.format_desired= DRSUAPI_DS_NAME_FORMAT_FQDN_1779;
names[0].str = nt4_domain;
@@ -138,7 +183,7 @@
r.in.req.req1.format_offered= DRSUAPI_DS_NAME_FORMAT_NT4_ACCOUNT;
r.in.req.req1.format_desired= DRSUAPI_DS_NAME_FORMAT_FQDN_1779;
- names[0].str = talloc_asprintf(mem_ctx, %s%s$, nt4_domain,
dcerpc_server_name(p));
+ names[0].str = talloc_asprintf(mem_ctx, %s%s$, nt4_domain,
priv-dcinfo.netbios_name);
printf(testing DsCrackNames with name '%s' desired format:%d\n,
names[0].str, r.in.req.req1.format_desired);
@@ -276,7 +321,7 @@
r.in.req.req1.format_offered= DRSUAPI_DS_NAME_FORMAT_GUID;
r.in.req.req1.format_desired= DRSUAPI_DS_NAME_FORMAT_FQDN_1779;
- names[0].str = GUID_string2(mem_ctx, priv-site_guid);
+ names[0].str = GUID_string2(mem_ctx, priv-dcinfo.site_guid);
printf(testing DsCrackNames with Site GUID '%s' desired format:%d\n,
names[0].str, r.in.req.req1.format_desired);
@@ -298,7 +343,8 @@
return ret;
}
- names[0].str = GUID_string2(mem_ctx, priv-computer_guid);
+ r.in.req.req1.format_desired= DRSUAPI_DS_NAME_FORMAT_NT4_ACCOUNT;
+ names[0].str = GUID_string2(mem_ctx, priv-dcinfo.computer_guid);
printf(testing DsCrackNames with Computer GUID '%s' desired
format:%d\n,
names[0].str, r.in.req.req1.format_desired);
@@ -320,7 +366,7 @@
return ret;
}
- names[0].str = GUID_string2(mem_ctx, priv-server_guid);
+ names[0].str = GUID_string2(mem_ctx, priv-dcinfo.server_guid);
printf(testing DsCrackNames with Server GUID '%s' desired format:%d\n,
names[0].str,
svn commit: samba r3916 - in branches/SAMBA_4_0/source/smb_server: .
Author: tridge
Date: 2004-11-23 00:09:23 + (Tue, 23 Nov 2004)
New Revision: 3916
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3916
Log:
w2k3 does not check the max_setup count in nttrans requests
Modified:
branches/SAMBA_4_0/source/smb_server/nttrans.c
Changeset:
Modified: branches/SAMBA_4_0/source/smb_server/nttrans.c
===
--- branches/SAMBA_4_0/source/smb_server/nttrans.c 2004-11-22 17:30:32 UTC
(rev 3915)
+++ branches/SAMBA_4_0/source/smb_server/nttrans.c 2004-11-23 00:09:23 UTC
(rev 3916)
@@ -413,10 +413,13 @@
return;
}
+#if 0
+ /* w2k3 does not check the max_setup count */
if (trans.out.setup_count trans.in.max_setup) {
req_reply_error(req, NT_STATUS_BUFFER_TOO_SMALL);
return;
}
+#endif
if (trans.out.params.length trans.in.max_param) {
status = NT_STATUS_BUFFER_TOO_SMALL;
trans.out.params.length = trans.in.max_param;
svn commit: samba r3917 - in branches/SAMBA_4_0/source: librpc/idl rpc_server/lsa torture/rpc
Author: abartlet
Date: 2004-11-23 00:31:00 + (Tue, 23 Nov 2004)
New Revision: 3917
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3917
Log:
A few more LSA RPCs found in my wanderings (for trusted domains, these
seem to be 'shortcut' RPCs, that just avoid an open/query pair).
Rename a few others to give us a slightly sensible pattern.
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/librpc/idl/lsa.idl
branches/SAMBA_4_0/source/rpc_server/lsa/dcesrv_lsa.c
branches/SAMBA_4_0/source/torture/rpc/lsa.c
branches/SAMBA_4_0/source/torture/rpc/samsync.c
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/lsa.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/lsa.idl2004-11-23 00:09:23 UTC
(rev 3916)
+++ branches/SAMBA_4_0/source/librpc/idl/lsa.idl2004-11-23 00:31:00 UTC
(rev 3917)
@@ -435,7 +435,7 @@
} lsa_TrustedDomainInfo;
/* Function: 0x1a */
- NTSTATUS lsa_QueryInfoTrustedDomain(
+ NTSTATUS lsa_QueryTrustedDomainInfo(
[in,ref] policy_handle *trustdom_handle,
[in] uint16 level,
[out,switch_is(level)] lsa_TrustedDomainInfo *info
@@ -544,7 +544,13 @@
);
/* Function: 0x27 */
- NTSTATUS lsa_QueryTrustDomainInfo();
+ NTSTATUS lsa_QueryTrustedDomainInfoBySid(
+ [in,ref] policy_handle *handle,
+ [in,ref] dom_sid2 *dom_sid,
+ [in] uint16 level,
+ [out,switch_is(level)] lsa_TrustedDomainInfo *info
+);
+
/* Function: 0x28 */
NTSTATUS lsa_SetTrustDomainInfo();
/* Function: 0x29 */
@@ -581,7 +587,12 @@
NTSTATUS lsa_SetInfoPolicy2();
/* Function 0x30 */
- NTSTATUS lsa_QueryTrustedDomainInfoByName();
+ NTSTATUS lsa_QueryTrustedDomainInfoByName(
+ [in,ref] policy_handle *handle,
+ [in] lsa_String trusted_domain,
+ [in] uint16 level,
+ [out,switch_is(level)] lsa_TrustedDomainInfo *info
+ );
/* Function 0x31 */
NTSTATUS lsa_SetTrustedDomainInfoByName();
Modified: branches/SAMBA_4_0/source/rpc_server/lsa/dcesrv_lsa.c
===
--- branches/SAMBA_4_0/source/rpc_server/lsa/dcesrv_lsa.c 2004-11-23
00:09:23 UTC (rev 3916)
+++ branches/SAMBA_4_0/source/rpc_server/lsa/dcesrv_lsa.c 2004-11-23
00:31:00 UTC (rev 3917)
@@ -613,10 +613,10 @@
/*
- lsa_QueryInfoTrustedDomain
+ lsa_QueryTrustedDomainInfo
*/
-static NTSTATUS lsa_QueryInfoTrustedDomain(struct dcesrv_call_state *dce_call,
TALLOC_CTX *mem_ctx,
- struct lsa_QueryInfoTrustedDomain *r)
+static NTSTATUS lsa_QueryTrustedDomainInfo(struct dcesrv_call_state *dce_call,
TALLOC_CTX *mem_ctx,
+ struct lsa_QueryTrustedDomainInfo *r)
{
DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
}
@@ -743,10 +743,10 @@
/*
- lsa_QueryTrustDomainInfo
+ lsa_QueryTrustedDomainInfoBySid
*/
-static NTSTATUS lsa_QueryTrustDomainInfo(struct dcesrv_call_state *dce_call,
TALLOC_CTX *mem_ctx,
- struct lsa_QueryTrustDomainInfo *r)
+static NTSTATUS lsa_QueryTrustedDomainInfoBySid(struct dcesrv_call_state
*dce_call, TALLOC_CTX *mem_ctx,
+ struct
lsa_QueryTrustedDomainInfoBySid *r)
{
DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
}
Modified: branches/SAMBA_4_0/source/torture/rpc/lsa.c
===
--- branches/SAMBA_4_0/source/torture/rpc/lsa.c 2004-11-23 00:09:23 UTC (rev
3916)
+++ branches/SAMBA_4_0/source/torture/rpc/lsa.c 2004-11-23 00:31:00 UTC (rev
3917)
@@ -769,12 +769,12 @@
return False;
}
- printf(\nTesting OpenTrustedDomain and OpenTrustedDomainByName\n);
+ printf(\nTesting OpenTrustedDomain, OpenTrustedDomainByName and
QueryInfoTrustedDomain\n);
for (i=0; i domains.count; i++) {
struct lsa_OpenTrustedDomain trust;
struct lsa_OpenTrustedDomainByName trust_by_name;
- struct policy_handle trust_handle;
+ struct policy_handle trustdom_handle;
struct policy_handle handle2;
struct lsa_Close c;
int levels [] = {1, 3, 6};
@@ -782,7 +782,7 @@
trust.in.handle = handle;
trust.in.sid = domains.domains[i].sid;
trust.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
- trust.out.trustdom_handle = trust_handle;
+ trust.out.trustdom_handle = trustdom_handle;
svn commit: samba r3918 - branches/SAMBA_3_0/source/utils trunk/source/utils
Author: gd
Date: 2004-11-23 01:05:31 + (Tue, 23 Nov 2004)
New Revision: 3918
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3918
Log:
Allow to set OWNER- and GROUP-entries while setting security descriptors
with smbcacls and using with the -S or -M switch. Fixes #404 and #2076.
Guenther
Modified:
branches/SAMBA_3_0/source/utils/smbcacls.c
trunk/source/utils/smbcacls.c
Changeset:
Modified: branches/SAMBA_3_0/source/utils/smbcacls.c
===
--- branches/SAMBA_3_0/source/utils/smbcacls.c 2004-11-23 00:31:00 UTC (rev
3917)
+++ branches/SAMBA_3_0/source/utils/smbcacls.c 2004-11-23 01:05:31 UTC (rev
3918)
@@ -657,6 +657,14 @@
}
}
+ if (sd-owner_sid) {
+ old-owner_sid = sd-owner_sid;
+ }
+
+ if (sd-grp_sid) {
+ old-grp_sid = sd-grp_sid;
+ }
+
break;
case SMB_ACL_ADD:
@@ -674,7 +682,7 @@
sort_acl(old-dacl);
/* Create new security descriptor and set it */
- sd = make_sec_desc(ctx,old-revision, old-type, NULL, NULL,
+ sd = make_sec_desc(ctx,old-revision, old-type, old-owner_sid,
old-grp_sid,
NULL, old-dacl, sd_size);
fnum = cli_nt_create(cli, filename, WRITE_DAC_ACCESS);
Modified: trunk/source/utils/smbcacls.c
===
--- trunk/source/utils/smbcacls.c 2004-11-23 00:31:00 UTC (rev 3917)
+++ trunk/source/utils/smbcacls.c 2004-11-23 01:05:31 UTC (rev 3918)
@@ -657,6 +657,14 @@
}
}
+ if (sd-owner_sid) {
+ old-owner_sid = sd-owner_sid;
+ }
+
+ if (sd-grp_sid) {
+ old-grp_sid = sd-grp_sid;
+ }
+
break;
case SMB_ACL_ADD:
@@ -674,7 +682,7 @@
sort_acl(old-dacl);
/* Create new security descriptor and set it */
- sd = make_sec_desc(ctx,old-revision, old-type, NULL, NULL,
+ sd = make_sec_desc(ctx,old-revision, old-type, old-owner_sid,
old-grp_sid,
NULL, old-dacl, sd_size);
fnum = cli_nt_create(cli, filename, WRITE_DAC_ACCESS);
svn commit: samba r3919 - in branches/SAMBA_4_0/source: librpc/idl torture/rpc
Author: abartlet
Date: 2004-11-23 03:11:38 + (Tue, 23 Nov 2004)
New Revision: 3919
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3919
Log:
Add more info levels to the QueryTrustedDomainInfo structures, with
names and other assistance from the ethereal sources.
More work needs to be done to validate some of the levels, which do
not appear in the query - perhaps they are modification levels.
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/librpc/idl/lsa.idl
branches/SAMBA_4_0/source/torture/rpc/lsa.c
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/lsa.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/lsa.idl2004-11-23 01:05:31 UTC
(rev 3918)
+++ branches/SAMBA_4_0/source/librpc/idl/lsa.idl2004-11-23 03:11:38 UTC
(rev 3919)
@@ -411,27 +411,93 @@
[size_is(size),length_is(length)] uint8 *data;
} lsa_DATA_BUF;
+ typedef [flag(NDR_PAHEX)] struct {
+ uint32 size;
+ [size_is(size)] uint8 *data;
+ } lsa_DATA_BUF2;
+
+ typedef enum {
+ LSA_TRUSTED_DOMAIN_INFO_NAME=1,
+ LSA_TRUSTED_DOMAIN_INFO_2=2,
+ LSA_TRUSTED_DOMAIN_INFO_FLAGS=3,
+ LSA_TRUSTED_DOMAIN_INFO_PASSWORD=4,
+ LSA_TRUSTED_DOMAIN_INFO_5=5,
+ LSA_TRUSTED_DOMAIN_INFO_INFO_EX=6,
+ LSA_TRUSTED_DOMAIN_INFO_AUTH_INFO=7,
+ LSA_TRUSTED_DOMAIN_INFO_FULL_INFO=8,
+ LSA_TRUSTED_DOMAIN_INFO_INFO_ALL=12
+ } lsa_TrustDomInfoEnum;
+
typedef struct {
lsa_String domain_name;
- } lsa_TrustDomainInfo1;
+ } lsa_TrustDomainInfoName;
typedef struct {
uint32flags;
- } lsa_TrustDomainInfo3;
+ } lsa_TrustDomainInfoFlags;
typedef struct {
+ lsa_DATA_BUF *password;
+ lsa_DATA_BUF *old_password;
+ } lsa_TrustDomainInfoPassword;
+
+ typedef struct {
+ lsa_String domain_name;
+ dom_sid2*sid;
+ } lsa_TrustDomainInfo5;
+
+ typedef struct {
lsa_String name;
lsa_String name2;
dom_sid2*sid;
uint32 unknown1;
uint32 unknown2;
uint32 unknown3;
- } lsa_TrustDomainInfo6;
+ } lsa_TrustDomainInfoInfoEx;
+ typedef struct {
+ HYPER_T unknown1;
+ uint32 unknown2;
+ lsa_DATA_BUF2 data;
+ } lsa_TrustDomainInfoBuffer;
+
+ typedef struct {
+ uint32 unknown1;
+ lsa_TrustDomainInfoBuffer *buff1;
+ lsa_TrustDomainInfoBuffer *buff2;
+ uint32 unknown2;
+ lsa_TrustDomainInfoBuffer *buff3;
+ lsa_TrustDomainInfoBuffer *buff4;
+ } lsa_TrustDomainInfoAuthInfo;
+
+ typedef struct {
+ lsa_TrustDomainInfoInfoEx info_ex;
+ lsa_TrustDomainInfoFlags flags;
+ lsa_TrustDomainInfoAuthInfo auth_info;
+ } lsa_TrustDomainInfoFullInfo;
+
+ typedef struct {
+ lsa_TrustDomainInfoInfoEx info_ex;
+ lsa_DATA_BUF2data1;
+ } lsa_TrustDomainInfo11;
+
+ typedef struct {
+ lsa_TrustDomainInfoInfoEx info_ex;
+ lsa_DATA_BUF2data1;
+ lsa_TrustDomainInfoFlags flags;
+ lsa_TrustDomainInfoAuthInfo auth_info;
+ } lsa_TrustDomainInfoInfoAll;
+
typedef union {
- [case(1)]lsa_TrustDomainInfo1 info1;
- [case(3)]lsa_TrustDomainInfo3 info3;
- [case(6)]lsa_TrustDomainInfo6 info6;
+ [case(LSA_TRUSTED_DOMAIN_INFO_NAME)]
lsa_TrustDomainInfoName name;
+ [case(LSA_TRUSTED_DOMAIN_INFO_FLAGS)]
lsa_TrustDomainInfoFlags flags;
+ [case(LSA_TRUSTED_DOMAIN_INFO_PASSWORD)]
lsa_TrustDomainInfoPassword password;
+ [case(LSA_TRUSTED_DOMAIN_INFO_5)] lsa_TrustDomainInfo5
info5;
+ [case(LSA_TRUSTED_DOMAIN_INFO_INFO_EX)]
lsa_TrustDomainInfoInfoExinfo_ex;
+ [case(LSA_TRUSTED_DOMAIN_INFO_AUTH_INFO)]
lsa_TrustDomainInfoAuthInfo auth_info;
+ [case(LSA_TRUSTED_DOMAIN_INFO_FULL_INFO)]
lsa_TrustDomainInfoFullInfo full_info;
+ [case(11)]lsa_TrustDomainInfo11 info11;
+ [case(LSA_TRUSTED_DOMAIN_INFO_INFO_ALL)]
lsa_TrustDomainInfoInfoAll info_all;
} lsa_TrustedDomainInfo;
/* Function: 0x1a */
Modified: branches/SAMBA_4_0/source/torture/rpc/lsa.c
===
--- branches/SAMBA_4_0/source/torture/rpc/lsa.c 2004-11-23 01:05:31 UTC (rev
3918)
+++
svn commit: samba-docs r283 - in trunk/Samba-HOWTO-Collection: .
Author: sharpe Date: 2004-11-23 06:00:23 + (Tue, 23 Nov 2004) New Revision: 283 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=283 Log: Fix a small but annoying cut-n-pasteo with the net groupmap modify exampled. You do not specify a RID on a modify command. Modified: trunk/Samba-HOWTO-Collection/NT4Migration.xml Changeset: Modified: trunk/Samba-HOWTO-Collection/NT4Migration.xml === --- trunk/Samba-HOWTO-Collection/NT4Migration.xml 2004-11-18 11:03:57 UTC (rev 282) +++ trunk/Samba-HOWTO-Collection/NT4Migration.xml 2004-11-23 06:00:23 UTC (rev 283) @@ -271,9 +271,9 @@ Keep this as a shell script for future re-use # First assign well known domain global groups -net groupmap modify ntgroup=Domain Admins unixgroup=root rid=512 -net groupmap modify ntgroup=Domain Users unixgroup=users rid=513 -net groupmap modify ntgroup=Domain Guests unixgroup=nobody rid=514 +net groupmap modify ntgroup=Domain Admins unixgroup=root +net groupmap modify ntgroup=Domain Users unixgroup=users +net groupmap modify ntgroup=Domain Guests unixgroup=nobody # Now for our added domain global groups net groupmap add ntgroup=Designers unixgroup=designers type=d rid=3200
