Build status as of Sun Oct 16 00:00:03 2005
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2005-10-15 00:00:12.0 + +++ /home/build/master/cache/broken_results.txt 2005-10-16 00:00:09.0 + @@ -1,17 +1,17 @@ -Build status as of Sat Oct 15 00:00:02 2005 +Build status as of Sun Oct 16 00:00:03 2005 Build counts: Tree Total Broken Panic ccache 10 2 0 -distcc 9 2 0 -lorikeet-heimdal 33 20 0 -ppp 15 0 0 -rsync35 2 0 +distcc 10 2 0 +lorikeet-heimdal 33 18 0 +ppp 16 0 0 +rsync35 3 0 samba2 0 0 samba-docs 0 0 0 -samba4 36 18 4 -samba_3_037 11 0 +samba4 35 18 3 +samba_3_036 11 0 smb-build25 5 0 -talloc 11 6 0 -tdb 35 4 0 +talloc 12 6 0 +tdb 9 3 0
svn commit: samba r11094 - in branches/SAMBA_4_0/source: libnet winbind
Author: vlendec Date: 2005-10-15 22:01:15 + (Sat, 15 Oct 2005) New Revision: 11094 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11094 Log: Connect to SAM, implement getdcname Added: branches/SAMBA_4_0/source/winbind/wb_cmd_getdcname.c branches/SAMBA_4_0/source/winbind/wb_cmd_lookupname.c branches/SAMBA_4_0/source/winbind/wb_connect_sam.c Modified: branches/SAMBA_4_0/source/libnet/libnet_join.c branches/SAMBA_4_0/source/winbind/config.mk branches/SAMBA_4_0/source/winbind/wb_async_helpers.c branches/SAMBA_4_0/source/winbind/wb_init_domain.c branches/SAMBA_4_0/source/winbind/wb_samba3_cmd.c branches/SAMBA_4_0/source/winbind/wb_samba3_protocol.c branches/SAMBA_4_0/source/winbind/wb_server.h Changeset: Sorry, the patch is too large (812 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11094
svn commit: samba r11093 - in branches/SAMBA_4_0/source: include winbind
Author: vlendec Date: 2005-10-15 19:18:05 + (Sat, 15 Oct 2005) New Revision: 11093 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11093 Log: Implement wb_queue_domain_send: If the domain is not yet initialized, do that first. And if a request is being processed, queue it. This correctly survived 3 endless loops with wbinfo's doing different things while starting up smbd. The number of indirections starts to become a bit scary, but what can you do without a decent programming language that provides closures :-) One thing that we might consider is to auto-generate async rpc requests that return composite_context structs instead of rpc_requests. Otherwise I'd have to write a lot of wrappers like composite_netr_LogonSamLogon_send. The alternative would be to write two versions of wb_queue_domain_send which I would like to avoid. This is cluttered enough already. Volker Modified: branches/SAMBA_4_0/source/include/structs.h branches/SAMBA_4_0/source/winbind/wb_async_helpers.c branches/SAMBA_4_0/source/winbind/wb_connect_lsa.c branches/SAMBA_4_0/source/winbind/wb_init_domain.c branches/SAMBA_4_0/source/winbind/wb_pam_auth.c branches/SAMBA_4_0/source/winbind/wb_server.h Changeset: Sorry, the patch is too large (596 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11093
svn commit: samba r11092 - in branches/SAMBA_4_0/source/script/tests: .
Author: metze Date: 2005-10-15 12:30:58 + (Sat, 15 Oct 2005) New Revision: 11092 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11092 Log: run NBT-WINSREPLICATION-QUICK test with make test metze Modified: branches/SAMBA_4_0/source/script/tests/test_nbt.sh Changeset: Modified: branches/SAMBA_4_0/source/script/tests/test_nbt.sh === --- branches/SAMBA_4_0/source/script/tests/test_nbt.sh 2005-10-15 12:30:08 UTC (rev 11091) +++ branches/SAMBA_4_0/source/script/tests/test_nbt.sh 2005-10-15 12:30:58 UTC (rev 11092) @@ -18,7 +18,7 @@ PATH=bin:$PATH export PATH -for f in NBT-REGISTER NBT-WINS; do +for f in NBT-REGISTER NBT-WINS NBT-WINSREPLICATION-QUICK; do testit "$f" bin/smbtorture $TORTURE_OPTIONS //$SERVER/_none_ $f || failed=`expr $failed + 1` done
svn commit: samba r11091 - in branches/SAMBA_4_0/source/torture: . nbt
Author: metze
Date: 2005-10-15 12:30:08 + (Sat, 15 Oct 2005)
New Revision: 11091
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11091
Log:
add a NBT-WINSREPLICATION-QUICK test that passed the current samba4 server
metze
Modified:
branches/SAMBA_4_0/source/torture/nbt/winsreplication.c
branches/SAMBA_4_0/source/torture/torture.c
Changeset:
Modified: branches/SAMBA_4_0/source/torture/nbt/winsreplication.c
===
--- branches/SAMBA_4_0/source/torture/nbt/winsreplication.c 2005-10-15
12:23:33 UTC (rev 11090)
+++ branches/SAMBA_4_0/source/torture/nbt/winsreplication.c 2005-10-15
12:30:08 UTC (rev 11091)
@@ -1487,6 +1487,36 @@
/*
test WINS replication operations
*/
+BOOL torture_nbt_winsreplication_quick(void)
+{
+ const char *address;
+ struct nbt_name name;
+ TALLOC_CTX *mem_ctx = talloc_new(NULL);
+ NTSTATUS status;
+ BOOL ret = True;
+
+ make_nbt_name_server(&name, lp_parm_string(-1, "torture", "host"));
+
+ /* do an initial name resolution to find its IP */
+ status = resolve_name(&name, mem_ctx, &address, NULL);
+ if (!NT_STATUS_IS_OK(status)) {
+ printf("Failed to resolve %s - %s\n",
+ name.name, nt_errstr(status));
+ talloc_free(mem_ctx);
+ return False;
+ }
+
+ ret &= test_assoc_ctx1(mem_ctx, address);
+ ret &= test_assoc_ctx2(mem_ctx, address);
+
+ talloc_free(mem_ctx);
+
+ return ret;
+}
+
+/*
+ test WINS replication operations
+*/
BOOL torture_nbt_winsreplication(void)
{
const char *address;
Modified: branches/SAMBA_4_0/source/torture/torture.c
===
--- branches/SAMBA_4_0/source/torture/torture.c 2005-10-15 12:23:33 UTC (rev
11090)
+++ branches/SAMBA_4_0/source/torture/torture.c 2005-10-15 12:30:08 UTC (rev
11091)
@@ -2340,8 +2340,9 @@
/* nbt tests */
{"NBT-REGISTER", torture_nbt_register, 0},
{"NBT-WINS", torture_nbt_wins, 0},
+ {"NBT-DGRAM", torture_nbt_dgram, 0},
+ {"NBT-WINSREPLICATION-QUICK", torture_nbt_winsreplication_quick, 0},
{"NBT-WINSREPLICATION", torture_nbt_winsreplication, 0},
- {"NBT-DGRAM", torture_nbt_dgram, 0},
/* libnet tests */
{"NET-USERINFO", torture_userinfo, 0},
svn commit: samba r11090 - in branches/SAMBA_4_0/source/libcli/wrepl: .
Author: metze
Date: 2005-10-15 12:23:33 + (Sat, 15 Oct 2005)
New Revision: 11090
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11090
Log:
we need this to run correct under socket_wrapper
metze
Modified:
branches/SAMBA_4_0/source/libcli/wrepl/winsrepl.c
Changeset:
Modified: branches/SAMBA_4_0/source/libcli/wrepl/winsrepl.c
===
--- branches/SAMBA_4_0/source/libcli/wrepl/winsrepl.c 2005-10-15 11:04:46 UTC
(rev 11089)
+++ branches/SAMBA_4_0/source/libcli/wrepl/winsrepl.c 2005-10-15 12:23:33 UTC
(rev 11090)
@@ -287,7 +287,7 @@
wrepl_socket->fde = event_add_fd(wrepl_socket->event_ctx, wrepl_socket,
socket_get_fd(wrepl_socket->sock),
-0,
+EVENT_FD_WRITE,
wrepl_handler, wrepl_socket);
if (wrepl_socket->fde == NULL) {
req->status = NT_STATUS_NO_MEMORY;
svn commit: samba r11089 - in branches/SAMBA_4_0/source: param wrepl_server
Author: metze
Date: 2005-10-15 11:04:46 + (Sat, 15 Oct 2005)
New Revision: 11089
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11089
Log:
start the winsreplication task when we run with wins support = yes
metze
Modified:
branches/SAMBA_4_0/source/param/loadparm.c
branches/SAMBA_4_0/source/wrepl_server/wrepl_server.c
Changeset:
Modified: branches/SAMBA_4_0/source/param/loadparm.c
===
--- branches/SAMBA_4_0/source/param/loadparm.c 2005-10-15 10:55:30 UTC (rev
11088)
+++ branches/SAMBA_4_0/source/param/loadparm.c 2005-10-15 11:04:46 UTC (rev
11089)
@@ -603,7 +603,7 @@
do_parameter("max connections", "-1", NULL);
do_parameter("dcerpc endpoint servers", "epmapper srvsvc wkssvc rpcecho
samr netlogon lsarpc spoolss drsuapi winreg dssetup", NULL);
- do_parameter("server services", "smb rpc nbt ldap cldap web kdc", NULL);
+ do_parameter("server services", "smb rpc nbt wrepl ldap cldap web kdc",
NULL);
do_parameter("ntptr providor", "simple_ldb", NULL);
do_parameter("auth methods", "anonymous sam_ignoredomain", NULL);
do_parameter("private dir", dyn_PRIVATE_DIR, NULL);
Modified: branches/SAMBA_4_0/source/wrepl_server/wrepl_server.c
===
--- branches/SAMBA_4_0/source/wrepl_server/wrepl_server.c 2005-10-15
10:55:30 UTC (rev 11088)
+++ branches/SAMBA_4_0/source/wrepl_server/wrepl_server.c 2005-10-15
11:04:46 UTC (rev 11089)
@@ -381,6 +381,10 @@
*/
static NTSTATUS wreplsrv_init(struct event_context *event_ctx, const struct
model_ops *model_ops)
{
+ if (!lp_wins_support()) {
+ return NT_STATUS_OK;
+ }
+
return task_server_startup(event_ctx, model_ops, wreplsrv_task_init);
}
svn commit: samba r11088 - in branches/SAMBA_4_0/source/nbt_server/wins: .
Author: metze
Date: 2005-10-15 10:55:30 + (Sat, 15 Oct 2005)
New Revision: 11088
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11088
Log:
don't try to set empty strings values as attributes
our ldb doesn't support them, does w2k3 LDAP supports them?
metze
Modified:
branches/SAMBA_4_0/source/nbt_server/wins/winsdb.c
Changeset:
Modified: branches/SAMBA_4_0/source/nbt_server/wins/winsdb.c
===
--- branches/SAMBA_4_0/source/nbt_server/wins/winsdb.c 2005-10-15 10:15:42 UTC
(rev 11087)
+++ branches/SAMBA_4_0/source/nbt_server/wins/winsdb.c 2005-10-15 10:55:30 UTC
(rev 11088)
@@ -514,10 +514,10 @@
msg->dn = winsdb_dn(msg, rec->name);
if (msg->dn == NULL) goto failed;
ret |= ldb_msg_add_fmt(msg, "type", "0x%02X", rec->name->type);
- if (rec->name->name) {
+ if (rec->name->name && *rec->name->name) {
ret |= ldb_msg_add_string(msg, "name", rec->name->name);
}
- if (rec->name->scope) {
+ if (rec->name->scope && *rec->name->scope) {
ret |= ldb_msg_add_string(msg, "scope", rec->name->scope);
}
ret |= ldb_msg_add_fmt(msg, "objectClass", "winsRecord");
Re: svn commit: samba r11082 - in branches/SAMBA_4_0/source/winbind: .
On Sat, Oct 15, 2005 at 08:17:22AM +, [EMAIL PROTECTED] wrote: > state->ctx->status = irpc_call_recv(ireq); > + talloc_free(ireq); > if (!composite_is_ok(state->ctx)) return; Hi Volker, typicaly in samba4 the _recv() function free's the request struct, we should maybe add that to irpc_call_recv() too, btw: why does it segfault here? when you don't free the struct here? metze
svn commit: samba r11087 - in branches/SAMBA_4_0/source: nbt_server/wins scripting/libjs setup
Author: metze
Date: 2005-10-15 10:15:42 + (Sat, 15 Oct 2005)
New Revision: 11087
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11087
Log:
- add type,name,scope as attributes to winsRecords,
so you can use them in search filters,
only for administration not used inside the winserver code
- fix the samba3 ugrade scripts to create a correct samba4 wins.ldb
metze
Modified:
branches/SAMBA_4_0/source/nbt_server/wins/winsdb.c
branches/SAMBA_4_0/source/scripting/libjs/upgrade.js
branches/SAMBA_4_0/source/setup/upgrade
Changeset:
Modified: branches/SAMBA_4_0/source/nbt_server/wins/winsdb.c
===
--- branches/SAMBA_4_0/source/nbt_server/wins/winsdb.c 2005-10-15 10:04:33 UTC
(rev 11086)
+++ branches/SAMBA_4_0/source/nbt_server/wins/winsdb.c 2005-10-15 10:15:42 UTC
(rev 11087)
@@ -513,6 +513,13 @@
msg->dn = winsdb_dn(msg, rec->name);
if (msg->dn == NULL) goto failed;
+ ret |= ldb_msg_add_fmt(msg, "type", "0x%02X", rec->name->type);
+ if (rec->name->name) {
+ ret |= ldb_msg_add_string(msg, "name", rec->name->name);
+ }
+ if (rec->name->scope) {
+ ret |= ldb_msg_add_string(msg, "scope", rec->name->scope);
+ }
ret |= ldb_msg_add_fmt(msg, "objectClass", "winsRecord");
ret |= ldb_msg_add_fmt(msg, "recordType", "%u", rec->type);
ret |= ldb_msg_add_fmt(msg, "recordState", "%u", rec->state);
Modified: branches/SAMBA_4_0/source/scripting/libjs/upgrade.js
===
--- branches/SAMBA_4_0/source/scripting/libjs/upgrade.js2005-10-15
10:04:33 UTC (rev 11086)
+++ branches/SAMBA_4_0/source/scripting/libjs/upgrade.js2005-10-15
10:15:42 UTC (rev 11087)
@@ -228,22 +228,73 @@
function upgrade_wins(samba3)
{
var ldif = "";
+ var version_id = 0;
+
for (i in samba3.winsentries) {
+ var rType;
+ var rState;
+ var nType;
+ var numIPs = 0;
var e = samba3.winsentries[i];
-
+ var now = sys.nttime();
+ var ttl = sys.unix2nttime(e.ttl);
+
+ version_id++;
+
+ for (var i in e.ips) {
+ numIPs++;
+ }
+
+ if (e.type == 0x1C) {
+ rType = 0x2;
+ } else if (sys.bitAND(e.type, 0x80)) {
+ if (numIPs > 1) {
+ rType = 0x2;
+ } else {
+ rType = 0x1;
+ }
+ } else {
+ if (numIPs > 1) {
+ rType = 0x3;
+ } else {
+ rType = 0x0;
+ }
+ }
+
+ if (ttl > now) {
+ rState = 0x0;/* active */
+ } else {
+ rState = 0x1;/* released */
+ }
+
+ nType = (sys.bitAND(e.nb_flags,0x60)>>5);
+
ldif = ldif + sprintf("
-dn: type=%d,name=%s
+dn: name:%s,type=0x%02X
+type: 0x%02X
name: %s
-objectClass: wins
-nbFlags: %x
-expires: %s
-", e.type, e.name, e.name, e.type, e.nb_flags, sys.ldaptime(e.ttl));
+objectClass: winsRecord
+recordType: %u
+recordState: %u
+nodeType: %u
+isStatic: 0
+expireTime: %s
+versionID: %llu
+", e.name, e.type, e.type, e.name,
+ rType, rState, nType,
+ sys.ldaptime(ttl), version_id);
for (var i in e.ips) {
ldif = ldif + sprintf("address: %s\n", e.ips[i]);
}
}
+ ldif = ldif + sprintf("
+dn: CN=VERSION
+objectClass: winsMaxVersion
+maxVersion: %llu
+", version_id);
+
return ldif;
}
@@ -569,7 +620,7 @@
dn: @MODULES
changetype: modify
replace: @LIST
[EMAIL PROTECTED]: samldb,timestamps,objectguid,rdn_name,samba3sam
[EMAIL PROTECTED]: samldb,operational,objectguid,rdn_name,samba3sam
");
if (!ok) {
message("Error enabling samba3sam module: " +
samdb.errstring() + "\n");
Modified: branches/SAMBA_4_0/source/setup/upgrade
===
--- branches/SAMBA_4_0/source/setup/upgrade 2005-10-15 10:04:33 UTC (rev
11086)
+++ branches/SAMBA_4_0/source/setup/upgrade 2005-10-15 10:15:42 UTC (rev
11087)
@@ -75,7 +75,7 @@
if (options.targetdir != undefined) {
paths = new Object();
paths.smbconf = sprintf("%s/smb.conf", options.targetdir);
- var ldbs = new
Array("hklm","hkcr","hku","hkcu","hkpd","hkpt","samdb","rootdse","secrets","winsdb");
+ var ldbs = new
Array("hklm","hkcr","hku","hkcu","hkpd","hkpt","samdb","rootdse","secrets","wins");
for (var i in ldbs) {
var n = ldbs[i];
svn commit: samba r11086 - in branches/SAMBA_4_0/source/scripting/ejs: .
Author: metze
Date: 2005-10-15 10:04:33 + (Sat, 15 Oct 2005)
New Revision: 11086
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11086
Log:
add sys.unix2nttime() function
metze
Modified:
branches/SAMBA_4_0/source/scripting/ejs/smbcalls_sys.c
Changeset:
Modified: branches/SAMBA_4_0/source/scripting/ejs/smbcalls_sys.c
===
--- branches/SAMBA_4_0/source/scripting/ejs/smbcalls_sys.c 2005-10-15
09:32:04 UTC (rev 11085)
+++ branches/SAMBA_4_0/source/scripting/ejs/smbcalls_sys.c 2005-10-15
10:04:33 UTC (rev 11086)
@@ -67,6 +67,22 @@
}
/*
+ return time as a 64 bit nttime value from a 32 bit time_t value
+*/
+static int ejs_sys_unix2nttime(MprVarHandle eid, int argc, struct MprVar
**argv)
+{
+ NTTIME nt;
+ if (argc != 1 || !mprVarIsNumber(argv[0]->type)) {
+ ejsSetErrorMsg(eid, "sys_unix2nttime invalid arguments");
+ return -1;
+ }
+ unix_to_nt_time(&nt, mprVarToNumber(argv[0]));
+ struct MprVar v = mprCreateNumberVar(nt);
+ mpr_Return(eid, v);
+ return 0;
+}
+
+/*
return the given time as a gmtime structure
*/
static int ejs_sys_gmtime(MprVarHandle eid, int argc, struct MprVar **argv)
@@ -313,6 +329,7 @@
mprSetCFunction(obj, "interfaces", ejs_sys_interfaces);
mprSetCFunction(obj, "hostname", ejs_sys_hostname);
mprSetCFunction(obj, "nttime", ejs_sys_nttime);
+ mprSetCFunction(obj, "unix2nttime", ejs_sys_unix2nttime);
mprSetCFunction(obj, "gmtime", ejs_sys_gmtime);
mprSetCFunction(obj, "ldaptime", ejs_sys_ldaptime);
mprSetCFunction(obj, "httptime", ejs_sys_httptime);
svn commit: samba r11085 - in branches/SAMBA_4_0/source/scripting/ejs: .
Author: metze
Date: 2005-10-15 09:32:04 + (Sat, 15 Oct 2005)
New Revision: 11085
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11085
Log:
as ejs doesn't support '&' '|' bitwise AND and OR,
we need some helper functions for this
metze
Modified:
branches/SAMBA_4_0/source/scripting/ejs/smbcalls_sys.c
Changeset:
Modified: branches/SAMBA_4_0/source/scripting/ejs/smbcalls_sys.c
===
--- branches/SAMBA_4_0/source/scripting/ejs/smbcalls_sys.c 2005-10-15
09:28:56 UTC (rev 11084)
+++ branches/SAMBA_4_0/source/scripting/ejs/smbcalls_sys.c 2005-10-15
09:32:04 UTC (rev 11085)
@@ -257,8 +257,53 @@
return 0;
}
+/*
+ bitwise AND
+ usage:
+ var z = sys.bitAND(x, 0x70);
+*/
+static int ejs_sys_bitAND(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+ int x, y, z;
+ if (argc != 2 ||
+ !mprVarIsNumber(argv[0]->type) ||
+ !mprVarIsNumber(argv[1]->type)) {
+ ejsSetErrorMsg(eid, "bitand invalid arguments");
+ return -1;
+ }
+ x = mprToInt(argv[0]);
+ y = mprToInt(argv[1]);
+ z = x & y;
+
+ mpr_Return(eid, mprCreateIntegerVar(z));
+ return 0;
+}
+
/*
+ bitwise OR
+ usage:
+ var z = sys.bitOR(x, 0x70);
+*/
+static int ejs_sys_bitOR(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+ int x, y, z;
+
+ if (argc != 2 ||
+ !mprVarIsNumber(argv[0]->type) ||
+ !mprVarIsNumber(argv[1]->type)) {
+ ejsSetErrorMsg(eid, "bitand invalid arguments");
+ return -1;
+ }
+ x = mprToInt(argv[0]);
+ y = mprToInt(argv[1]);
+ z = x | y;
+
+ mpr_Return(eid, mprCreateIntegerVar(z));
+ return 0;
+}
+
+/*
initialise sys ejs subsystem
*/
static int ejs_sys_init(MprVarHandle eid, int argc, struct MprVar **argv)
@@ -276,6 +321,8 @@
mprSetStringCFunction(obj, "file_save", ejs_sys_file_save);
mprSetStringCFunction(obj, "stat", ejs_sys_stat);
mprSetStringCFunction(obj, "lstat", ejs_sys_lstat);
+ mprSetCFunction(obj, "bitAND", ejs_sys_bitAND);
+ mprSetCFunction(obj, "bitOR", ejs_sys_bitOR);
return 0;
}
svn commit: samba r11084 - in branches/SAMBA_4_0/source/lib/appweb: ejs mpr
Author: metze
Date: 2005-10-15 09:28:56 + (Sat, 15 Oct 2005)
New Revision: 11084
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11084
Log:
- allow hex numbers with 'a'...'f' digits to be parsed
- parse hex numbers correct
tridge: how could we submit this to the upstream appweb library?
metze
Modified:
branches/SAMBA_4_0/source/lib/appweb/ejs/ejsLex.c
branches/SAMBA_4_0/source/lib/appweb/mpr/var.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/appweb/ejs/ejsLex.c
===
--- branches/SAMBA_4_0/source/lib/appweb/ejs/ejsLex.c 2005-10-15 09:25:43 UTC
(rev 11083)
+++ branches/SAMBA_4_0/source/lib/appweb/ejs/ejsLex.c 2005-10-15 09:28:56 UTC
(rev 11084)
@@ -633,12 +633,19 @@
break;
}
if (tolower(c) == 'x') {
- if (tokenAddChar(ep, c) < 0) {
- return EJS_TOK_ERR;
- }
- if ((c = inputGetc(ep)) < 0) {
- break;
- }
+ do {
+ if (tokenAddChar(ep, c) < 0) {
+ return EJS_TOK_ERR;
+ }
+ if ((c = inputGetc(ep)) < 0) {
+ break;
+ }
+ } while (isdigit(c) || (tolower(c) >= 'a' &&
tolower(c) <= 'f'));
+
+ mprDestroyVar(&ep->tokenNumber);
+ ep->tokenNumber = mprParseVar(ep->token, type);
+ inputPutback(ep, c);
+ return EJS_TOK_NUMBER;
}
if (! isdigit(c)) {
#if BLD_FEATURE_FLOATING_POINT
Modified: branches/SAMBA_4_0/source/lib/appweb/mpr/var.c
===
--- branches/SAMBA_4_0/source/lib/appweb/mpr/var.c 2005-10-15 09:25:43 UTC
(rev 11083)
+++ branches/SAMBA_4_0/source/lib/appweb/mpr/var.c 2005-10-15 09:28:56 UTC
(rev 11084)
@@ -2015,7 +2015,7 @@
if (isdigit(c)) {
num64 = (c - '0') + (num64 * radix);
} else if (c >= 'a' && c <= 'f') {
- num64 = (c - 'a') + (num64 * radix);
+ num64 = (c - ('a' - 10)) + (num64 *
radix);
} else {
break;
}
@@ -2132,7 +2132,7 @@
if (isdigit(c)) {
num = (c - '0') + (num * radix);
} else if (c >= 'a' && c <= 'f') {
- num = (c - 'a') + (num * radix);
+ num = (c - ('a' - 10)) + (num * radix);
} else {
break;
}
svn commit: samba r11083 - in branches/SAMBA_4_0/source/scripting/ejs: .
Author: metze
Date: 2005-10-15 09:25:43 + (Sat, 15 Oct 2005)
New Revision: 11083
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11083
Log:
use the addresses from the record
metze
Modified:
branches/SAMBA_4_0/source/scripting/ejs/smbcalls_samba3.c
Changeset:
Modified: branches/SAMBA_4_0/source/scripting/ejs/smbcalls_samba3.c
===
--- branches/SAMBA_4_0/source/scripting/ejs/smbcalls_samba3.c 2005-10-15
08:17:22 UTC (rev 11082)
+++ branches/SAMBA_4_0/source/scripting/ejs/smbcalls_samba3.c 2005-10-15
09:25:43 UTC (rev 11083)
@@ -405,7 +405,9 @@
ips = mprObject("array");
for (j = 0; j < samba3->winsdb_entries[i].ip_count; j++) {
- mprAddArray(&ips, j, mprString(iface_n_ip(i)));
+ const char *addr;
+ addr = sys_inet_ntoa(samba3->winsdb_entries[i].ips[j]);
+ mprAddArray(&ips, j, mprString(addr));
}
mprSetVar(&w, "ips", ips);
svn commit: samba r11082 - in branches/SAMBA_4_0/source/winbind: .
Author: vlendec Date: 2005-10-15 08:17:22 + (Sat, 15 Oct 2005) New Revision: 11082 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11082 Log: Fix a segfault Modified: branches/SAMBA_4_0/source/winbind/wb_async_helpers.c Changeset: Modified: branches/SAMBA_4_0/source/winbind/wb_async_helpers.c === --- branches/SAMBA_4_0/source/winbind/wb_async_helpers.c2005-10-15 00:50:03 UTC (rev 11081) +++ branches/SAMBA_4_0/source/winbind/wb_async_helpers.c2005-10-15 08:17:22 UTC (rev 11082) @@ -139,6 +139,7 @@ talloc_get_type(ireq->async.private, struct finddcs_state); state->ctx->status = irpc_call_recv(ireq); + talloc_free(ireq); if (!composite_is_ok(state->ctx)) return; state->dcs[0].name = talloc_steal(state->dcs, state->r.out.dcname);
