svn commit: samba r17549 - in branches/SOC/sree/ui: .
Author: sree Date: 2006-08-15 06:03:13 + (Tue, 15 Aug 2006) New Revision: 17549 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17549 Log: Add instructions for installing Qooxdoo 0.5.3 for use with SWAT. Completed the New User and User Properties Dialogs. Added: branches/SOC/sree/ui/header_columns_patch branches/SOC/sree/ui/propuser.html Modified: branches/SOC/sree/ui/README branches/SOC/sree/ui/newuser.html Changeset: Sorry, the patch is too large (558 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17549
svn commit: samba r17548 - in branches/SAMBA_4_0/source/scripting/libjs: .
Author: abartlet
Date: 2006-08-15 02:39:38 + (Tue, 15 Aug 2006)
New Revision: 17548
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17548
Log:
It is a good idea to commit the fix (from mkhl) before the test that
shows the need for...
Martin Kuhl writes:
The ejs function `substitute_var' returns `undefined' when the first
argument ends in a pattern that should be substituted.
For that reason, the second assertion fails in the following test-case:
,
| libinclude("base.js");
|
| var obj = new Object();
| obj.FOO = "foo";
| obj.BAR = "bar";
| var str1 = "${FOO}:${BAR}";
| var str2 = "${FOO}:${BAR} "; // note the space after the brace
| var sub1 = substitute_var(str1, obj);
| var sub2 = substitute_var(str2, obj);
|
| assert(str1 + " " == str2);
| assert(sub1 + " " == sub2);
`
The problem is that the function `split' returns a single-element
array in both cases:
a) the string to split doesn't contain the split pattern
b) the string ends with the split pattern
To work around this, the following patch tests this condition and
returns `undefined' only if the string to split (`list[i]') really
didn't contain a closing brace.
Modified:
branches/SAMBA_4_0/source/scripting/libjs/base.js
Changeset:
Modified: branches/SAMBA_4_0/source/scripting/libjs/base.js
===
--- branches/SAMBA_4_0/source/scripting/libjs/base.js 2006-08-15 02:25:10 UTC
(rev 17547)
+++ branches/SAMBA_4_0/source/scripting/libjs/base.js 2006-08-15 02:39:38 UTC
(rev 17548)
@@ -72,7 +72,7 @@
var i;
for (i=1;i
svn commit: samba r17547 - in branches/SAMBA_4_0: source/script/tests testprogs/ejs
Author: abartlet
Date: 2006-08-15 02:25:10 + (Tue, 15 Aug 2006)
New Revision: 17547
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17547
Log:
Add test by mkhl for some of our variable substituion behaviour.
Andrew Bartlett
Added:
branches/SAMBA_4_0/testprogs/ejs/base.js
Modified:
branches/SAMBA_4_0/source/script/tests/test_ejs.sh
Changeset:
Modified: branches/SAMBA_4_0/source/script/tests/test_ejs.sh
===
--- branches/SAMBA_4_0/source/script/tests/test_ejs.sh 2006-08-15 02:24:19 UTC
(rev 17546)
+++ branches/SAMBA_4_0/source/script/tests/test_ejs.sh 2006-08-15 02:25:10 UTC
(rev 17547)
@@ -21,6 +21,8 @@
PATH=bin:$PATH
export PATH
+testit "base.js" $SCRIPTDIR/base.js || failed=`expr $failed + 1`
+
for f in samr.js echo.js; do
testit "$f" $SCRIPTDIR/$f $CONFIGURATION ncalrpc: -U$USERNAME%$PASSWORD ||
failed=`expr $failed + 1`
done
Added: branches/SAMBA_4_0/testprogs/ejs/base.js
===
--- branches/SAMBA_4_0/testprogs/ejs/base.js2006-08-15 02:24:19 UTC (rev
17546)
+++ branches/SAMBA_4_0/testprogs/ejs/base.js2006-08-15 02:25:10 UTC (rev
17547)
@@ -0,0 +1,15 @@
+#!/bin/sh
+exec smbscript "$0" ${1+"$@"}
+libinclude("base.js");
+
+var obj = new Object();
+obj.FOO = "foo";
+obj.BAR = "bar";
+var str1 = "${FOO}:${BAR}";
+var str2 = "${FOO}:${BAR} "; // note the space after the brace
+var sub1 = substitute_var(str1, obj);
+var sub2 = substitute_var(str2, obj);
+
+assert(str1 + " " == str2);
+assert(sub1 + " " == sub2);
+exit(0);
Property changes on: branches/SAMBA_4_0/testprogs/ejs/base.js
___
Name: svn:executable
+ *
svn commit: samba r17546 - in branches/SAMBA_4_0/testprogs/ejs: .
Author: abartlet
Date: 2006-08-15 02:24:19 + (Tue, 15 Aug 2006)
New Revision: 17546
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17546
Log:
Test the loading of per-partition modules.
Andrew Bartlett
Modified:
branches/SAMBA_4_0/testprogs/ejs/ldb.js
Changeset:
Modified: branches/SAMBA_4_0/testprogs/ejs/ldb.js
===
--- branches/SAMBA_4_0/testprogs/ejs/ldb.js 2006-08-15 02:18:32 UTC (rev
17545)
+++ branches/SAMBA_4_0/testprogs/ejs/ldb.js 2006-08-15 02:24:19 UTC (rev
17546)
@@ -82,7 +82,7 @@
{
ok = ldb.add("
dn: @MODULES
[EMAIL PROTECTED]: rootdse,operational,objectguid,rdn_name,partition
[EMAIL PROTECTED]: rootdse,operational,rdn_name,partition
dn: cn=ROOTDSE
defaultNamingContext: cn=Test
@@ -95,6 +95,7 @@
replicateEntries: @SUBCLASSES
replicateEntries: @ATTRIBUTES
replicateEntries: @INDEXLIST
+modules: cn=PartTest:objectguid
");
}
@@ -238,9 +239,9 @@
assert(res7.length == 0);
var res8 = ldb.search("x=11", "cn=sub,cn=parttest", ldb.SCOPE_DEFAULT,
attrs);
- assert(res8[0].objectGUID != undefined);
- assert(res8[0].createTimestamp != undefined);
- assert(res8[0].whenCreated != undefined);
+
+ assert(res8[0].objectGUID == undefined); /* The objectGUID module is
not loaded here */
+ assert(res8[0].uSNCreated != undefined);
assert(res8[0].name == "x11");
assert(res8[0].cn == "x11");
svn commit: samba r17545 - in branches/SAMBA_4_0/testdata/samba3: .
Author: abartlet
Date: 2006-08-15 02:18:32 + (Tue, 15 Aug 2006)
New Revision: 17545
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17545
Log:
I forgot to commit this file, a source file for the the samba3sam
tests, by mkhl.
Andrew Bartlett
Added:
branches/SAMBA_4_0/testdata/samba3/provision_samba3sam.ldif
Changeset:
Added: branches/SAMBA_4_0/testdata/samba3/provision_samba3sam.ldif
===
--- branches/SAMBA_4_0/testdata/samba3/provision_samba3sam.ldif 2006-08-15
00:31:39 UTC (rev 17544)
+++ branches/SAMBA_4_0/testdata/samba3/provision_samba3sam.ldif 2006-08-15
02:18:32 UTC (rev 17545)
@@ -0,0 +1,201 @@
+dn: @INDEXLIST
[EMAIL PROTECTED]: name
[EMAIL PROTECTED]: sAMAccountName
[EMAIL PROTECTED]: objectSid
[EMAIL PROTECTED]: objectClass
[EMAIL PROTECTED]: objectCategory
[EMAIL PROTECTED]: member
[EMAIL PROTECTED]: uidNumber
[EMAIL PROTECTED]: gidNumber
[EMAIL PROTECTED]: unixName
[EMAIL PROTECTED]: privilege
[EMAIL PROTECTED]: nCName
+
+dn: @ATTRIBUTES
+userPrincipalName: CASE_INSENSITIVE
+servicePrincipalName: CASE_INSENSITIVE
+dnsDomain: CASE_INSENSITIVE
+dnsRoot: CASE_INSENSITIVE
+nETBIOSName: CASE_INSENSITIVE
+cn: CASE_INSENSITIVE
+dc: CASE_INSENSITIVE
+name: CASE_INSENSITIVE
+dn: CASE_INSENSITIVE
+sAMAccountName: CASE_INSENSITIVE
+objectClass: CASE_INSENSITIVE
+sambaPassword: HIDDEN
+krb5Key: HIDDEN
+ntPwdHash: HIDDEN
+sambaNTPwdHistory: HIDDEN
+lmPwdHash: HIDDEN
+sambaLMPwdHistory: HIDDEN
+createTimestamp: HIDDEN
+modifyTimestamp: HIDDEN
+groupType: INTEGER
+sAMAccountType: INTEGER
+systemFlags: INTEGER
+userAccountControl: INTEGER
+
+dn: @SUBCLASSES
+top: domain
+top: person
+top: group
+domain: domainDNS
+domain: builtinDomain
+person: organizationalPerson
+organizationalPerson: user
+user: computer
+template: userTemplate
+template: groupTemplate
+
+dn: @KLUDGEACL
+passwordAttribute: sambaPassword
+passwordAttribute: ntPwdHash
+passwordAttribute: sambaNTPwdHistory
+passwordAttribute: lmPwdHash
+passwordAttribute: sambaLMPwdHistory
+passwordAttribute: krb5key
+
+# the rootDSE module looks in this record for its base data
+dn: cn=ROOTDSE
+subschemaSubentry: CN=Aggregate,CN=Schema,CN=Configuration,${BASEDN}
+dsServiceName: CN=NTDS
Settings,CN=${NETBIOSNAME},CN=Servers,CN=Default-First-Site-Name,CN=Sites,CN=Configuration,${BASEDN}
+defaultNamingContext: ${BASEDN}
+rootDomainNamingContext: ${BASEDN}
+configurationNamingContext: CN=Configuration,${BASEDN}
+schemaNamingContext: CN=Schema,CN=Configuration,${BASEDN}
+supportedLDAPVersion: 3
+dnsHostName: ${DNSNAME}
+ldapServiceName: ${DNSDOMAIN}:[EMAIL PROTECTED]
+serverName:
CN=${NETBIOSNAME},CN=Servers,CN=Default-First-Site,CN=Sites,CN=Configuration,${BASEDN}
+domainFunctionality: 0
+forestFunctionality: 0
+domainControllerFunctionality: 2
+isSynchronized: TRUE
+vendorName: Samba Team (http://samba.org)
+vendorVersion: ${VERSION}
+
+dn: CN=Templates
+objectClass: top
+objectClass: container
+cn: Templates
+description: Container for SAM account templates
+instanceType: 4
+showInAdvancedViewOnly: TRUE
+systemFlags: 2348810240
+objectCategory: CN=Container,CN=Schema,CN=Configuration,${BASEDN}
+isCriticalSystemObject: TRUE
+
+###
+# note! the template users must not match normal searches. Be careful
+# with what classes you put them in
+###
+
+dn: CN=TemplateUser,CN=Templates
+objectClass: top
+objectClass: person
+objectClass: organizationalPerson
+objectClass: Template
+objectClass: userTemplate
+cn: TemplateUser
+instanceType: 4
+userAccountControl: 514
+badPwdCount: 0
+codePage: 0
+countryCode: 0
+badPasswordTime: 0
+lastLogoff: 0
+lastLogon: 0
+pwdLastSet: 0
+primaryGroupID: 513
+accountExpires: -1
+logonCount: 0
+sAMAccountType: 805306368
+objectCategory: CN=Person,CN=Schema,CN=Configuration,${BASEDN}
+
+dn: CN=TemplateComputer,CN=Templates
+objectClass: top
+objectClass: person
+objectClass: organizationalPerson
+objectClass: Template
+objectClass: userTemplate
+cn: TemplateComputer
+instanceType: 4
+userAccountControl: 4098
+badPwdCount: 0
+codePage: 0
+countryCode: 0
+badPasswordTime: 0
+lastLogoff: 0
+lastLogon: 0
+pwdLastSet: 0
+primaryGroupID: 513
+accountExpires: -1
+logonCount: 0
+sAMAccountType: 805306369
+objectCategory: CN=Computer,CN=Schema,CN=Configuration,${BASEDN}
+
+dn: CN=TemplateTrustingDomain,CN=Templates
+objectClass: top
+objectClass: Template
+objectClass: userTemplate
+cn: TemplateTrustingDomain
+instanceType: 4
+userAccountControl: 2080
+badPwdCount: 0
+codePage: 0
+countryCode: 0
+badPasswordTime: 0
+lastLogoff: 0
+lastLogon: 0
+primaryGroupID: 513
+accountExpires: -1
+logonCount: 0
+sAMAccountType: 805306370
+
+dn: CN=TemplateGroup,CN=Templates
+objectClass: top
+objectClass: Template
+objectClass: groupTemplate
+cn: TemplateGroup
+instanceType: 4
+groupType: -2147483646
+sAMAccountType: 268435456
+objectCategory: CN=Group,CN=Schema,CN=Configuration,${BASEDN}
+
+# Currently this isn't used, we don't have a way to detect it
svn commit: samba r17544 - in branches/SAMBA_4_0/testprogs/ejs: .
Author: abartlet Date: 2006-08-15 00:31:39 + (Tue, 15 Aug 2006) New Revision: 17544 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17544 Log: Add execute bit to js script. Andrew Bartlett Modified: branches/SAMBA_4_0/testprogs/ejs/samba3sam.js Changeset: Property changes on: branches/SAMBA_4_0/testprogs/ejs/samba3sam.js ___ Name: svn:executable + *
Build status as of Tue Aug 15 00:00:02 2006
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2006-08-14 00:00:27.0 + +++ /home/build/master/cache/broken_results.txt 2006-08-15 00:00:20.0 + @@ -1,18 +1,18 @@ -Build status as of Mon Aug 14 00:00:01 2006 +Build status as of Tue Aug 15 00:00:02 2006 Build counts: Tree Total Broken Panic SOC 0 0 0 ccache 22 4 0 -distcc 23 2 0 +distcc 22 2 0 lorikeet-heimdal 0 0 0 ppp 12 0 0 rsync27 2 0 samba0 0 0 samba-docs 0 0 0 -samba4 35 18 3 -samba_3_031 5 0 +samba4 35 18 4 +samba_3_031 7 0 smb-build20 20 0 -talloc 14 4 0 -tdb 22 8 0 +talloc 16 4 0 +tdb 23 8 0
svn commit: samba r17543 - in branches/SAMBA_4_0: source/script/tests testprogs/ejs
Author: abartlet
Date: 2006-08-14 23:41:10 + (Mon, 14 Aug 2006)
New Revision: 17543
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17543
Log:
Patch from Martin K?\195?\188hl <[EMAIL PROTECTED]> to extend the
samba3sam test cases for ldb_map, and to include this into our default
'make test'.
Added:
branches/SAMBA_4_0/testprogs/ejs/samba3sam.js
Modified:
branches/SAMBA_4_0/source/script/tests/test_ejs.sh
branches/SAMBA_4_0/testprogs/ejs/samba3sam
Changeset:
Modified: branches/SAMBA_4_0/source/script/tests/test_ejs.sh
===
--- branches/SAMBA_4_0/source/script/tests/test_ejs.sh 2006-08-14 23:25:04 UTC
(rev 17542)
+++ branches/SAMBA_4_0/source/script/tests/test_ejs.sh 2006-08-14 23:41:10 UTC
(rev 17543)
@@ -16,6 +16,7 @@
. $incdir/test_functions.sh
SCRIPTDIR=../testprogs/ejs
+DATADIR=../testdata
PATH=bin:$PATH
export PATH
@@ -28,6 +29,8 @@
testit "ldb.js" $SCRIPTDIR/ldb.js `pwd` $CONFIGURATION || failed=`expr $failed
+ 1`
+testit "samba3sam.js" $SCRIPTDIR/samba3sam.js `pwd` $DATADIR/samba3/ ||
failed=`expr $failed + 1`
+
testit "winreg" scripting/bin/winreg $CONFIGURATION ncalrpc: 'HKLM'
-U$USERNAME%$PASSWORD || failed=`expr $failed + 1`
testok $0 $failed
Modified: branches/SAMBA_4_0/testprogs/ejs/samba3sam
===
--- branches/SAMBA_4_0/testprogs/ejs/samba3sam 2006-08-14 23:25:04 UTC (rev
17542)
+++ branches/SAMBA_4_0/testprogs/ejs/samba3sam 2006-08-14 23:41:10 UTC (rev
17543)
@@ -48,20 +48,13 @@
assert(ok);
println("Initial samba4 LDIF...");
-var path = "../../source/setup/provision_init.ldif";
+var path = "../../testdata/samba3/provision_samba3sam.ldif"
var ldif = sys.file_load(mypath + path);
ldif = substitute_var(ldif, local);
assert(ldif != undefined);
ok = s4.add(ldif);
assert(ok);
-var path = "../../source/setup/provision_templates.ldif";
-var ldif = sys.file_load(mypath + path);
-ldif = substitute_var(ldif, local);
-assert(ldif != undefined);
-ok = s4.add(ldif);
-assert(ok);
-
println("Registering partitions...");
var ldif = substitute_var(prt_ldif, local);
assert(ldif != undefined);
@@ -112,6 +105,24 @@
assert(oc[i] == "posixGroup" || oc[i] == "group");
}
+println("Looking up by objectClass");
+msg = s4.search("(|(objectClass=user)(cn=Administrator))");
+assert(msg != undefined);
+assert(msg.length == 2);
+for (var i = 0; i < msg.length; i++) {
+assert((msg[i].dn ==
"unixName=Administrator,ou=Users,sambaDomainName=TESTS,dc=vernstok,dc=nl") ||
+ (msg[i].dn ==
"unixName=nobody,ou=Users,sambaDomainName=TESTS,dc=vernstok,dc=nl"));
+}
+
+println("Looking up by objectClass");
+msg = s4.search("(|(objectClass=user)(cn=Administrator))");
+assert(msg != undefined);
+assert(msg.length == 2);
+for (var i = 0; i < msg.length; i++) {
+assert((msg[i].dn ==
"unixName=Administrator,ou=Users,sambaDomainName=TESTS,dc=vernstok,dc=nl") ||
+ (msg[i].dn ==
"unixName=nobody,ou=Users,sambaDomainName=TESTS,dc=vernstok,dc=nl"));
+}
+
println("Adding a record that will be fallbacked");
ok = s4.add("
dn: cn=Foo,dc=idealx,dc=org
Added: branches/SAMBA_4_0/testprogs/ejs/samba3sam.js
===
--- branches/SAMBA_4_0/testprogs/ejs/samba3sam.js 2006-08-14 23:25:04 UTC
(rev 17542)
+++ branches/SAMBA_4_0/testprogs/ejs/samba3sam.js 2006-08-14 23:41:10 UTC
(rev 17543)
@@ -0,0 +1,259 @@
+#!/usr/bin/env smbscript
+/*
+ (C) Jelmer Vernooij <[EMAIL PROTECTED]> 2005
+ (C) Martin Kuehl <[EMAIL PROTECTED]> 2006
+ Published under the GNU GPL
+ Sponsored by Google Summer of Code
+ */
+
+var sys;
+var ldb = ldb_init();
+var smb3 = ldb_init();
+var smb4 = ldb_init();
+var options = GetOptions(ARGV, "POPT_AUTOHELP", "POPT_COMMON_SAMBA");
+if (options == undefined) {
+println("Failed to parse options");
+return -1;
+}
+
+libinclude("base.js");
+
+if (options.ARGV.length != 2) {
+println("Usage: samba3sam.js ");
+return -1;
+}
+
+prefix = options.ARGV[0];
+datadir = options.ARGV[1];
+
+function setup_modules(sys, ldb, from, to) {
+ var ldif = sys.file_load(datadir + "provision_samba3sam.ldif");
+ ldif = substitute_var(ldif, from);
+ assert(ldif != undefined);
+ var ok = ldb.add(ldif);
+ assert(ok);
+
+ var ok = ldb.add("
+dn: @MAP=samba3sam
[EMAIL PROTECTED]: " + from.BASEDN + "
[EMAIL PROTECTED]: " + to.BASEDN + "
+
+dn: @MODULES
[EMAIL PROTECTED]:
rootdse,paged_results,server_sort,extended_dn,asq,samldb,objectclass,password_hash,operational,objectguid,rdn_name,samba3sam,partition
+
+dn: @PARTITION
+partition: " + from.BASEDN + ":" + from.URL + "
+partition: " + to.BASEDN + ":" + to.URL + "
+replicateEntries: @SUBCLASSES
+replicateEntries: @ATTRIBUTES
+replicateEntries: @INDEXLIST
+");
+ assert(ok);
+}
+
+function setup_data(sys, ldb, remote) {
+
svn commit: samba r17542 - in branches/SAMBA_4_0/source/lib/ldb/modules: .
Author: abartlet
Date: 2006-08-14 23:25:04 + (Mon, 14 Aug 2006)
New Revision: 17542
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17542
Log:
In using ldb_map, I ran across some very odd behaviours when we search
for objectClass=xyz. The code has been warning at me 'no
covert_operator set', and indeed this is the case. (It then proceeds to
strip this as a search expression)
In this commit, I have implemented a convert_operator for objectClass,
by pretending it is a simple MAP_CONVERT operator for the search
requests.
I also have changed the logic for when we should bail out. I can only
see reason to bail out on the search if we have both local and remote
trees. How can a remote-only search be un-splittable?
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/lib/ldb/modules/ldb_map.c
branches/SAMBA_4_0/source/lib/ldb/modules/ldb_map.h
branches/SAMBA_4_0/source/lib/ldb/modules/ldb_map_outbound.c
branches/SAMBA_4_0/source/lib/ldb/modules/ldb_map_private.h
Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/modules/ldb_map.c
===
--- branches/SAMBA_4_0/source/lib/ldb/modules/ldb_map.c 2006-08-14 16:53:14 UTC
(rev 17541)
+++ branches/SAMBA_4_0/source/lib/ldb/modules/ldb_map.c 2006-08-14 23:25:04 UTC
(rev 17542)
@@ -798,7 +798,27 @@
return el;
}
+/* Mappings for searches on objectClass= assuming a one-to-one
+ * mapping. Needed because this is a generate operator for the
+ * add/modify code */
+static int map_objectclass_convert_operator(struct ldb_module *module, void
*mem_ctx,
+ struct ldb_parse_tree **new, const
struct ldb_parse_tree *tree)
+{
+
+ static const struct ldb_map_attribute objectclass_map = {
+ .local_name = "objectclass",
+ .type = MAP_CONVERT,
+ .u = {
+ .convert = {
+.remote_name = "objectclass",
+.convert_local = map_objectclass_convert_local,
+.convert_remote =
map_objectclass_convert_remote,
+},
+ },
+ };
+ return map_subtree_collect_remote_simple(module, mem_ctx, new, tree,
&objectclass_map);
+}
/* Auxiliary request construction
* == */
@@ -1142,6 +1162,7 @@
{
.local_name = "objectclass",
.type = MAP_GENERATE,
+ .convert_operator = map_objectclass_convert_operator,
.u = {
.generate = {
.remote_names = { "objectclass", NULL },
Modified: branches/SAMBA_4_0/source/lib/ldb/modules/ldb_map.h
===
--- branches/SAMBA_4_0/source/lib/ldb/modules/ldb_map.h 2006-08-14 16:53:14 UTC
(rev 17541)
+++ branches/SAMBA_4_0/source/lib/ldb/modules/ldb_map.h 2006-08-14 23:25:04 UTC
(rev 17542)
@@ -68,7 +68,7 @@
} type;
/* if set, will be called for search expressions that contain this
attribute */
- struct ldb_parse_tree *(*convert_operator)(const struct ldb_map_context
*, TALLOC_CTX *ctx, const struct ldb_parse_tree *);
+ int (*convert_operator)(struct ldb_module *, TALLOC_CTX *ctx, struct
ldb_parse_tree **new, const struct ldb_parse_tree *);
union {
struct {
Modified: branches/SAMBA_4_0/source/lib/ldb/modules/ldb_map_outbound.c
===
--- branches/SAMBA_4_0/source/lib/ldb/modules/ldb_map_outbound.c
2006-08-14 16:53:14 UTC (rev 17541)
+++ branches/SAMBA_4_0/source/lib/ldb/modules/ldb_map_outbound.c
2006-08-14 23:25:04 UTC (rev 17542)
@@ -679,7 +679,7 @@
}
/* Collect a simple subtree that queries attributes in the remote partition */
-static int map_subtree_collect_remote_simple(struct ldb_module *module, void
*mem_ctx, struct ldb_parse_tree **new, const struct ldb_parse_tree *tree, const
struct ldb_map_attribute *map)
+int map_subtree_collect_remote_simple(struct ldb_module *module, void
*mem_ctx, struct ldb_parse_tree **new, const struct ldb_parse_tree *tree, const
struct ldb_map_attribute *map)
{
const char *attr;
struct ldb_val val;
@@ -757,8 +757,7 @@
map = map_attr_find_local(data, tree->u.equality.attr);
if (map->convert_operator) {
- *new = map->convert_operator(data, mem_ctx, tree);
- return 0;
+ return map->convert_operator(module, mem_ctx, new, tree);
}
if (map->type == MAP_GENERATE) {
@@ -1084,7 +1083,7 @@
goto failed;
}
- if (((local_tree == NULL) ^ (remote_tree == NULL)) &&
+ if (((local_tree != NULL) && (remote_tree != NULL)) &&
(!ldb_parse_tree_check_splittable(req->op.search.t
svn commit: linux-cifs-client r69 - in branches/linux-converged-for-old-kernels/fs/cifs: .
Author: jra Date: 2006-08-14 22:30:06 + (Mon, 14 Aug 2006) New Revision: 69 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=linux-cifs-client&rev=69 Log: Roll back the header_assemble changes to try and keep closer to the git tree. Jeremy. Modified: branches/linux-converged-for-old-kernels/fs/cifs/cifsproto.h branches/linux-converged-for-old-kernels/fs/cifs/cifssmb.c branches/linux-converged-for-old-kernels/fs/cifs/connect.c branches/linux-converged-for-old-kernels/fs/cifs/misc.c branches/linux-converged-for-old-kernels/fs/cifs/transport.c Changeset: Modified: branches/linux-converged-for-old-kernels/fs/cifs/cifsproto.h === --- branches/linux-converged-for-old-kernels/fs/cifs/cifsproto.h 2006-08-11 22:04:45 UTC (rev 68) +++ branches/linux-converged-for-old-kernels/fs/cifs/cifsproto.h 2006-08-14 22:30:06 UTC (rev 69) @@ -76,7 +76,6 @@ extern int map_smb_to_linux_error(struct smb_hdr *smb); extern void header_assemble(struct smb_hdr *, char /* command */ , const struct cifsTconInfo *, - __u16 mid, int /* length of fixed section (word count) in two byte units */); extern int small_smb_init_no_tc(const int smb_cmd, const int wct, struct cifsSesInfo *ses, Modified: branches/linux-converged-for-old-kernels/fs/cifs/cifssmb.c === --- branches/linux-converged-for-old-kernels/fs/cifs/cifssmb.c 2006-08-11 22:04:45 UTC (rev 68) +++ branches/linux-converged-for-old-kernels/fs/cifs/cifssmb.c 2006-08-14 22:30:06 UTC (rev 69) @@ -211,8 +211,7 @@ return -ENOMEM; } - header_assemble((struct smb_hdr *) *request_buf, smb_command, tcon, - tcon ? GetNextMid(tcon->ses->server) : 0, wct); + header_assemble((struct smb_hdr *) *request_buf, smb_command, tcon,wct); if(tcon != NULL) cifs_stats_inc(&tcon->num_smbs_sent); @@ -356,7 +355,7 @@ *response_buf = *request_buf; header_assemble((struct smb_hdr *) *request_buf, smb_command, tcon, - tcon ? GetNextMid(tcon->ses->server) : 0, wct /*wct */ ); + wct /*wct */ ); if(tcon != NULL) cifs_stats_inc(&tcon->num_smbs_sent); Modified: branches/linux-converged-for-old-kernels/fs/cifs/connect.c === --- branches/linux-converged-for-old-kernels/fs/cifs/connect.c 2006-08-11 22:04:45 UTC (rev 68) +++ branches/linux-converged-for-old-kernels/fs/cifs/connect.c 2006-08-14 22:30:06 UTC (rev 69) @@ -2118,8 +2118,9 @@ /* send SMBsessionSetup here */ header_assemble(smb_buffer, SMB_COM_SESSION_SETUP_ANDX, - NULL /* no tCon exists yet */ , GetNextMid(ses->server), 13 /* wct */ ); + NULL /* no tCon exists yet */ , 13 /* wct */ ); + smb_buffer->Mid = GetNextMid(ses->server); pSMB->req_no_secext.AndXCommand = 0xFF; pSMB->req_no_secext.MaxBufferSize = cpu_to_le16(ses->server->maxBuf); pSMB->req_no_secext.MaxMpxCount = cpu_to_le16(ses->server->maxReq); @@ -2410,8 +2411,9 @@ /* send SMBsessionSetup here */ header_assemble(smb_buffer, SMB_COM_SESSION_SETUP_ANDX, - NULL /* no tCon exists yet */ , GetNextMid(ses->server), 12 /* wct */ ); + NULL /* no tCon exists yet */ , 12 /* wct */ ); + smb_buffer->Mid = GetNextMid(ses->server); pSMB->req.hdr.Flags2 |= SMBFLG2_EXT_SEC; pSMB->req.hdr.Flags |= (SMBFLG_CASELESS | SMBFLG_CANONICAL_PATH_FORMAT); @@ -2743,8 +2745,9 @@ /* send SMBsessionSetup here */ header_assemble(smb_buffer, SMB_COM_SESSION_SETUP_ANDX, - NULL /* no tCon exists yet */ , GetNextMid(ses->server), 12 /* wct */ ); + NULL /* no tCon exists yet */ , 12 /* wct */ ); + smb_buffer->Mid = GetNextMid(ses->server); pSMB->req.hdr.Flags |= (SMBFLG_CASELESS | SMBFLG_CANONICAL_PATH_FORMAT); pSMB->req.hdr.Flags2 |= SMBFLG2_EXT_SEC; pSMB->req.AndXCommand = 0xFF; @@ -3131,8 +3134,9 @@ smb_buffer_response = smb_buffer; header_assemble(smb_buffer, SMB_COM_TREE_CONNECT_ANDX, - NULL /*no tid */ , GetNextMid(ses->server), 4 /*wct */ ); + NULL /*no tid */ , 4 /*wct */ ); + smb_buffer->Mid = GetNextMid(ses->server); smb_buffer->Uid = ses->Suid; pSMB = (TCONX_REQ *) smb_buffer; pSMBr = (TCONX_RSP *) smb_buffer_response; Modified: branches/linux-converged-for-old-kernels/fs/cifs/misc.c === --- branches/linux-converged-for-old-kernels/fs/cifs/misc.c
svn commit: samba r17541 - in branches: SAMBA_3_0/source/include SAMBA_3_0/source/smbd SAMBA_3_0_23/source/include
Author: jra
Date: 2006-08-14 16:53:14 + (Mon, 14 Aug 2006)
New Revision: 17541
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17541
Log:
When returning a trans2 request, if the "max data
bytes returned" is less than the amount we want
to send, return what we can and set STATUS_BUFFER_OVERFLOW
(doserror ERRDOS,ERRbufferoverflow). Required by
OS/2 to handle EA's that are too large. It's hard
to test this in Samba4 smbtorture as the max data
bytes returned is hard coded at 0x (as it is
in the Samba3 client libraries also). I used a
custom version of Samba4 smbtorture to test this
out. Might add a "max data bytes" param to make
this testable in the build farm. Confirmed by
"Guenter Kukkukk (sambaos2)" <[EMAIL PROTECTED]>
and Andreas Taegener <[EMAIL PROTECTED]>
that this fixes the issue.
Jeremy.
Modified:
branches/SAMBA_3_0/source/include/doserr.h
branches/SAMBA_3_0/source/smbd/blocking.c
branches/SAMBA_3_0/source/smbd/error.c
branches/SAMBA_3_0/source/smbd/trans2.c
branches/SAMBA_3_0_23/source/include/doserr.h
Changeset:
Modified: branches/SAMBA_3_0/source/include/doserr.h
===
--- branches/SAMBA_3_0/source/include/doserr.h 2006-08-14 16:35:56 UTC (rev
17540)
+++ branches/SAMBA_3_0/source/include/doserr.h 2006-08-14 16:53:14 UTC (rev
17541)
@@ -44,6 +44,7 @@
#define ERRnomem 8 /* Out of memory */
#define ERRbadmem 9 /* Invalid memory block address */
#define ERRbadenv 10 /* Invalid environment */
+#define ERRbadformat 11 /* Bad Format */
#define ERRbadaccess 12 /* Invalid open mode */
#define ERRbaddata 13 /* Invalid data (only from ioctl call) */
#define ERRres 14 /* reserved */
@@ -60,6 +61,7 @@
#define ERRfilexists 80 /* File in operation already exists */
#define ERRinvalidparam 87
#define ERRcannotopen 110 /* Cannot open the file specified */
+#define ERRbufferoverflow 111
#define ERRinsufficientbuffer 122
#define ERRinvalidname 123 /* Invalid name */
#define ERRunknownlevel 124
Modified: branches/SAMBA_3_0/source/smbd/blocking.c
===
--- branches/SAMBA_3_0/source/smbd/blocking.c 2006-08-14 16:35:56 UTC (rev
17540)
+++ branches/SAMBA_3_0/source/smbd/blocking.c 2006-08-14 16:53:14 UTC (rev
17541)
@@ -458,7 +458,8 @@
construct_reply_common(inbuf, outbuf);
SCVAL(outbuf,smb_com,SMBtrans2);
SSVAL(params,0,0);
- send_trans2_replies(outbuf, max_send, params, 2, NULL, 0);
+ /* Fake up max_data_bytes here - we know it fits. */
+ send_trans2_replies(outbuf, max_send, params, 2, NULL, 0, 0x);
return True;
}
Modified: branches/SAMBA_3_0/source/smbd/error.c
===
--- branches/SAMBA_3_0/source/smbd/error.c 2006-08-14 16:35:56 UTC (rev
17540)
+++ branches/SAMBA_3_0/source/smbd/error.c 2006-08-14 16:53:14 UTC (rev
17541)
@@ -81,9 +81,8 @@
If the override errors are set they take precedence over any passed in values.
/
-int error_packet(char *outbuf, uint8 eclass, uint32 ecode, NTSTATUS ntstatus,
int line, const char *file)
+void error_packet_set(char *outbuf, uint8 eclass, uint32 ecode, NTSTATUS
ntstatus, int line, const char *file)
{
- int outsize = set_message(outbuf,0,0,True);
BOOL force_nt_status = False;
BOOL force_dos_status = False;
@@ -125,6 +124,11 @@
eclass,
ecode));
}
+}
+int error_packet(char *outbuf, uint8 eclass, uint32 ecode, NTSTATUS ntstatus,
int line, const char *file)
+{
+ int outsize = set_message(outbuf,0,0,True);
+ error_packet_set(outbuf, eclass, ecode, ntstatus, line, file);
return outsize;
}
Modified: branches/SAMBA_3_0/source/smbd/trans2.c
===
--- branches/SAMBA_3_0/source/smbd/trans2.c 2006-08-14 16:35:56 UTC (rev
17540)
+++ branches/SAMBA_3_0/source/smbd/trans2.c 2006-08-14 16:53:14 UTC (rev
17541)
@@ -573,7 +573,8 @@
char *params,
int paramsize,
char *pdata,
- int datasize)
+ int datasize,
+ int max_data_bytes)
{
/* As we are using a protocol > LANMAN1 then the max_send
variable must have been set in the sessetupX call.
@@ -594,6 +595,18 @@
set_message(outbuf,10,0,True);
+ /* Modify the data_to_send and datasize and set the error if
+ we're trying to send more than max_data_bytes. We still send
+ the part of the packet(s) that fit. Strange, but needed
+ for OS/2. */
+
+ if (max_data_bytes > 0 && datasize > max_data_bytes) {
+ DEBUG(5,("send_trans2_replies: max_data_bytes %
svn commit: samba r17540 - in branches/SAMBA_4_0/source/script/tests: .
Author: metze Date: 2006-08-14 16:35:56 + (Mon, 14 Aug 2006) New Revision: 17540 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17540 Log: store command line args of selftest.sh in local vars as $0,$1,$2,$3 may change in side the script or included scripts. This fixes the usage of SOCKET_WRAPPER on non linux systems (tested on IRIX 6.4) metze Modified: branches/SAMBA_4_0/source/script/tests/selftest.sh Changeset: Modified: branches/SAMBA_4_0/source/script/tests/selftest.sh === --- branches/SAMBA_4_0/source/script/tests/selftest.sh 2006-08-14 14:56:21 UTC (rev 17539) +++ branches/SAMBA_4_0/source/script/tests/selftest.sh 2006-08-14 16:35:56 UTC (rev 17540) @@ -7,17 +7,22 @@ exit fi +ARG0=$0 +ARG1=$1 +ARG2=$2 +ARG3=$3 + if [ -z "$TORTURE_MAXTIME" ]; then TORTURE_MAXTIME=600 fi OLD_PWD=`pwd` -PREFIX=$1 +PREFIX=$ARG1 PREFIX=`echo $PREFIX | sed s+//+/+` export PREFIX # allow selection of the test lists -TESTS=$2 +TESTS=$ARG2 if [ $TESTS = "all" ]; then TLS_ENABLED="yes" @@ -29,7 +34,7 @@ LD_LIBRARY_PATH=$OLD_PWD/bin:$LD_LIBRARY_PATH export LD_LIBRARY_PATH -incdir=`dirname $0` +incdir=`dirname $ARG0` echo -n "PROVISIONING..." . $incdir/mktestsetup.sh $PREFIX || exit 1 echo "DONE" @@ -37,14 +42,16 @@ PATH=bin:$PATH export PATH -DO_SOCKET_WRAPPER=$3 +DO_SOCKET_WRAPPER=$ARG3 if [ x"$DO_SOCKET_WRAPPER" = x"SOCKET_WRAPPER" ];then SOCKET_WRAPPER_DIR="$PREFIX/sw" export SOCKET_WRAPPER_DIR echo "SOCKET_WRAPPER_DIR=$SOCKET_WRAPPER_DIR" +else + echo "NOT USING SOCKET_WRAPPER" fi -incdir=`dirname $0` +incdir=`dirname $ARG0` . $incdir/test_functions.sh SMBD_TEST_FIFO="$PREFIX/smbd_test.fifo" @@ -94,8 +101,8 @@ kill `cat $PIDDIR/smbd.pid` END=`date` -echo "START: $START ($0)"; -echo "END: $END ($0)"; +echo "START: $START ($ARG0)"; +echo "END: $END ($ARG0)"; # if there were any valgrind failures, show them count=`find $PREFIX -name 'valgrind.log*' | wc -l` @@ -109,4 +116,4 @@ done fi -teststatus $0 $failed +teststatus $ARG0 $failed
svn commit: samba r17539 - in branches/SAMBA_4_0/source: lib/crypto script/tests torture/local
Author: metze
Date: 2006-08-14 14:56:21 + (Mon, 14 Aug 2006)
New Revision: 17539
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17539
Log:
add HMAC-MD5 test code based on the example values from rfc 2104, 2202
metze
Added:
branches/SAMBA_4_0/source/lib/crypto/hmacmd5test.c
Modified:
branches/SAMBA_4_0/source/script/tests/test_local.sh
branches/SAMBA_4_0/source/torture/local/config.mk
branches/SAMBA_4_0/source/torture/local/local.c
Changeset:
Added: branches/SAMBA_4_0/source/lib/crypto/hmacmd5test.c
===
--- branches/SAMBA_4_0/source/lib/crypto/hmacmd5test.c 2006-08-14 14:53:38 UTC
(rev 17538)
+++ branches/SAMBA_4_0/source/lib/crypto/hmacmd5test.c 2006-08-14 14:56:21 UTC
(rev 17539)
@@ -0,0 +1,99 @@
+/*
+ Unix SMB/CIFS implementation.
+ HMAC MD5 tests
+ Copyright (C) Stefan Metzmacher 2006
+
+ 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 "lib/crypto/crypto.h"
+
+struct torture_context;
+
+static DATA_BLOB data_blob_repeat_byte(uint8_t byte, size_t length)
+{
+ DATA_BLOB b = data_blob(NULL, length);
+ memset(b.data, byte, length);
+ return b;
+}
+
+/*
+ This uses the test values from rfc 2104, 2202
+*/
+BOOL torture_local_crypto_hmacmd5(struct torture_context *torture)
+{
+ BOOL ret = True;
+ uint32_t i;
+ struct {
+ DATA_BLOB key;
+ DATA_BLOB data;
+ DATA_BLOB md5;
+ } testarray[] = {
+ {
+ .key= data_blob_repeat_byte(0x0b, 16),
+ .data = data_blob_string_const("Hi There"),
+ .md5=
strhex_to_data_blob("9294727a3638bb1c13f48ef8158bfc9d")
+ },{
+ .key= data_blob_string_const("Jefe"),
+ .data = data_blob_string_const("what do ya want for
nothing?"),
+ .md5=
strhex_to_data_blob("750c783e6ab0b503eaa86e310a5db738")
+ },{
+ .key= data_blob_repeat_byte(0xaa, 16),
+ .data = data_blob_repeat_byte(0xdd, 50),
+ .md5=
strhex_to_data_blob("56be34521d144c88dbb8c733f0e8b3f6")
+ },{
+ .key=
strhex_to_data_blob("0102030405060708090a0b0c0d0e0f10111213141516171819"),
+ .data = data_blob_repeat_byte(0xcd, 50),
+ .md5=
strhex_to_data_blob("697eaf0aca3a3aea3a75164746ffaa79")
+ },{
+ .key= data_blob_repeat_byte(0x0c, 16),
+ .data = data_blob_string_const("Test With Truncation"),
+ .md5=
strhex_to_data_blob("56461ef2342edc00f9bab995690efd4c")
+ },{
+ .key= data_blob_repeat_byte(0xaa, 80),
+ .data = data_blob_string_const("Test Using Larger Than
Block-Size Key - Hash Key First"),
+ .md5=
strhex_to_data_blob("6b1ab7fe4bd7bf8f0b62e6ce61b9d0cd")
+ },{
+ .key= data_blob_repeat_byte(0xaa, 80),
+ .data = data_blob_string_const("Test Using Larger Than
Block-Size Key "
+"and Larger Than One
Block-Size Data"),
+ .md5=
strhex_to_data_blob("6f630fad67cda0ee1fb1f562db3aa53e")
+ }
+ };
+
+ for (i=0; i < ARRAY_SIZE(testarray); i++) {
+ HMACMD5Context ctx;
+ uint8_t md5[16];
+ int e;
+
+ hmac_md5_init_rfc2104(testarray[i].key.data,
testarray[i].key.length, &ctx);
+ hmac_md5_update(testarray[i].data.data,
testarray[i].data.length, &ctx);
+ hmac_md5_final(md5, &ctx);
+
+ e = memcmp(testarray[i].md5.data,
+ md5,
+ MIN(testarray[i].md5.length, sizeof(md5)));
+ if (e != 0) {
+ printf("hmacmd5 test[%u]: failed\n", i);
+ dump_data(0, testarray[i].key.data,
testarray[i].key.length);
+ dump_data(0, testarray[i].data.data,
testarray[i].data.length);
+ dump_data(0, testarray[i].md5.data,
testarray[i].md5.length);
+ dump_data(0, md5, sizeof(md5));
+ ret = False;
+ }
+ }
+
+
svn commit: samba r17538 - in branches/SAMBA_4_0/source/torture/libnet: .
Author: metze
Date: 2006-08-14 14:53:38 + (Mon, 14 Aug 2006)
New Revision: 17538
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17538
Log:
this function should be static...
metze
Modified:
branches/SAMBA_4_0/source/torture/libnet/libnet_user.c
Changeset:
Modified: branches/SAMBA_4_0/source/torture/libnet/libnet_user.c
===
--- branches/SAMBA_4_0/source/torture/libnet/libnet_user.c 2006-08-14
13:10:53 UTC (rev 17537)
+++ branches/SAMBA_4_0/source/torture/libnet/libnet_user.c 2006-08-14
14:53:38 UTC (rev 17538)
@@ -307,7 +307,7 @@
continue; \
}
-void set_test_changes(TALLOC_CTX *mem_ctx, struct libnet_ModifyUser *r, int
num_changes)
+static void set_test_changes(TALLOC_CTX *mem_ctx, struct libnet_ModifyUser *r,
int num_changes)
{
enum fields { account_name = 0, full_name, description, home_directory,
home_drive,
comment, logon_script, profile_path, acct_expiry,
allow_password_change,
svn commit: samba r17537 - in branches/SAMBA_4_0/source/include/system: .
Author: metze Date: 2006-08-14 13:10:53 + (Mon, 14 Aug 2006) New Revision: 17537 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17537 Log: if we replace inet_ntoa() we need a prototype of rep_inet_ntoa... metze Modified: branches/SAMBA_4_0/source/include/system/network.h Changeset: Modified: branches/SAMBA_4_0/source/include/system/network.h === --- branches/SAMBA_4_0/source/include/system/network.h 2006-08-14 12:54:37 UTC (rev 17536) +++ branches/SAMBA_4_0/source/include/system/network.h 2006-08-14 13:10:53 UTC (rev 17537) @@ -70,6 +70,7 @@ #endif #ifdef REPLACE_INET_NTOA +char *rep_inet_ntoa(struct in_addr ip); #define inet_ntoa rep_inet_ntoa #endif
svn commit: samba r17536 - in branches/SAMBA_3_0/source/libads: .
Author: vlendec
Date: 2006-08-14 12:54:37 + (Mon, 14 Aug 2006)
New Revision: 17536
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17536
Log:
Add a debug message citing the reason why an LDAP connection failed, inspired
by Christian M Ambach <[EMAIL PROTECTED]>.
Volker
Modified:
branches/SAMBA_3_0/source/libads/ldap.c
Changeset:
Modified: branches/SAMBA_3_0/source/libads/ldap.c
===
--- branches/SAMBA_3_0/source/libads/ldap.c 2006-08-14 12:42:46 UTC (rev
17535)
+++ branches/SAMBA_3_0/source/libads/ldap.c 2006-08-14 12:54:37 UTC (rev
17536)
@@ -65,6 +65,11 @@
ldp = ldap_open(server, port);
+ if (ldp == NULL) {
+ DEBUG(2,("Could not open LDAP connection to %s:%d: %s\n",
+server, port, strerror(errno)));
+ }
+
/* Teardown timeout. */
CatchSignal(SIGALRM, SIGNAL_CAST SIG_IGN);
alarm(0);
svn commit: samba r17535 - in branches/SAMBA_3_0/source/libads: .
Author: vlendec
Date: 2006-08-14 12:42:46 + (Mon, 14 Aug 2006)
New Revision: 17535
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17535
Log:
Reformatting, this had many tabs instead of ^$
Modified:
branches/SAMBA_3_0/source/libads/ldap.c
Changeset:
Modified: branches/SAMBA_3_0/source/libads/ldap.c
===
--- branches/SAMBA_3_0/source/libads/ldap.c 2006-08-14 11:38:29 UTC (rev
17534)
+++ branches/SAMBA_3_0/source/libads/ldap.c 2006-08-14 12:42:46 UTC (rev
17535)
@@ -47,28 +47,28 @@
/***
Signal function to tell us we timed out.
/
-
+
static void gotalarm_sig(void)
{
gotalarm = 1;
}
-
+
LDAP *ldap_open_with_timeout(const char *server, int port, unsigned int to)
{
LDAP *ldp = NULL;
-
+
/* Setup timeout */
gotalarm = 0;
CatchSignal(SIGALRM, SIGNAL_CAST gotalarm_sig);
alarm(to);
/* End setup timeout. */
-
+
ldp = ldap_open(server, port);
-
+
/* Teardown timeout. */
CatchSignal(SIGALRM, SIGNAL_CAST SIG_IGN);
alarm(0);
-
+
return ldp;
}
svn commit: samba r17534 - in branches/SAMBA_4_0/source/scripting/libjs: .
Author: abartlet Date: 2006-08-14 11:38:29 + (Mon, 14 Aug 2006) New Revision: 17534 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17534 Log: Try another group for 'wheel' on True64. Modified: branches/SAMBA_4_0/source/scripting/libjs/provision.js Changeset: Modified: branches/SAMBA_4_0/source/scripting/libjs/provision.js === --- branches/SAMBA_4_0/source/scripting/libjs/provision.js 2006-08-14 09:58:50 UTC (rev 17533) +++ branches/SAMBA_4_0/source/scripting/libjs/provision.js 2006-08-14 11:38:29 UTC (rev 17534) @@ -572,7 +572,7 @@ subobj.ROOT = findnss(nss.getpwnam, "root"); subobj.NOBODY = findnss(nss.getpwnam, "nobody"); subobj.NOGROUP = findnss(nss.getgrnam, "nogroup", "nobody"); - subobj.WHEEL= findnss(nss.getgrnam, "wheel", "root", "staff"); + subobj.WHEEL= findnss(nss.getgrnam, "wheel", "root", "staff", "adm"); subobj.BACKUP = findnss(nss.getgrnam, "backup", "wheel", "root", "staff"); subobj.USERS= findnss(nss.getgrnam, "users", "guest", "other", "unknown"); subobj.DNSDOMAIN= strlower(subobj.REALM);
svn commit: samba r17533 - in branches/SAMBA_4_0/source/param: .
Author: metze Date: 2006-08-14 09:58:50 + (Mon, 14 Aug 2006) New Revision: 17533 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17533 Log: add missing include, so that "socket options = TCP_NODELY" as default can work... metze Modified: branches/SAMBA_4_0/source/param/loadparm.c Changeset: Modified: branches/SAMBA_4_0/source/param/loadparm.c === --- branches/SAMBA_4_0/source/param/loadparm.c 2006-08-14 09:52:58 UTC (rev 17532) +++ branches/SAMBA_4_0/source/param/loadparm.c 2006-08-14 09:58:50 UTC (rev 17533) @@ -59,6 +59,7 @@ #include "pstring.h" #include "system/time.h" #include "system/locale.h" +#include "system/network.h" /* needed for TCP_NODELAY */ #include "librpc/gen_ndr/svcctl.h" #include "librpc/gen_ndr/samr.h" #include "smb_server/smb_server.h"
svn commit: samba r17532 - in branches/SAMBA_4_0/source/lib/tdb/common: .
Author: metze Date: 2006-08-14 09:52:58 + (Mon, 14 Aug 2006) New Revision: 17532 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17532 Log: merge from SAMBA_3_0 Revision: 17460 First step at fixing the build breakage with the groupmapping test. On Linux, F_RDLCK is defined to 0, for example NetBSD has it at 1. Still does not work fully though. Still investigating. metze Modified: branches/SAMBA_4_0/source/lib/tdb/common/traverse.c Changeset: Modified: branches/SAMBA_4_0/source/lib/tdb/common/traverse.c === --- branches/SAMBA_4_0/source/lib/tdb/common/traverse.c 2006-08-14 07:40:18 UTC (rev 17531) +++ branches/SAMBA_4_0/source/lib/tdb/common/traverse.c 2006-08-14 09:52:58 UTC (rev 17532) @@ -261,6 +261,7 @@ if (tdb_unlock_record(tdb, tdb->travlocks.off) != 0) return tdb_null; tdb->travlocks.off = tdb->travlocks.hash = 0; + tdb->travlocks.lock_rw = F_RDLCK; if (tdb_next_lock(tdb, &tdb->travlocks, &rec) <= 0) return tdb_null;
svn commit: samba r17531 - in branches/SAMBA_4_0/source/build/m4: .
Author: metze
Date: 2006-08-14 07:40:18 + (Mon, 14 Aug 2006)
New Revision: 17531
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17531
Log:
fix whitespaces
metze
Modified:
branches/SAMBA_4_0/source/build/m4/check_path.m4
Changeset:
Modified: branches/SAMBA_4_0/source/build/m4/check_path.m4
===
--- branches/SAMBA_4_0/source/build/m4/check_path.m42006-08-14 03:28:25 UTC
(rev 17530)
+++ branches/SAMBA_4_0/source/build/m4/check_path.m42006-08-14 07:40:18 UTC
(rev 17531)
@@ -26,7 +26,7 @@
logfilebase="${localstatedir}/log/samba"
privatedir="${localstatedir}/lib/samba/private"
sysconfdir="${sysconfdir}/samba"
- modulesdir="${libdir}/samba"
+modulesdir="${libdir}/samba"
datadir="${datadir}/samba"
includedir="${includedir}/samba-4.0"
winbindd_socket_dir="${localstatedir}/run/samba/winbind_pipe"
