svn commit: samba r21353 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_25/source/nsswitch
Author: gd Date: 2007-02-15 11:44:06 + (Thu, 15 Feb 2007) New Revision: 21353 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21353 Log: In the turn of tracking down nss_winbind related bugs on Linux: print NSS_STATUS code with DEBUG_NSS when leaving a function. Guenther Modified: branches/SAMBA_3_0/source/nsswitch/winbind_nss_linux.c branches/SAMBA_3_0_25/source/nsswitch/winbind_nss_linux.c Changeset: Sorry, the patch is too large (661 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21353
svn commit: samba r21355 - in branches/SAMBA_4_0/source/dsdb/samdb: .
Author: metze
Date: 2007-02-15 11:53:50 + (Thu, 15 Feb 2007)
New Revision: 21355
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21355
Log:
work in child domains, CN=Configuration isn't always under the domain dn
metze
Modified:
branches/SAMBA_4_0/source/dsdb/samdb/cracknames.c
Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/samdb/cracknames.c
===
--- branches/SAMBA_4_0/source/dsdb/samdb/cracknames.c 2007-02-15 11:51:06 UTC
(rev 21354)
+++ branches/SAMBA_4_0/source/dsdb/samdb/cracknames.c 2007-02-15 11:53:50 UTC
(rev 21355)
@@ -69,8 +69,8 @@
return DRSUAPI_DS_NAME_STATUS_RESOLVE_ERROR;
}
- service_dn = ldb_dn_new(tmp_ctx, ldb_ctx, CN=Directory
Service,CN=Windows NT,CN=Services,CN=Configuration);
- if ( ! ldb_dn_add_base(service_dn, samdb_base_dn(ldb_ctx))) {
+ service_dn = ldb_dn_new(tmp_ctx, ldb_ctx, CN=Directory
Service,CN=Windows NT,CN=Services);
+ if ( ! ldb_dn_add_base(service_dn, samdb_config_dn(ldb_ctx))) {
return DRSUAPI_DS_NAME_STATUS_RESOLVE_ERROR;
}
service_dn_str = ldb_dn_alloc_linearized(tmp_ctx, service_dn);
svn commit: samba r21356 - in branches/SAMBA_4_0/source/rpc_server/drsuapi: .
Author: metze
Date: 2007-02-15 11:57:23 + (Thu, 15 Feb 2007)
New Revision: 21356
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21356
Log:
we have a function to get the sites dn
also it's not always under the domain dn
metze
Modified:
branches/SAMBA_4_0/source/rpc_server/drsuapi/dcesrv_drsuapi.c
Changeset:
Modified: branches/SAMBA_4_0/source/rpc_server/drsuapi/dcesrv_drsuapi.c
===
--- branches/SAMBA_4_0/source/rpc_server/drsuapi/dcesrv_drsuapi.c
2007-02-15 11:53:50 UTC (rev 21355)
+++ branches/SAMBA_4_0/source/rpc_server/drsuapi/dcesrv_drsuapi.c
2007-02-15 11:57:23 UTC (rev 21356)
@@ -395,15 +395,11 @@
r-out.level_out = r-in.req.req1.level;
- sites_dn = samdb_domain_to_dn(b_state-sam_ctx, mem_ctx,
r-in.req.req1.domain_name);
+ sites_dn = samdb_sites_dn(b_state-sam_ctx, mem_ctx);
if (!sites_dn) {
return WERR_DS_OBJ_NOT_FOUND;
}
- if (!ldb_dn_add_child_fmt(sites_dn, CN=Sites,CN=Configuration)) {
- return WERR_NOMEM;
- }
-
switch (r-out.level_out) {
case -1:
/* this level is not like the others */
svn commit: samba r21357 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_25/source/nsswitch
Author: gd
Date: 2007-02-15 12:05:19 + (Thu, 15 Feb 2007)
New Revision: 21357
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21357
Log:
Fix typo.
Guenther
Modified:
branches/SAMBA_3_0/source/nsswitch/winbindd_group.c
branches/SAMBA_3_0_25/source/nsswitch/winbindd_group.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_group.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd_group.c 2007-02-15 11:57:23 UTC
(rev 21356)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_group.c 2007-02-15 12:05:19 UTC
(rev 21357)
@@ -1302,7 +1302,7 @@
}
if ( s-domain-primary lp_winbind_trusted_domains_only()) {
- DEBUG(7,(winbindd_getpwnam: My domain -- rejecting
+ DEBUG(7,(winbindd_getgroups: My domain -- rejecting
getgroups() for %s\\%s.\n, s-domname,
s-username));
request_error(state);
Modified: branches/SAMBA_3_0_25/source/nsswitch/winbindd_group.c
===
--- branches/SAMBA_3_0_25/source/nsswitch/winbindd_group.c 2007-02-15
11:57:23 UTC (rev 21356)
+++ branches/SAMBA_3_0_25/source/nsswitch/winbindd_group.c 2007-02-15
12:05:19 UTC (rev 21357)
@@ -1302,7 +1302,7 @@
}
if ( s-domain-primary lp_winbind_trusted_domains_only()) {
- DEBUG(7,(winbindd_getpwnam: My domain -- rejecting
+ DEBUG(7,(winbindd_getgroups: My domain -- rejecting
getgroups() for %s\\%s.\n, s-domname,
s-username));
request_error(state);
svn commit: samba r21358 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_25/source/nsswitch
Author: gd
Date: 2007-02-15 12:10:57 + (Thu, 15 Feb 2007)
New Revision: 21358
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21358
Log:
Some more debugging for _nss_winbind_initgroups_dyn() on Linux.
Guenther
Modified:
branches/SAMBA_3_0/source/nsswitch/winbind_nss_linux.c
branches/SAMBA_3_0_25/source/nsswitch/winbind_nss_linux.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbind_nss_linux.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbind_nss_linux.c 2007-02-15
12:05:19 UTC (rev 21357)
+++ branches/SAMBA_3_0/source/nsswitch/winbind_nss_linux.c 2007-02-15
12:10:57 UTC (rev 21358)
@@ -943,10 +943,22 @@
int num_gids = response.data.num_entries;
gid_t *gid_list = (gid_t *)response.extra_data.data;
+#ifdef DEBUG_NSS
+ fprintf(stderr, [%5d]: initgroups %s: got NSS_STATUS_SUCCESS
+ and %d gids\n, getpid(),
+ user, num_gids);
+#endif
+
/* Copy group list to client */
for (i = 0; i num_gids; i++) {
+#ifdef DEBUG_NSS
+ fprintf(stderr, [%5d]: initgroups %s (%d):
+ processing gid %d \n, getpid(),
+ user, group, gid_list[i]);
+#endif
+
/* Skip primary group */
if (gid_list[i] == group) {
Modified: branches/SAMBA_3_0_25/source/nsswitch/winbind_nss_linux.c
===
--- branches/SAMBA_3_0_25/source/nsswitch/winbind_nss_linux.c 2007-02-15
12:05:19 UTC (rev 21357)
+++ branches/SAMBA_3_0_25/source/nsswitch/winbind_nss_linux.c 2007-02-15
12:10:57 UTC (rev 21358)
@@ -943,10 +943,22 @@
int num_gids = response.data.num_entries;
gid_t *gid_list = (gid_t *)response.extra_data.data;
+#ifdef DEBUG_NSS
+ fprintf(stderr, [%5d]: initgroups %s: got NSS_STATUS_SUCCESS
+ and %d gids\n, getpid(),
+ user, num_gids);
+#endif
+
/* Copy group list to client */
for (i = 0; i num_gids; i++) {
+#ifdef DEBUG_NSS
+ fprintf(stderr, [%5d]: initgroups %s (%d):
+ processing gid %d \n, getpid(),
+ user, group, gid_list[i]);
+#endif
+
/* Skip primary group */
if (gid_list[i] == group) {
svn commit: samba r21359 - in branches/SAMBA_4_0/source/dsdb/repl: .
Author: metze
Date: 2007-02-15 12:40:13 + (Thu, 15 Feb 2007)
New Revision: 21359
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21359
Log:
remove the rid encryption before storing the password hashes
We decided to store them plain in our ldb
metze
Modified:
branches/SAMBA_4_0/source/dsdb/repl/replicated_objects.c
Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/repl/replicated_objects.c
===
--- branches/SAMBA_4_0/source/dsdb/repl/replicated_objects.c2007-02-15
12:10:57 UTC (rev 21358)
+++ branches/SAMBA_4_0/source/dsdb/repl/replicated_objects.c2007-02-15
12:40:13 UTC (rev 21359)
@@ -28,9 +28,12 @@
#include librpc/gen_ndr/ndr_drsuapi.h
#include librpc/gen_ndr/ndr_drsblobs.h
#include lib/crypto/crypto.h
+#include libcli/auth/libcli_auth.h
static WERROR dsdb_decrypt_attribute_value(TALLOC_CTX *mem_ctx,
const DATA_BLOB *gensec_skey,
+ bool rid_crypt,
+ uint32_t rid,
DATA_BLOB *in,
DATA_BLOB *out)
{
@@ -49,6 +52,13 @@
DATA_BLOB plain_buffer;
+ /*
+* users with rid == 0 should not exist
+*/
+ if (rid_crypt rid == 0) {
+ return WERR_DS_DRA_INVALID_PARAMETER;
+ }
+
/*
* the first 16 bytes at the beginning are the confounder
* followed by the 4 byte crc32 checksum
@@ -90,12 +100,21 @@
}
checked_buffer = data_blob_const(dec_buffer.data + 4, dec_buffer.length
- 4);
- if (checked_buffer.length) {
- plain_buffer = data_blob_talloc(mem_ctx, checked_buffer.data,
checked_buffer.length);
- memset(checked_buffer.data, 0x00, checked_buffer.length);
- W_ERROR_HAVE_NO_MEMORY(plain_buffer.data);
- } else {
- plain_buffer = data_blob_const(NULL, 0);
+ plain_buffer = data_blob_talloc(mem_ctx, checked_buffer.data,
checked_buffer.length);
+ W_ERROR_HAVE_NO_MEMORY(plain_buffer.data);
+
+ if (rid_crypt) {
+ uint32_t i, num_hashes;
+
+ if ((checked_buffer.length % 16) != 0) {
+ return WERR_DS_DRA_INVALID_PARAMETER;
+ }
+
+ num_hashes = plain_buffer.length / 16;
+ for (i = 0; i num_hashes; i++) {
+ uint32_t offset = i * 16;
+ sam_rid_crypt(rid, checked_buffer.data + offset,
plain_buffer.data + offset, 0);
+ }
}
*out = plain_buffer;
@@ -103,12 +122,14 @@
}
static WERROR dsdb_decrypt_attribute(const DATA_BLOB *gensec_skey,
+uint32_t rid,
struct drsuapi_DsReplicaAttribute *attr)
{
WERROR status;
TALLOC_CTX *mem_ctx;
DATA_BLOB *enc_data;
DATA_BLOB plain_data;
+ bool rid_crypt = false;
if (attr-value_ctr.num_values == 0) {
return WERR_OK;
@@ -119,6 +140,8 @@
case DRSUAPI_ATTRIBUTE_unicodePwd:
case DRSUAPI_ATTRIBUTE_ntPwdHistory:
case DRSUAPI_ATTRIBUTE_lmPwdHistory:
+ rid_crypt = true;
+ break;
case DRSUAPI_ATTRIBUTE_supplementalCredentials:
case DRSUAPI_ATTRIBUTE_priorValue:
case DRSUAPI_ATTRIBUTE_currentValue:
@@ -144,6 +167,8 @@
status = dsdb_decrypt_attribute_value(mem_ctx,
gensec_skey,
+ rid_crypt,
+ rid,
enc_data,
plain_data);
W_ERROR_NOT_OK_RETURN(status);
@@ -178,6 +203,8 @@
struct drsuapi_DsReplicaAttribute *name_a = NULL;
struct drsuapi_DsReplicaMetaData *name_d = NULL;
struct replPropertyMetaData1 *rdn_m = NULL;
+ struct dom_sid *sid = NULL;
+ uint32_t rid = 0;
int ret;
if (!in-object.identifier) {
@@ -196,6 +223,11 @@
return WERR_FOOBAR;
}
+ sid = in-object.identifier-sid;
+ if (sid-num_auths 0) {
+ rid = sid-sub_auths[sid-num_auths - 1];
+ }
+
msg = ldb_msg_new(mem_ctx);
W_ERROR_HAVE_NO_MEMORY(msg);
@@ -238,7 +270,7 @@
m = md-ctr.ctr1.array[i];
e = msg-elements[i];
- status = dsdb_decrypt_attribute(gensec_skey, a);
+ status = dsdb_decrypt_attribute(gensec_skey, rid, a);
W_ERROR_NOT_OK_RETURN(status);
status = dsdb_attribute_drsuapi_to_ldb(schema, a,
msg-elements, e);
svn commit: samba r21360 - in branches/SAMBA_4_0/source/torture/libnet: .
Author: metze
Date: 2007-02-15 12:47:58 + (Thu, 15 Feb 2007)
New Revision: 21360
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21360
Log:
- put in the correct machine account password into test_secrets.ldb
- don't overwrite the passwords with 'test' as we now understand the windows
format for the password hashes
metze
Modified:
branches/SAMBA_4_0/source/torture/libnet/libnet_BecomeDC.c
Changeset:
Modified: branches/SAMBA_4_0/source/torture/libnet/libnet_BecomeDC.c
===
--- branches/SAMBA_4_0/source/torture/libnet/libnet_BecomeDC.c 2007-02-15
12:40:13 UTC (rev 21359)
+++ branches/SAMBA_4_0/source/torture/libnet/libnet_BecomeDC.c 2007-02-15
12:47:58 UTC (rev 21360)
@@ -200,9 +200,9 @@
subobj.CONFIGDN_MOD = \naming_fsmo,repl_meta_data\;\n
subobj.SCHEMADN_MOD = \schema_fsmo,repl_meta_data\;\n
\n
- subobj.KRBTGTPASS = \test\;\n
- subobj.MACHINEPASS = \test\;\n
- subobj.ADMINPASS= \test\;\n
+ subobj.KRBTGTPASS = \_NOT_USED_\;\n
+ subobj.MACHINEPASS = \%s\;\n
+ subobj.ADMINPASS= \_NOT_USED_\;\n
\n
var paths = provision_default_paths(subobj);\n
paths.samdb = \%s\;\n
@@ -222,6 +222,7 @@
p-dest_dsa-netbios_name, /* subobj.HOSTNAME */
p-dest_dsa-dns_name, /* subobj.DNSNAME */
p-dest_dsa-site_name, /* subobj.DEFAULTSITE */
+ cli_credentials_get_password(s-machine_account),/*
subobj.MACHINEPASS */
TORTURE_SAMDB_LDB, /* paths.samdb */
TORTURE_SECRETS_LDB,/* paths.secrets */
TORTURE_SECRETS_KEYTAB);/* paths.keytab */
@@ -707,81 +708,6 @@
return test_become_dc_store_chunk(private_data, c);
}
-static BOOL test_become_dc_set_test_passwords(struct test_become_dc_state *s)
-{
- struct ldb_message *msg;
- int ret;
-
- printf(Set up \test\ as password for the krbtgt, machine and
administrator accounts\n);
-
- /*
-* first krbtgt password
-*/
- msg = ldb_msg_new(s);
- if (!msg) return False;
-
- msg-dn = ldb_dn_new_fmt(msg, s-ldb, CN=krbtgt,CN=Users,%s,
-ldb_dn_get_linearized(samdb_base_dn(s-ldb)));
- if (!msg) return False;
-
- ret = ldb_msg_add_string(msg, sambaPassword, test);
- if (ret != LDB_SUCCESS) return False;
-
- ret = samdb_replace(s-ldb, s, msg);
- if (ret != LDB_SUCCESS) {
- printf(failed to replace sambaPassword for '%s': %s\n,
- ldb_dn_get_linearized(msg-dn),
- ldb_strerror(ret));
- return False;
- }
- talloc_free(msg);
-
- /*
-* our machine account password
-*/
- msg = ldb_msg_new(s);
- if (!msg) return False;
-
- msg-dn = ldb_dn_new(msg, s-ldb, s-computer_dn);
- if (!msg) return False;
-
- ret = ldb_msg_add_string(msg, sambaPassword, test);
- if (ret != LDB_SUCCESS) return False;
-
- ret = samdb_replace(s-ldb, s, msg);
- if (ret != LDB_SUCCESS) {
- printf(failed to replace sambaPassword for '%s': %s\n,
- ldb_dn_get_linearized(msg-dn),
- ldb_strerror(ret));
- return False;
- }
- talloc_free(msg);
-
- /*
-* the Administrator account password
-*/
- msg = ldb_msg_new(s);
- if (!msg) return False;
-
- msg-dn = ldb_dn_new_fmt(msg, s-ldb, CN=Administrator,CN=Users,%s,
-ldb_dn_get_linearized(samdb_base_dn(s-ldb)));
- if (!msg) return False;
-
- ret = ldb_msg_add_string(msg, sambaPassword, test);
- if (ret != LDB_SUCCESS) return False;
-
- ret = samdb_replace(s-ldb, s, msg);
- if (ret != LDB_SUCCESS) {
- printf(failed to replace sambaPassword for '%s': %s\n,
- ldb_dn_get_linearized(msg-dn),
- ldb_strerror(ret));
- return False;
- }
- talloc_free(msg);
-
- return True;
-}
-
BOOL torture_net_become_dc(struct torture_context *torture)
{
BOOL ret = True;
@@ -886,8 +812,6 @@
goto cleanup;
}
- ret = test_become_dc_set_test_passwords(s);
-
cleanup:
ZERO_STRUCT(u);
u.in.domain_dns_name= torture_join_dom_dns_name(s-tj);
svn commit: samba r21361 - in branches/SAMBA_4_0/testprogs/ejs: .
Author: metze
Date: 2007-02-15 12:51:44 + (Thu, 15 Feb 2007)
New Revision: 21361
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21361
Log:
let samba3sam.js pass when we'll use unicodePwd for storing the nt hash
jelmer: what should this test really test?
metze
Modified:
branches/SAMBA_4_0/testprogs/ejs/samba3sam.js
Changeset:
Modified: branches/SAMBA_4_0/testprogs/ejs/samba3sam.js
===
--- branches/SAMBA_4_0/testprogs/ejs/samba3sam.js 2007-02-15 12:47:58 UTC
(rev 21360)
+++ branches/SAMBA_4_0/testprogs/ejs/samba3sam.js 2007-02-15 12:51:44 UTC
(rev 21361)
@@ -137,7 +137,7 @@
dn: cn=Niemand,cn=Users,dc=vernstok,dc=nl
objectClass: user
unixName: bin
-unicodePwd: geheim
+sambaUnicodePwd: geheim
cn: Niemand
);
if (ok.error != 0) {
@@ -147,27 +147,27 @@
assert(ok.error == 0);
println(Checking for existence of record (remote));
- msg = ldb.search((unixName=bin), new Array('unixName','cn','dn',
'unicodePwd'));
+ msg = ldb.search((unixName=bin), new Array('unixName','cn','dn',
'sambaUnicodePwd'));
assert(msg.error == 0);
assert(msg.msgs.length == 1);
assert(msg.msgs[0].cn == Niemand);
- assert(msg.msgs[0].unicodePwd == geheim);
+ assert(msg.msgs[0].sambaUnicodePwd == geheim);
println(Checking for existence of record (local remote));
- msg = ldb.search(((unixName=bin)(unicodePwd=geheim)), new
Array('unixName','cn','dn', 'unicodePwd'));
+ msg = ldb.search(((unixName=bin)(sambaUnicodePwd=geheim)), new
Array('unixName','cn','dn', 'sambaUnicodePwd'));
assert(msg.error == 0);
assert(msg.msgs.length == 1); // TODO: should check with more
records
assert(msg.msgs[0].cn == Niemand);
assert(msg.msgs[0].unixName == bin);
- assert(msg.msgs[0].unicodePwd == geheim);
+ assert(msg.msgs[0].sambaUnicodePwd == geheim);
println(Checking for existence of record (local || remote));
- msg = ldb.search((|(unixName=bin)(unicodePwd=geheim)), new
Array('unixName','cn','dn', 'unicodePwd'));
+ msg = ldb.search((|(unixName=bin)(sambaUnicodePwd=geheim)), new
Array('unixName','cn','dn', 'sambaUnicodePwd'));
println(got + msg.msgs.length + replies);
assert(msg.error == 0);
assert(msg.msgs.length == 1); // TODO: should check with more
records
assert(msg.msgs[0].cn == Niemand);
- assert(msg.msgs[0].unixName == bin || msg.msgs[0].unicodePwd ==
geheim);
+ assert(msg.msgs[0].unixName == bin || msg.msgs[0].sambaUnicodePwd ==
geheim);
println(Checking for data in destination database);
msg = s3.db.search((cn=Niemand));
svn commit: samba r21362 - in branches/SAMBA_4_0/source: auth auth/credentials dsdb/samdb dsdb/samdb/ldb_modules libnet rpc_server/netlogon rpc_server/samr
Author: metze
Date: 2007-02-15 12:54:58 + (Thu, 15 Feb 2007)
New Revision: 21362
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21362
Log:
rename:
ntPwdHash = unicodePwd
lmPwdHash = dBCSPwd
sambaLMPwdHistory = lmPwdHistory
sambaNTPwdHistory = ntPwdHistory
Note: you need to reprovision after this change!
metze
Modified:
branches/SAMBA_4_0/source/auth/credentials/credentials_files.c
branches/SAMBA_4_0/source/auth/sam.c
branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/local_password.c
branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/password_hash.c
branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/samba3sam.c
branches/SAMBA_4_0/source/dsdb/samdb/samdb.c
branches/SAMBA_4_0/source/libnet/libnet_samsync_ldb.c
branches/SAMBA_4_0/source/rpc_server/netlogon/dcerpc_netlogon.c
branches/SAMBA_4_0/source/rpc_server/samr/samr_password.c
Changeset:
Modified: branches/SAMBA_4_0/source/auth/credentials/credentials_files.c
===
--- branches/SAMBA_4_0/source/auth/credentials/credentials_files.c
2007-02-15 12:51:44 UTC (rev 21361)
+++ branches/SAMBA_4_0/source/auth/credentials/credentials_files.c
2007-02-15 12:54:58 UTC (rev 21362)
@@ -184,7 +184,7 @@
flatname,
realm,
secureChannelType,
- ntPwdHash,
+ unicodePwd,
msDS-KeyVersionNumber,
saltPrincipal,
privateKeytab,
@@ -264,7 +264,7 @@
}
if (!password) {
- const struct ldb_val *nt_password_hash =
ldb_msg_find_ldb_val(msgs[0], ntPwdHash);
+ const struct ldb_val *nt_password_hash =
ldb_msg_find_ldb_val(msgs[0], unicodePwd);
struct samr_Password hash;
ZERO_STRUCT(hash);
if (nt_password_hash) {
Modified: branches/SAMBA_4_0/source/auth/sam.c
===
--- branches/SAMBA_4_0/source/auth/sam.c2007-02-15 12:51:44 UTC (rev
21361)
+++ branches/SAMBA_4_0/source/auth/sam.c2007-02-15 12:54:58 UTC (rev
21362)
@@ -39,8 +39,8 @@
krb5Key,
/* passwords */
- lmPwdHash,
- ntPwdHash,
+ dBCSPwd,
+ unicodePwd,
userAccountControl,
Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/local_password.c
===
--- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/local_password.c
2007-02-15 12:51:44 UTC (rev 21361)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/local_password.c
2007-02-15 12:54:58 UTC (rev 21362)
@@ -54,10 +54,10 @@
static const char * const password_attrs[] = {
sambaPassword,
krb5Key,
- ntPwdHash,
- lmPwdHash,
- sambaLMPwdHistory,
- sambaNTPwdHistory,
+ unicodePwd,
+ dBCSPwd,
+ lmPwdHistory,
+ ntPwdHistory,
msDS-KeyVersionNumber,
pwdLastSet
};
Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/password_hash.c
===
--- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/password_hash.c
2007-02-15 12:51:44 UTC (rev 21361)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/password_hash.c
2007-02-15 12:54:58 UTC (rev 21362)
@@ -106,22 +106,22 @@
}
if (is_mod) {
- if (ldb_msg_add_empty(msg, ntPwdHash, LDB_FLAG_MOD_REPLACE,
NULL) != 0) {
+ if (ldb_msg_add_empty(msg, unicodePwd, LDB_FLAG_MOD_REPLACE,
NULL) != 0) {
return LDB_ERR_OPERATIONS_ERROR;
}
- if (ldb_msg_add_empty(msg, lmPwdHash, LDB_FLAG_MOD_REPLACE,
NULL) != 0) {
+ if (ldb_msg_add_empty(msg, dBCSPwd, LDB_FLAG_MOD_REPLACE,
NULL) != 0) {
return LDB_ERR_OPERATIONS_ERROR;
}
}
/* compute the new nt and lm hashes */
E_md4hash(sambaPassword, tmp_hash.hash);
- if (samdb_msg_add_hash(module-ldb, msg, msg, ntPwdHash, tmp_hash)
!= 0) {
+ if (samdb_msg_add_hash(module-ldb, msg, msg, unicodePwd, tmp_hash)
!= 0) {
return LDB_ERR_OPERATIONS_ERROR;
}
if (E_deshash(sambaPassword, tmp_hash.hash)) {
- if (samdb_msg_add_hash(module-ldb, msg, msg, lmPwdHash,
tmp_hash) != 0) {
+ if (samdb_msg_add_hash(module-ldb, msg, msg, dBCSPwd,
tmp_hash) != 0) {
return LDB_ERR_OPERATIONS_ERROR;
}
}
@@ -276,7 +276,7 @@
key.mkvno = 0;
key.salt = NULL; /* No salt for this enc type */
- ntPwdHash = samdb_result_hash(msg, msg, ntPwdHash);
+ ntPwdHash = samdb_result_hash(msg, msg, unicodePwd);
if (ntPwdHash == NULL) { /* what happened ?! */
return LDB_ERR_OPERATIONS_ERROR;
svn commit: samba r21363 - in branches/SAMBA_4_0/source/kdc: .
Author: metze
Date: 2007-02-15 12:56:46 + (Thu, 15 Feb 2007)
New Revision: 21363
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21363
Log:
fallback to fetch the KEYTYPE_ARCFOUR out of the unicodePwd attribute
when no krb5key attribute is present or it doesn't contain the KEYTYPE_ARCFOUR
key.
metze
Modified:
branches/SAMBA_4_0/source/kdc/hdb-ldb.c
Changeset:
Modified: branches/SAMBA_4_0/source/kdc/hdb-ldb.c
===
--- branches/SAMBA_4_0/source/kdc/hdb-ldb.c 2007-02-15 12:54:58 UTC (rev
21362)
+++ branches/SAMBA_4_0/source/kdc/hdb-ldb.c 2007-02-15 12:56:46 UTC (rev
21363)
@@ -58,8 +58,6 @@
userPrincipalName,
servicePrincipalName,
- krb5Key,
-
userAccountControl,
pwdLastSet,
@@ -69,6 +67,10 @@
whenChanged,
msDS-KeyVersionNumber,
+ krb5Key,
+
+ unicodePwd,
+
NULL
};
@@ -196,63 +198,109 @@
talloc_free(entry_ex-ctx);
}
-static krb5_error_code LDB_message2entry_keys(TALLOC_CTX *mem_ctx,
+static krb5_error_code LDB_message2entry_keys(krb5_context context,
+ TALLOC_CTX *mem_ctx,
struct ldb_message *msg,
unsigned int userAccountControl,
hdb_entry_ex *entry_ex)
{
krb5_error_code ret = 0;
- struct ldb_message_element *ldb_keys;
+ struct ldb_message_element *krb5keys;
+ struct samr_Password *hash;
int i;
+ bool arcfour_needed = true;
+ uint32_t allocated_keys = 0;
+ entry_ex-entry.keys.val = NULL;
+ entry_ex-entry.keys.len = 0;
+
/* Get krb5Key from the db */
- ldb_keys = ldb_msg_find_element(msg, krb5Key);
+ krb5keys = ldb_msg_find_element(msg, krb5Key);
+ hash = samdb_result_hash(mem_ctx, msg, unicodePwd);
- if (!ldb_keys) {
+ if (krb5keys) {
+ allocated_keys = krb5keys-num_values;
+ }
+
+ if (hash) {
+ allocated_keys++;
+ }
+
+ if (allocated_keys == 0) {
/* oh, no password. Apparently (comment in
* hdb-ldap.c) this violates the ASN.1, but this
* allows an entry with no keys (yet). */
- entry_ex-entry.keys.val = NULL;
- entry_ex-entry.keys.len = 0;
- } else {
- /* allocate space to decode into */
- entry_ex-entry.keys.val = calloc(ldb_keys-num_values,
sizeof(Key));
- if (entry_ex-entry.keys.val == NULL) {
- ret = ENOMEM;
+ return 0;
+ }
+
+ /* allocate space to decode into */
+ entry_ex-entry.keys.len = 0;
+ entry_ex-entry.keys.val = calloc(allocated_keys, sizeof(Key));
+ if (entry_ex-entry.keys.val == NULL) {
+ ret = ENOMEM;
+ goto out;
+ }
+
+ /* Decode Kerberos keys into the hdb structure */
+ for (i=0; (krb5keys i krb5keys-num_values); i++) {
+ size_t decode_len;
+ Key key;
+ ret = decode_Key(krb5keys-values[i].data,
krb5keys-values[i].length,
+key, decode_len);
+ if (ret) {
+ /* Could be bougus data in the entry, or out of memory
*/
goto out;
}
- entry_ex-entry.keys.len = 0;
-
- /* Decode Kerberos keys into the hdb structure */
- for (i=0; i ldb_keys-num_values; i++) {
- size_t decode_len;
- Key key;
- ret = decode_Key(ldb_keys-values[i].data,
ldb_keys-values[i].length,
-key, decode_len);
- if (ret) {
- /* Could be bougus data in the entry, or out of
memory */
- goto out;
- }
-
- if (userAccountControl UF_USE_DES_KEY_ONLY) {
- switch (key.key.keytype) {
- case KEYTYPE_DES:
-
entry_ex-entry.keys.val[entry_ex-entry.keys.len] = key;
- entry_ex-entry.keys.len++;
- default:
- /* We must use DES keys only */
- break;
- }
- } else {
+ if (userAccountControl UF_USE_DES_KEY_ONLY) {
+ switch (key.key.keytype) {
+ case KEYTYPE_DES:
+ arcfour_needed = false;
entry_ex-entry.keys.val[entry_ex-entry.keys.len] = key;
svn commit: samba r21364 - in branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules: .
Author: metze
Date: 2007-02-15 13:01:18 + (Thu, 15 Feb 2007)
New Revision: 21364
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21364
Log:
cosmetic change: it's nicer to use the KEYTYPE_ macro
for the keytype field...
metze
Modified:
branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/password_hash.c
Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/password_hash.c
===
--- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/password_hash.c
2007-02-15 12:56:46 UTC (rev 21363)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/password_hash.c
2007-02-15 13:01:18 UTC (rev 21364)
@@ -231,7 +231,7 @@
struct ldb_val val;
int ret;
- if (keys[i].key.keytype == ETYPE_ARCFOUR_HMAC_MD5) {
+ if (keys[i].key.keytype == KEYTYPE_ARCFOUR) {
/* We might end up doing this below:
* This ensures we get the unicode
* conversion right. This should also
@@ -282,7 +282,7 @@
}
krb5_ret = krb5_keyblock_init(smb_krb5_context-krb5_context,
- ETYPE_ARCFOUR_HMAC_MD5,
+ KEYTYPE_ARCFOUR,
ntPwdHash-hash, sizeof(ntPwdHash-hash),
key.key);
if (krb5_ret) {
svn commit: samba r21365 - in branches/SAMBA_3_0/source: .
Author: vlendec Date: 2007-02-15 14:09:39 + (Thu, 15 Feb 2007) New Revision: 21365 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21365 Log: Lets see which build farm machines have makecontext friends Modified: branches/SAMBA_3_0/source/configure.in Changeset: Modified: branches/SAMBA_3_0/source/configure.in === --- branches/SAMBA_3_0/source/configure.in 2007-02-15 13:01:18 UTC (rev 21364) +++ branches/SAMBA_3_0/source/configure.in 2007-02-15 14:09:39 UTC (rev 21365) @@ -1243,6 +1243,7 @@ AC_CHECK_HEADERS(sys/mman.h) # setbuffer, shmget, shm_open are needed for smbtorture AC_CHECK_FUNCS(setbuffer shmget shm_open) +AC_CHECK_FUNCS(makecontext getcontext setcontext swapcontext) # Find a method of generating a stack trace AC_CHECK_HEADERS(execinfo.h libexc.h libunwind.h)
svn commit: samba r21366 - in branches/SAMBA_4_0/webapps/swat/source/class/swat/module/ldbbrowse: .
Author: idra Date: 2007-02-15 14:48:47 + (Thu, 15 Feb 2007) New Revision: 21366 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21366 Log: Until we have a schema enforcing module (which will make it impossible to add object without an objectclass), we need to use the default ldb search filter (an empty one), to retrieve all objects, and all record contents. Modified: branches/SAMBA_4_0/webapps/swat/source/class/swat/module/ldbbrowse/Fsm.js Changeset: Modified: branches/SAMBA_4_0/webapps/swat/source/class/swat/module/ldbbrowse/Fsm.js === --- branches/SAMBA_4_0/webapps/swat/source/class/swat/module/ldbbrowse/Fsm.js 2007-02-15 14:09:39 UTC (rev 21365) +++ branches/SAMBA_4_0/webapps/swat/source/class/swat/module/ldbbrowse/Fsm.js 2007-02-15 14:48:47 UTC (rev 21366) @@ -311,7 +311,7 @@ } // Build the search expression - var searchExpr = (objectclass=*); + var searchExpr = ; // Get our module descriptor var module = fsm.getObject(swat.main.module); @@ -415,7 +415,7 @@ baseDN = hierarchy.reverse().join(,); // Build the search expression - var searchExpr = (objectclass=*); + var searchExpr = ; // Get our module descriptor var module = fsm.getObject(swat.main.module);
svn commit: samba r21367 - in branches/SAMBA_4_0/webapps/swat/source/class/swat/module/ldbbrowse: .
Author: idra Date: 2007-02-15 14:49:35 + (Thu, 15 Feb 2007) New Revision: 21367 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21367 Log: Clear out the table with a deleted object contents after the record is deleted. Could be confusing otherwise. Modified: branches/SAMBA_4_0/webapps/swat/source/class/swat/module/ldbbrowse/Gui.js Changeset: Modified: branches/SAMBA_4_0/webapps/swat/source/class/swat/module/ldbbrowse/Gui.js === --- branches/SAMBA_4_0/webapps/swat/source/class/swat/module/ldbbrowse/Gui.js 2007-02-15 14:48:47 UTC (rev 21366) +++ branches/SAMBA_4_0/webapps/swat/source/class/swat/module/ldbbrowse/Gui.js 2007-02-15 14:49:35 UTC (rev 21367) @@ -517,15 +517,18 @@ var result = rpcRequest.getUserData(result); var tree = module.fsm.getObject(tree); - var node = tree.getDataModel().getData()[tree.getSelectedNodes()[0].parentNodeId]; + var dataModel = tree.getDataModel(); + var node = dataModel.getData()[tree.getSelectedNodes()[0].parentNodeId]; - tree.getDataModel().prune(node.nodeId, false); + dataModel.prune(node.nodeId, false); node.bOpened = false; tree.toggleOpened(node); alert(Object Successfully deleted!); this._ldbmod.setBase(); + // just clear the attribute/value table. + dataModel.setData([ ]); }; qx.Proto._displaySearchResults = function(module, rpcRequest)
Rev 67: 1st working ib integrated ctdb in http://samba.org/~tridge/psomogyi/
revno: 67
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Peter Somogyi [EMAIL PROTECTED]
branch nick: ctdb
timestamp: Thu 2007-02-15 17:02:38 +0100
message:
1st working ib integrated ctdb
TODO: bugfix of ctdb_bench (wants to sent via uninitialised connection - see
bench_ring/dest)
modified:
ib/README.txt readme.txt-20070212151749-ess18rmh152b8hao-1
ib/ibw_ctdb.c ibw_ctdb.c-20070102171255-7krov7858dqza466-1
ib/ibw_ctdb.h ibw_ctdb.h-20070102171259-nmuvtzt98aqzg7xp-1
ib/ibw_ctdb_init.c
ibw_ctdb_init.c-20070102171305-cn2z4k7ibx8141d5-1
ib/ibwrapper.c ibwrapper.c-20061204130028-0125b4f5a72f4b11
ib/ibwrapper_test.c
ibwrapper_test.c-20061214171730-h11a2z5ed6pt66hj-1
=== modified file 'ib/README.txt'
--- a/ib/README.txt 2007-02-12 15:47:12 +
+++ b/ib/README.txt 2007-02-15 16:02:38 +
@@ -9,3 +9,12 @@
./configure --enable-infiniband
+Example for testing
+===
+bin/ctdb_test --transport ib --nlist ../2nodes_rm.txt --listen 10.0.0.1:9001
+bin/ctdb_test --transport ib --nlist ../2nodes_rm.txt --listen 10.0.0.2:9001
+
+where 2nodes_rm.txt:
+10.0.0.1:9001
+10.0.0.2:9001
+
=== modified file 'ib/ibw_ctdb.c'
--- a/ib/ibw_ctdb.c 2007-02-14 17:58:20 +
+++ b/ib/ibw_ctdb.c 2007-02-15 16:02:38 +
@@ -29,6 +29,36 @@
#include ibwrapper.h
#include ibw_ctdb.h
+int ctdb_ibw_node_connect(struct ibw_ctx *ictx, struct ctdb_node *node)
+{
+ struct sockaddr_in sock_out;
+
+ memset(sock_out, 0, sizeof(struct sockaddr_in));
+ inet_pton(AF_INET, node-address.address, sock_out.sin_addr);
+ sock_out.sin_port = htons(node-address.port);
+ sock_out.sin_family = PF_INET;
+
+ if (ibw_connect(ictx, sock_out, node)) {
+ DEBUG(0, (ctdb_ibw_node_connect: ibw_connect failed - retrying
in 1 sec...\n));
+ /* try again once a second */
+ event_add_timed(node-ctdb-ev, node, timeval_current_ofs(1,
0),
+ ctdb_ibw_node_connect_event, node);
+ return -1;
+ }
+
+ /* continues at ibw_ctdb.c/IBWC_CONNECTED in good case */
+ return 0;
+}
+
+void ctdb_ibw_node_connect_event(struct event_context *ev, struct timed_event
*te,
+ struct timeval t, void *private)
+{
+ struct ctdb_node *node = talloc_get_type(private, struct ctdb_node);
+ struct ibw_ctx *ictx = talloc_get_type(node-ctdb-private, struct
ibw_ctx);
+
+ ctdb_ibw_node_connect(ictx, node);
+}
+
int ctdb_ibw_connstate_handler(struct ibw_ctx *ctx, struct ibw_conn *conn)
{
if (ctx!=NULL) {
@@ -76,11 +106,17 @@
if (node!=NULL)
node-ctdb-upcalls-node_dead(node);
talloc_free(conn);
+ /* normal + intended disconnect = not reconnecting in
this layer */
} break;
case IBWC_ERROR: {
-/* struct ctdb_node *node =
talloc_get_type(conn-conn_userdata, struct ctdb_node);
+ struct ctdb_node *node =
talloc_get_type(conn-conn_userdata, struct ctdb_node);
if (node!=NULL)
- node-ctdb-upcalls-node_dead(node);*/
+ node-private = NULL; /* not to use again */
+
+ DEBUG(10, (IBWC_ERROR, reconnecting
immediately...\n));
+ talloc_free(conn);
+ event_add_timed(node-ctdb-ev, node,
timeval_current_ofs(1, 0),
+ ctdb_ibw_node_connect_event, node);
} break;
default:
assert(0);
@@ -94,17 +130,20 @@
int ctdb_ibw_receive_handler(struct ibw_conn *conn, void *buf, int n)
{
struct ctdb_context *ctdb = talloc_get_type(conn-ctx-ctx_userdata,
struct ctdb_context);
+ void*buf2; /* future TODO: a solution for removal of this */
assert(ctdb!=NULL);
+ assert(buf!=NULL);
+ assert(conn!=NULL);
assert(conn-state==IBWC_CONNECTED);
- /* TODO: shall I short-circuit this in ibwrapper? */
- /* maybe when everything go fine... */
+ /* so far buf is an ib-registered memory area
+* and being reused for next receive
+* noticed that HL requires talloc-ed memory to be stolen */
+ buf2 = talloc_zero_size(conn, n);
+ memcpy(buf2, buf, n);
- /* TODO2: !!! here I can provide conn-conn_userdata (with no perf.
penalty) -
-* as struct ctdb_node in case the connection
-* has been built up by ibw_connect !!! */
- ctdb-upcalls-recv_pkt(ctdb, (uint8_t *)buf, (uint32_t)n);
+ ctdb-upcalls-recv_pkt(ctdb, (uint8_t *)buf2, (uint32_t)n);
return 0;
}
=== modified file 'ib/ibw_ctdb.h'
--- a/ib/ibw_ctdb.h 2007-01-02
svn commit: samba r21370 - in branches/SAMBA_3_0_25/source/smbd: .
Author: idra
Date: 2007-02-15 16:51:30 + (Thu, 15 Feb 2007)
New Revision: 21370
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21370
Log:
check into 3.0.25 as well
Modified:
branches/SAMBA_3_0_25/source/smbd/dfree.c
Changeset:
Modified: branches/SAMBA_3_0_25/source/smbd/dfree.c
===
--- branches/SAMBA_3_0_25/source/smbd/dfree.c 2007-02-15 16:50:14 UTC (rev
21369)
+++ branches/SAMBA_3_0_25/source/smbd/dfree.c 2007-02-15 16:51:30 UTC (rev
21370)
@@ -66,7 +66,7 @@
SMB_BIG_UINT sys_disk_free(connection_struct *conn, const char *path, BOOL
small_query,
SMB_BIG_UINT *bsize,SMB_BIG_UINT
*dfree,SMB_BIG_UINT *dsize)
{
- int dfree_retval;
+ SMB_BIG_UINT dfree_retval;
SMB_BIG_UINT dfree_q = 0;
SMB_BIG_UINT bsize_q = 0;
SMB_BIG_UINT dsize_q = 0;
svn commit: samba-web r1082 - in trunk/patches/patches-3.0.24: .
Author: jerry Date: 2007-02-15 16:56:33 + (Thu, 15 Feb 2007) New Revision: 1082 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=1082 Log: add jra's revision r21346 sec_desc in SetPrinter(Info3) for Vista clients Modified: trunk/patches/patches-3.0.24/spoolss.diff Changeset: Modified: trunk/patches/patches-3.0.24/spoolss.diff === --- trunk/patches/patches-3.0.24/spoolss.diff 2007-02-09 20:23:59 UTC (rev 1081) +++ trunk/patches/patches-3.0.24/spoolss.diff 2007-02-15 16:56:33 UTC (rev 1082) @@ -1,7 +1,7 @@ Index: samba-3.0.24/source/rpc_server/srv_spoolss_nt.c === --- samba-3.0.24.orig/source/rpc_server/srv_spoolss_nt.c 2007-02-04 12:59:21.0 -0600 -+++ samba-3.0.24/source/rpc_server/srv_spoolss_nt.c2007-02-09 14:22:20.0 -0600 samba-3.0.24/source/rpc_server/srv_spoolss_nt.c2007-02-14 11:47:48.0 -0600 @@ -5848,6 +5848,12 @@ goto done; } @@ -34,7 +34,7 @@ Index: samba-3.0.24/source/printing/nt_printing.c === --- samba-3.0.24.orig/source/printing/nt_printing.c2007-02-04 13:09:01.0 -0600 -+++ samba-3.0.24/source/printing/nt_printing.c 2007-02-09 14:22:20.0 -0600 samba-3.0.24/source/printing/nt_printing.c 2007-02-14 11:47:48.0 -0600 @@ -2984,11 +2984,15 @@ return True; } @@ -171,7 +171,7 @@ Index: samba-3.0.24/source/rpc_server/srv_spoolss.c === --- samba-3.0.24.orig/source/rpc_server/srv_spoolss.c 2006-04-19 21:29:27.0 -0500 -+++ samba-3.0.24/source/rpc_server/srv_spoolss.c 2007-02-09 14:22:43.0 -0600 samba-3.0.24/source/rpc_server/srv_spoolss.c 2007-02-14 11:47:48.0 -0600 @@ -1477,6 +1477,15 @@ ZERO_STRUCT(r_u);
Re: svn commit: samba r21346 - in branches: SAMBA_3_0/source/rpc_parse SAMBA_3_0_25/source/rpc_parse
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 [EMAIL PROTECTED] wrote: Author: jra Date: 2007-02-14 17:17:32 + (Wed, 14 Feb 2007) New Revision: 21346 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21346 Log: FIXME ! Our parsing here is wrong I think, but for a level3 it makes no sense for ptr_sec_desc to be NULL. JRA. Based on a Vista sniff from Martin Zielinski [EMAIL PROTECTED]. Jerry - part of the Vista patchset. Jeremy. Added to the patches page. jerry -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.3 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFF1JERIR7qMdg1EfYRAhGaAKCXnpILsEj7mt10TXnWAHidhwsyKgCePSOB V/JGQwhxpKu8p15dIFb0/lw= =eunp -END PGP SIGNATURE-
svn commit: samba-web r1083 - in trunk/patches/patches-3.0.24: .
Author: jerry
Date: 2007-02-15 17:04:18 + (Thu, 15 Feb 2007)
New Revision: 1083
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=1083
Log:
improve my quilt-foo and actually include the changes to parse_spoolss.c in the
patch this time
Modified:
trunk/patches/patches-3.0.24/spoolss.diff
Changeset:
Modified: trunk/patches/patches-3.0.24/spoolss.diff
===
--- trunk/patches/patches-3.0.24/spoolss.diff 2007-02-15 16:56:33 UTC (rev
1082)
+++ trunk/patches/patches-3.0.24/spoolss.diff 2007-02-15 17:04:18 UTC (rev
1083)
@@ -1,7 +1,7 @@
Index: samba-3.0.24/source/rpc_server/srv_spoolss_nt.c
===
--- samba-3.0.24.orig/source/rpc_server/srv_spoolss_nt.c 2007-02-04
12:59:21.0 -0600
-+++ samba-3.0.24/source/rpc_server/srv_spoolss_nt.c2007-02-14
11:47:48.0 -0600
samba-3.0.24/source/rpc_server/srv_spoolss_nt.c2007-02-15
11:02:09.0 -0600
@@ -5848,6 +5848,12 @@
goto done;
}
@@ -34,7 +34,7 @@
Index: samba-3.0.24/source/printing/nt_printing.c
===
--- samba-3.0.24.orig/source/printing/nt_printing.c2007-02-04
13:09:01.0 -0600
-+++ samba-3.0.24/source/printing/nt_printing.c 2007-02-14 11:47:48.0
-0600
samba-3.0.24/source/printing/nt_printing.c 2007-02-15 11:02:09.0
-0600
@@ -2984,11 +2984,15 @@
return True;
}
@@ -171,7 +171,7 @@
Index: samba-3.0.24/source/rpc_server/srv_spoolss.c
===
--- samba-3.0.24.orig/source/rpc_server/srv_spoolss.c 2006-04-19
21:29:27.0 -0500
-+++ samba-3.0.24/source/rpc_server/srv_spoolss.c 2007-02-14
11:47:48.0 -0600
samba-3.0.24/source/rpc_server/srv_spoolss.c 2007-02-15
11:02:09.0 -0600
@@ -1477,6 +1477,15 @@
ZERO_STRUCT(r_u);
@@ -188,3 +188,25 @@
DEBUG(0,(spoolss_io_q_addprinterdriverex: unable to unmarshall
SPOOL_Q_ADDPRINTERDRIVEREX.\n));
return False;
}
+Index: samba-3.0.24/source/rpc_parse/parse_spoolss.c
+===
+--- samba-3.0.24.orig/source/rpc_parse/parse_spoolss.c 2007-02-15
11:02:19.0 -0600
samba-3.0.24/source/rpc_parse/parse_spoolss.c 2007-02-15
11:02:25.0 -0600
+@@ -3893,7 +3893,16 @@
+ }
+ case 3:
+ {
+- ptr_sec_desc = q_u-info.info_3-secdesc_ptr;
++ /* FIXME ! Our parsing here is wrong I think,
++ * but for a level3 it makes no sense for
++ * ptr_sec_desc to be NULL. JRA. Based on
++ * a Vista sniff from Martin Zielinski [EMAIL
PROTECTED].
++ */
++ if (UNMARSHALLING(ps)) {
++ ptr_sec_desc = 1;
++ } else {
++ ptr_sec_desc = q_u-info.info_3-secdesc_ptr;
++ }
+ break;
+ }
+ }
svn commit: samba r21371 - in branches/SAMBA_4_0/webapps/swat/source/class/swat/module/ldbbrowse: .
Author: idra Date: 2007-02-15 18:48:37 + (Thu, 15 Feb 2007) New Revision: 21371 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21371 Log: Ehmm I was reseting the wrong dataModel... Modified: branches/SAMBA_4_0/webapps/swat/source/class/swat/module/ldbbrowse/Gui.js Changeset: Modified: branches/SAMBA_4_0/webapps/swat/source/class/swat/module/ldbbrowse/Gui.js === --- branches/SAMBA_4_0/webapps/swat/source/class/swat/module/ldbbrowse/Gui.js 2007-02-15 16:51:30 UTC (rev 21370) +++ branches/SAMBA_4_0/webapps/swat/source/class/swat/module/ldbbrowse/Gui.js 2007-02-15 18:48:37 UTC (rev 21371) @@ -527,8 +527,10 @@ alert(Object Successfully deleted!); this._ldbmod.setBase(); + // just clear the attribute/value table. - dataModel.setData([ ]); + var tableModel = module.fsm.getObject(tableModel:browse); + tableModel.setData([]); }; qx.Proto._displaySearchResults = function(module, rpcRequest)
Rev 11481: Tests, more tests! Some are still commented out, because the code they test is broken at the moment. in file:///home/jelmer/bzr.samba/SAMBA_4_0/
At file:///home/jelmer/bzr.samba/SAMBA_4_0/
revno: 11481
revision-id: [EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: Jelmer Vernooij [EMAIL PROTECTED]
branch nick: SAMBA_4_0
timestamp: Thu 2007-02-15 20:28:24 +0100
message:
Tests, more tests! Some are still commented out, because the code they test
is broken at the moment.
modified:
source/librpc/idl/winreg.idl svn-v2:[EMAIL PROTECTED]
source/torture/ndr/winreg.csvn-v2:[EMAIL PROTECTED]
=== modified file 'source/librpc/idl/winreg.idl'
--- a/source/librpc/idl/winreg.idl 2007-02-14 21:37:06 +
+++ b/source/librpc/idl/winreg.idl 2007-02-15 19:28:24 +
@@ -127,7 +127,7 @@
/**/
/* Function: 0x07 */
- WERROR winreg_DeleteKey(
+ [public] WERROR winreg_DeleteKey(
[in,ref] policy_handle *handle,
[in] winreg_String key
);
@@ -171,13 +171,13 @@
/**/
/* Function: 0x0b */
- WERROR winreg_FlushKey(
+ [public] WERROR winreg_FlushKey(
[in,ref] policy_handle *handle
);
/**/
/* Function: 0x0c */
- WERROR winreg_GetKeySecurity(
+ [public] WERROR winreg_GetKeySecurity(
[in,ref] policy_handle *handle,
[in] security_secinfo sec_info,
[in,out,ref] KeySecurityData *sd
@@ -193,7 +193,7 @@
/**/
/* Function: 0x0e */
- WERROR winreg_NotifyChangeKeyValue(
+ [public] WERROR winreg_NotifyChangeKeyValue(
[in,ref] policy_handle *handle,
[in] uint8 watch_subtree,
[in] uint32 notify_filter,
@@ -205,7 +205,7 @@
/**/
/* Function: 0x0f */
- WERROR winreg_OpenKey(
+ [public] WERROR winreg_OpenKey(
[in,ref] policy_handle *parent_handle,
[in] winreg_String keyname,
[in] uint32 unknown,
@@ -215,7 +215,7 @@
/**/
/* Function: 0x10 */
- WERROR winreg_QueryInfoKey(
+ [public] WERROR winreg_QueryInfoKey(
[in,ref] policy_handle *handle,
[in,out,ref] winreg_String *class_in,
[out,ref] uint32 *num_subkeys,
@@ -295,7 +295,7 @@
/**/
/* Function: 0x1a */
- WERROR winreg_GetVersion(
+ [public] WERROR winreg_GetVersion(
[in,ref] policy_handle *handle,
[out,ref]uint32 *version
);
=== modified file 'source/torture/ndr/winreg.c'
--- a/source/torture/ndr/winreg.c 2007-02-14 21:37:06 +
+++ b/source/torture/ndr/winreg.c 2007-02-15 19:28:24 +
@@ -279,6 +279,200 @@
return true;
}
+static const uint8_t flushkey_in_data[] = {
+ 0x00, 0x00, 0x00, 0x00, 0xb2, 0x64, 0xbc, 0xb3, 0x7f, 0x90, 0x29, 0x4a,
+ 0xb4, 0xb3, 0x91, 0xe7, 0xe4, 0x4a, 0x58, 0xe3
+};
+
+static bool flushkey_in_check(struct torture_context *tctx,
+ struct
winreg_FlushKey *r)
+{
+ torture_assert_int_equal(tctx, r-in.handle-handle_type, 0, handle
type);
+ return true;
+}
+
+static const uint8_t flushkey_out_data[] = {
+ 0x00, 0x00, 0x00, 0x00
+};
+
+static bool flushkey_out_check(struct torture_context *tctx,
+ struct
winreg_FlushKey *r)
+{
+ torture_assert_werr_ok(tctx, r-out.result, return code);
+ return true;
+}
+
+
+static const uint8_t openkey_in_data[] = {
+ 0x00, 0x00, 0x00, 0x00, 0xb2, 0x64, 0xbc, 0xb3, 0x7f, 0x90, 0x29, 0x4a,
+ 0xb4, 0xb3, 0x91, 0xe7, 0xe4, 0x4a, 0x58, 0xe3, 0x16, 0x00, 0x16, 0x00,
+ 0x01, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x0b, 0x00, 0x00, 0x00, 0x73, 0x00, 0x70, 0x00, 0x6f, 0x00, 0x74, 0x00,
+ 0x74, 0x00, 0x79, 0x00, 0x66, 0x00, 0x6f, 0x00, 0x6f, 0x00, 0x74, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02
+};
+
+static bool openkey_in_check(struct torture_context *tctx, struct
winreg_OpenKey *r)
+{
+ torture_assert_int_equal(tctx, r-in.unknown, 0, unknown);
+ torture_assert_int_equal(tctx, r-in.access_mask, 0x0200, access
mask);
+ torture_assert_str_equal(tctx, r-in.keyname.name, spottyfoot,
keyname);
+ /* FIXME: parent handle */
+ return true;
+}
+
+static const uint8_t openkey_out_data[] = {
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
+};
+
+static bool openkey_out_check(struct torture_context *tctx, struct
winreg_OpenKey *r)
+{
+ torture_assert(tctx, GUID_all_zero(r-out.handle-uuid), handle);
+ torture_assert_werr_equal(tctx, r-out.result, WERR_BADFILE, return
code);
+ return true;
+}
+
+static
svn commit: samba r21372 - in branches/SAMBA_4_0: . source/librpc/idl source/torture/ndr
Author: jelmer Date: 2007-02-15 19:33:03 + (Thu, 15 Feb 2007) New Revision: 21372 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21372 Log: Tests, more tests! Some are still commented out, because the code they test is broken at the moment. Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/librpc/idl/winreg.idl branches/SAMBA_4_0/source/torture/ndr/winreg.c Changeset: Property changes on: branches/SAMBA_4_0 ___ Name: bzr:merge - [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] + [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] Modified: branches/SAMBA_4_0/source/librpc/idl/winreg.idl === --- branches/SAMBA_4_0/source/librpc/idl/winreg.idl 2007-02-15 18:48:37 UTC (rev 21371) +++ branches/SAMBA_4_0/source/librpc/idl/winreg.idl 2007-02-15 19:33:03 UTC (rev 21372) @@ -127,7 +127,7 @@ /**/ /* Function: 0x07 */ - WERROR winreg_DeleteKey( + [public] WERROR winreg_DeleteKey( [in,ref] policy_handle *handle, [in] winreg_String key ); @@ -171,13 +171,13 @@ /**/ /* Function: 0x0b */ - WERROR winreg_FlushKey( + [public] WERROR winreg_FlushKey( [in,ref] policy_handle *handle ); /**/ /* Function: 0x0c */ - WERROR winreg_GetKeySecurity( + [public] WERROR winreg_GetKeySecurity( [in,ref] policy_handle *handle, [in] security_secinfo sec_info, [in,out,ref] KeySecurityData *sd @@ -193,7 +193,7 @@ /**/ /* Function: 0x0e */ - WERROR winreg_NotifyChangeKeyValue( + [public] WERROR winreg_NotifyChangeKeyValue( [in,ref] policy_handle *handle, [in] uint8 watch_subtree, [in] uint32 notify_filter, @@ -205,7 +205,7 @@ /**/ /* Function: 0x0f */ - WERROR winreg_OpenKey( + [public] WERROR winreg_OpenKey( [in,ref] policy_handle *parent_handle, [in] winreg_String keyname, [in] uint32 unknown, @@ -215,7 +215,7 @@ /**/ /* Function: 0x10 */ - WERROR winreg_QueryInfoKey( + [public] WERROR winreg_QueryInfoKey( [in,ref] policy_handle *handle, [in,out,ref] winreg_String *class_in, [out,ref] uint32 *num_subkeys, @@ -295,7 +295,7 @@ /**/ /* Function: 0x1a */ - WERROR winreg_GetVersion( + [public] WERROR winreg_GetVersion( [in,ref] policy_handle *handle, [out,ref]uint32 *version ); Modified: branches/SAMBA_4_0/source/torture/ndr/winreg.c === --- branches/SAMBA_4_0/source/torture/ndr/winreg.c 2007-02-15 18:48:37 UTC (rev 21371) +++ branches/SAMBA_4_0/source/torture/ndr/winreg.c 2007-02-15 19:33:03 UTC (rev 21372) @@ -279,6 +279,200 @@
Rev 11482: More tests. in file:///home/jelmer/bzr.samba/SAMBA_4_0/
At file:///home/jelmer/bzr.samba/SAMBA_4_0/
revno: 11482
revision-id: [EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: Jelmer Vernooij [EMAIL PROTECTED]
branch nick: SAMBA_4_0
timestamp: Thu 2007-02-15 22:03:30 +0100
message:
More tests.
added:
source/torture/ndr/atsvc.c atsvc.c-20070215202923-ar674o5zg66g8bza-1
modified:
source/librpc/idl/atsvc.idlsvn-v2:[EMAIL PROTECTED]
source/librpc/idl/winreg.idl svn-v2:[EMAIL PROTECTED]
source/torture/config.mk svn-v2:[EMAIL PROTECTED]
source/torture/ndr/ndr.c svn-v2:[EMAIL PROTECTED]
source/torture/ndr/winreg.csvn-v2:[EMAIL PROTECTED]
=== added file 'source/torture/ndr/atsvc.c'
--- a/source/torture/ndr/atsvc.c1970-01-01 00:00:00 +
+++ b/source/torture/ndr/atsvc.c2007-02-15 21:03:30 +
@@ -0,0 +1,215 @@
+/*
+ Unix SMB/CIFS implementation.
+ test suite for atsvc ndr operations
+
+ Copyright (C) Jelmer Vernooij 2007
+
+ 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 2 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, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include includes.h
+#include torture/ndr/ndr.h
+#include librpc/gen_ndr/ndr_atsvc.h
+
+static const uint8_t jobenum_in_data[] = {
+ 0x01, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x09, 0x00, 0x00, 0x00, 0x57, 0x00, 0x49, 0x00, 0x4e, 0x00, 0x32, 0x00,
+ 0x4b, 0x00, 0x44, 0x00, 0x43, 0x00, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+ 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static bool jobenum_in_check(struct torture_context *tctx,
+struct atsvc_JobEnum
*r)
+{
+ torture_assert(tctx, r-in.servername != NULL, servername ptr);
+ torture_assert_str_equal(tctx, r-in.servername, WIN2KDC1,
servername);
+ torture_assert_int_equal(tctx, r-in.ctr-entries_read, 0, ctr entries
read);
+ torture_assert(tctx, r-in.ctr-first_entry == NULL, ctr entries
first_entry);
+ torture_assert_int_equal(tctx, r-in.preferred_max_len, -1, preferred
max len);
+ torture_assert(tctx, r-in.resume_handle != NULL, resume handle ptr);
+ torture_assert_int_equal(tctx, *r-in.resume_handle, 0, resume
handle);
+ return true;
+}
+
+static const uint8_t jobenum_out_data[] = {
+ 0x07, 0x00, 0x00, 0x00, 0x28, 0x14, 0x0a, 0x00, 0x07, 0x00, 0x00, 0x00,
+ 0x01, 0x00, 0x00, 0x00, 0xc0, 0xe4, 0x0a, 0x05, 0x00, 0x00, 0x00, 0x00,
+ 0x02, 0x13, 0x00, 0x00, 0x40, 0x18, 0x0a, 0x00, 0x02, 0x00, 0x00, 0x00,
+ 0xc0, 0xe4, 0x0a, 0x05, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0x00, 0x00,
+ 0x30, 0x18, 0x0a, 0x00, 0x03, 0x00, 0x00, 0x00, 0xc0, 0xe4, 0x0a, 0x05,
+ 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0x00, 0x00, 0x20, 0x18, 0x0a, 0x00,
+ 0x04, 0x00, 0x00, 0x00, 0xc0, 0xe4, 0x0a, 0x05, 0x00, 0x00, 0x00, 0x00,
+ 0x02, 0x13, 0x00, 0x00, 0x10, 0x18, 0x0a, 0x00, 0x05, 0x00, 0x00, 0x00,
+ 0xc0, 0xe4, 0x0a, 0x05, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0x00, 0x00,
+ 0x00, 0x18, 0x0a, 0x00, 0x06, 0x00, 0x00, 0x00, 0xc0, 0xe4, 0x0a, 0x05,
+ 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0x00, 0x00, 0xf0, 0x17, 0x0a, 0x00,
+ 0x07, 0x00, 0x00, 0x00, 0xc0, 0xe4, 0x0a, 0x05, 0x00, 0x00, 0x00, 0x00,
+ 0x02, 0x13, 0x00, 0x00, 0xe0, 0x17, 0x0a, 0x00, 0x08, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x66, 0x00, 0x6f, 0x00,
+ 0x6f, 0x00, 0x2e, 0x00, 0x65, 0x00, 0x78, 0x00, 0x65, 0x00, 0x00, 0x00,
+ 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
+ 0x62, 0x00, 0x61, 0x00, 0x72, 0x00, 0x2e, 0x00, 0x65, 0x00, 0x78, 0x00,
+ 0x65, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x08, 0x00, 0x00, 0x00, 0x66, 0x00, 0x6f, 0x00, 0x6f, 0x00, 0x2e, 0x00,
+ 0x65, 0x00, 0x78, 0x00, 0x65, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x66, 0x00, 0x6f, 0x00,
+ 0x6f, 0x00, 0x2e, 0x00, 0x65, 0x00, 0x78, 0x00, 0x65, 0x00, 0x00, 0x00,
+ 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
+ 0x66, 0x00, 0x6f, 0x00, 0x6f, 0x00, 0x2e, 0x00, 0x65, 0x00, 0x78, 0x00,
+ 0x65, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x08, 0x00, 0x00, 0x00, 0x66, 0x00, 0x6f, 0x00, 0x6f, 0x00, 0x2e, 0x00,
+ 0x65, 0x00, 0x78, 0x00, 0x65, 0x00,
svn commit: samba r21373 - in branches/SAMBA_4_0: . source/librpc/idl source/torture source/torture/ndr
Author: jelmer Date: 2007-02-15 21:06:33 + (Thu, 15 Feb 2007) New Revision: 21373 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21373 Log: More tests. Added: branches/SAMBA_4_0/source/torture/ndr/atsvc.c Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/librpc/idl/atsvc.idl branches/SAMBA_4_0/source/librpc/idl/winreg.idl branches/SAMBA_4_0/source/torture/config.mk branches/SAMBA_4_0/source/torture/ndr/ndr.c branches/SAMBA_4_0/source/torture/ndr/winreg.c Changeset: Property changes on: branches/SAMBA_4_0 ___ Name: bzr:merge - [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] + [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] Modified: branches/SAMBA_4_0/source/librpc/idl/atsvc.idl === --- branches/SAMBA_4_0/source/librpc/idl/atsvc.idl 2007-02-15 19:33:03 UTC (rev 21372) +++ branches/SAMBA_4_0/source/librpc/idl/atsvc.idl 2007-02-15 21:06:33 UTC (rev 21373) @@ -71,7 +71,7 @@ /**/ /* Function: 0x00 */ - NTSTATUS atsvc_JobAdd( + [public] NTSTATUS atsvc_JobAdd( [in,unique,string,charset(UTF16)] uint16 *servername, [in] atsvc_JobInfo *job_info, [out,ref]uint32 *job_id @@ -79,7 +79,7 @@ /**/ /* Function: 0x01 */ - NTSTATUS atsvc_JobDel( + [public] NTSTATUS atsvc_JobDel( [in,unique,string,charset(UTF16)] uint16 *servername, [in]uint32 min_job_id, [in]uint32 max_job_id @@ -101,7 +101,7 @@ /**/ /* Function: 0x02 */ - NTSTATUS atsvc_JobEnum( + [public] NTSTATUS atsvc_JobEnum( [in,unique,string,charset(UTF16)] uint16 *servername, [in,out] atsvc_enum_ctr *ctr, [in] uint32 preferred_max_len, Modified: branches/SAMBA_4_0/source/librpc/idl/winreg.idl === --- branches/SAMBA_4_0/source/librpc/idl/winreg.idl 2007-02-15 19:33:03 UTC (rev 21372) +++ branches/SAMBA_4_0/source/librpc/idl/winreg.idl 2007-02-15 21:06:33 UTC (rev 21373) @@ -148,7 +148,7 @@ [size_is(size/2),length_is(length/2),charset(UTF16)] uint16 *name; } winreg_StringBuf; - WERROR winreg_EnumKey( + [public] WERROR winreg_EnumKey( [in,ref]policy_handle*handle, [in]uint32 enum_index, [in,out,ref]winreg_StringBuf *name, Modified: branches/SAMBA_4_0/source/torture/config.mk === --- branches/SAMBA_4_0/source/torture/config.mk 2007-02-15 19:33:03 UTC (rev 21372) +++ branches/SAMBA_4_0/source/torture/config.mk 2007-02-15 21:06:33 UTC (rev 21373) @@ -101,7 +101,8 @@ INIT_FUNCTION = torture_ndr_init PRIVATE_PROTO_HEADER = ndr/proto.h OBJ_FILES = ndr/ndr.o \ - ndr/winreg.o + ndr/winreg.o \
Rev 11483: lsa tests in file:///home/jelmer/bzr.samba/SAMBA_4_0/
At file:///home/jelmer/bzr.samba/SAMBA_4_0/ revno: 11483 revision-id: [EMAIL PROTECTED] parent: svn-v2:[EMAIL PROTECTED] committer: Jelmer Vernooij [EMAIL PROTECTED] branch nick: SAMBA_4_0 timestamp: Thu 2007-02-15 23:04:50 +0100 message: lsa tests added: source/torture/ndr/lsa.c lsa.c-20070215220302-1uxt3fp0chzgd7p5-1 modified: source/librpc/idl/lsa.idl svn-v2:[EMAIL PROTECTED] source/torture/config.mk svn-v2:[EMAIL PROTECTED] source/torture/ndr/ndr.c svn-v2:[EMAIL PROTECTED] Diff too large for email (1185 lines, the limit is 1000).
svn commit: samba r21374 - in branches/SAMBA_4_0: . source/librpc/idl source/torture source/torture/ndr
Author: jelmer Date: 2007-02-15 22:07:18 + (Thu, 15 Feb 2007) New Revision: 21374 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21374 Log: lsa tests Added: branches/SAMBA_4_0/source/torture/ndr/lsa.c Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/librpc/idl/lsa.idl branches/SAMBA_4_0/source/torture/config.mk branches/SAMBA_4_0/source/torture/ndr/ndr.c Changeset: Sorry, the patch is too large (1301 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21374
Rev 11484: More lsa tests. in file:///home/jelmer/bzr.samba/SAMBA_4_0/
At file:///home/jelmer/bzr.samba/SAMBA_4_0/
revno: 11484
revision-id: [EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: Jelmer Vernooij [EMAIL PROTECTED]
branch nick: SAMBA_4_0
timestamp: Thu 2007-02-15 23:55:39 +0100
message:
More lsa tests.
modified:
source/librpc/idl/lsa.idl svn-v2:[EMAIL PROTECTED]
source/torture/ndr/atsvc.c svn-v2:[EMAIL PROTECTED]
source/torture/ndr/lsa.c svn-v2:[EMAIL PROTECTED]
=== modified file 'source/librpc/idl/lsa.idl'
--- a/source/librpc/idl/lsa.idl 2007-02-15 22:07:18 +
+++ b/source/librpc/idl/lsa.idl 2007-02-15 22:55:39 +
@@ -47,7 +47,7 @@
/**/
/* Function: 0x01 */
- NTSTATUS lsa_Delete (
+ [public] NTSTATUS lsa_Delete (
[in] policy_handle *handle
);
@@ -247,7 +247,7 @@
/**/
/* Function: 0x0a */
- NTSTATUS lsa_CreateAccount (
+ [public] NTSTATUS lsa_CreateAccount (
[in]policy_handle *handle,
[in]dom_sid2 *sid,
[in]uint32 access_mask,
@@ -375,7 +375,7 @@
/* Function:0x10 */
- NTSTATUS lsa_CreateSecret(
+ [public] NTSTATUS lsa_CreateSecret(
[in] policy_handle *handle,
[in] lsa_String name,
[in] uint32 access_mask,
@@ -555,7 +555,7 @@
NTSTATUS lsa_SetInformationTrustedDomain();
/* Function: 0x1c */
- NTSTATUS lsa_OpenSecret(
+ [public] NTSTATUS lsa_OpenSecret(
[in] policy_handle*handle,
[in] lsa_Stringname,
[in] uint32access_mask,
@@ -564,7 +564,7 @@
/* Function: 0x1d */
- NTSTATUS lsa_SetSecret(
+ [public] NTSTATUS lsa_SetSecret(
[in] policy_handle*sec_handle,
[in,unique] lsa_DATA_BUF *new_val,
[in,unique] lsa_DATA_BUF *old_val
@@ -575,7 +575,7 @@
} lsa_DATA_BUF_PTR;
/* Function: 0x1e */
- NTSTATUS lsa_QuerySecret (
+ [public] NTSTATUS lsa_QuerySecret (
[in] policy_handle *sec_handle,
[in,out,unique] lsa_DATA_BUF_PTR *new_val,
[in,out,unique] NTTIME_hyper *new_mtime,
=== modified file 'source/torture/ndr/atsvc.c'
--- a/source/torture/ndr/atsvc.c2007-02-15 21:06:33 +
+++ b/source/torture/ndr/atsvc.c2007-02-15 22:55:39 +
@@ -199,16 +199,16 @@
struct torture_suite *suite = torture_suite_create(ctx, atsvc);
torture_suite_add_ndr_pull_fn_test(suite, atsvc_JobEnum,
jobenum_in_data, NDR_IN, jobenum_in_check );
- /* torture_suite_add_ndr_pull_fn_test(suite, atsvc_JobEnum,
jobenum_out_data, NDR_IN, jobenum_out_check ); */
+ torture_suite_add_ndr_pull_fn_test(suite, atsvc_JobEnum,
jobenum_out_data, NDR_OUT, jobenum_out_check );
torture_suite_add_ndr_pull_fn_test(suite, atsvc_JobAdd, jobadd_in_data,
NDR_IN, jobadd_in_check );
- /* torture_suite_add_ndr_pull_fn_test(suite, atsvc_JobAdd,
jobadd_out_data, NDR_IN, jobadd_out_check ); */
+ torture_suite_add_ndr_pull_fn_test(suite, atsvc_JobAdd,
jobadd_out_data, NDR_OUT, jobadd_out_check );
torture_suite_add_ndr_pull_fn_test(suite, atsvc_JobDel, jobdel_in_data,
NDR_IN, jobdel_in_check );
- /* torture_suite_add_ndr_pull_fn_test(suite, atsvc_JobDel,
jobdel_out_data, NDR_IN, jobdel_out_check ); */
+ torture_suite_add_ndr_pull_fn_test(suite, atsvc_JobDel,
jobdel_out_data, NDR_OUT, jobdel_out_check );
torture_suite_add_ndr_pull_fn_test(suite, atsvc_JobGetInfo,
jobgetinfo_in_data, NDR_IN, jobgetinfo_in_check );
- /* torture_suite_add_ndr_pull_fn_test(suite, atsvc_JobGetInfo,
jobgetinfo_out_data, NDR_IN, jobgetinfo_out_check ); */
+ torture_suite_add_ndr_pull_fn_test(suite, atsvc_JobGetInfo,
jobgetinfo_out_data, NDR_OUT, jobgetinfo_out_check );
return suite;
}
=== modified file 'source/torture/ndr/lsa.c'
--- a/source/torture/ndr/lsa.c 2007-02-15 22:07:18 +
+++ b/source/torture/ndr/lsa.c 2007-02-15 22:55:39 +
@@ -1092,22 +1092,234 @@
return true;
}
+static const uint8_t lsarcreateaccount_in_data[] = {
+ 0x00, 0x00, 0x00, 0x00, 0x2a, 0xab, 0xb8, 0x84, 0x36, 0xc6, 0xed, 0x4f,
+ 0x83, 0x16, 0x04, 0xe8, 0x63, 0x15, 0xeb, 0x84, 0x03, 0x00, 0x00, 0x00,
+ 0x01, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xb4, 0x71, 0xbc, 0x00,
+ 0xe1, 0x10, 0x00, 0x00, 0x26, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02
+};
+
+static bool lsarcreateaccount_in_check(struct torture_context *tctx,
+struct
lsa_CreateAccount *r)
+{
+ /* FIXME: Handle */
+ /* FIXME: Sid */
+
svn commit: samba r21375 - in branches/SAMBA_4_0: . source/librpc/idl source/torture/ndr
Author: jelmer Date: 2007-02-15 22:59:10 + (Thu, 15 Feb 2007) New Revision: 21375 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21375 Log: More lsa tests. Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/librpc/idl/lsa.idl branches/SAMBA_4_0/source/torture/ndr/atsvc.c branches/SAMBA_4_0/source/torture/ndr/lsa.c Changeset: Property changes on: branches/SAMBA_4_0 ___ Name: bzr:merge - [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] + [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] Modified: branches/SAMBA_4_0/source/librpc/idl/lsa.idl === --- branches/SAMBA_4_0/source/librpc/idl/lsa.idl2007-02-15 22:07:18 UTC (rev 21374) +++ branches/SAMBA_4_0/source/librpc/idl/lsa.idl2007-02-15 22:59:10 UTC (rev 21375) @@ -47,7 +47,7 @@ /**/ /* Function: 0x01 */ - NTSTATUS lsa_Delete ( + [public] NTSTATUS lsa_Delete ( [in] policy_handle *handle ); @@ -247,7 +247,7 @@ /**/ /* Function: 0x0a */ - NTSTATUS lsa_CreateAccount ( + [public] NTSTATUS lsa_CreateAccount ( [in]policy_handle *handle, [in]dom_sid2 *sid, [in]uint32 access_mask, @@ -375,7 +375,7 @@ /* Function:0x10 */ - NTSTATUS lsa_CreateSecret( + [public] NTSTATUS lsa_CreateSecret( [in] policy_handle *handle, [in] lsa_String name, [in] uint32 access_mask, @@ -555,7 +555,7 @@ NTSTATUS lsa_SetInformationTrustedDomain(); /* Function: 0x1c */ - NTSTATUS lsa_OpenSecret( + [public] NTSTATUS lsa_OpenSecret( [in] policy_handle*handle, [in] lsa_Stringname, [in] uint32access_mask, @@ -564,7 +564,7 @@ /* Function: 0x1d */ - NTSTATUS lsa_SetSecret( + [public] NTSTATUS lsa_SetSecret( [in] policy_handle*sec_handle, [in,unique] lsa_DATA_BUF *new_val, [in,unique] lsa_DATA_BUF *old_val @@ -575,7 +575,7 @@ } lsa_DATA_BUF_PTR; /* Function: 0x1e */ - NTSTATUS lsa_QuerySecret ( + [public] NTSTATUS lsa_QuerySecret ( [in] policy_handle *sec_handle, [in,out,unique] lsa_DATA_BUF_PTR *new_val, [in,out,unique] NTTIME_hyper *new_mtime, Modified: branches/SAMBA_4_0/source/torture/ndr/atsvc.c === --- branches/SAMBA_4_0/source/torture/ndr/atsvc.c 2007-02-15 22:07:18 UTC (rev 21374) +++ branches/SAMBA_4_0/source/torture/ndr/atsvc.c 2007-02-15 22:59:10 UTC (rev 21375) @@ -199,16 +199,16 @@ struct torture_suite *suite =
Rev 11485: More tests. in file:///home/jelmer/bzr.samba/SAMBA_4_0/
At file:///home/jelmer/bzr.samba/SAMBA_4_0/
revno: 11485
revision-id: [EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: Jelmer Vernooij [EMAIL PROTECTED]
branch nick: SAMBA_4_0
timestamp: Fri 2007-02-16 00:49:24 +0100
message:
More tests.
modified:
source/librpc/idl/lsa.idl svn-v2:[EMAIL PROTECTED]
source/torture/ndr/lsa.c svn-v2:[EMAIL PROTECTED]
=== modified file 'source/librpc/idl/lsa.idl'
--- a/source/librpc/idl/lsa.idl 2007-02-15 22:59:10 +
+++ b/source/librpc/idl/lsa.idl 2007-02-15 23:49:24 +
@@ -268,7 +268,7 @@
[size_is(num_sids)] lsa_SidPtr *sids;
} lsa_SidArray;
- NTSTATUS lsa_EnumAccounts (
+ [public] NTSTATUS lsa_EnumAccounts (
[in] policy_handle *handle,
[in,out] uint32 *resume_handle,
[in,range(0,8192)] uint32 num_entries,
@@ -279,7 +279,7 @@
/*/
/* Function: 0x0c*/
- NTSTATUS lsa_CreateTrustedDomain(
+ [public] NTSTATUS lsa_CreateTrustedDomain(
[in] policy_handle *handle,
[in] lsa_DomainInfo *info,
[in] uint32 access_mask,
@@ -824,7 +824,7 @@
[size_is(count)] lsa_TranslatedName2 *names;
} lsa_TransNameArray2;
- NTSTATUS lsa_LookupSids2(
+ [public] NTSTATUS lsa_LookupSids2(
[in] policy_handle *handle,
[in] lsa_SidArray *sids,
[out,unique]lsa_RefDomainList *domains,
=== modified file 'source/torture/ndr/lsa.c'
--- a/source/torture/ndr/lsa.c 2007-02-15 22:59:10 +
+++ b/source/torture/ndr/lsa.c 2007-02-15 23:49:24 +
@@ -1287,6 +1287,213 @@
return true;
}
+static const uint8_t lsarcreatetrusteddomain_in_data[] = {
+ 0x00, 0x00, 0x00, 0x00, 0x2a, 0xab, 0xb8, 0x84, 0x36, 0xc6, 0xed, 0x4f,
+ 0x83, 0x16, 0x04, 0xe8, 0x63, 0x15, 0xeb, 0x84, 0x1a, 0x00, 0x1a, 0x00,
+ 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x74, 0x00, 0x6f, 0x00,
+ 0x72, 0x00, 0x74, 0x00, 0x75, 0x00, 0x72, 0x00, 0x65, 0x00, 0x64, 0x00,
+ 0x6f, 0x00, 0x6d, 0x00, 0x61, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x00, 0x00,
+ 0x04, 0x00, 0x00, 0x00, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,
+ 0x15, 0x00, 0x00, 0x00, 0x76, 0x7c, 0x01, 0x00, 0x93, 0xcb, 0x05, 0x00,
+ 0x39, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02
+};
+
+static bool lsarcreatetrusteddomain_in_check(struct torture_context *tctx,
+
struct lsa_CreateTrustedDomain *r)
+{
+ /* FIXME: Handle */
+ torture_assert_str_equal(tctx, r-in.info-name.string,
torturedomain, name);
+ torture_assert(tctx, r-in.info-sid != NULL, sid);
+ torture_assert_int_equal(tctx, r-in.access_mask, 0x200, access
mask);
+ return true;
+}
+
+static const uint8_t lsarcreatetrusteddomain_out_data[] = {
+ 0x00, 0x00, 0x00, 0x00, 0xb5, 0x23, 0x36, 0x5f, 0x33, 0x92, 0x41, 0x4c,
+ 0x9a, 0x73, 0x7d, 0x6a, 0x23, 0x14, 0x62, 0x56, 0x00, 0x00, 0x00, 0x00
+};
+
+static bool lsarcreatetrusteddomain_out_check(struct torture_context *tctx,
+
struct lsa_CreateTrustedDomain *r)
+{
+ /* FIXME: Handle */
+ torture_assert_ntstatus_ok(tctx, r-out.result, return code);
+ return true;
+}
+
+static const uint8_t lsarenumerateaccounts_in_data[] = {
+ 0x00, 0x00, 0x00, 0x00, 0x2a, 0xab, 0xb8, 0x84, 0x36, 0xc6, 0xed, 0x4f,
+ 0x83, 0x16, 0x04, 0xe8, 0x63, 0x15, 0xeb, 0x84, 0x00, 0x00, 0x00, 0x00,
+ 0x64, 0x00, 0x00, 0x00
+};
+
+static bool lsarenumerateaccounts_in_check(struct torture_context *tctx,
+
struct lsa_EnumAccounts *r)
+{
+ /* FIXME: handle */
+ torture_assert(tctx, r-in.resume_handle != NULL, resume handle ptr);
+ torture_assert_int_equal(tctx, *r-in.resume_handle, 0, resume
handle);
+ torture_assert_int_equal(tctx, r-in.num_entries, 100, num entries);
+ return true;
+}
+
+static const uint8_t lsarenumerateaccounts_out_data[] = {
+ 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00,
+ 0x07, 0x00, 0x00, 0x00, 0x04, 0x00, 0x02, 0x00, 0x08, 0x00, 0x02, 0x00,
+ 0x0c, 0x00, 0x02, 0x00, 0x10, 0x00, 0x02, 0x00, 0x14, 0x00, 0x02, 0x00,
+ 0x18, 0x00, 0x02, 0x00, 0x1c, 0x00, 0x02, 0x00, 0x02, 0x00, 0x00, 0x00,
+ 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x20, 0x00, 0x00, 0x00,
+ 0x24, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x05, 0x20, 0x00, 0x00, 0x00, 0x20, 0x02, 0x00, 0x00,
+ 0x05, 0x00, 0x00, 0x00, 0x01, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00,
svn commit: samba r21376 - in branches/SAMBA_4_0: . source/librpc/idl source/torture/ndr
Author: jelmer
Date: 2007-02-15 23:53:53 + (Thu, 15 Feb 2007)
New Revision: 21376
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21376
Log:
More tests.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/librpc/idl/lsa.idl
branches/SAMBA_4_0/source/torture/ndr/lsa.c
Changeset:
Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
- [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
+ [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
Modified: branches/SAMBA_4_0/source/librpc/idl/lsa.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/lsa.idl2007-02-15 22:59:10 UTC
(rev 21375)
+++ branches/SAMBA_4_0/source/librpc/idl/lsa.idl2007-02-15 23:53:53 UTC
(rev 21376)
@@ -268,7 +268,7 @@
[size_is(num_sids)] lsa_SidPtr *sids;
} lsa_SidArray;
- NTSTATUS lsa_EnumAccounts (
+ [public] NTSTATUS lsa_EnumAccounts (
[in] policy_handle *handle,
[in,out] uint32 *resume_handle,
[in,range(0,8192)] uint32 num_entries,
@@ -279,7 +279,7 @@
/*/
/* Function: 0x0c*/
- NTSTATUS lsa_CreateTrustedDomain(
+ [public] NTSTATUS lsa_CreateTrustedDomain(
[in] policy_handle *handle,
[in] lsa_DomainInfo *info,
[in] uint32 access_mask,
@@ -824,7 +824,7 @@
[size_is(count)] lsa_TranslatedName2 *names;
} lsa_TransNameArray2;
- NTSTATUS lsa_LookupSids2(
+ [public] NTSTATUS lsa_LookupSids2(
[in] policy_handle *handle,
[in] lsa_SidArray *sids,
[out,unique]lsa_RefDomainList *domains,
Modified: branches/SAMBA_4_0/source/torture/ndr/lsa.c
===
--- branches/SAMBA_4_0/source/torture/ndr/lsa.c 2007-02-15 22:59:10 UTC (rev
21375)
+++ branches/SAMBA_4_0/source/torture/ndr/lsa.c 2007-02-15 23:53:53 UTC (rev
21376)
@@ -1287,6 +1287,213 @@
return true;
}
+static const uint8_t lsarcreatetrusteddomain_in_data[] = {
+ 0x00, 0x00, 0x00, 0x00, 0x2a, 0xab, 0xb8, 0x84, 0x36, 0xc6, 0xed, 0x4f,
+ 0x83, 0x16, 0x04, 0xe8, 0x63, 0x15, 0xeb, 0x84, 0x1a, 0x00, 0x1a, 0x00,
+ 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x74, 0x00, 0x6f, 0x00,
+ 0x72, 0x00, 0x74, 0x00, 0x75, 0x00, 0x72, 0x00, 0x65, 0x00, 0x64, 0x00,
+ 0x6f, 0x00, 0x6d, 0x00, 0x61, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x00, 0x00,
+ 0x04, 0x00, 0x00, 0x00, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,
+ 0x15, 0x00, 0x00, 0x00, 0x76, 0x7c, 0x01, 0x00, 0x93, 0xcb, 0x05, 0x00,
+ 0x39, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02
+};
+
+static bool lsarcreatetrusteddomain_in_check(struct torture_context *tctx,
+
Build status as of Fri Feb 16 00:00:02 2007
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2007-02-15 00:00:26.0 + +++ /home/build/master/cache/broken_results.txt 2007-02-16 00:00:33.0 + @@ -1,22 +1,22 @@ -Build status as of Thu Feb 15 00:00:02 2007 +Build status as of Fri Feb 16 00:00:02 2007 Build counts: Tree Total Broken Panic SOC 0 0 0 build_farm 0 0 0 -ccache 33 6 0 +ccache 34 6 0 ctdb 0 0 0 distcc 3 0 0 ldb 32 5 0 libreplace 30 2 0 -lorikeet-heimdal 28 17 0 -ppp 14 0 0 +lorikeet-heimdal 29 17 0 +ppp 15 0 0 rsync34 5 0 samba0 0 0 samba-docs 0 0 0 -samba4 37 27 0 -samba_3_039 14 0 +samba4 38 26 0 +samba_3_040 15 0 smb-build31 31 0 -talloc 33 1 0 +talloc 34 1 0 tdb 32 2 0
Rev 11486: More tests. in file:///home/jelmer/bzr.samba/SAMBA_4_0/
At file:///home/jelmer/bzr.samba/SAMBA_4_0/
revno: 11486
revision-id: [EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: Jelmer Vernooij [EMAIL PROTECTED]
branch nick: SAMBA_4_0
timestamp: Fri 2007-02-16 01:30:36 +0100
message:
More tests.
modified:
source/librpc/idl/lsa.idl svn-v2:[EMAIL PROTECTED]
source/torture/ndr/lsa.c svn-v2:[EMAIL PROTECTED]
=== modified file 'source/librpc/idl/lsa.idl'
--- a/source/librpc/idl/lsa.idl 2007-02-15 23:53:53 +
+++ b/source/librpc/idl/lsa.idl 2007-02-16 00:30:36 +
@@ -69,7 +69,7 @@
[size_is(count)] lsa_PrivEntry *privs;
} lsa_PrivArray;
- NTSTATUS lsa_EnumPrivs (
+ [public] NTSTATUS lsa_EnumPrivs (
[in] policy_handle *handle,
[in,out] uint32 *resume_handle,
[in] uint32 max_count,
@@ -850,7 +850,7 @@
[size_is(count)] lsa_TranslatedSid2 *sids;
} lsa_TransSidArray2;
- NTSTATUS lsa_LookupNames2 (
+ [public] NTSTATUS lsa_LookupNames2 (
[in] policy_handle *handle,
[in,range(0,1000)] uint32 num_names,
[in,size_is(num_names)] lsa_String names[],
@@ -903,7 +903,7 @@
[size_is(count)] lsa_TranslatedSid3 *sids;
} lsa_TransSidArray3;
- NTSTATUS lsa_LookupNames3 (
+ [public] NTSTATUS lsa_LookupNames3 (
[in] policy_handle *handle,
[in,range(0,1000)] uint32 num_names,
[in,size_is(num_names)] lsa_String names[],
@@ -939,7 +939,7 @@
/*/
/* Function 0x4c */
- NTSTATUS lsa_LookupSids3(
+ [public] NTSTATUS lsa_LookupSids3(
[in] lsa_SidArray *sids,
[out,unique] lsa_RefDomainList *domains,
[in,out] lsa_TransNameArray2 *names,
=== modified file 'source/torture/ndr/lsa.c'
--- a/source/torture/ndr/lsa.c 2007-02-15 23:53:53 +
+++ b/source/torture/ndr/lsa.c 2007-02-16 00:30:36 +
@@ -1492,7 +1492,491 @@
return true;
}
-
+static const uint8_t lsarlookupnames2_in_data[] = {
+ 0x00, 0x00, 0x00, 0x00, 0x2a, 0xab, 0xb8, 0x84, 0x36, 0xc6, 0xed, 0x4f,
+ 0x83, 0x16, 0x04, 0xe8, 0x63, 0x15, 0xeb, 0x84, 0x07, 0x00, 0x00, 0x00,
+ 0x07, 0x00, 0x00, 0x00, 0x22, 0x00, 0x22, 0x00, 0x01, 0x00, 0x00, 0x00,
+ 0x1c, 0x00, 0x1c, 0x00, 0x02, 0x00, 0x00, 0x00, 0x20, 0x00, 0x20, 0x00,
+ 0x03, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x1e, 0x00, 0x04, 0x00, 0x00, 0x00,
+ 0x1a, 0x00, 0x1a, 0x00, 0x05, 0x00, 0x00, 0x00, 0x26, 0x00, 0x26, 0x00,
+ 0x06, 0x00, 0x00, 0x00, 0x10, 0x00, 0x10, 0x00, 0x07, 0x00, 0x00, 0x00,
+ 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00,
+ 0x41, 0x00, 0x63, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x75, 0x00, 0x6e, 0x00,
+ 0x74, 0x00, 0x20, 0x00, 0x4f, 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, 0x00,
+ 0x61, 0x00, 0x74, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x73, 0x00, 0x00, 0x00,
+ 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00,
+ 0x41, 0x00, 0x64, 0x00, 0x6d, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x69, 0x00,
+ 0x73, 0x00, 0x74, 0x00, 0x72, 0x00, 0x61, 0x00, 0x74, 0x00, 0x6f, 0x00,
+ 0x72, 0x00, 0x73, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x10, 0x00, 0x00, 0x00, 0x53, 0x00, 0x55, 0x00, 0x50, 0x00, 0x50, 0x00,
+ 0x4f, 0x00, 0x52, 0x00, 0x54, 0x00, 0x5f, 0x00, 0x33, 0x00, 0x38, 0x00,
+ 0x38, 0x00, 0x39, 0x00, 0x34, 0x00, 0x35, 0x00, 0x61, 0x00, 0x30, 0x00,
+ 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00,
+ 0x4e, 0x00, 0x45, 0x00, 0x54, 0x00, 0x57, 0x00, 0x4f, 0x00, 0x52, 0x00,
+ 0x4b, 0x00, 0x20, 0x00, 0x53, 0x00, 0x45, 0x00, 0x52, 0x00, 0x56, 0x00,
+ 0x49, 0x00, 0x43, 0x00, 0x45, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x4c, 0x00, 0x4f, 0x00,
+ 0x43, 0x00, 0x41, 0x00, 0x4c, 0x00, 0x20, 0x00, 0x53, 0x00, 0x45, 0x00,
+ 0x52, 0x00, 0x56, 0x00, 0x49, 0x00, 0x43, 0x00, 0x45, 0x00, 0x00, 0x00,
+ 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00,
+ 0x41, 0x00, 0x75, 0x00, 0x74, 0x00, 0x68, 0x00, 0x65, 0x00, 0x6e, 0x00,
+ 0x74, 0x00, 0x69, 0x00, 0x63, 0x00, 0x61, 0x00, 0x74, 0x00, 0x65, 0x00,
+ 0x64, 0x00, 0x20, 0x00, 0x55, 0x00, 0x73, 0x00, 0x65, 0x00, 0x72, 0x00,
+ 0x73, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x08, 0x00, 0x00, 0x00, 0x45, 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, 0x00,
+ 0x79, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static bool lsarlookupnames2_in_check(struct torture_context *tctx,
+
struct lsa_LookupNames2 *r)
+{
+ /* FIXME: Handle */
+ torture_assert_int_equal(tctx,
svn commit: samba r21377 - in branches/SAMBA_4_0: . source/librpc/idl source/torture/ndr
Author: jelmer Date: 2007-02-16 00:35:11 + (Fri, 16 Feb 2007) New Revision: 21377 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21377 Log: More tests. Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/librpc/idl/lsa.idl branches/SAMBA_4_0/source/torture/ndr/lsa.c Changeset: Sorry, the patch is too large (677 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21377
Rev 11487: Add simple NDR epmap test. in file:///home/jelmer/bzr.samba/SAMBA_4_0/
At file:///home/jelmer/bzr.samba/SAMBA_4_0/
revno: 11487
revision-id: [EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: Jelmer Vernooij [EMAIL PROTECTED]
branch nick: SAMBA_4_0
timestamp: Fri 2007-02-16 02:05:04 +0100
message:
Add simple NDR epmap test.
added:
source/torture/ndr/epmap.c epmap.c-20070216010313-hk7pxh9btce290tm-1
modified:
source/librpc/idl/epmapper.idl svn-v2:[EMAIL PROTECTED]
source/torture/config.mk svn-v2:[EMAIL PROTECTED]
source/torture/ndr/ndr.c svn-v2:[EMAIL PROTECTED]
=== added file 'source/torture/ndr/epmap.c'
--- a/source/torture/ndr/epmap.c1970-01-01 00:00:00 +
+++ b/source/torture/ndr/epmap.c2007-02-16 01:05:04 +
@@ -0,0 +1,78 @@
+/*
+ Unix SMB/CIFS implementation.
+ test suite for epmap ndr operations
+
+ Copyright (C) Jelmer Vernooij 2007
+
+ 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 2 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, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include includes.h
+#include torture/ndr/ndr.h
+#include librpc/gen_ndr/ndr_epmapper.h
+
+static const uint8_t map_in_data[] = {
+ 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+ 0x4b, 0x00, 0x00, 0x00, 0x4b, 0x00, 0x00, 0x00, 0x05, 0x00, 0x13, 0x00,
+ 0x0d, 0x78, 0x57, 0x34, 0x12, 0x34, 0x12, 0xcd, 0xab, 0xef, 0x00, 0x01,
+ 0x23, 0x45, 0x67, 0x89, 0xac, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x13,
+ 0x00, 0x0d, 0x04, 0x5d, 0x88, 0x8a, 0xeb, 0x1c, 0xc9, 0x11, 0x9f, 0xe8,
+ 0x08, 0x00, 0x2b, 0x10, 0x48, 0x60, 0x02, 0x00, 0x02, 0x00, 0x00, 0x00,
+ 0x01, 0x00, 0x0b, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x07, 0x02, 0x00,
+ 0x00, 0x00, 0x01, 0x00, 0x09, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
+};
+
+static bool map_in_check(struct torture_context *tctx,
+struct epm_Map *r)
+{
+ /* FIXME: Object */
+ torture_assert_int_equal(tctx, r-in.max_towers, 1, max towers);
+ torture_assert(tctx, r-in.map_tower != NULL, map tower);
+ torture_assert_int_equal(tctx, r-in.map_tower-tower_length, 75,
tower len);
+ /* FIXME: entry handle */
+
+ return true;
+}
+
+static const uint8_t map_out_data[] = {
+ 0x00, 0x00, 0x00, 0x00, 0x18, 0xc3, 0x47, 0xdd, 0xe6, 0x5a, 0x8b, 0x42,
+ 0xb3, 0xb7, 0xc7, 0x79, 0x7b, 0xf0, 0x45, 0xe0, 0x01, 0x00, 0x00, 0x00,
+ 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+ 0x05, 0x00, 0x00, 0x00, 0x4b, 0x00, 0x00, 0x00
+};
+
+static bool map_out_check(struct torture_context *tctx,
+ struct epm_Map *r)
+{
+ torture_assert_int_equal(tctx, *r-out.num_towers, 1, num towers);
+ torture_assert_int_equal(tctx, r-out.result, 0x4b, return code);
+ /* FIXME: entry handle */
+
+ return true;
+}
+
+struct torture_suite *ndr_epmap_suite(TALLOC_CTX *ctx)
+{
+ struct torture_suite *suite = torture_suite_create(ctx, epmap);
+
+ torture_suite_add_ndr_pull_fn_test(suite, epm_Map, map_in_data, NDR_IN,
map_in_check );
+ /* torture_suite_add_ndr_pull_fn_test(suite, epm_Map, map_out_data,
NDR_OUT, map_out_check ); */
+
+ return suite;
+}
+
=== modified file 'source/librpc/idl/epmapper.idl'
--- a/source/librpc/idl/epmapper.idl2007-01-05 20:51:19 +
+++ b/source/librpc/idl/epmapper.idl2007-02-16 01:05:04 +
@@ -265,7 +265,7 @@
epm_twr_t *twr;
} epm_twr_p_t;
- error_status_t epm_Map(
+ [public] error_status_t epm_Map(
[in,ptr] GUID*object,
[in,ptr] epm_twr_t *map_tower,
[in,out]policy_handle *entry_handle,
=== modified file 'source/torture/config.mk'
--- a/source/torture/config.mk 2007-02-15 22:07:18 +
+++ b/source/torture/config.mk 2007-02-16 01:05:04 +
@@ -103,7 +103,8 @@
OBJ_FILES = ndr/ndr.o \
ndr/winreg.o \
ndr/atsvc.o \
- ndr/lsa.o
+ ndr/lsa.o \
+ ndr/epmap.o
[MODULE::torture_rpc]
#
svn commit: samba r21378 - in branches/SAMBA_4_0: . source/librpc/idl source/torture source/torture/ndr
Author: jelmer Date: 2007-02-16 01:08:59 + (Fri, 16 Feb 2007) New Revision: 21378 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21378 Log: Add simple NDR epmap test. Added: branches/SAMBA_4_0/source/torture/ndr/epmap.c Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/librpc/idl/epmapper.idl branches/SAMBA_4_0/source/torture/config.mk branches/SAMBA_4_0/source/torture/ndr/ndr.c Changeset: Property changes on: branches/SAMBA_4_0 ___ Name: bzr:merge - [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] + [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] Modified: branches/SAMBA_4_0/source/librpc/idl/epmapper.idl === --- branches/SAMBA_4_0/source/librpc/idl/epmapper.idl 2007-02-16 00:35:11 UTC (rev 21377) +++ branches/SAMBA_4_0/source/librpc/idl/epmapper.idl 2007-02-16 01:08:59 UTC (rev 21378) @@ -265,7 +265,7 @@ epm_twr_t *twr; } epm_twr_p_t; - error_status_t epm_Map( + [public] error_status_t epm_Map( [in,ptr] GUID*object, [in,ptr] epm_twr_t *map_tower, [in,out]policy_handle *entry_handle, Modified: branches/SAMBA_4_0/source/torture/config.mk === --- branches/SAMBA_4_0/source/torture/config.mk 2007-02-16 00:35:11 UTC (rev 21377) +++ branches/SAMBA_4_0/source/torture/config.mk 2007-02-16 01:08:59 UTC (rev 21378) @@ -103,7 +103,8 @@ OBJ_FILES = ndr/ndr.o \ ndr/winreg.o \ ndr/atsvc.o \ - ndr/lsa.o + ndr/lsa.o \ + ndr/epmap.o [MODULE::torture_rpc] # TORTURE_NET and TORTURE_NBT use functions from torture_rpc... Added: branches/SAMBA_4_0/source/torture/ndr/epmap.c === --- branches/SAMBA_4_0/source/torture/ndr/epmap.c 2007-02-16 00:35:11 UTC (rev 21377) +++ branches/SAMBA_4_0/source/torture/ndr/epmap.c 2007-02-16 01:08:59 UTC (rev 21378) @@ -0,0 +1,78 @@ +/* + Unix SMB/CIFS implementation. + test suite for epmap ndr operations + + Copyright (C) Jelmer Vernooij 2007 + + 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 2 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, write to the
Rev 59: merged peters IB work in http://samba.org/~tridge/ctdb
revno: 59 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell [EMAIL PROTECTED] branch nick: tridge timestamp: Fri 2007-02-16 14:41:45 +1100 message: merged peters IB work added: ib/README.txt readme.txt-20070212151749-ess18rmh152b8hao-1 renamed: tests/ibwrapper_test.c = ib/ibwrapper_test.c ibwrapper_test.c-20061214171730-h11a2z5ed6pt66hj-1 modified: Makefile.inmakefile.in-20061117234101-o3qt14umlg9en8z0-1 common/ctdb.c ctdb.c-20061127094323-t50f58d65iaao5of-2 ib/ibw_ctdb.c ibw_ctdb.c-20070102171255-7krov7858dqza466-1 ib/ibw_ctdb.h ibw_ctdb.h-20070102171259-nmuvtzt98aqzg7xp-1 ib/ibw_ctdb_init.c ibw_ctdb_init.c-20070102171305-cn2z4k7ibx8141d5-1 ib/ibwrapper.c ibwrapper.c-20061204130028-0125b4f5a72f4b11 ib/ibwrapper_test.c ibwrapper_test.c-20061214171730-h11a2z5ed6pt66hj-1 revno: 44.1.23 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Peter Somogyi [EMAIL PROTECTED] branch nick: ctdb timestamp: Thu 2007-02-15 17:02:38 +0100 message: 1st working ib integrated ctdb TODO: bugfix of ctdb_bench (wants to sent via uninitialised connection - see bench_ring/dest) revno: 44.1.22 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Peter Somogyi [EMAIL PROTECTED] branch nick: ctdb timestamp: Wed 2007-02-14 18:58:20 +0100 message: ib: a trivial approach of integration TODO: bugfix (not yet complete, something happens differently than expected at tcpip when connection is refused in the beginning) revno: 44.1.21 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Peter Somogyi [EMAIL PROTECTED] branch nick: ctdb timestamp: Mon 2007-02-12 16:47:12 +0100 message: Some minor changes before integrating ib... revno: 44.1.20 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Peter Somogyi [EMAIL PROTECTED] branch nick: ctdb timestamp: Mon 2007-02-12 15:13:22 +0100 message: Merged tridge's code. (I had error 206 at direct bzr merge, so 1st I did a bzr branch and merged that one.) revno: 44.1.19 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Peter Somogyi [EMAIL PROTECTED] branch nick: ctdb timestamp: Fri 2007-02-09 18:06:13 +0100 message: ib: adjustment of a test scenario Diff too large for email (627, the limit is 200).
Rev 60: fixed incr initialisation in http://samba.org/~tridge/ctdb
revno: 60
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge
timestamp: Fri 2007-02-16 14:48:27 +1100
message:
fixed incr initialisation
modified:
ctdb_bench.c ctdb_bench.c-20061219052637-2liagoglohxb6p7s-1
=== modified file 'ctdb_bench.c'
--- a/ctdb_bench.c 2007-02-09 01:45:58 +
+++ b/ctdb_bench.c 2007-02-16 03:48:27 +
@@ -149,19 +149,22 @@
*/
static void bench_ring(struct ctdb_context *ctdb, struct event_context *ev)
{
- TDB_DATA data;
- int incr, vnn=ctdb_get_vnn(ctdb);
-
- data.dptr = (uint8_t *)incr;
- data.dsize = sizeof(incr);
+ int vnn=ctdb_get_vnn(ctdb);
if (vnn == 0) {
/* two messages are injected into the ring, moving
in opposite directions */
- int dest = (ctdb_get_vnn(ctdb) + incr) %
ctdb_get_num_nodes(ctdb);
+ int dest, incr;
+ TDB_DATA data;
+
+ data.dptr = (uint8_t *)incr;
+ data.dsize = sizeof(incr);
+
incr = 1;
+ dest = (ctdb_get_vnn(ctdb) + incr) % ctdb_get_num_nodes(ctdb);
ctdb_send_message(ctdb, dest, 0, data);
incr = -1;
+ dest = (ctdb_get_vnn(ctdb) + incr) % ctdb_get_num_nodes(ctdb);
ctdb_send_message(ctdb, dest, 0, data);
}
