Rev 11290: Merge upstream in
file:///home/jelmer/bzr.samba/4.0-perlselftest/
Jelmer Vernooij
jelmer at samba.org
Mon Jan 22 23:50:35 GMT 2007
------------------------------------------------------------
revno: 11290
revision-id: jelmer at samba.org-20070122235024-gtgv3wzl366p3cj4
parent: jelmer at samba.org-20070122234929-7j7c9h1zx7ot8trj
parent: jelmer at samba.org-20070122234054-jp4r2wzkgn0t954k
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 4.0-perlselftest
timestamp: Tue 2007-01-23 00:50:24 +0100
message:
Merge upstream
modified:
.bzrignore svn-v2:17811 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-.bzrignore
source/dsdb/samdb/ldb_modules/schema_fsmo.c svn-v2:20771 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fdsdb%2fsamdb%2fldb_modules%2fschema_fsmo.c
source/setup/provision_templates.ldif svn-v2:8660 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fsetup%2fprovision_templates.ldif
source/torture/config.mk svn-v2:860 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2ftorture%2fconfig.mk
testprogs/blackbox/test_smbclient.sh svn-v2:20746 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-testprogs%2fblackbox%2ftest_smbclient.sh
------------------------------------------------------------
revno: 11286.1.6
merged: jelmer at samba.org-20070122234054-jp4r2wzkgn0t954k
parent: svn-v2:20959 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: SAMBA_4_0
timestamp: Tue 2007-01-23 00:40:54 +0100
message:
Fix lcov
------------------------------------------------------------
revno: 11286.1.5
merged: svn-v2:20959 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
parent: svn-v2:20958 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
parent: jelmer at samba.org-20070122233549-k085tfo2o1eqz7mm
committer: jelmer
timestamp: Mon 2007-01-22 23:38:55 +0000
message:
Add ignore entries
------------------------------------------------------------
revno: 11286.1.4.1.1
merged: jelmer at samba.org-20070122233549-k085tfo2o1eqz7mm
parent: svn-v2:20958 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: SAMBA_4_0
timestamp: Tue 2007-01-23 00:35:49 +0100
message:
Add ignore entries
------------------------------------------------------------
revno: 11286.1.4
merged: svn-v2:20958 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
parent: svn-v2:20957 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: abartlet
timestamp: Mon 2007-01-22 23:09:07 +0000
message:
Inspired by the lcov output, check the PASSWD_FILE and
--authentication-file options to smbclient.
Andrew Bartlett
------------------------------------------------------------
revno: 11286.1.3
merged: svn-v2:20957 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
parent: svn-v2:20956 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: metze
timestamp: Mon 2007-01-22 19:07:57 +0000
message:
a value of FF0000000000000000000000000000000000000000 isn't stored as schemaInfo
so we need to use it as value if nothing is stored
metze
------------------------------------------------------------
revno: 11286.1.2
merged: svn-v2:20956 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
parent: svn-v2:20955 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: metze
timestamp: Mon 2007-01-22 18:56:44 +0000
message:
cn and instanceType are autogenerated values, later we need to remove them from all
ldif files, but for now only the ones used by the NET-API-BECOME-DC test
metze
------------------------------------------------------------
revno: 11286.1.1
merged: svn-v2:20955 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
parent: svn-v2:20954 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
parent: jelmer at samba.org-20070122182054-6b26fqrdqyjhyeuc
committer: jelmer
timestamp: Mon 2007-01-22 18:24:24 +0000
message:
Add tests
=== modified file '.bzrignore'
--- a/.bzrignore 2007-01-22 22:55:34 +0000
+++ b/.bzrignore 2007-01-22 23:50:24 +0000
@@ -150,4 +150,14 @@
source/heimdal/lib/roken/err.h
source/scripting/ejs/ejsnet/proto.h
source/heimdal/lib/hx509/asn1_*.c
+*.gcno
+*.gcda
source/bin/shared/*.so*
+*.1
+*.3
+*.8
+source/pidl/blib
+source/pidl/pm_to_blib
+source/coverage
+source/st
+source/samba.info
=== modified file 'source/dsdb/samdb/ldb_modules/schema_fsmo.c'
--- a/source/dsdb/samdb/ldb_modules/schema_fsmo.c 2007-01-18 01:31:09 +0000
+++ b/source/dsdb/samdb/ldb_modules/schema_fsmo.c 2007-01-22 19:07:57 +0000
@@ -42,6 +42,7 @@
struct ldb_result *schema_res;
const struct ldb_val *prefix_val;
const struct ldb_val *info_val;
+ struct ldb_val info_val_default;
struct ldb_result *a_res;
struct ldb_result *c_res;
uint32_t i;
@@ -116,10 +117,13 @@
}
info_val = ldb_msg_find_ldb_val(schema_res->msgs[0], "schemaInfo");
if (!info_val) {
- ldb_debug_set(module->ldb, LDB_DEBUG_FATAL,
- "schema_fsmo_init: no schemaInfo attribute found\n");
- talloc_free(mem_ctx);
- return LDB_ERR_CONSTRAINT_VIOLATION;
+ info_val_default = strhex_to_data_blob("FF0000000000000000000000000000000000000000");
+ if (!info_val_default.data) {
+ ldb_oom(module->ldb);
+ return LDB_ERR_OPERATIONS_ERROR;
+ }
+ talloc_steal(mem_ctx, info_val_default.data);
+ info_val = &info_val_default;
}
status = dsdb_load_oid_mappings_ldb(schema, prefix_val, info_val);
=== modified file 'source/setup/provision_templates.ldif'
--- a/source/setup/provision_templates.ldif 2007-01-05 16:12:30 +0000
+++ b/source/setup/provision_templates.ldif 2007-01-22 18:56:44 +0000
@@ -1,9 +1,7 @@
dn: CN=Templates
objectClass: top
objectClass: container
-cn: Templates
description: Container for SAM account templates
-instanceType: 4
showInAdvancedViewOnly: TRUE
systemFlags: 2348810240
objectCategory: CN=Container,${SCHEMADN}
@@ -20,8 +18,6 @@
objectClass: organizationalPerson
objectClass: Template
objectClass: userTemplate
-cn: TemplateUser
-instanceType: 4
userAccountControl: 514
badPwdCount: 0
codePage: 0
@@ -42,8 +38,6 @@
objectClass: organizationalPerson
objectClass: Template
objectClass: userTemplate
-cn: TemplateComputer
-instanceType: 4
userAccountControl: 4098
badPwdCount: 0
codePage: 0
@@ -62,8 +56,6 @@
objectClass: top
objectClass: Template
objectClass: userTemplate
-cn: TemplateTrustingDomain
-instanceType: 4
userAccountControl: 2080
badPwdCount: 0
codePage: 0
@@ -80,8 +72,6 @@
objectClass: top
objectClass: Template
objectClass: groupTemplate
-cn: TemplateGroup
-instanceType: 4
groupType: -2147483646
sAMAccountType: 268435456
objectCategory: CN=Group,${SCHEMADN}
@@ -101,8 +91,6 @@
objectClass: top
objectClass: Template
objectClass: foreignSecurityPrincipalTemplate
-cn: TemplateForeignSecurityPrincipal
-instanceType: 4
showInAdvancedViewOnly: TRUE
objectCategory: CN=Foreign-Security-Principal,${SCHEMADN}
@@ -111,14 +99,10 @@
objectClass: leaf
objectClass: Template
objectClass: secretTemplate
-cn: TemplateSecret
-instanceType: 4
dn: CN=TemplateTrustedDomain,CN=Templates
objectClass: top
objectClass: leaf
objectClass: Template
objectClass: trustedDomainTemplate
-cn: TemplateTrustedDomain
-instanceType: 4
=== modified file 'source/torture/config.mk'
--- a/source/torture/config.mk 2007-01-22 18:16:01 +0000
+++ b/source/torture/config.mk 2007-01-22 23:40:54 +0000
@@ -336,20 +336,18 @@
GCOV_FLAGS = -ftest-coverage -fprofile-arcs
GCOV_LIBS = -lgcov
-gcov:
+test_cov:
@$(MAKE) test \
HOSTCC_CFLAGS="$(HOSTCC_CFLAGS) $(GCOV_FLAGS)" \
CFLAGS="$(CFLAGS) $(GCOV_FLAGS)" \
LDFLAGS="$(LDFLAGS) $(GCOV_FLAGS) $(GCOV_LIBS)"
+
+gcov: test_cov
for I in $(sort $(dir $(ALL_OBJS))); \
do $(GCOV) -p -o $$I $$I/*.c; \
done
-lcov:
- @$(MAKE) test \
- HOSTCC_CFLAGS="$(HOSTCC_CFLAGS) $(GCOV_FLAGS)" \
- CFLAGS="$(CFLAGS) $(GCOV_FLAGS)" \
- LDFLAGS="$(LDFLAGS) $(GCOV_FLAGS) $(GCOV_LIBS)"
- rm **/{lex,parse}.{gcda,gcno}
+lcov: test_cov
+ rm heimdal/lib/*/{lex,parse}.{gcda,gcno}
lcov --base-directory `pwd` --directory . --capture --output-file samba.info
genhtml -o coverage samba.info
=== modified file 'testprogs/blackbox/test_smbclient.sh'
--- a/testprogs/blackbox/test_smbclient.sh 2007-01-14 01:33:16 +0000
+++ b/testprogs/blackbox/test_smbclient.sh 2007-01-22 23:09:07 +0000
@@ -97,6 +97,17 @@
echo ls | runcmd "List directory with LANMAN1" -m LANMAN1 || failed=`expr $failed + 1`
echo ls | runcmd "List directory with LANMAN2" -m LANMAN2 || failed=`expr $failed + 1`
-rm -f tmpfile tmpfile-old tmpfilex
+echo ls | testit "Test login with --machine-pass" $VALGRIND bin/smbclient $CONFIGURATION //$SERVER/tmp --machine-pass
+
+echo "password=$PASSWORD\nusername=$USERNAME\ndomain=$DOMAIN" > tmpauthfile
+
+echo ls | testit "Test login with --authentication-file" $VALGRIND bin/smbclient $CONFIGURATION //$SERVER/tmp --authentication-file=tmpauthfile
+
+echo "$PASSWORD" > tmppassfile
+
+echo ls | PASSWD_FILE="tmppassfile" testit "Test login with PASSWD_FILE" $VALGRIND bin/smbclient $CONFIGURATION //$SERVER/tmp -W "$DOMAIN" -U"$USERNAME"
+
+
+rm -f tmpfile tmpfile-old tmpfilex tmpauthfile tmppassfile
exit $failed
More information about the samba-cvs
mailing list