svn commit: samba r9103 - in trunk/source/smbd: .
Author: vlendec
Date: 2005-08-05 05:42:09 + (Fri, 05 Aug 2005)
New Revision: 9103
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9103
Log:
Hmm. It's too late :-)
Here's the real fix for the problem jerry sees.
Volker
Modified:
trunk/source/smbd/open.c
trunk/source/smbd/oplock.c
Changeset:
Modified: trunk/source/smbd/open.c
===
--- trunk/source/smbd/open.c2005-08-05 05:32:39 UTC (rev 9102)
+++ trunk/source/smbd/open.c2005-08-05 05:42:09 UTC (rev 9103)
@@ -1670,7 +1670,10 @@
set_share_mode(fsp, 0, fsp->oplock_type);
if ((fsp->oplock_type != NO_OPLOCK) &&
(fsp->oplock_type != FAKE_LEVEL_II_OPLOCK)) {
- set_file_oplock(fsp, fsp->oplock_type);
+ if (!set_file_oplock(fsp, fsp->oplock_type)) {
+ /* Could not get the kernel oplock */
+ fsp->oplock_type = NO_OPLOCK;
+ }
}
if (create_options & FILE_DELETE_ON_CLOSE) {
Modified: trunk/source/smbd/oplock.c
===
--- trunk/source/smbd/oplock.c 2005-08-05 05:32:39 UTC (rev 9102)
+++ trunk/source/smbd/oplock.c 2005-08-05 05:42:09 UTC (rev 9103)
@@ -110,9 +110,8 @@
BOOL set_file_oplock(files_struct *fsp, int oplock_type)
{
- if (koplocks) {
- koplocks->set_oplock(fsp, oplock_type);
- }
+ if (koplocks && !koplocks->set_oplock(fsp, oplock_type))
+ return False;
fsp->oplock_type = oplock_type;
fsp->sent_oplock_break = NO_BREAK_SENT;
svn commit: samba r9102 - in branches/SAMBA_4_0/source/script: .
Author: tpot
Date: 2005-08-05 05:32:39 + (Fri, 05 Aug 2005)
New Revision: 9102
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9102
Log:
Generate files in $srcdir/libcli/gen_raw instead of $srcdir.
Start fixing compile problems in generated output.
Modified:
branches/SAMBA_4_0/source/script/build_smb_interfaces.pl
Changeset:
Modified: branches/SAMBA_4_0/source/script/build_smb_interfaces.pl
===
--- branches/SAMBA_4_0/source/script/build_smb_interfaces.pl2005-08-05
05:26:58 UTC (rev 9101)
+++ branches/SAMBA_4_0/source/script/build_smb_interfaces.pl2005-08-05
05:32:39 UTC (rev 9102)
@@ -13,9 +13,11 @@
my $parser = new smb_interfaces;
$header = $parser->parse($file);
+stat "libcli/gen_raw" || mkdir("libcli/gen_raw") || die("mkdir");
+
# Create header
-open(FILE, ">ejs_${basename}.h");
+open(FILE, ">libcli/gen_raw/ejs_${basename}.h");
print FILE "/* header auto-generated by build_smb_interfaces.pl */\n\n";
@@ -60,16 +62,23 @@
# Create file
-open(FILE, ">ejs_${basename}.c");
+open(FILE, ">libcli/gen_raw/ejs_${basename}.c");
print FILE "/* EJS wrapper functions auto-generated by build_smb_interfaces.pl
*/\n\n";
+print FILE "#include \"includes.h\"\n";
+print FILE "#include \"lib/appweb/ejs/ejs.h\"\n";
+print FILE "#include \"scripting/ejs/ejsrpc.h\"\n"; # TODO: remove this
+print FILE "\n";
+
# Top level push/pull functions
sub print_field($$) {
my $f = shift;
my $suffix = shift;
+ my $type = "UNKNOWN";
+
if ($f->{TYPE} eq "char" and $f->{POINTERS} == 1) {
$type = "string";
}
@@ -106,7 +115,7 @@
# Push from struct.out
- print FILE "static NTSTATUS ejs_push_$x->{STRUCT_NAME}(struct ejs_rpc *ejs,
struct MprVar *v, const struct $x->{STRUCT_NAME} *r)\n\n";
+ print FILE "static NTSTATUS ejs_push_$x->{STRUCT_NAME}(struct ejs_rpc *ejs,
struct MprVar *v, struct $x->{STRUCT_NAME} *r)\n\n";
print FILE "{\n";
print FILE "\tNDR_CHECK(ejs_push_struct_start(ejs, &v, \"output\"));\n";
svn commit: samba r9101 - in branches/SAMBA_4_0/source/build/pidl: .
Author: tpot Date: 2005-08-05 05:26:58 + (Fri, 05 Aug 2005) New Revision: 9101 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9101 Log: Check in file generated by Parse::YAPP. Modified: branches/SAMBA_4_0/source/build/pidl/smb_interfaces.pm Changeset: Sorry, the patch is too large (617 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9101
svn commit: samba r9100 - in trunk/source/smbd: .
Author: vlendec
Date: 2005-08-05 05:22:42 + (Fri, 05 Aug 2005)
New Revision: 9100
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9100
Log:
Experimental patch for jerry
Modified:
trunk/source/smbd/oplock.c
Changeset:
Modified: trunk/source/smbd/oplock.c
===
--- trunk/source/smbd/oplock.c 2005-08-05 04:50:32 UTC (rev 9099)
+++ trunk/source/smbd/oplock.c 2005-08-05 05:22:42 UTC (rev 9100)
@@ -110,8 +110,9 @@
BOOL set_file_oplock(files_struct *fsp, int oplock_type)
{
- if (koplocks && !koplocks->set_oplock(fsp, oplock_type))
- return False;
+ if (koplocks) {
+ koplocks->set_oplock(fsp, oplock_type);
+ }
fsp->oplock_type = oplock_type;
fsp->sent_oplock_break = NO_BREAK_SENT;
svn commit: samba r9099 - in branches/SAMBA_4_0/source/script: .
Author: tpot
Date: 2005-08-05 04:50:32 + (Fri, 05 Aug 2005)
New Revision: 9099
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9099
Log:
Start generating code to pull/push fields. Generate functions to call
the smb_raw_foo() calls.
Modified:
branches/SAMBA_4_0/source/script/build_smb_interfaces.pl
Changeset:
Modified: branches/SAMBA_4_0/source/script/build_smb_interfaces.pl
===
--- branches/SAMBA_4_0/source/script/build_smb_interfaces.pl2005-08-05
04:48:02 UTC (rev 9098)
+++ branches/SAMBA_4_0/source/script/build_smb_interfaces.pl2005-08-05
04:50:32 UTC (rev 9099)
@@ -4,6 +4,8 @@
#
use File::Basename;
+use Data::Dumper;
+
my $file = shift;
my $basename = basename($file, ".h");
@@ -11,9 +13,6 @@
my $parser = new smb_interfaces;
$header = $parser->parse($file);
-use Data::Dumper;
-#print Dumper($header);
-
# Create header
open(FILE, ">ejs_${basename}.h");
@@ -38,28 +37,6 @@
print FILE "NTSTATUS ejs_pull_$name(struct ejs_rpc *, struct MprVar *, const
char *, const uint32_t *);\n";
}
-sub pushpull_for($)
-{
- my $obj = shift;
- my $name = struct_name($obj);
-
- print FILE "NTSTATUS ejs_push_$name(struct ejs_rpc *ejs, struct MprVar *v,
const char *name, const uint32_t *r)\n";
- print FILE "{\n";
-
- print FILE "\tNDR_CHECK(ejs_push_struct_start(ejs, &v, \"output\"));\n";
-
- print FILE "\n\treturn NT_STATUS_OK;\n";
- print FILE "}\n\n";
-
- print FILE "NTSTATUS ejs_pull_$name(struct ejs_rpc *ejs, struct MprVar *v,
const char *name, const uint32_t *r)\n";
- print FILE "{\n";
-
- print FILE "\tNDR_CHECK(ejs_pull_struct_start(ejs, &v, \"input\"));\n";
-
- print FILE "\treturn NT_STATUS_OK;\n";
- print FILE "}\n\n";
-}
-
foreach my $x (@{$header}) {
# Prototypes for top level structures and unions
@@ -89,21 +66,58 @@
# Top level push/pull functions
+sub print_field($$) {
+ my $f = shift;
+ my $suffix = shift;
+
+ if ($f->{TYPE} eq "char" and $f->{POINTERS} == 1) {
+$type = "string";
+ }
+
+ if ($f->{TYPE} =~ /_t$/) {
+$type = $f->{TYPE};
+$type =~ s/_t$//;
+ }
+
+ foreach my $x (@{$f->{NAME}}) {
+print FILE "\tNDR_CHECK(ejs_pull_$type(ejs, v, \"$x\",
&r->$suffix.$x));\n";
+ }
+}
+
foreach my $x (@{$header}) {
next, if $x->{STRUCT_NAME} eq "";
+ # Pull in to struct.in
+
print FILE "static NTSTATUS ejs_pull_$x->{STRUCT_NAME}(struct ejs_rpc *ejs,
struct MprVar *v, struct $x->{STRUCT_NAME} *r)\n";
print FILE "{\n";
print FILE "\tNDR_CHECK(ejs_pull_struct_start(ejs, &v, \"input\"));\n";
- print FILE "\treturn NT_STATUS_OK;\n";
+
+ foreach my $e (@{$x->{DATA}}) {
+next, if $e->{NAME}[0] ne 'in';
+foreach my $f (@{$e->{DATA}}) {
+ print_field($f, "in");
+}
+ }
+
+ print FILE "\n\treturn NT_STATUS_OK;\n";
print FILE "}\n\n";
+ # Push from struct.out
+
print FILE "static NTSTATUS ejs_push_$x->{STRUCT_NAME}(struct ejs_rpc *ejs,
struct MprVar *v, const struct $x->{STRUCT_NAME} *r)\n\n";
print FILE "{\n";
print FILE "\tNDR_CHECK(ejs_push_struct_start(ejs, &v, \"output\"));\n";
- print FILE "\treturn NT_STATUS_OK;\n";
+ foreach my $e (@{$x->{DATA}}) {
+next, if $e->{NAME}[0] ne 'out';
+foreach my $f (@{$e->{DATA}}) {
+ print_field($f, "out");
+}
+ }
+
+ print FILE "\n\treturn NT_STATUS_OK;\n";
print FILE "}\n\n";
}
@@ -117,12 +131,34 @@
print FILE "static int ejs_$x->{STRUCT_NAME}(int eid, int argc, struct
MprVar **argv)\n";
print FILE "{\n";
- print FILE "\tstruct $x->{STRUCT_NAME} parms;\n\n";
+ print FILE "\tstruct $x->{STRUCT_NAME} parms;\n";
+ print FILE "\tstruct smbcli_tree *tree;\n";
+ print FILE "\tNTSTATUS result;\n\n";
- print FILE "\t$raw_name(tree, ¶ms);\n";
+ $output = << "__HERE__";
+ if (argc != 1 || argv[0]->type != MPR_TYPE_OBJECT) {
+ ejsSetErrorMsg(eid, "invalid arguments");
+ return -1;
+ }
- print FILE "\tejsSetErrorMsg(eid, \"Not implemented\");\n";
- print FILE "\treturn -1;\n";
+ tree = mprGetThisPtr(eid, "tree");
+
+ if (!tree) {
+ ejsSetErrorMsg(eid, "invalid tree");
+ return -1;
+ }
+
+__HERE__
+
+ print FILE $output;
+ print FILE "\tresult = $raw_name(tree, ¶ms);\n\n";
+
+ print FILE "\tmpr_Return(eid, mprNTSTATUS(status));\n";
+ print FILE "\tif (NT_STATUS_EQUAL(status, NT_STATUS_INTERNAL_ERROR)) {\n";
+ print FILE "\t\treturn -1;\n";
+ print FILE "\t}\n\n";
+ print FILE "\treturn 0;\n";
+
print FILE "}\n\n";
}
svn commit: samba r9098 - branches/SAMBA_3_0/source/rpc_server trunk/source/rpc_server
Author: jerry
Date: 2005-08-05 04:48:02 + (Fri, 05 Aug 2005)
New Revision: 9098
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9098
Log:
fix another usrmgr.exe crash when viewing user properties at debuglevel 10
Modified:
branches/SAMBA_3_0/source/rpc_server/srv_samr_nt.c
trunk/source/rpc_server/srv_samr_nt.c
Changeset:
Modified: branches/SAMBA_3_0/source/rpc_server/srv_samr_nt.c
===
--- branches/SAMBA_3_0/source/rpc_server/srv_samr_nt.c 2005-08-05 04:46:33 UTC
(rev 9097)
+++ branches/SAMBA_3_0/source/rpc_server/srv_samr_nt.c 2005-08-05 04:48:02 UTC
(rev 9098)
@@ -1229,7 +1229,7 @@
}
for (i = 0; i < num_names; i++) {
- DEBUG(10, ("names[%d]:%s\n", i, *names[i] ? names[i] : ""));
+ DEBUG(10, ("names[%d]:%s\n", i, names[i] && *names[i] ?
names[i] : ""));
init_unistr2(&uni_name[i], names[i], UNI_FLAGS_NONE);
init_uni_hdr(&hdr_name[i], &uni_name[i]);
}
Modified: trunk/source/rpc_server/srv_samr_nt.c
===
--- trunk/source/rpc_server/srv_samr_nt.c 2005-08-05 04:46:33 UTC (rev
9097)
+++ trunk/source/rpc_server/srv_samr_nt.c 2005-08-05 04:48:02 UTC (rev
9098)
@@ -1228,7 +1228,7 @@
}
for (i = 0; i < num_names; i++) {
- DEBUG(10, ("names[%d]:%s\n", i, *names[i] ? names[i] : ""));
+ DEBUG(10, ("names[%d]:%s\n", i, names[i] && *names[i] ?
names[i] : ""));
init_unistr2(&uni_name[i], names[i], UNI_FLAGS_NONE);
init_uni_hdr(&hdr_name[i], &uni_name[i]);
}
svn commit: samba r9097 - in trunk/source/registry: .
Author: jerry
Date: 2005-08-05 04:46:33 + (Fri, 05 Aug 2005)
New Revision: 9097
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9097
Log:
fix perfount crashes
Modified:
trunk/source/registry/reg_perfcount.c
Changeset:
Modified: trunk/source/registry/reg_perfcount.c
===
--- trunk/source/registry/reg_perfcount.c 2005-08-05 04:36:31 UTC (rev
9096)
+++ trunk/source/registry/reg_perfcount.c 2005-08-05 04:46:33 UTC (rev
9097)
@@ -13,14 +13,17 @@
char key[] = "1";
uint32 retval = 0;
char buf[PERFCOUNT_MAX_LEN];
+ const char *counter_dir = lp_counters_dir();
+
- pstrcpy(fname, lp_counters_dir());
- pstrcat(fname, "/names.tdb");
+ if ( !*counter_dir )
+ return 0;
+ pstr_sprintf( fname, "%s/names.tdb", counter_dir );
+
names = tdb_open_log(fname, 0, TDB_DEFAULT, O_RDONLY, 0444);
- if(names == NULL)
- {
+ if ( !names ) {
DEBUG(1, ("reg_perfcount_get_base_index: unable to open
[%s].\n", fname));
return 0;
}
svn commit: samba r9096 - in branches/SAMBA_4_0/source/scripting/ejs: .
Author: tpot
Date: 2005-08-05 04:36:31 + (Fri, 05 Aug 2005)
New Revision: 9096
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9096
Log:
Spelling.
Modified:
branches/SAMBA_4_0/source/scripting/ejs/mprutil.c
Changeset:
Modified: branches/SAMBA_4_0/source/scripting/ejs/mprutil.c
===
--- branches/SAMBA_4_0/source/scripting/ejs/mprutil.c 2005-08-05 04:32:24 UTC
(rev 9095)
+++ branches/SAMBA_4_0/source/scripting/ejs/mprutil.c 2005-08-05 04:36:31 UTC
(rev 9096)
@@ -403,7 +403,7 @@
}
/*
- get a poiner in the current object
+ get a pointer in the current object
*/
void *mprGetThisPtr(int eid, const char *name)
{
svn commit: samba r9095 - branches/SAMBA_3_0/source/tdb trunk/source/tdb
Author: vlendec
Date: 2005-08-05 04:32:24 + (Fri, 05 Aug 2005)
New Revision: 9095
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9095
Log:
Add crude chainlength statistics to the crude tdbtool.
Volker
Modified:
branches/SAMBA_3_0/source/tdb/tdb.c
trunk/source/tdb/tdb.c
Changeset:
Modified: branches/SAMBA_3_0/source/tdb/tdb.c
===
--- branches/SAMBA_3_0/source/tdb/tdb.c 2005-08-05 01:57:45 UTC (rev 9094)
+++ branches/SAMBA_3_0/source/tdb/tdb.c 2005-08-05 04:32:24 UTC (rev 9095)
@@ -560,6 +560,7 @@
static int tdb_dump_chain(TDB_CONTEXT *tdb, int i)
{
tdb_off rec_ptr, top;
+ int hash_length = 0;
top = TDB_HASH_TOP(i);
@@ -574,8 +575,11 @@
while (rec_ptr) {
rec_ptr = tdb_dump_record(tdb, rec_ptr);
+ hash_length += 1;
}
+ printf("chain %d length %d\n", i, hash_length);
+
return tdb_unlock(tdb, i, F_WRLCK);
}
Modified: trunk/source/tdb/tdb.c
===
--- trunk/source/tdb/tdb.c 2005-08-05 01:57:45 UTC (rev 9094)
+++ trunk/source/tdb/tdb.c 2005-08-05 04:32:24 UTC (rev 9095)
@@ -560,6 +560,7 @@
static int tdb_dump_chain(TDB_CONTEXT *tdb, int i)
{
tdb_off rec_ptr, top;
+ int hash_length = 0;
top = TDB_HASH_TOP(i);
@@ -574,8 +575,11 @@
while (rec_ptr) {
rec_ptr = tdb_dump_record(tdb, rec_ptr);
+ hash_length += 1;
}
+ printf("chain %d length %d\n", i, hash_length);
+
return tdb_unlock(tdb, i, F_WRLCK);
}
svn commit: samba r9094 - in branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Ethereal: .
Author: jelmer
Date: 2005-08-05 01:57:45 + (Fri, 05 Aug 2005)
New Revision: 9094
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9094
Log:
More ethereal parser updates, only header fields left to fix + actual data call
Modified:
branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Ethereal/Conformance.pm
branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Ethereal/NDR.pm
Changeset:
Modified:
branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Ethereal/Conformance.pm
===
--- branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Ethereal/Conformance.pm
2005-08-05 01:23:35 UTC (rev 9093)
+++ branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Ethereal/Conformance.pm
2005-08-05 01:57:45 UTC (rev 9094)
@@ -8,7 +8,7 @@
require Exporter;
@ISA = qw(Exporter);
[EMAIL PROTECTED] = qw(EmitProhibited FindDissectorParam);
[EMAIL PROTECTED] = qw(EmitProhibited FindDissectorParam %hf_renames);
use strict;
@@ -25,7 +25,7 @@
#FIXME
}
-my %hf_renames = ();
+use vars qw(%hf_renames);
sub handle_hf_rename($$)
{
Modified: branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Ethereal/NDR.pm
===
--- branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Ethereal/NDR.pm
2005-08-05 01:23:35 UTC (rev 9093)
+++ branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Ethereal/NDR.pm
2005-08-05 01:57:45 UTC (rev 9094)
@@ -12,9 +12,9 @@
use Parse::Pidl::Typelist;
use Parse::Pidl::Util qw(has_property ParseExpr);
use Parse::Pidl::NDR;
-use Parse::Pidl::Ethereal::Conformance qw(EmitProhibited FindDissectorParam);
+use Parse::Pidl::Ethereal::Conformance qw(EmitProhibited FindDissectorParam
%hf_renames);
-my %ptrtype_define_mappings = (
+my %ptrtype_mappings = (
"unique" => "NDR_POINTER_UNIQUE",
"ref" => "NDR_POINTER_REF",
"ptr" => "NDR_POINTER_PTR"
@@ -208,56 +208,79 @@
deindent;
pidl_code "return offset;";
pidl_code "}\n";
- register_new_type($name, $dissectorname, bitmap_ft($e), "BASE_HEX",
"0", "NULL", $e->{ALIGN});
}
-sub FindType($)
+sub ElementLevel()
{
- my $foo = shift;
-#FIXME
- return {
- FT_TYPE => "FIXME",
- BASE_TYPE => "FIXME",
- VALS => "VALS",
- MASK => 0,
- DISSECTOR => "FOOBNA"
- };
+ my ($e,$l,$hf,$myname) = @_;
+
+ if ($l->{TYPE} eq "POINTER") {
+ pidl_code
"offset=dissect_ndr_pointer(tvb,offset,pinfo,tree,drep,$myname\_,$ptrtype_mappings{$l->{POINTER_TYPE}},\"\",$hf);";
+ } elsif ($l->{TYPE} eq "ARRAY") {
+ my $af = "";
+
+ ($af = "ucarray") if ($l->{IS_VARYING});
+ ($af = "uvarray") if ($l->{IS_CONFORMANT});
+ ($af = "ucvarray") if ($l->{IS_CONFORMANT} and
$l->{IS_VARYING});
+
+ pidl_code
"offset=dissect_ndr_$af(tvb,offset,pinfo,tree,drep,$myname\_);";
+ } elsif ($l->{TYPE} eq "DATA") {
+# pidl_code "guint32 param=" .
FindDissectorParam($dissectorname).";";
+# pidl_code "offset=$type->{DISSECTOR}(tvb, offset, pinfo, tree,
drep, $hf, param);";
+ } elsif ($_->{TYPE} eq "SUBCONTEXT") {
+ die("subcontext() not supported")
+ }
}
sub Element($$$)
{
my ($e,$pn,$ifname) = @_;
- my $hf_index = "hf_$ifname\_$pn\_$e->{NAME}";
my $dissectorname = "$ifname\_dissect\_$ifname\_$pn\_$e->{NAME}";
return if (EmitProhibited($dissectorname));
- my $type = FindType($e->{DATA_TYPE});
+ my $hf = "";
+ #FIXME my $hf = register_hf_field("hf_$ifname\_$pn\_$e->{NAME}",
$e->{NAME}, "$ifname.$pn.$e->{NAME}", $type->{FT_TYPE}, $type->{BASE_TYPE},
$type->{VALS}, $type->{MASK}, "");
+ my $add = "";
- my $hf = register_hf_field($hf_index, $e->{NAME},
"$ifname.$pn.$e->{NAME}", $type->{FT_TYPE}, $type->{BASE_TYPE}, $type->{VALS},
$type->{MASK}, "");
-
- pidl_code "static int";
- pidl_code "$dissectorname(tvbuff_t *tvb, int offset, packet_info
*pinfo, proto_tree *tree, guint8 *drep)";
- pidl_code "{";
- indent;
- pidl_code "guint32 param=" . FindDissectorParam($dissectorname).";";
- pidl_code "offset=$type->{DISSECTOR}(tvb, offset, pinfo, tree, drep,
$hf, param);";
- pidl_code "return offset;";
- deindent;
- pidl_code "}\n";
+ foreach (@{$e->{LEVELS}}) {
+ next if ($_->{TYPE} eq "SWITCH");
+ pidl_code "static int";
+ pidl_code "$dissectorname$add(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree, guint8 *drep)";
+ pidl_code "{";
+ indent;
+
+ ElementLevel($e,$_,$hf,$dissectorname.$add);
+
+ pidl_code "return offset;";
+ deindent;
+ pidl_code "}\n";
+ $add.="_";
+
svn commit: samba r9093 - in trunk/source/include: .
Author: jmcd Date: 2005-08-05 01:23:35 + (Fri, 05 Aug 2005) New Revision: 9093 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9093 Log: Fix #2954, aix 5.1 compile. Stupid aix aio.h header defines aio_error and aio_return as macros... Modified: trunk/source/include/vfs.h trunk/source/include/vfs_macros.h Changeset: Modified: trunk/source/include/vfs.h === --- trunk/source/include/vfs.h 2005-08-05 01:23:35 UTC (rev 9092) +++ trunk/source/include/vfs.h 2005-08-05 01:23:35 UTC (rev 9093) @@ -316,9 +316,9 @@ /* aio operations */ int (*aio_read)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb); int (*aio_write)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb); - ssize_t (*aio_return)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb); + ssize_t (*aio_return_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb); int (*aio_cancel)(struct vfs_handle_struct *handle, struct files_struct *fsp, int fd, SMB_STRUCT_AIOCB *aiocb); - int (*aio_error)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb); + int (*aio_error_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb); int (*aio_fsync)(struct vfs_handle_struct *handle, struct files_struct *fsp, int op, SMB_STRUCT_AIOCB *aiocb); int (*aio_suspend)(struct vfs_handle_struct *handle, struct files_struct *fsp, const SMB_STRUCT_AIOCB * const aiocb[], int n, const struct timespec *timeout); Modified: trunk/source/include/vfs_macros.h === --- trunk/source/include/vfs_macros.h 2005-08-05 01:23:35 UTC (rev 9092) +++ trunk/source/include/vfs_macros.h 2005-08-05 01:23:35 UTC (rev 9093) @@ -125,9 +125,9 @@ /* AIO operations. */ #define SMB_VFS_AIO_READ(fsp,aiocb) ((fsp)->conn->vfs.ops.aio_read((fsp)->conn->vfs.handles.aio_read,(fsp),(aiocb))) #define SMB_VFS_AIO_WRITE(fsp,aiocb) ((fsp)->conn->vfs.ops.aio_write((fsp)->conn->vfs.handles.aio_write,(fsp),(aiocb))) -#define SMB_VFS_AIO_RETURN(fsp,aiocb) ((fsp)->conn->vfs.ops.aio_return((fsp)->conn->vfs.handles.aio_return,(fsp),(aiocb))) +#define SMB_VFS_AIO_RETURN(fsp,aiocb) ((fsp)->conn->vfs.ops.aio_return_fn((fsp)->conn->vfs.handles.aio_return,(fsp),(aiocb))) #define SMB_VFS_AIO_CANCEL(fsp,fd,aiocb) ((fsp)->conn->vfs.ops.aio_cancel((fsp)->conn->vfs.handles.aio_cancel,(fsp),(fd),(aiocb))) -#define SMB_VFS_AIO_ERROR(fsp,aiocb) ((fsp)->conn->vfs.ops.aio_error((fsp)->conn->vfs.handles.aio_error,(fsp),(aiocb))) +#define SMB_VFS_AIO_ERROR(fsp,aiocb) ((fsp)->conn->vfs.ops.aio_error_fn((fsp)->conn->vfs.handles.aio_error,(fsp),(aiocb))) #define SMB_VFS_AIO_FSYNC(fsp,op,aiocb) ((fsp)->conn->vfs.ops.aio_fsync((fsp)->conn->vfs.handles.aio_fsync,(fsp),(op),(aiocb))) #define SMB_VFS_AIO_SUSPEND(fsp,aiocb,n,ts) ((fsp)->conn->vfs.ops.aio_suspend((fsp)->conn->vfs.handles.aio_suspend,(fsp),(aiocb),(n),(ts))) @@ -235,9 +235,9 @@ /* AIO operations. */ #define SMB_VFS_OPAQUE_AIO_READ(fsp,aiocb) ((fsp)->conn->vfs_opaque.ops.aio_read((fsp)->conn->vfs_opaque.handles.aio_read,(fsp),(aiocb))) #define SMB_VFS_OPAQUE_AIO_WRITE(fsp,aiocb) ((fsp)->conn->vfs_opaque.ops.aio_write((fsp)->conn->vfs_opaque.handles.aio_write,(fsp),(aiocb))) -#define SMB_VFS_OPAQUE_AIO_RETURN(fsp,aiocb) ((fsp)->conn->vfs_opaque.ops.aio_return((fsp)->conn->vfs_opaque.handles.aio_return,(fsp),(aiocb))) +#define SMB_VFS_OPAQUE_AIO_RETURN(fsp,aiocb) ((fsp)->conn->vfs_opaque.ops.aio_return_fn((fsp)->conn->vfs_opaque.handles.aio_return,(fsp),(aiocb))) #define SMB_VFS_OPAQUE_AIO_CANCEL(fsp,fd,aiocb) ((fsp)->conn->vfs_opaque.ops.aio_cancel((fsp)->conn->vfs_opaque.handles.cancel,(fsp),(fd),(aiocb))) -#define SMB_VFS_OPAQUE_AIO_ERROR(fsp,aiocb) ((fsp)->conn->vfs_opaque.ops.aio_error((fsp)->conn->vfs_opaque.handles.aio_error,(fsp),(aiocb))) +#define SMB_VFS_OPAQUE_AIO_ERROR(fsp,aiocb) ((fsp)->conn->vfs_opaque.ops.aio_error_fn((fsp)->conn->vfs_opaque.handles.aio_error,(fsp),(aiocb))) #define SMB_VFS_OPAQUE_AIO_FSYNC(fsp,op,aiocb) ((fsp)->conn->vfs_opaque.ops.aio_fsync((fsp)->conn->vfs_opaque.handles.aio_fsync,(fsp),(op),(aiocb))) #define SMB_VFS_OPAQUE_AIO_SUSPEND(fsp,aiocb,n,ts) ((fsp)->conn->vfs_opaque.ops.aio_suspend((fsp)->conn->vfs_opaque.handles.aio_suspend,(fsp),(aiocb),(n),(ts))) @@ -346,9 +346,9 @@ /* AIO operations. */ #define SMB_VFS_NEXT_AIO_READ(handle,fsp,aiocb) ((handle)->vfs_next.ops.aio_read((handle)->vfs_next.handles.aio_read,(fsp),(aiocb))) #define SMB_VFS_NEXT_AIO_WRITE(handle,fsp,aiocb) ((handle)->vfs_next.ops.aio_write((handle)->vfs_next.handles.aio_write,(fsp),(aiocb))) -#define SMB_VFS_NEXT_AIO
svn commit: samba r9092 - in branches/SAMBA_4_0/source/script: .
Author: tpot
Date: 2005-08-05 01:23:35 + (Fri, 05 Aug 2005)
New Revision: 9092
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9092
Log:
Generate some more stub functions.
Modified:
branches/SAMBA_4_0/source/script/build_smb_interfaces.pl
Changeset:
Modified: branches/SAMBA_4_0/source/script/build_smb_interfaces.pl
===
--- branches/SAMBA_4_0/source/script/build_smb_interfaces.pl2005-08-05
01:23:33 UTC (rev 9091)
+++ branches/SAMBA_4_0/source/script/build_smb_interfaces.pl2005-08-05
01:23:35 UTC (rev 9092)
@@ -87,12 +87,40 @@
print FILE "/* EJS wrapper functions auto-generated by build_smb_interfaces.pl
*/\n\n";
-# Top level functions
+# Top level push/pull functions
foreach my $x (@{$header}) {
+
next, if $x->{STRUCT_NAME} eq "";
+
+ print FILE "static NTSTATUS ejs_pull_$x->{STRUCT_NAME}(struct ejs_rpc *ejs,
struct MprVar *v, struct $x->{STRUCT_NAME} *r)\n";
+ print FILE "{\n";
+ print FILE "\tNDR_CHECK(ejs_pull_struct_start(ejs, &v, \"input\"));\n";
+ print FILE "\treturn NT_STATUS_OK;\n";
+ print FILE "}\n\n";
+
+ print FILE "static NTSTATUS ejs_push_$x->{STRUCT_NAME}(struct ejs_rpc *ejs,
struct MprVar *v, const struct $x->{STRUCT_NAME} *r)\n\n";
+ print FILE "{\n";
+ print FILE "\tNDR_CHECK(ejs_push_struct_start(ejs, &v, \"output\"));\n";
+
+ print FILE "\treturn NT_STATUS_OK;\n";
+ print FILE "}\n\n";
+}
+
+# Top level call functions
+
+foreach my $x (@{$header}) {
+ next, if $x->{STRUCT_NAME} eq "";
+
+ $raw_name = $x->{STRUCT_NAME};
+ $raw_name =~ s/smb_/smb_raw_/;
+
print FILE "static int ejs_$x->{STRUCT_NAME}(int eid, int argc, struct
MprVar **argv)\n";
print FILE "{\n";
+ print FILE "\tstruct $x->{STRUCT_NAME} parms;\n\n";
+
+ print FILE "\t$raw_name(tree, ¶ms);\n";
+
print FILE "\tejsSetErrorMsg(eid, \"Not implemented\");\n";
print FILE "\treturn -1;\n";
print FILE "}\n\n";
svn commit: samba r9091 - in branches/SAMBA_3_0/source/include: .
Author: jmcd Date: 2005-08-05 01:23:33 + (Fri, 05 Aug 2005) New Revision: 9091 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9091 Log: Fix #2954, aix 5.1 compile. Stupid aix aio.h header defines aio_error and aio_return as macros... Modified: branches/SAMBA_3_0/source/include/vfs.h branches/SAMBA_3_0/source/include/vfs_macros.h Changeset: Modified: branches/SAMBA_3_0/source/include/vfs.h === --- branches/SAMBA_3_0/source/include/vfs.h 2005-08-05 01:23:06 UTC (rev 9090) +++ branches/SAMBA_3_0/source/include/vfs.h 2005-08-05 01:23:33 UTC (rev 9091) @@ -316,9 +316,9 @@ /* aio operations */ int (*aio_read)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb); int (*aio_write)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb); - ssize_t (*aio_return)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb); + ssize_t (*aio_return_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb); int (*aio_cancel)(struct vfs_handle_struct *handle, struct files_struct *fsp, int fd, SMB_STRUCT_AIOCB *aiocb); - int (*aio_error)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb); + int (*aio_error_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb); int (*aio_fsync)(struct vfs_handle_struct *handle, struct files_struct *fsp, int op, SMB_STRUCT_AIOCB *aiocb); int (*aio_suspend)(struct vfs_handle_struct *handle, struct files_struct *fsp, const SMB_STRUCT_AIOCB * const aiocb[], int n, const struct timespec *timeout); Modified: branches/SAMBA_3_0/source/include/vfs_macros.h === --- branches/SAMBA_3_0/source/include/vfs_macros.h 2005-08-05 01:23:06 UTC (rev 9090) +++ branches/SAMBA_3_0/source/include/vfs_macros.h 2005-08-05 01:23:33 UTC (rev 9091) @@ -125,9 +125,9 @@ /* AIO operations. */ #define SMB_VFS_AIO_READ(fsp,aiocb) ((fsp)->conn->vfs.ops.aio_read((fsp)->conn->vfs.handles.aio_read,(fsp),(aiocb))) #define SMB_VFS_AIO_WRITE(fsp,aiocb) ((fsp)->conn->vfs.ops.aio_write((fsp)->conn->vfs.handles.aio_write,(fsp),(aiocb))) -#define SMB_VFS_AIO_RETURN(fsp,aiocb) ((fsp)->conn->vfs.ops.aio_return((fsp)->conn->vfs.handles.aio_return,(fsp),(aiocb))) +#define SMB_VFS_AIO_RETURN(fsp,aiocb) ((fsp)->conn->vfs.ops.aio_return_fn((fsp)->conn->vfs.handles.aio_return,(fsp),(aiocb))) #define SMB_VFS_AIO_CANCEL(fsp,fd,aiocb) ((fsp)->conn->vfs.ops.aio_cancel((fsp)->conn->vfs.handles.aio_cancel,(fsp),(fd),(aiocb))) -#define SMB_VFS_AIO_ERROR(fsp,aiocb) ((fsp)->conn->vfs.ops.aio_error((fsp)->conn->vfs.handles.aio_error,(fsp),(aiocb))) +#define SMB_VFS_AIO_ERROR(fsp,aiocb) ((fsp)->conn->vfs.ops.aio_error_fn((fsp)->conn->vfs.handles.aio_error,(fsp),(aiocb))) #define SMB_VFS_AIO_FSYNC(fsp,op,aiocb) ((fsp)->conn->vfs.ops.aio_fsync((fsp)->conn->vfs.handles.aio_fsync,(fsp),(op),(aiocb))) #define SMB_VFS_AIO_SUSPEND(fsp,aiocb,n,ts) ((fsp)->conn->vfs.ops.aio_suspend((fsp)->conn->vfs.handles.aio_suspend,(fsp),(aiocb),(n),(ts))) @@ -235,9 +235,9 @@ /* AIO operations. */ #define SMB_VFS_OPAQUE_AIO_READ(fsp,aiocb) ((fsp)->conn->vfs_opaque.ops.aio_read((fsp)->conn->vfs_opaque.handles.aio_read,(fsp),(aiocb))) #define SMB_VFS_OPAQUE_AIO_WRITE(fsp,aiocb) ((fsp)->conn->vfs_opaque.ops.aio_write((fsp)->conn->vfs_opaque.handles.aio_write,(fsp),(aiocb))) -#define SMB_VFS_OPAQUE_AIO_RETURN(fsp,aiocb) ((fsp)->conn->vfs_opaque.ops.aio_return((fsp)->conn->vfs_opaque.handles.aio_return,(fsp),(aiocb))) +#define SMB_VFS_OPAQUE_AIO_RETURN(fsp,aiocb) ((fsp)->conn->vfs_opaque.ops.aio_return_fn((fsp)->conn->vfs_opaque.handles.aio_return,(fsp),(aiocb))) #define SMB_VFS_OPAQUE_AIO_CANCEL(fsp,fd,aiocb) ((fsp)->conn->vfs_opaque.ops.aio_cancel((fsp)->conn->vfs_opaque.handles.cancel,(fsp),(fd),(aiocb))) -#define SMB_VFS_OPAQUE_AIO_ERROR(fsp,aiocb) ((fsp)->conn->vfs_opaque.ops.aio_error((fsp)->conn->vfs_opaque.handles.aio_error,(fsp),(aiocb))) +#define SMB_VFS_OPAQUE_AIO_ERROR(fsp,aiocb) ((fsp)->conn->vfs_opaque.ops.aio_error_fn((fsp)->conn->vfs_opaque.handles.aio_error,(fsp),(aiocb))) #define SMB_VFS_OPAQUE_AIO_FSYNC(fsp,op,aiocb) ((fsp)->conn->vfs_opaque.ops.aio_fsync((fsp)->conn->vfs_opaque.handles.aio_fsync,(fsp),(op),(aiocb))) #define SMB_VFS_OPAQUE_AIO_SUSPEND(fsp,aiocb,n,ts) ((fsp)->conn->vfs_opaque.ops.aio_suspend((fsp)->conn->vfs_opaque.handles.aio_suspend,(fsp),(aiocb),(n),(ts))) @@ -346,9 +346,9 @@ /* AIO operations. */ #define SMB_VFS_NEXT_AIO_READ(handle,fsp,aiocb) ((handle)->vfs_next.ops.aio_read((handle)->vfs_next.handles.aio_read,(fsp),(aiocb))) #define SMB_VFS_NEXT_AIO_WRITE(handle,fsp
svn commit: samba r9090 - in branches/SAMBA_4_0/source: libnet torture/libnet
Author: mimir
Date: 2005-08-05 01:23:06 + (Fri, 05 Aug 2005)
New Revision: 9090
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9090
Log:
Another field in usermod function - account flags.
rafal
Modified:
branches/SAMBA_4_0/source/libnet/composite.h
branches/SAMBA_4_0/source/libnet/userman.c
branches/SAMBA_4_0/source/torture/libnet/userman.c
Changeset:
Modified: branches/SAMBA_4_0/source/libnet/composite.h
===
--- branches/SAMBA_4_0/source/libnet/composite.h2005-08-05 01:04:45 UTC
(rev 9089)
+++ branches/SAMBA_4_0/source/libnet/composite.h2005-08-05 01:23:06 UTC
(rev 9090)
@@ -87,6 +87,7 @@
struct timeval *acct_expiry;
struct timeval *allow_password_change;
struct timeval *force_password_change;
+ uint32_t acct_flags;
} change;
} in;
};
Modified: branches/SAMBA_4_0/source/libnet/userman.c
===
--- branches/SAMBA_4_0/source/libnet/userman.c 2005-08-05 01:04:45 UTC (rev
9089)
+++ branches/SAMBA_4_0/source/libnet/userman.c 2005-08-05 01:23:06 UTC (rev
9090)
@@ -578,6 +578,12 @@
i->info17.acct_expiry =
timeval_to_nttime(s->change.acct_expiry);
s->change.fields ^= USERMOD_FIELD_ACCT_EXPIRY;
+
+ } else if (s->change.fields & USERMOD_FIELD_ACCT_FLAGS) {
+ *level = 16;
+ i->info16.acct_flags = s->change.acct_flags;
+
+ s->change.fields ^= USERMOD_FIELD_ACCT_FLAGS;
}
}
Modified: branches/SAMBA_4_0/source/torture/libnet/userman.c
===
--- branches/SAMBA_4_0/source/torture/libnet/userman.c 2005-08-05 01:04:45 UTC
(rev 9089)
+++ branches/SAMBA_4_0/source/torture/libnet/userman.c 2005-08-05 01:23:06 UTC
(rev 9090)
@@ -422,15 +422,15 @@
struct timeval force = { 3, 55444 };
struct usermod_change changes[] = {
- { USERMOD_FIELD_ACCOUNT_NAME, "changed", NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL },
- { USERMOD_FIELD_FULL_NAME, NULL, "Testing full account
name", NULL, NULL, NULL, NULL, NULL, NULL, NULL },
- { USERMOD_FIELD_DESCRIPTION,NULL, NULL, "Description of
tested account", NULL, NULL, NULL, NULL, NULL, NULL },
- { USERMOD_FIELD_COMMENT,NULL, NULL, NULL, "Comment for
the tested account", NULL, NULL, NULL, NULL, NULL },
- { USERMOD_FIELD_LOGON_SCRIPT, NULL, NULL, NULL, NULL,
"test_logon.cmd", NULL, NULL, NULL, NULL },
- { USERMOD_FIELD_PROFILE_PATH, NULL, NULL, NULL, NULL, NULL,
"TESTSRV\\profiles\\test", NULL, NULL, NULL },
- { USERMOD_FIELD_ACCT_EXPIRY,NULL, NULL, NULL, NULL, NULL,
NULL, &expiry, NULL, NULL },
- { USERMOD_FIELD_ALLOW_PASS_CHG, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, &allow, NULL },
- { USERMOD_FIELD_FORCE_PASS_CHG, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, &force }
+ { USERMOD_FIELD_ACCOUNT_NAME, "changed", NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, 0 },
+ { USERMOD_FIELD_FULL_NAME, NULL, "Testing full account
name", NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0 },
+ { USERMOD_FIELD_DESCRIPTION,NULL, NULL, "Description of
tested account", NULL, NULL, NULL, NULL, NULL, NULL, 0 },
+ { USERMOD_FIELD_COMMENT,NULL, NULL, NULL, "Comment for
the tested account", NULL, NULL, NULL, NULL, NULL, 0 },
+ { USERMOD_FIELD_LOGON_SCRIPT, NULL, NULL, NULL, NULL,
"test_logon.cmd", NULL, NULL, NULL, NULL, 0 },
+ { USERMOD_FIELD_PROFILE_PATH, NULL, NULL, NULL, NULL, NULL,
"TESTSRV\\profiles\\test", NULL, NULL, NULL, 0 },
+ { USERMOD_FIELD_ACCT_EXPIRY,NULL, NULL, NULL, NULL, NULL,
NULL, &expiry, NULL, NULL, 0 },
+ { USERMOD_FIELD_ALLOW_PASS_CHG, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, &allow, NULL, 0 },
+ { USERMOD_FIELD_FORCE_PASS_CHG, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, &force, ACB_NORMAL }
};
mem_ctx = talloc_init("test_userdel");
svn commit: samba r9089 - in branches/SAMBA_4_0/source/script: .
Author: tpot
Date: 2005-08-05 01:04:45 + (Fri, 05 Aug 2005)
New Revision: 9089
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9089
Log:
Start generating module init and top level ejs functions for smb_interfaces.
Modified:
branches/SAMBA_4_0/source/script/build_smb_interfaces.pl
Changeset:
Modified: branches/SAMBA_4_0/source/script/build_smb_interfaces.pl
===
--- branches/SAMBA_4_0/source/script/build_smb_interfaces.pl2005-08-05
00:59:24 UTC (rev 9088)
+++ branches/SAMBA_4_0/source/script/build_smb_interfaces.pl2005-08-05
01:04:45 UTC (rev 9089)
@@ -46,13 +46,16 @@
print FILE "NTSTATUS ejs_push_$name(struct ejs_rpc *ejs, struct MprVar *v,
const char *name, const uint32_t *r)\n";
print FILE "{\n";
- print FILE "\tNDR_CHECK(ejs_push_struct_start(ejs, &v, name));\n";
+ print FILE "\tNDR_CHECK(ejs_push_struct_start(ejs, &v, \"output\"));\n";
print FILE "\n\treturn NT_STATUS_OK;\n";
print FILE "}\n\n";
print FILE "NTSTATUS ejs_pull_$name(struct ejs_rpc *ejs, struct MprVar *v,
const char *name, const uint32_t *r)\n";
print FILE "{\n";
+
+ print FILE "\tNDR_CHECK(ejs_pull_struct_start(ejs, &v, \"input\"));\n";
+
print FILE "\treturn NT_STATUS_OK;\n";
print FILE "}\n\n";
}
@@ -87,7 +90,30 @@
# Top level functions
foreach my $x (@{$header}) {
- pushpull_for($x);
+ next, if $x->{STRUCT_NAME} eq "";
+ print FILE "static int ejs_$x->{STRUCT_NAME}(int eid, int argc, struct
MprVar **argv)\n";
+ print FILE "{\n";
+ print FILE "\tejsSetErrorMsg(eid, \"Not implemented\");\n";
+ print FILE "\treturn -1;\n";
+ print FILE "}\n\n";
}
+# Module initialisation
+
+print FILE "static int ejs_${basename}_init(int eid, int argc, struct MprVar
**argv)\n";
+print FILE "{\n";
+print FILE "\tstruct MprVar *obj = mprInitObject(eid, \"${basename}\", argc,
argtv);\n\n";
+
+foreach my $x (@{$header}) {
+ next, if $x->{STRUCT_NAME} eq "";
+ print FILE "\tmprSetCFunction(obj, \"$x->{STRUCT_NAME}\",
ejs_$x->{STRUCT_NAME});\n";
+}
+
+print FILE "}\n\n";
+
+print FILE "NTSTATUS ejs_init_${basename}(void)\n";
+print FILE "{\n";
+print FILE "\treturn smbcalls_register_ejs(\"${basename}_init\",
ejs_${basename}_init);\n";
+print FILE "}\n";
+
close(FILE);
svn commit: samba r9088 - in branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Ethereal: .
Author: jelmer Date: 2005-08-05 00:59:24 + (Fri, 05 Aug 2005) New Revision: 9088 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9088 Log: More ethereal parser generator updates Modified: branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Ethereal/Conformance.pm branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Ethereal/NDR.pm Changeset: Sorry, the patch is too large (440 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9088
svn commit: samba r9087 - in branches/SAMBA_3_0/source: .
Author: jerry Date: 2005-08-05 00:59:23 + (Fri, 05 Aug 2005) New Revision: 9087 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9087 Log: change version to 3.0.21pre1 since I will start cherry picking patches for the final 3.0.20 Modified: branches/SAMBA_3_0/source/VERSION Changeset: Modified: branches/SAMBA_3_0/source/VERSION === --- branches/SAMBA_3_0/source/VERSION 2005-08-05 00:58:31 UTC (rev 9086) +++ branches/SAMBA_3_0/source/VERSION 2005-08-05 00:59:23 UTC (rev 9087) @@ -19,7 +19,7 @@ SAMBA_VERSION_MAJOR=3 SAMBA_VERSION_MINOR=0 -SAMBA_VERSION_RELEASE=20 +SAMBA_VERSION_RELEASE=21 # If a official release has a serious bug # @@ -41,7 +41,7 @@ # e.g. SAMBA_VERSION_PRE_RELEASE=1 # # -> "2.2.9pre1" # -SAMBA_VERSION_PRE_RELEASE= +SAMBA_VERSION_PRE_RELEASE=1 # For 'rc' releases the version will be# @@ -51,7 +51,7 @@ # e.g. SAMBA_VERSION_RC_RELEASE=1 # # -> "3.0.0rc1" # -SAMBA_VERSION_RC_RELEASE=1 +SAMBA_VERSION_RC_RELEASE= # To mark SVN snapshots this should be set to 'yes'#
svn commit: samba r9086 - branches/SAMBA_3_0/source/printing branches/SAMBA_3_0/source/registry branches/SAMBA_3_0/source/rpc_parse trunk/source/printing trunk/source/registry trunk/source/rpc_parse
Author: jerry Date: 2005-08-05 00:58:31 + (Fri, 05 Aug 2005) New Revision: 9086 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9086 Log: * fix invalid read in parse_spoolss when writing a devmode to the wire * fix dup_a_regval() when size is 0 * ensure we pass a pstring to unlink_internals (fixes delete_driver code) Modified: branches/SAMBA_3_0/source/printing/nt_printing.c branches/SAMBA_3_0/source/registry/reg_objects.c branches/SAMBA_3_0/source/rpc_parse/parse_spoolss.c trunk/source/printing/nt_printing.c trunk/source/registry/reg_objects.c trunk/source/rpc_parse/parse_spoolss.c Changeset: Sorry, the patch is too large (373 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9086
svn commit: samba r9085 - in branches/SAMBA_4_0/source/include: .
Author: abartlet Date: 2005-08-05 00:56:21 + (Fri, 05 Aug 2005) New Revision: 9085 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9085 Log: Missing structs.h entry. Andrew Bartlett Modified: branches/SAMBA_4_0/source/include/structs.h Changeset: Modified: branches/SAMBA_4_0/source/include/structs.h === --- branches/SAMBA_4_0/source/include/structs.h 2005-08-05 00:41:53 UTC (rev 9084) +++ branches/SAMBA_4_0/source/include/structs.h 2005-08-05 00:56:21 UTC (rev 9085) @@ -90,6 +90,7 @@ struct drsuapi_DsCrackNames; struct PAC_BUFFER; +struct PAC_DATA; struct samr_ChangePasswordUser; struct samr_OemChangePasswordUser2;
svn commit: samba r9084 - in branches/SAMBA_4_0/source: auth/gensec auth/kerberos kdc torture/auth
Author: abartlet Date: 2005-08-05 00:41:53 + (Fri, 05 Aug 2005) New Revision: 9084 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9084 Log: 'resign' the sample PAC for the validation of the signature algorithms. If we ever get problems with the kerberos code, it should show up as a different signature in this PAC. This involved returning more data from the pac functions, so changed some callers and split up some functions. Andrew Bartlett Modified: branches/SAMBA_4_0/source/auth/gensec/gensec_gssapi.c branches/SAMBA_4_0/source/auth/gensec/gensec_krb5.c branches/SAMBA_4_0/source/auth/kerberos/kerberos.h branches/SAMBA_4_0/source/auth/kerberos/kerberos_pac.c branches/SAMBA_4_0/source/kdc/pac-glue.c branches/SAMBA_4_0/source/torture/auth/pac.c Changeset: Sorry, the patch is too large (581 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9084
svn commit: samba r9083 - in trunk/source/rpc_server: .
Author: jra
Date: 2005-08-05 00:35:51 + (Fri, 05 Aug 2005)
New Revision: 9083
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9083
Log:
Fix bind-nak issue in the HEAD way... code currently different from
3.0.
Jeremy.
Modified:
trunk/source/rpc_server/srv_pipe.c
Changeset:
Modified: trunk/source/rpc_server/srv_pipe.c
===
--- trunk/source/rpc_server/srv_pipe.c 2005-08-05 00:31:06 UTC (rev 9082)
+++ trunk/source/rpc_server/srv_pipe.c 2005-08-05 00:35:51 UTC (rev 9083)
@@ -672,13 +672,12 @@
prs_init( &outgoing_rpc, 0, p->mem_ctx, MARSHALL);
prs_give_memory( &outgoing_rpc, (char *)p->out_data.current_pdu,
sizeof(p->out_data.current_pdu), False);
-
/*
* Initialize a bind_nak header.
*/
init_rpc_hdr(&nak_hdr, RPC_BINDNACK, RPC_FLG_FIRST | RPC_FLG_LAST,
-p->hdr.call_id, RPC_HEADER_LEN + sizeof(uint16), 0);
+ p->hdr.call_id, RPC_HEADER_LEN + sizeof(uint16), 0);
/*
* Marshall the header into the outgoing PDU.
@@ -696,7 +695,7 @@
if(!prs_uint16("reject code", &outgoing_rpc, 0, &zero)) {
prs_mem_free(&outgoing_rpc);
-return False;
+ return False;
}
p->out_data.data_sent_length = 0;
@@ -1238,10 +1237,7 @@
prs_mem_free(&out_hdr_ba);
prs_mem_free(&out_auth);
- if(!setup_bind_nak(p)) {
- return False;
- }
- return True;
+ return setup_bind_nak(p);
}
for (i = 0; i < rpc_lookup_size; i++) {
@@ -1433,7 +1429,7 @@
prs_mem_free(&outgoing_rpc);
prs_mem_free(&out_hdr_ba);
prs_mem_free(&out_auth);
- return False;
+ return setup_bind_nak(p);
}
/
svn commit: samba r9082 - in branches/SAMBA_4_0/source/scripting/ejs: .
Author: tridge
Date: 2005-08-05 00:31:06 + (Fri, 05 Aug 2005)
New Revision: 9082
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9082
Log:
added the ECMA functions encodeURIComponent() and
decodeURIComponent(), which I am using as part of my object
linearisation code
Modified:
branches/SAMBA_4_0/source/scripting/ejs/smbcalls_string.c
Changeset:
Modified: branches/SAMBA_4_0/source/scripting/ejs/smbcalls_string.c
===
--- branches/SAMBA_4_0/source/scripting/ejs/smbcalls_string.c 2005-08-05
00:30:21 UTC (rev 9081)
+++ branches/SAMBA_4_0/source/scripting/ejs/smbcalls_string.c 2005-08-05
00:31:06 UTC (rev 9082)
@@ -336,7 +336,86 @@
return ret;
}
+
/*
+ encode a string, replacing all non-alpha with %02x form
+*/
+static int ejs_encodeURIComponent(MprVarHandle eid, int argc, char **argv)
+{
+ int i, j, count=0;
+ const char *s;
+ char *ret;
+ if (argc != 1) {
+ ejsSetErrorMsg(eid, "encodeURIComponent invalid arguments");
+ return -1;
+ }
+
+ s = argv[0];
+
+ for (i=0;s[i];i++) {
+ if (!isalnum(s[i])) count++;
+ }
+
+ ret = talloc_size(mprMemCtx(), i + count*2 + 1);
+ if (ret == NULL) {
+ return -1;
+ }
+ for (i=j=0;s[i];i++,j++) {
+ if (!isalnum(s[i])) {
+ snprintf(ret+j, 4, "%%%02X", (unsigned)s[i]);
+ j += 2;
+ } else {
+ ret[j] = s[i];
+ }
+ }
+ ret[j] = 0;
+ mpr_Return(eid, mprString(ret));
+ talloc_free(ret);
+ return 0;
+}
+
+/*
+ encode a string, replacing all non-alpha of %02x form
+*/
+static int ejs_decodeURIComponent(MprVarHandle eid, int argc, char **argv)
+{
+ int i, j, count=0;
+ const char *s;
+ char *ret;
+ if (argc != 1) {
+ ejsSetErrorMsg(eid, "decodeURIComponent invalid arguments");
+ return -1;
+ }
+
+ s = argv[0];
+
+ ret = talloc_size(mprMemCtx(), strlen(s) + 1);
+ if (ret == NULL) {
+ return -1;
+ }
+
+ for (i=j=0;s[i];i++,j++) {
+ if (s[i] == '%') {
+ unsigned c;
+ if (sscanf(s+i+1, "%02X", &c) != 1) {
+ ejsSetErrorMsg(eid, "decodeURIComponent bad
format");
+ return -1;
+ }
+ ret[j] = c;
+ i += 2;
+ } else {
+ ret[j] = s[i];
+ }
+ if (!isalnum(s[i])) count++;
+ }
+
+ ret[j] = 0;
+ mpr_Return(eid, mprString(ret));
+ talloc_free(ret);
+ return 0;
+}
+
+/*
initialise string ejs subsystem
*/
static int ejs_string_init(MprVarHandle eid, int argc, struct MprVar **argv)
@@ -351,6 +430,8 @@
mprSetCFunction(obj, "join", ejs_join);
mprSetCFunction(obj, "sprintf", ejs_sprintf);
mprSetCFunction(obj, "vsprintf", ejs_vsprintf);
+ mprSetStringCFunction(obj, "encodeURIComponent",
ejs_encodeURIComponent);
+ mprSetStringCFunction(obj, "decodeURIComponent",
ejs_decodeURIComponent);
return 0;
}
svn commit: samba r9081 - in branches/SAMBA_4_0/source/build/pidl: . Parse/Pidl/Ethereal
Author: jelmer Date: 2005-08-05 00:30:21 + (Fri, 05 Aug 2005) New Revision: 9081 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9081 Log: Work on new ethereal parser generator, partially based on Ronnie Sahlberg's idl2eth.c Added: branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Ethereal/Conformance.pm branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Ethereal/NDR.pm Removed: branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Ethereal/NDR/ Modified: branches/SAMBA_4_0/source/build/pidl/pidl Changeset: Sorry, the patch is too large (779 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9081
svn commit: samba r9080 - in branches/SAMBA_3_0/source/rpc_server: .
Author: jra
Date: 2005-08-05 00:25:52 + (Fri, 05 Aug 2005)
New Revision: 9080
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9080
Log:
If we don't understand the auth, bind nak not pdu fault.
Should fix usermgr on W2K3 SP1.
Jeremy.
Modified:
branches/SAMBA_3_0/source/rpc_server/srv_pipe.c
Changeset:
Modified: branches/SAMBA_3_0/source/rpc_server/srv_pipe.c
===
--- branches/SAMBA_3_0/source/rpc_server/srv_pipe.c 2005-08-05 00:07:08 UTC
(rev 9079)
+++ branches/SAMBA_3_0/source/rpc_server/srv_pipe.c 2005-08-05 00:25:52 UTC
(rev 9080)
@@ -666,7 +666,7 @@
if(!prs_uint16("reject code", &outgoing_rpc, 0, &zero)) {
prs_mem_free(&outgoing_rpc);
-return False;
+ return False;
}
p->out_data.data_sent_length = 0;
@@ -896,11 +896,9 @@
if (i == rpc_lookup_size) {
if (NT_STATUS_IS_ERR(smb_probe_module("rpc", p->name))) {
- DEBUG(3,("api_pipe_bind_req: Unknown pipe name %s in
bind request.\n",
-p->name ));
- if(!setup_bind_nak(p))
- return False;
- return True;
+ DEBUG(3,("api_pipe_bind_req: Unknown pipe name %s in
bind request.\n",
+ p->name ));
+ return setup_bind_nak(p);
}
for (i = 0; i < rpc_lookup_size; i++) {
@@ -921,7 +919,7 @@
/* decode the bind request */
if(!smb_io_rpc_hdr_rb("", &hdr_rb, rpc_in_p, 0)) {
DEBUG(0,("api_pipe_bind_req: unable to unmarshall RPC_HDR_RB
struct.\n"));
- return False;
+ return setup_bind_nak(p);
}
/*
@@ -938,7 +936,7 @@
if(!smb_io_rpc_hdr_auth("", &auth_info, rpc_in_p, 0)) {
DEBUG(0,("api_pipe_bind_req: unable to unmarshall
RPC_HDR_AUTH struct.\n"));
- return False;
+ return setup_bind_nak(p);
}
switch(auth_info.auth_type) {
@@ -947,26 +945,26 @@
if(!smb_io_rpc_auth_verifier("",
&auth_verifier, rpc_in_p, 0)) {
DEBUG(0,("api_pipe_bind_req: unable to "
"unmarshall RPC_HDR_AUTH
struct.\n"));
- return False;
+ return setup_bind_nak(p);
}
if(!strequal(auth_verifier.signature,
"NTLMSSP")) {
DEBUG(0,("api_pipe_bind_req: "
"auth_verifier.signature !=
NTLMSSP\n"));
- return False;
+ return setup_bind_nak(p);
}
if(auth_verifier.msg_type != NTLMSSP_NEGOTIATE)
{
DEBUG(0,("api_pipe_bind_req: "
"auth_verifier.msg_type (%d)
!= NTLMSSP_NEGOTIATE\n",
auth_verifier.msg_type));
- return False;
+ return setup_bind_nak(p);
}
if(!smb_io_rpc_auth_ntlmssp_neg("",
&ntlmssp_neg, rpc_in_p, 0)) {
DEBUG(0,("api_pipe_bind_req: "
"Failed to unmarshall
RPC_AUTH_NTLMSSP_NEG.\n"));
- return False;
+ return setup_bind_nak(p);
}
p->ntlmssp_chal_flags = SMBD_NTLMSSP_NEG_FLAGS;
@@ -981,13 +979,13 @@
if (!server_auth2_negotiated) {
DEBUG(0, ("Attempt to bind using
schannel "
"without successful
serverauth2\n"));
- return False;
+ return setup_bind_nak(p);
}
if (!smb_io_rpc_auth_netsec_neg("", &neg,
rpc_in_p, 0)) {
DEBUG(0,("api_pipe_bind_req: "
"Could not unmarshal SCHANNEL
auth neg\n"));
- return False;
+ return setup_bind_nak(p);
}
p->netsec_auth_validated = True;
@@ -1006,7 +1004,7 @@
svn commit: samba r9079 - in trunk/source/smbd: .
Author: vlendec
Date: 2005-08-05 00:07:08 + (Fri, 05 Aug 2005)
New Revision: 9079
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9079
Log:
revert another accidential commit
Modified:
trunk/source/smbd/process.c
Changeset:
Modified: trunk/source/smbd/process.c
===
--- trunk/source/smbd/process.c 2005-08-04 23:56:18 UTC (rev 9078)
+++ trunk/source/smbd/process.c 2005-08-05 00:07:08 UTC (rev 9079)
@@ -1742,7 +1742,7 @@
clobber_region(SAFE_STRING_FUNCTION_NAME, SAFE_STRING_LINE,
InBuffer, total_buffer_size);
#endif
- while
(!receive_message_or_smb(InBuffer,BUFFER_SIZE+LARGE_WRITEX_HDR_SIZE,-1)) {
+ while
(!receive_message_or_smb(InBuffer,BUFFER_SIZE+LARGE_WRITEX_HDR_SIZE,select_timeout))
{
if(!timeout_processing( deadtime, &select_timeout,
&last_timeout_processing_time))
return;
num_smbs = 0; /* Reset smb counter. */
Build status as of Fri Aug 5 00:00:01 2005
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2005-08-04 00:00:09.0 + +++ /home/build/master/cache/broken_results.txt 2005-08-05 00:00:09.0 + @@ -1,17 +1,17 @@ -Build status as of Thu Aug 4 00:00:02 2005 +Build status as of Fri Aug 5 00:00:01 2005 Build counts: Tree Total Broken Panic -ccache 35 6 0 -distcc 35 5 0 -lorikeet-heimdal 33 11 0 -ppp 21 2 0 -rsync34 2 0 +ccache 36 6 0 +distcc 36 5 0 +lorikeet-heimdal 34 12 0 +ppp 22 2 0 +rsync35 2 0 samba0 0 0 samba-docs 0 0 0 -samba4 38 22 0 -samba_3_035 5 0 -smb-build31 4 0 -talloc 34 12 0 -tdb 34 15 0 +samba4 39 13 0 +samba_3_036 4 0 +smb-build32 4 0 +talloc 35 12 0 +tdb 35 15 0
svn commit: samba r9078 - in branches/SAMBA_4_0/source: . lib lib/charset
Author: metze Date: 2005-08-04 23:56:18 + (Thu, 04 Aug 2005) New Revision: 9078 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9078 Log: - move charset stuff to lib/charset - don't use the global $LIBS variable for -liconv as $LIBS is not used anymore should fix the build on solaris 10 metze Added: branches/SAMBA_4_0/source/lib/charset/ branches/SAMBA_4_0/source/lib/charset/charcnv.c branches/SAMBA_4_0/source/lib/charset/config.m4 branches/SAMBA_4_0/source/lib/charset/config.mk branches/SAMBA_4_0/source/lib/charset/iconv.c Removed: branches/SAMBA_4_0/source/lib/charcnv.c branches/SAMBA_4_0/source/lib/iconv.c branches/SAMBA_4_0/source/lib/iconv.m4 Modified: branches/SAMBA_4_0/source/configure.in branches/SAMBA_4_0/source/main.mk Changeset: Sorry, the patch is too large (1617 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9078
svn commit: samba r9077 - in branches/SAMBA_4_0/source/heimdal_build: .
Author: metze Date: 2005-08-04 23:43:05 + (Thu, 04 Aug 2005) New Revision: 9077 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9077 Log: HEIMDAL_ROKEN needs inet_aton and on solaris it's in -lsocket this should fix the build on sun1 metze Modified: branches/SAMBA_4_0/source/heimdal_build/config.mk Changeset: Modified: branches/SAMBA_4_0/source/heimdal_build/config.mk === --- branches/SAMBA_4_0/source/heimdal_build/config.mk 2005-08-04 23:20:48 UTC (rev 9076) +++ branches/SAMBA_4_0/source/heimdal_build/config.mk 2005-08-04 23:43:05 UTC (rev 9077) @@ -297,7 +297,7 @@ heimdal/lib/roken/strupr.o \ heimdal/lib/roken/strpool.o \ heimdal_build/replace.o -REQUIRED_SUBSYSTEMS = HEIMDAL_ROKEN_ADDRINFO +REQUIRED_SUBSYSTEMS = HEIMDAL_ROKEN_ADDRINFO EXT_LIB_SOCKET NOPROTO = YES # End SUBSYSTEM HEIMDAL_ROKEN ###
svn commit: samba r9076 - branches/SAMBA_3_0/source/rpcclient branches/SAMBA_3_0/source/utils trunk/source/rpcclient trunk/source/utils
Author: gd
Date: 2005-08-04 23:20:48 + (Thu, 04 Aug 2005)
New Revision: 9076
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9076
Log:
fix two other issues invented along the
cli_spoolss_enumprinterkey-changes.
Guenther
Modified:
branches/SAMBA_3_0/source/rpcclient/cmd_spoolss.c
branches/SAMBA_3_0/source/utils/net_rpc_printer.c
trunk/source/rpcclient/cmd_spoolss.c
trunk/source/utils/net_rpc_printer.c
Changeset:
Modified: branches/SAMBA_3_0/source/rpcclient/cmd_spoolss.c
===
--- branches/SAMBA_3_0/source/rpcclient/cmd_spoolss.c 2005-08-04 21:20:53 UTC
(rev 9075)
+++ branches/SAMBA_3_0/source/rpcclient/cmd_spoolss.c 2005-08-04 23:20:48 UTC
(rev 9076)
@@ -2296,7 +2296,7 @@
/* Enumerate subkeys */
- result = cli_spoolss_enumprinterkey(cli, mem_ctx, &hnd, keyname, NULL,
NULL);
+ result = cli_spoolss_enumprinterkey(cli, mem_ctx, &hnd, keyname,
&keylist, NULL);
if (!W_ERROR_IS_OK(result))
goto done;
Modified: branches/SAMBA_3_0/source/utils/net_rpc_printer.c
===
--- branches/SAMBA_3_0/source/utils/net_rpc_printer.c 2005-08-04 21:20:53 UTC
(rev 9075)
+++ branches/SAMBA_3_0/source/utils/net_rpc_printer.c 2005-08-04 23:20:48 UTC
(rev 9076)
@@ -939,7 +939,7 @@
WERROR result;
/* enumprinterkey call */
- result = cli_spoolss_enumprinterkey(cli, mem_ctx, hnd, keyname, NULL,
NULL);
+ result = cli_spoolss_enumprinterkey(cli, mem_ctx, hnd, keyname,
keylist, NULL);
if (!W_ERROR_IS_OK(result)) {
printf("enumprinterkey failed: %s\n", dos_errstr(result));
Modified: trunk/source/rpcclient/cmd_spoolss.c
===
--- trunk/source/rpcclient/cmd_spoolss.c2005-08-04 21:20:53 UTC (rev
9075)
+++ trunk/source/rpcclient/cmd_spoolss.c2005-08-04 23:20:48 UTC (rev
9076)
@@ -2296,7 +2296,7 @@
/* Enumerate subkeys */
- result = cli_spoolss_enumprinterkey(cli, mem_ctx, &hnd, keyname, NULL,
NULL);
+ result = cli_spoolss_enumprinterkey(cli, mem_ctx, &hnd, keyname,
&keylist, NULL);
if (!W_ERROR_IS_OK(result))
goto done;
Modified: trunk/source/utils/net_rpc_printer.c
===
--- trunk/source/utils/net_rpc_printer.c2005-08-04 21:20:53 UTC (rev
9075)
+++ trunk/source/utils/net_rpc_printer.c2005-08-04 23:20:48 UTC (rev
9076)
@@ -939,7 +939,7 @@
WERROR result;
/* enumprinterkey call */
- result = cli_spoolss_enumprinterkey(cli, mem_ctx, hnd, keyname, NULL,
NULL);
+ result = cli_spoolss_enumprinterkey(cli, mem_ctx, hnd, keyname,
keylist, NULL);
if (!W_ERROR_IS_OK(result)) {
printf("enumprinterkey failed: %s\n", dos_errstr(result));
svn commit: samba r9075 - in branches/SOC/SAMBA_3_0/source: include libmsrpc
Author: skel Date: 2005-08-04 21:20:53 + (Thu, 04 Aug 2005) New Revision: 9075 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9075 Log: organized the CacServerHandle, added cac_GetServer function to get a SMBCSRV* and took it out of the server handle, fixed up info class constants Modified: branches/SOC/SAMBA_3_0/source/include/libmsrpc.h branches/SOC/SAMBA_3_0/source/include/libmsrpc_internal.h branches/SOC/SAMBA_3_0/source/libmsrpc/cac_lsarpc.c branches/SOC/SAMBA_3_0/source/libmsrpc/libmsrpc.c Changeset: Sorry, the patch is too large (647 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9075
svn commit: samba r9074 - in branches/SAMBA_4_0/source/ntvfs: .
Author: tridge
Date: 2005-08-04 21:00:38 + (Thu, 04 Aug 2005)
New Revision: 9074
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9074
Log:
cope with a null ntvfs context in disconnect, so the destructor that
runs on a failed ntvfs init works
Modified:
branches/SAMBA_4_0/source/ntvfs/ntvfs_interface.c
Changeset:
Modified: branches/SAMBA_4_0/source/ntvfs/ntvfs_interface.c
===
--- branches/SAMBA_4_0/source/ntvfs/ntvfs_interface.c 2005-08-04 21:00:15 UTC
(rev 9073)
+++ branches/SAMBA_4_0/source/ntvfs/ntvfs_interface.c 2005-08-04 21:00:38 UTC
(rev 9074)
@@ -35,7 +35,11 @@
NTSTATUS ntvfs_disconnect(struct smbsrv_tcon *tcon)
{
- struct ntvfs_module_context *ntvfs = tcon->ntvfs_ctx->modules;
+ struct ntvfs_module_context *ntvfs;
+ if (tcon->ntvfs_ctx == NULL) {
+ return NT_STATUS_INVALID_CONNECTION;
+ }
+ ntvfs = tcon->ntvfs_ctx->modules;
if (!ntvfs->ops->disconnect) {
return NT_STATUS_NOT_IMPLEMENTED;
}
svn commit: samba r9073 - in branches/SAMBA_3_0/source/include: .
Author: jra Date: 2005-08-04 21:00:15 + (Thu, 04 Aug 2005) New Revision: 9073 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9073 Log: Fixing up please-add-me typos in stupid, over-designed stackable vfs interface. Jeremy. Modified: branches/SAMBA_3_0/source/include/vfs_macros.h Changeset: Modified: branches/SAMBA_3_0/source/include/vfs_macros.h === --- branches/SAMBA_3_0/source/include/vfs_macros.h 2005-08-04 21:00:13 UTC (rev 9072) +++ branches/SAMBA_3_0/source/include/vfs_macros.h 2005-08-04 21:00:15 UTC (rev 9073) @@ -234,11 +234,11 @@ /* AIO operations. */ #define SMB_VFS_OPAQUE_AIO_READ(fsp,aiocb) ((fsp)->conn->vfs_opaque.ops.aio_read((fsp)->conn->vfs_opaque.handles.aio_read,(fsp),(aiocb))) -#define SMB_VFS_OPAQUE_AIO_WRITE(fsp,aiocb) ((fsp)->conn->vfs_opaque.ops.aio_write((fsp)->conn->vfs_opaque.handles.aio_read,(fsp),(aiocb))) -#define SMB_VFS_OPAQUE_AIO_RETURN(fsp,aiocb) ((fsp)->conn->vfs_opaque.ops.aio_return((fsp)->conn->vfs_opaque.handles.aio_read,(fsp),(aiocb))) -#define SMB_VFS_OPAQUE_AIO_CANCEL(fsp,fd,aiocb) ((fsp)->conn->vfs_opaque.ops.aio_cancel((fsp)->conn->vfs_opaque.handles.aio_read,(fsp),(fd),(aiocb))) -#define SMB_VFS_OPAQUE_AIO_ERROR(fsp,aiocb) ((fsp)->conn->vfs_opaque.ops.aio_error((fsp)->conn->vfs_opaque.handles.aio_read,(fsp),(aiocb))) -#define SMB_VFS_OPAQUE_AIO_FSYNC(fsp,op,aiocb) ((fsp)->conn->vfs_opaque.ops.aio_fsync((fsp)->conn->vfs_opaque.handles.aio_read,(fsp),(op),(aiocb))) +#define SMB_VFS_OPAQUE_AIO_WRITE(fsp,aiocb) ((fsp)->conn->vfs_opaque.ops.aio_write((fsp)->conn->vfs_opaque.handles.aio_write,(fsp),(aiocb))) +#define SMB_VFS_OPAQUE_AIO_RETURN(fsp,aiocb) ((fsp)->conn->vfs_opaque.ops.aio_return((fsp)->conn->vfs_opaque.handles.aio_return,(fsp),(aiocb))) +#define SMB_VFS_OPAQUE_AIO_CANCEL(fsp,fd,aiocb) ((fsp)->conn->vfs_opaque.ops.aio_cancel((fsp)->conn->vfs_opaque.handles.cancel,(fsp),(fd),(aiocb))) +#define SMB_VFS_OPAQUE_AIO_ERROR(fsp,aiocb) ((fsp)->conn->vfs_opaque.ops.aio_error((fsp)->conn->vfs_opaque.handles.aio_error,(fsp),(aiocb))) +#define SMB_VFS_OPAQUE_AIO_FSYNC(fsp,op,aiocb) ((fsp)->conn->vfs_opaque.ops.aio_fsync((fsp)->conn->vfs_opaque.handles.aio_fsync,(fsp),(op),(aiocb))) #define SMB_VFS_OPAQUE_AIO_SUSPEND(fsp,aiocb,n,ts) ((fsp)->conn->vfs_opaque.ops.aio_suspend((fsp)->conn->vfs_opaque.handles.aio_suspend,(fsp),(aiocb),(n),(ts))) /*** @@ -345,11 +345,11 @@ /* AIO operations. */ #define SMB_VFS_NEXT_AIO_READ(handle,fsp,aiocb) ((handle)->vfs_next.ops.aio_read((handle)->vfs_next.handles.aio_read,(fsp),(aiocb))) -#define SMB_VFS_NEXT_AIO_WRITE(handle,fsp,aiocb) ((handle)->vfs_next.ops.aio_write((handle)->vfs_next.handles.aio_read,(fsp),(aiocb))) -#define SMB_VFS_NEXT_AIO_RETURN(handle,fsp,aiocb) ((handle)->vfs_next.ops.aio_return((handle)->vfs_next.handles.aio_read,(fsp),(aiocb))) -#define SMB_VFS_NEXT_AIO_CANCEL(handle,fsp,fd,aiocb) ((handle)->vfs_next.ops.aio_cancel((handle)->vfs_next.handles.aio_read,(fsp),(fd),(aiocb))) -#define SMB_VFS_NEXT_AIO_ERROR(handle,fsp,aiocb) ((handle)->vfs_next.ops.aio_error((handle)->vfs_next.handles.aio_read,(fsp),(aiocb))) -#define SMB_VFS_NEXT_AIO_FSYNC(handle,fsp,op,aiocb) ((handle)->vfs_next.ops.aio_fsync((handle)->vfs_next.handles.aio_read,(fsp),(op),(aiocb))) +#define SMB_VFS_NEXT_AIO_WRITE(handle,fsp,aiocb) ((handle)->vfs_next.ops.aio_write((handle)->vfs_next.handles.aio_write,(fsp),(aiocb))) +#define SMB_VFS_NEXT_AIO_RETURN(handle,fsp,aiocb) ((handle)->vfs_next.ops.aio_return((handle)->vfs_next.handles.aio_return,(fsp),(aiocb))) +#define SMB_VFS_NEXT_AIO_CANCEL(handle,fsp,fd,aiocb) ((handle)->vfs_next.ops.aio_cancel((handle)->vfs_next.handles.aio_cancel,(fsp),(fd),(aiocb))) +#define SMB_VFS_NEXT_AIO_ERROR(handle,fsp,aiocb) ((handle)->vfs_next.ops.aio_error((handle)->vfs_next.handles.aio_error,(fsp),(aiocb))) +#define SMB_VFS_NEXT_AIO_FSYNC(handle,fsp,op,aiocb) ((handle)->vfs_next.ops.aio_fsync((handle)->vfs_next.handles.aio_fsync,(fsp),(op),(aiocb))) #define SMB_VFS_NEXT_AIO_SUSPEND(handle,fsp,aiocb,n,ts) ((handle)->vfs_next.ops.aio_suspend((handle)->vfs_next.handles.aio_suspend,(fsp),(aiocb),(n),(ts))) #endif /* _VFS_MACROS_H */
svn commit: samba r9072 - in trunk/source/include: .
Author: jra Date: 2005-08-04 21:00:13 + (Thu, 04 Aug 2005) New Revision: 9072 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9072 Log: Fixing up please-add-me typos in stupid, over-designed stackable vfs interface. Jeremy. Modified: trunk/source/include/vfs_macros.h Changeset: Modified: trunk/source/include/vfs_macros.h === --- trunk/source/include/vfs_macros.h 2005-08-04 20:22:25 UTC (rev 9071) +++ trunk/source/include/vfs_macros.h 2005-08-04 21:00:13 UTC (rev 9072) @@ -234,11 +234,11 @@ /* AIO operations. */ #define SMB_VFS_OPAQUE_AIO_READ(fsp,aiocb) ((fsp)->conn->vfs_opaque.ops.aio_read((fsp)->conn->vfs_opaque.handles.aio_read,(fsp),(aiocb))) -#define SMB_VFS_OPAQUE_AIO_WRITE(fsp,aiocb) ((fsp)->conn->vfs_opaque.ops.aio_write((fsp)->conn->vfs_opaque.handles.aio_read,(fsp),(aiocb))) -#define SMB_VFS_OPAQUE_AIO_RETURN(fsp,aiocb) ((fsp)->conn->vfs_opaque.ops.aio_return((fsp)->conn->vfs_opaque.handles.aio_read,(fsp),(aiocb))) -#define SMB_VFS_OPAQUE_AIO_CANCEL(fsp,fd,aiocb) ((fsp)->conn->vfs_opaque.ops.aio_cancel((fsp)->conn->vfs_opaque.handles.aio_read,(fsp),(fd),(aiocb))) -#define SMB_VFS_OPAQUE_AIO_ERROR(fsp,aiocb) ((fsp)->conn->vfs_opaque.ops.aio_error((fsp)->conn->vfs_opaque.handles.aio_read,(fsp),(aiocb))) -#define SMB_VFS_OPAQUE_AIO_FSYNC(fsp,op,aiocb) ((fsp)->conn->vfs_opaque.ops.aio_fsync((fsp)->conn->vfs_opaque.handles.aio_read,(fsp),(op),(aiocb))) +#define SMB_VFS_OPAQUE_AIO_WRITE(fsp,aiocb) ((fsp)->conn->vfs_opaque.ops.aio_write((fsp)->conn->vfs_opaque.handles.aio_write,(fsp),(aiocb))) +#define SMB_VFS_OPAQUE_AIO_RETURN(fsp,aiocb) ((fsp)->conn->vfs_opaque.ops.aio_return((fsp)->conn->vfs_opaque.handles.aio_return,(fsp),(aiocb))) +#define SMB_VFS_OPAQUE_AIO_CANCEL(fsp,fd,aiocb) ((fsp)->conn->vfs_opaque.ops.aio_cancel((fsp)->conn->vfs_opaque.handles.cancel,(fsp),(fd),(aiocb))) +#define SMB_VFS_OPAQUE_AIO_ERROR(fsp,aiocb) ((fsp)->conn->vfs_opaque.ops.aio_error((fsp)->conn->vfs_opaque.handles.aio_error,(fsp),(aiocb))) +#define SMB_VFS_OPAQUE_AIO_FSYNC(fsp,op,aiocb) ((fsp)->conn->vfs_opaque.ops.aio_fsync((fsp)->conn->vfs_opaque.handles.aio_fsync,(fsp),(op),(aiocb))) #define SMB_VFS_OPAQUE_AIO_SUSPEND(fsp,aiocb,n,ts) ((fsp)->conn->vfs_opaque.ops.aio_suspend((fsp)->conn->vfs_opaque.handles.aio_suspend,(fsp),(aiocb),(n),(ts))) /*** @@ -345,11 +345,11 @@ /* AIO operations. */ #define SMB_VFS_NEXT_AIO_READ(handle,fsp,aiocb) ((handle)->vfs_next.ops.aio_read((handle)->vfs_next.handles.aio_read,(fsp),(aiocb))) -#define SMB_VFS_NEXT_AIO_WRITE(handle,fsp,aiocb) ((handle)->vfs_next.ops.aio_write((handle)->vfs_next.handles.aio_read,(fsp),(aiocb))) -#define SMB_VFS_NEXT_AIO_RETURN(handle,fsp,aiocb) ((handle)->vfs_next.ops.aio_return((handle)->vfs_next.handles.aio_read,(fsp),(aiocb))) -#define SMB_VFS_NEXT_AIO_CANCEL(handle,fsp,fd,aiocb) ((handle)->vfs_next.ops.aio_cancel((handle)->vfs_next.handles.aio_read,(fsp),(fd),(aiocb))) -#define SMB_VFS_NEXT_AIO_ERROR(handle,fsp,aiocb) ((handle)->vfs_next.ops.aio_error((handle)->vfs_next.handles.aio_read,(fsp),(aiocb))) -#define SMB_VFS_NEXT_AIO_FSYNC(handle,fsp,op,aiocb) ((handle)->vfs_next.ops.aio_fsync((handle)->vfs_next.handles.aio_read,(fsp),(op),(aiocb))) +#define SMB_VFS_NEXT_AIO_WRITE(handle,fsp,aiocb) ((handle)->vfs_next.ops.aio_write((handle)->vfs_next.handles.aio_write,(fsp),(aiocb))) +#define SMB_VFS_NEXT_AIO_RETURN(handle,fsp,aiocb) ((handle)->vfs_next.ops.aio_return((handle)->vfs_next.handles.aio_return,(fsp),(aiocb))) +#define SMB_VFS_NEXT_AIO_CANCEL(handle,fsp,fd,aiocb) ((handle)->vfs_next.ops.aio_cancel((handle)->vfs_next.handles.aio_cancel,(fsp),(fd),(aiocb))) +#define SMB_VFS_NEXT_AIO_ERROR(handle,fsp,aiocb) ((handle)->vfs_next.ops.aio_error((handle)->vfs_next.handles.aio_error,(fsp),(aiocb))) +#define SMB_VFS_NEXT_AIO_FSYNC(handle,fsp,op,aiocb) ((handle)->vfs_next.ops.aio_fsync((handle)->vfs_next.handles.aio_fsync,(fsp),(op),(aiocb))) #define SMB_VFS_NEXT_AIO_SUSPEND(handle,fsp,aiocb,n,ts) ((handle)->vfs_next.ops.aio_suspend((handle)->vfs_next.handles.aio_suspend,(fsp),(aiocb),(n),(ts))) #endif /* _VFS_MACROS_H */
svn commit: samba r9071 - in branches/SAMBA_4_0/source/scripting/ejs: .
Author: mimir
Date: 2005-08-04 20:22:25 + (Thu, 04 Aug 2005)
New Revision: 9071
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9071
Log:
Set real and workstation fields in ejs credentials object.
rafal
Modified:
branches/SAMBA_4_0/source/scripting/ejs/smbcalls_creds.c
Changeset:
Modified: branches/SAMBA_4_0/source/scripting/ejs/smbcalls_creds.c
===
--- branches/SAMBA_4_0/source/scripting/ejs/smbcalls_creds.c2005-08-04
19:59:57 UTC (rev 9070)
+++ branches/SAMBA_4_0/source/scripting/ejs/smbcalls_creds.c2005-08-04
20:22:25 UTC (rev 9071)
@@ -124,6 +124,64 @@
/*
+ set realm
+*/
+static int ejs_creds_set_realm(MprVarHandle eid, int argc, char **argv)
+{
+ struct cli_credentials *creds = ejs_creds_get_credentials(eid);
+ if (argc != 1) {
+ ejsSetErrorMsg(eid, "bad arguments to set_realm");
+ return -1;
+ }
+
+ cli_credentials_set_realm(creds, argv[0], CRED_SPECIFIED);
+ mpr_Return(eid, mprCreateBoolVar(True));
+ return 0;
+}
+
+
+/*
+ get realm
+*/
+static int ejs_creds_get_realm(MprVarHandle eid, int argc, struct MprVar
**argv)
+{
+ struct cli_credentials *creds = ejs_creds_get_credentials(eid);
+
+ mpr_Return(eid, mprString(cli_credentials_get_realm(creds)));
+ return 0;
+}
+
+
+/*
+ set workstation
+*/
+static int ejs_creds_set_workstation(MprVarHandle eid, int argc, char **argv)
+{
+ struct cli_credentials *creds = ejs_creds_get_credentials(eid);
+ if (argc != 1) {
+ ejsSetErrorMsg(eid, "bad arguments to set_workstation");
+ return -1;
+ }
+
+ cli_credentials_set_workstation(creds, argv[0], CRED_SPECIFIED);
+ mpr_Return(eid, mprCreateBoolVar(True));
+ return 0;
+}
+
+
+/*
+ get workstation
+*/
+static int ejs_creds_get_workstation(MprVarHandle eid, int argc, struct MprVar
**argv)
+{
+ struct cli_credentials *creds = ejs_creds_get_credentials(eid);
+
+ mpr_Return(eid, mprString(cli_credentials_get_workstation(creds)));
+ return 0;
+}
+
+
+/*
initialise credentials ejs object
*/
static int ejs_credentials_init(MprVarHandle eid, int argc, struct MprVar
**argv)
@@ -149,6 +207,10 @@
mprSetStringCFunction(obj, "set_username", ejs_creds_set_username);
mprSetCFunction(obj, "get_password", ejs_creds_get_password);
mprSetStringCFunction(obj, "set_password", ejs_creds_set_password);
+ mprSetCFunction(obj, "get_realm", ejs_creds_get_realm);
+ mprSetStringCFunction(obj, "set_realm", ejs_creds_set_realm);
+ mprSetCFunction(obj, "get_workstation", ejs_creds_get_workstation);
+ mprSetStringCFunction(obj, "set_workstation",
ejs_creds_set_workstation);
return 0;
}
svn commit: samba r9070 - in branches/SAMBA_4_0/source/scripting/ejs: .
Author: mimir
Date: 2005-08-04 19:59:57 + (Thu, 04 Aug 2005)
New Revision: 9070
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9070
Log:
More fields in ejs credentials object.
rafal
Modified:
branches/SAMBA_4_0/source/scripting/ejs/smbcalls_creds.c
Changeset:
Modified: branches/SAMBA_4_0/source/scripting/ejs/smbcalls_creds.c
===
--- branches/SAMBA_4_0/source/scripting/ejs/smbcalls_creds.c2005-08-04
19:59:55 UTC (rev 9069)
+++ branches/SAMBA_4_0/source/scripting/ejs/smbcalls_creds.c2005-08-04
19:59:57 UTC (rev 9070)
@@ -48,6 +48,26 @@
}
+/*
+ set a domain
+*/
+static int ejs_creds_set_domain(MprVarHandle eid, int argc, char **argv)
+{
+ struct cli_credentials *creds = ejs_creds_get_credentials(eid);
+ if (argc != 1) {
+ ejsSetErrorMsg(eid, "bad arguments to set_domain");
+ return -1;
+ }
+
+ cli_credentials_set_domain(creds, argv[0], CRED_SPECIFIED);
+ mpr_Return(eid, mprCreateBoolVar(True));
+ return 0;
+}
+
+
+/*
+ get a username
+*/
static int ejs_creds_get_username(MprVarHandle eid, int argc, struct MprVar
**argv)
{
struct cli_credentials *creds = ejs_creds_get_credentials(eid);
@@ -56,6 +76,10 @@
return 0;
}
+
+/*
+ set a username
+*/
static int ejs_creds_set_username(MprVarHandle eid, int argc, char **argv)
{
struct cli_credentials *creds = ejs_creds_get_credentials(eid);
@@ -71,6 +95,35 @@
/*
+ get user password
+*/
+static int ejs_creds_get_password(MprVarHandle eid, int argc, struct MprVar
**argv)
+{
+ struct cli_credentials *creds = ejs_creds_get_credentials(eid);
+
+ mpr_Return(eid, mprString(cli_credentials_get_password(creds)));
+ return 0;
+}
+
+
+/*
+ set user password
+*/
+static int ejs_creds_set_password(MprVarHandle eid, int argc, char **argv)
+{
+ struct cli_credentials *creds = ejs_creds_get_credentials(eid);
+ if (argc != 1) {
+ ejsSetErrorMsg(eid, "bad arguments to set_password");
+ return -1;
+ }
+
+ cli_credentials_set_password(creds, argv[0], CRED_SPECIFIED);
+ mpr_Return(eid, mprCreateBoolVar(True));
+ return 0;
+}
+
+
+/*
initialise credentials ejs object
*/
static int ejs_credentials_init(MprVarHandle eid, int argc, struct MprVar
**argv)
@@ -91,8 +144,11 @@
/* setup our object methods */
mprSetCFunction(obj, "get_domain", ejs_creds_get_domain);
+ mprSetStringCFunction(obj, "set_domain", ejs_creds_set_domain);
mprSetCFunction(obj, "get_username", ejs_creds_get_username);
mprSetStringCFunction(obj, "set_username", ejs_creds_set_username);
+ mprSetCFunction(obj, "get_password", ejs_creds_get_password);
+ mprSetStringCFunction(obj, "set_password", ejs_creds_set_password);
return 0;
}
svn commit: samba r9069 - in branches/SOC/SAMBA_4_0: . source/torture/rpc
Author: brad
Date: 2005-08-04 19:59:55 + (Thu, 04 Aug 2005)
New Revision: 9069
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9069
Log:
[EMAIL PROTECTED]: j0j0 | 2005-08-04 14:04:55 -0600
Some more work on the domain join
Modified:
branches/SOC/SAMBA_4_0/
branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c
Changeset:
Property changes on: branches/SOC/SAMBA_4_0
___
Name: svk:merge
- 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/SAMBA_4_0:9063
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/SAMBA_4_0:5277
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/samba-SAMBA_4_0:5276
+ 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/SAMBA_4_0:9063
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/SAMBA_4_0:5279
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/samba-SAMBA_4_0:5276
Modified: branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c
===
--- branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c 2005-08-04 17:33:10 UTC
(rev 9068)
+++ branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c 2005-08-04 19:59:55 UTC
(rev 9069)
@@ -45,6 +45,8 @@
struct ldb_context *ldb_ctx;
struct ldb_message *ldb_msg;
struct libnet_context *libnet_ctx;
+ struct event_context *libnet_evt_ctx;
+ struct event_context *dcerpc_evt_ctx;
const char *ldap_url;
const char *domain_dn;
@@ -79,7 +81,7 @@
struct drsuapi_DsBindInfoCtr *our_bind_info;
const char *binding = lp_parm_string(-1, "torture", "binding");
const char *new_dc_pass;
- struct event_context *event_ctx = NULL;
+ /*struct event_context *evt_ctx = NULL;*/
ctx = talloc_zero(mem_ctx, struct DsSyncTest);
if (!ctx) return NULL;
@@ -129,8 +131,13 @@
/*libnet_context_init should be passed an event_context *ev,
not a TALLOC_CTX *mem_ctx.
*/
- ctx->libnet_ctx = libnet_context_init(event_ctx);
-
+ /*
+ ctx->libnet_evt_ctx = NULL;
+ ctx->libnet_ctx = libnet_context_init(ctx->libnet_evt_ctx);
+ if (ctx->libnet_ctx == NULL) {
+printf("libnet_context_init() failed, ctx->libnet_context libnet_ctx
not initialized.\n");
+ }
+ */
return ctx;
}
@@ -198,13 +205,13 @@
{
NTSTATUS status;
BOOL ret = True;
- struct event_context *event = NULL;
-
+
+ ctx->dcerpc_evt_ctx = NULL;
status = dcerpc_pipe_connect_b(ctx,
&b->pipe, ctx->drsuapi_binding,
DCERPC_DRSUAPI_UUID,
DCERPC_DRSUAPI_VERSION,
- credentials, event);
+ credentials, ctx->dcerpc_evt_ctx);
if (!NT_STATUS_IS_OK(status)) {
printf("Failed to connect to server as a BDC: %s\n",
nt_errstr(status));
@@ -330,7 +337,8 @@
int rtn;
char *old_dn;
struct libnet_Join libnet_r;
-
+ struct event_context *evt_ctx = NULL;
+
rtn = ldb_connect(ctx->ldb_ctx,ctx->ldap_url,0,NULL);
if (rtn != 0) {
printf("test_CompleteJoin(): ldb_connect() failed: %s.\n",
@@ -728,6 +736,13 @@
libnet_r.in.domain_name is a netbios domain name.
*/
+ ctx->libnet_ctx = libnet_context_init(NULL);
+ if (ctx->libnet_ctx == NULL) {
+printf("libnet_context_init() failed, ctx->libnet_ctx not
initialized.\n");
+ }
+ if (ctx->libnet_ctx->event_ctx == NULL) {
+printf("event_ctx is probably not supposed to be null, but it
is.\n");
+ }
status = libnet_Join(ctx->libnet_ctx, ctx, &libnet_r);
if (!NT_STATUS_IS_OK(status)) {
const char *errstr = nt_errstr(status);
svn commit: samba r9068 - in branches/SAMBA_4_0/source: .
Author: lmuelle Date: 2005-08-04 17:33:10 + (Thu, 04 Aug 2005) New Revision: 9068 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9068 Log: Move # sign. Modified: branches/SAMBA_4_0/source/VERSION Changeset: Modified: branches/SAMBA_4_0/source/VERSION === --- branches/SAMBA_4_0/source/VERSION 2005-08-04 17:32:05 UTC (rev 9067) +++ branches/SAMBA_4_0/source/VERSION 2005-08-04 17:33:10 UTC (rev 9068) @@ -28,7 +28,7 @@ # so SAMBA's version will be # # .. # # # -# e.g. SAMBA_VERSION_REVISION=a # +# e.g. SAMBA_VERSION_REVISION=a# # -> "2.2.8a"# SAMBA_VERSION_REVISION=
svn commit: samba r9067 - in branches/SAMBA_4_0/source: .
Author: lmuelle Date: 2005-08-04 17:32:05 + (Thu, 04 Aug 2005) New Revision: 9067 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9067 Log: Use the right variable name in the example too. Modified: branches/SAMBA_4_0/source/VERSION Changeset: Modified: branches/SAMBA_4_0/source/VERSION === --- branches/SAMBA_4_0/source/VERSION 2005-08-04 17:09:21 UTC (rev 9066) +++ branches/SAMBA_4_0/source/VERSION 2005-08-04 17:32:05 UTC (rev 9067) @@ -28,7 +28,7 @@ # so SAMBA's version will be # # .. # # # -# e.g. SAMBA_VERSION_PRE_RELEASE=a # +# e.g. SAMBA_VERSION_REVISION=a # # -> "2.2.8a"# SAMBA_VERSION_REVISION=
svn commit: samba r9066 - in branches/SOC/SAMBA_4_0: . source source/build/m4 source/lib/netif source/lib/replace source/lib/socket
Author: brad Date: 2005-08-04 17:09:21 + (Thu, 04 Aug 2005) New Revision: 9066 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9066 Log: [EMAIL PROTECTED]: j0j0 | 2005-08-04 11:14:04 -0600 [EMAIL PROTECTED]: j0j0 | 2005-08-04 11:12:58 -0600 [EMAIL PROTECTED] (orig r9063): metze | 2005-08-04 10:49:17 -0600 - don't pollute the global $LIBS variable with -ldl - -lresolve seems to not being needed any more (it's actually not used, and the build farm seem to happy with it) - move socket and netif configure test to seperate files - don't pollute the global $LIBS variable with -lsocket ... - actually make use of the -lsocket when needed (should fix the solaris build) metze Added: branches/SOC/SAMBA_4_0/source/lib/netif/config.m4 branches/SOC/SAMBA_4_0/source/lib/replace/config.m4 Modified: branches/SOC/SAMBA_4_0/ branches/SOC/SAMBA_4_0/source/build/m4/rewrite.m4 branches/SOC/SAMBA_4_0/source/configure.in branches/SOC/SAMBA_4_0/source/lib/socket/config.m4 branches/SOC/SAMBA_4_0/source/lib/socket/config.mk Changeset: Sorry, the patch is too large (485 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9066
svn commit: samba r9065 - in branches/SOC/SAMBA_4_0: . source source/build/pidl/Parse/Pidl/Samba source/build/smb_build source/heimdal_build source/include source/libcli/util source/libnet source/ntvf
Author: brad Date: 2005-08-04 16:54:01 + (Thu, 04 Aug 2005) New Revision: 9065 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9065 Log: [EMAIL PROTECTED]: j0j0 | 2005-08-04 10:56:01 -0600 [EMAIL PROTECTED]: j0j0 | 2005-08-04 10:54:14 -0600 [EMAIL PROTECTED] (orig r9037): mimir | 2005-08-03 20:51:26 -0600 New fields in usermod function - allow_password_change and force_password_change datetime. rafal [EMAIL PROTECTED] (orig r9038): lmuelle | 2005-08-03 20:59:19 -0600 Revert svn rev 414. Discussed with Jerry and Metze. We need the option to add an 'a' if we're already in pre or rc state with the next release. Bugzilla Bug 2618 [EMAIL PROTECTED] (orig r9042): tridge | 2005-08-03 22:20:26 -0600 fixed the valgrind error in the RAW-SFILEINFO test [EMAIL PROTECTED] (orig r9043): tridge | 2005-08-03 22:20:43 -0600 fixed return code in RAW-STREAMS test [EMAIL PROTECTED] (orig r9044): tridge | 2005-08-03 22:21:03 -0600 added a comment so you can see what this test does :-) [EMAIL PROTECTED] (orig r9045): tridge | 2005-08-03 22:21:52 -0600 be friendly towards servers that don't understand the 'share' form for tconx, instead of the \\server\share form [EMAIL PROTECTED] (orig r9046): tridge | 2005-08-03 22:23:08 -0600 fixed display of privileges in RAW-ACLS test [EMAIL PROTECTED] (orig r9047): tridge | 2005-08-03 22:23:40 -0600 show the order of the server/correct output to make it easier to demo this test ;) [EMAIL PROTECTED] (orig r9048): tridge | 2005-08-03 22:24:37 -0600 added a new DOS error code (thanks to EMC) [EMAIL PROTECTED] (orig r9049): metze | 2005-08-03 22:45:42 -0600 - add property dependencies to include/proto.h - make some stuff easier metze [EMAIL PROTECTED] (orig r9050): metze | 2005-08-03 22:53:06 -0600 fix make pch all metze [EMAIL PROTECTED] (orig r9052): jelmer | 2005-08-03 23:23:07 -0600 Support lex/yacc compilers without support for -o [EMAIL PROTECTED] (orig r9053): jelmer | 2005-08-03 23:46:17 -0600 Change order of dependencies (.h files are used when creating the two compilers used for generating the rest of the heimdal files) [EMAIL PROTECTED] (orig r9054): tridge | 2005-08-04 00:14:34 -0600 removed incorrect paranoia check on opening streams (this caused RAW-STREAMS to fail) [EMAIL PROTECTED] (orig r9055): metze | 2005-08-04 00:52:58 -0600 fix header generation for string_array and some other scalar types the are actualy mapped to pointers in the api metze [EMAIL PROTECTED] (orig r9059): tridge | 2005-08-04 10:10:13 -0600 add a basic credentials object for mimir [EMAIL PROTECTED] (orig r9060): metze | 2005-08-04 10:11:26 -0600 prepend not overwrite the libs metze Added: branches/SOC/SAMBA_4_0/source/script/lex_compile.sh branches/SOC/SAMBA_4_0/source/script/yacc_compile.sh branches/SOC/SAMBA_4_0/source/scripting/ejs/smbcalls_creds.c Modified: branches/SOC/SAMBA_4_0/ branches/SOC/SAMBA_4_0/source/VERSION branches/SOC/SAMBA_4_0/source/aclocal.m4 branches/SOC/SAMBA_4_0/source/build/pidl/Parse/Pidl/Samba/Header.pm branches/SOC/SAMBA_4_0/source/build/smb_build/makefile.pm branches/SOC/SAMBA_4_0/source/heimdal_build/config.mk branches/SOC/SAMBA_4_0/source/include/doserr.h branches/SOC/SAMBA_4_0/source/libcli/util/nterr.c branches/SOC/SAMBA_4_0/source/libnet/composite.h branches/SOC/SAMBA_4_0/source/libnet/userman.c branches/SOC/SAMBA_4_0/source/main.mk branches/SOC/SAMBA_4_0/source/ntvfs/posix/pvfs_open.c branches/SOC/SAMBA_4_0/source/script/mkversion.sh branches/SOC/SAMBA_4_0/source/scripting/ejs/config.mk branches/SOC/SAMBA_4_0/source/scripting/ejs/smbcalls.c branches/SOC/SAMBA_4_0/source/torture/basic/denytest.c branches/SOC/SAMBA_4_0/source/torture/libnet/userman.c branches/SOC/SAMBA_4_0/source/torture/raw/acls.c branches/SOC/SAMBA_4_0/source/torture/raw/context.c branches/SOC/SAMBA_4_0/source/torture/raw/open.c branches/SOC/SAMBA_4_0/source/torture/raw/setfileinfo.c branches/SOC/SAMBA_4_0/source/torture/raw/streams.c branches/SOC/SAMBA_4_0/source/torture/torture_util.c Changeset: Sorry, the patch is too large (709 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9065
svn commit: samba r9064 - in branches/SOC/SAMBA_4_0: . source/torture/rpc
Author: brad
Date: 2005-08-04 16:53:51 + (Thu, 04 Aug 2005)
New Revision: 9064
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9064
Log:
[EMAIL PROTECTED]: j0j0 | 2005-08-04 10:53:00 -0600
Fixed a bug (passing a TALLOC_CTX to libnet_context_init() )
Modified:
branches/SOC/SAMBA_4_0/
branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c
Changeset:
Property changes on: branches/SOC/SAMBA_4_0
___
Name: svk:merge
- 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/SAMBA_4_0:9033
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/SAMBA_4_0:5250
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/samba-SAMBA_4_0:5244
+ 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/SAMBA_4_0:9033
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/SAMBA_4_0:5253
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/samba-SAMBA_4_0:5244
Modified: branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c
===
--- branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c 2005-08-04 16:49:17 UTC
(rev 9063)
+++ branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c 2005-08-04 16:53:51 UTC
(rev 9064)
@@ -45,7 +45,6 @@
struct ldb_context *ldb_ctx;
struct ldb_message *ldb_msg;
struct libnet_context *libnet_ctx;
- struct libnet_Join *libnet_r;
const char *ldap_url;
const char *domain_dn;
@@ -80,7 +79,8 @@
struct drsuapi_DsBindInfoCtr *our_bind_info;
const char *binding = lp_parm_string(-1, "torture", "binding");
const char *new_dc_pass;
-
+ struct event_context *event_ctx = NULL;
+
ctx = talloc_zero(mem_ctx, struct DsSyncTest);
if (!ctx) return NULL;
@@ -126,7 +126,10 @@
/* ctx->old_dc ...*/
ctx->ldb_ctx = ldb_init(mem_ctx);
- ctx->libnet_ctx = libnet_context_init(mem_ctx);
+ /*libnet_context_init should be passed an event_context *ev,
+ not a TALLOC_CTX *mem_ctx.
+ */
+ ctx->libnet_ctx = libnet_context_init(event_ctx);
return ctx;
}
@@ -808,10 +811,6 @@
mem_ctx = talloc_init("torture_rpc_dssync");
ctx = test_create_context(mem_ctx);
- /*
- ctx->ldb_ctx = ldb_init(mem_ctx);
- ctx->libnet_ctx = libnet_context_init(mem_ctx);
- */
rtn = ldb_connect(ctx->ldb_ctx,ctx->ldap_url,0,NULL);
printf("Connected to %s.\n",ctx->ldap_url);
svn commit: samba r9063 - in branches/SAMBA_4_0/source: . build/m4 lib/netif lib/replace lib/socket
Author: metze Date: 2005-08-04 16:49:17 + (Thu, 04 Aug 2005) New Revision: 9063 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9063 Log: - don't pollute the global $LIBS variable with -ldl - -lresolve seems to not being needed any more (it's actually not used, and the build farm seem to happy with it) - move socket and netif configure test to seperate files - don't pollute the global $LIBS variable with -lsocket ... - actually make use of the -lsocket when needed (should fix the solaris build) metze Added: branches/SAMBA_4_0/source/lib/netif/config.m4 branches/SAMBA_4_0/source/lib/replace/config.m4 Modified: branches/SAMBA_4_0/source/build/m4/rewrite.m4 branches/SAMBA_4_0/source/configure.in branches/SAMBA_4_0/source/lib/socket/config.m4 branches/SAMBA_4_0/source/lib/socket/config.mk Changeset: Sorry, the patch is too large (474 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9063
svn commit: samba r9062 - in branches/SOC/SAMBA_4_0: . source/torture/rpc
Author: brad
Date: 2005-08-04 16:17:47 + (Thu, 04 Aug 2005)
New Revision: 9062
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9062
Log:
[EMAIL PROTECTED]: j0j0 | 2005-08-04 10:21:34 -0600
Some more work towards performing a dc join.
Modified:
branches/SOC/SAMBA_4_0/
branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c
Changeset:
Property changes on: branches/SOC/SAMBA_4_0
___
Name: svk:merge
- 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/SAMBA_4_0:9033
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/SAMBA_4_0:5249
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/samba-SAMBA_4_0:5244
+ 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/SAMBA_4_0:9033
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/SAMBA_4_0:5250
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/samba-SAMBA_4_0:5244
Modified: branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c
===
--- branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c 2005-08-04 16:17:36 UTC
(rev 9061)
+++ branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c 2005-08-04 16:17:47 UTC
(rev 9062)
@@ -45,6 +45,7 @@
struct ldb_context *ldb_ctx;
struct ldb_message *ldb_msg;
struct libnet_context *libnet_ctx;
+ struct libnet_Join *libnet_r;
const char *ldap_url;
const char *domain_dn;
@@ -123,6 +124,9 @@
ctx->new_dc.invocation_id = GUID_random();
/* ctx->old_dc ...*/
+
+ ctx->ldb_ctx = ldb_init(mem_ctx);
+ ctx->libnet_ctx = libnet_context_init(mem_ctx);
return ctx;
}
@@ -708,30 +712,30 @@
attribute_ctr->num_attributes = i;
-
-
- printf("The libnet_Join struct has a domain_name element. I am
going to assume it is my ldap base dn.\n");
- printf("That said, my ldap base dn is: %s.\n",ctx->domain_dn);
- /* ctx->domain_dn is the ldap dn.*/
- libnet_r.in.domain_name =
talloc_asprintf(ctx,"%s",ctx->domain_dn);
+ libnet_r.in.domain_name = ctx->admin.credentials->domain;
libnet_r.in.secure_channel_type = SEC_CHAN_BDC;
- printf("attempting a DC join with libnet_Join()\n");
+ printf("attempting a DC join with
libnet_Join(%s)\n",libnet_r.in.domain_name);
/*
- we get the following error when libnet_Join gets reached,
- probably because we haven't provisioned these ldb's!
- Unable to open tdb '/usr/local/samba/private/secrets.ldb'
- Failed to connect to '/usr/local/samba/private/secrets.ldb'
+ if you haven't run the provision script, you get:
+ Unable to open tdb
'/usr/local/samba/private/secrets.ldb'
+ Failed to connect to
'/usr/local/samba/private/secrets.ldb'
+ when libnet_Join() is called.
+
+ libnet_r.in.domain_name is a netbios domain name.
*/
- status = libnet_Join(ctx->libnet_ctx,ctx,&libnet_r);
+
+ status = libnet_Join(ctx->libnet_ctx, ctx, &libnet_r);
if (!NT_STATUS_IS_OK(status)) {
const char *errstr = nt_errstr(status);
if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT))
{
errstr = dcerpc_errstr(ctx,
ctx->admin.drsuapi.pipe->last_fault_code);
}
printf("libnet_Join() failed - %s\n", errstr);
+ printf("libnet_r.out.error_string returned:
%s\n",libnet_r.out.error_string);
ret = False;
}
+
/*
status = dcerpc_drsuapi_DsAddEntry(ctx->admin.drsuapi.pipe,
ctx, &r);
if (!NT_STATUS_IS_OK(status)) {
@@ -804,8 +808,10 @@
mem_ctx = talloc_init("torture_rpc_dssync");
ctx = test_create_context(mem_ctx);
+ /*
ctx->ldb_ctx = ldb_init(mem_ctx);
- ctx->libnet_ctx = libnet_context_init(mem_ctx);
+ ctx->libnet_ctx = libnet_context_init(mem_ctx);
+ */
rtn = ldb_connect(ctx->ldb_ctx,ctx->ldap_url,0,NULL);
printf("Connected to %s.\n",ctx->ldap_url);
svn commit: samba r9061 - in branches/SOC/SAMBA_4_0: . source/torture/rpc
Author: brad
Date: 2005-08-04 16:17:36 + (Thu, 04 Aug 2005)
New Revision: 9061
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9061
Log:
[EMAIL PROTECTED]: j0j0 | 2005-08-03 21:01:02 -0600
Start using libnet_Join() for DC join.
Modified:
branches/SOC/SAMBA_4_0/
branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c
Changeset:
Property changes on: branches/SOC/SAMBA_4_0
___
Name: svk:merge
- 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/SAMBA_4_0:9033
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/SAMBA_4_0:5246
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/samba-SAMBA_4_0:5244
+ 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/SAMBA_4_0:9033
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/SAMBA_4_0:5249
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/samba-SAMBA_4_0:5244
Modified: branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c
===
--- branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c 2005-08-04 16:11:26 UTC
(rev 9060)
+++ branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c 2005-08-04 16:17:36 UTC
(rev 9061)
@@ -22,6 +22,7 @@
#include "includes.h"
#include "lib/cmdline/popt_common.h"
+#include "libnet/libnet.h"
#include "librpc/gen_ndr/ndr_drsuapi.h"
#include "librpc/gen_ndr/ndr_samr.h"
#include "libcli/ldap/ldap.h"
@@ -43,6 +44,7 @@
struct dcerpc_binding *drsuapi_binding;
struct ldb_context *ldb_ctx;
struct ldb_message *ldb_msg;
+ struct libnet_context *libnet_ctx;
const char *ldap_url;
const char *domain_dn;
@@ -141,32 +143,23 @@
"dn: %s\n"
"changetype: delete\n",
ctx->new_dc.dc_info2.ntds_dn);
-
- ldb_req = ldb_ldif_read_string(ldb_ctx,&ldif);
*/
- /*
-I'm pretty sure this delete fails because dcerpc_drsuapi_DsAddEntry Fails
DCERPC_FAULT_NDR
-in test_CompleteJoin().
-
+ /*
+ This delete fails because dcerpc_drsuapi_DsAddEntry Fails
DCERPC_FAULT_NDR
+ in test_CompleteJoin().
+ */
printf("test_destroy_context(): deleting ntds_dn
%s.\n",ctx->new_dc.dc_info2.ntds_dn);
rtn = ldb_delete(ctx->ldb_ctx,ctx->new_dc.dc_info2.ntds_dn);
if (rtn != 0) {
printf("test_destroy_context(): ldb_delete(ntds_dn)
failed: %s.\n",
ldb_errstring(ctx->ldb_ctx));
+ /* I want ldb_delete(server_dn) to get called.
+ I should just change the ordering or
+ not have this return at all perhaps.
return;
+ */
}
- */
-
-
- /* req = ldap_ldif2msg(ctx, ldif);
-req.messageid = ;
-req->type = LDAP_TAG_DelRequest;
-req->r.DelRequest.dn = ctx->new_dc.dc_info2.ntds_dn;
-req.num_controls = ;
-req.controls = ;
- rtn = ldap_transaction(ctx->admin.ldap.conn, req);
- */
}
{
@@ -177,7 +170,6 @@
"dn: %s\n"
"changetype: delete\n",
ctx->new_dc.dc_info2.server_dn);
- ldb_req = ldb_ldif_read_string(ldb_ctx,&ldif);
*/
printf("test_destroy_context(): deleting server_dn
%s.\n",ctx->new_dc.dc_info2.server_dn);
@@ -312,7 +304,7 @@
ctx->schema_dn = talloc_asprintf(ctx, "CN=Schema,%s", ctx->config_dn);
ctx->new_dc.dc_info2.server_dn = talloc_asprintf(ctx,
-/*
"CN=%s,CN=Servers,CN=Standardname-des-ersten-Standorts,CN=Sites,CN=Configuration,%s",
*/
+
/*"CN=%s,CN=Servers,CN=Standardname-des-ersten-Standorts,CN=Sites,CN=Configuration,%s",*/
"CN=%s,CN=Servers,CN=Default-First-Site-Name,CN=Sites,CN=Configuration,%s",
TEST_MACHINE_NAME, ctx->domain_dn);
@@ -330,6 +322,8 @@
BOOL ret = True;
int rtn;
char *old_dn;
+ struct libnet_Join libnet_r;
+
rtn = ldb_connect(ctx->ldb_ctx,ctx->ldap_url,0,NULL);
if (rtn != 0) {
printf("test_CompleteJoin(): ldb_connect() failed: %s.\n",
@@ -340,6 +334,8 @@
/* userAccountControl: 532480 0x82000
* UF_SERVER_TRUST_ACCOUNT|UF_TRUSTED_FOR_DELEGATION
+ */
+ /*
ldif = talloc_asprintf(ctx,
"dn: %s\n"
"changetype: modify\n"
@@ -348,8 +344,6 @@
ctx->new_dc.dc_info2.computer_dn,
UF_SERVER_TRUST_ACCOUNT|UF_TRUSTED_FOR_DELEGATION);
*/
-/* = UF_SERVER_TRUST_ACCOUNT|UF_TRUSTED_FOR_DELEGATION;*/
-
ctx->ldb_msg = ldb_msg_new(ctx);
ldb_msg_add_fmt(ctx->ldb_ctx,c
svn commit: samba r9060 - in branches/SAMBA_4_0/source: .
Author: metze Date: 2005-08-04 16:11:26 + (Thu, 04 Aug 2005) New Revision: 9060 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9060 Log: prepend not overwrite the libs metze Modified: branches/SAMBA_4_0/source/aclocal.m4 Changeset: Modified: branches/SAMBA_4_0/source/aclocal.m4 === --- branches/SAMBA_4_0/source/aclocal.m42005-08-04 16:10:13 UTC (rev 9059) +++ branches/SAMBA_4_0/source/aclocal.m42005-08-04 16:11:26 UTC (rev 9060) @@ -139,7 +139,7 @@ fi LIBS=$ac_func_search_ext_save_LIBS]) AS_IF([test "$ac_cv_search_ext_$1" != no], - [test "$ac_cv_search_ext_$1" = "none required" || $3="$ac_cv_search_ext_$1" + [test "$ac_cv_search_ext_$1" = "none required" || $3="$ac_cv_search_ext_$1 $$3" $4], [$5])dnl ])
svn commit: samba r9059 - in branches/SAMBA_4_0/source/scripting/ejs: .
Author: tridge
Date: 2005-08-04 16:10:13 + (Thu, 04 Aug 2005)
New Revision: 9059
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9059
Log:
add a basic credentials object for mimir
Added:
branches/SAMBA_4_0/source/scripting/ejs/smbcalls_creds.c
Modified:
branches/SAMBA_4_0/source/scripting/ejs/config.mk
branches/SAMBA_4_0/source/scripting/ejs/smbcalls.c
Changeset:
Modified: branches/SAMBA_4_0/source/scripting/ejs/config.mk
===
--- branches/SAMBA_4_0/source/scripting/ejs/config.mk 2005-08-04 15:09:18 UTC
(rev 9058)
+++ branches/SAMBA_4_0/source/scripting/ejs/config.mk 2005-08-04 16:10:13 UTC
(rev 9059)
@@ -24,6 +24,7 @@
scripting/ejs/smbcalls_string.o \
scripting/ejs/smbcalls_rand.o \
scripting/ejs/smbcalls_sys.o \
+ scripting/ejs/smbcalls_creds.o \
scripting/ejs/mprutil.o
REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC EJSRPC MESSAGING
# End SUBSYSTEM SMBCALLS
Modified: branches/SAMBA_4_0/source/scripting/ejs/smbcalls.c
===
--- branches/SAMBA_4_0/source/scripting/ejs/smbcalls.c 2005-08-04 15:09:18 UTC
(rev 9058)
+++ branches/SAMBA_4_0/source/scripting/ejs/smbcalls.c 2005-08-04 16:10:13 UTC
(rev 9059)
@@ -127,6 +127,7 @@
smb_setup_ejs_string();
smb_setup_ejs_random();
smb_setup_ejs_system();
+ smb_setup_ejs_credentials();
ejsDefineCFunction(-1, "typeof", ejs_typeof, NULL,
MPR_VAR_SCRIPT_HANDLE);
ejsDefineStringCFunction(-1, "libinclude", ejs_libinclude, NULL,
MPR_VAR_SCRIPT_HANDLE);
Added: branches/SAMBA_4_0/source/scripting/ejs/smbcalls_creds.c
===
--- branches/SAMBA_4_0/source/scripting/ejs/smbcalls_creds.c2005-08-04
15:09:18 UTC (rev 9058)
+++ branches/SAMBA_4_0/source/scripting/ejs/smbcalls_creds.c2005-08-04
16:10:13 UTC (rev 9059)
@@ -0,0 +1,107 @@
+/*
+ Unix SMB/CIFS implementation.
+
+ provide hooks credentials calls
+
+ Copyright (C) Andrew Tridgell 2005
+
+ 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 "scripting/ejs/smbcalls.h"
+#include "lib/appweb/ejs/ejs.h"
+
+/*
+ helper function to get the local objects credentials ptr
+*/
+static struct cli_credentials *ejs_creds_get_credentials(int eid)
+{
+ struct cli_credentials *creds = mprGetThisPtr(eid, "creds");
+ if (creds == NULL) {
+ ejsSetErrorMsg(eid, "NULL ejs credentials");
+ }
+ return creds;
+}
+
+/*
+ get a domain
+*/
+static int ejs_creds_get_domain(MprVarHandle eid, int argc, struct MprVar
**argv)
+{
+ struct cli_credentials *creds = ejs_creds_get_credentials(eid);
+
+ mpr_Return(eid, mprString(cli_credentials_get_domain(creds)));
+ return 0;
+}
+
+
+static int ejs_creds_get_username(MprVarHandle eid, int argc, struct MprVar
**argv)
+{
+ struct cli_credentials *creds = ejs_creds_get_credentials(eid);
+
+ mpr_Return(eid, mprString(cli_credentials_get_username(creds)));
+ return 0;
+}
+
+static int ejs_creds_set_username(MprVarHandle eid, int argc, char **argv)
+{
+ struct cli_credentials *creds = ejs_creds_get_credentials(eid);
+ if (argc != 1) {
+ ejsSetErrorMsg(eid, "bad arguments to set_username");
+ return -1;
+ }
+
+ cli_credentials_set_username(creds, argv[0], CRED_SPECIFIED);
+ mpr_Return(eid, mprCreateBoolVar(True));
+ return 0;
+}
+
+
+/*
+ initialise credentials ejs object
+*/
+static int ejs_credentials_init(MprVarHandle eid, int argc, struct MprVar
**argv)
+{
+ struct MprVar *obj = mprInitObject(eid, "credentials", argc, argv);
+ struct cli_credentials *creds;
+
+ creds = cli_credentials_init(mprMemCtx());
+ if (creds == NULL) {
+ return -1;
+ }
+
+ cli_credentials_guess(creds);
+ cli_credentials_set_username(creds, "", CRED_GUESSED);
+ cli_credentials_set_password(creds, "", CRED_GUESSED);
+
+ mprSetPtrChild(obj, "creds", creds);
+
+ /* setup our object methods */
+ mprSetCFunction(obj, "get_domain", ejs_creds_get_domain);
+ mp
svn commit: samba r9058 - in trunk/source: .
Author: herb Date: 2005-08-04 15:09:18 + (Thu, 04 Aug 2005) New Revision: 9058 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9058 Log: fix cut-and-paste error Modified: trunk/source/VERSION Changeset: Modified: trunk/source/VERSION === --- trunk/source/VERSION2005-08-04 15:07:17 UTC (rev 9057) +++ trunk/source/VERSION2005-08-04 15:09:18 UTC (rev 9058) @@ -28,7 +28,7 @@ # so SAMBA's version will be # # .. # # # -# e.g. SAMBA_VERSION_PRE_RELEASE=a # +# e.g. SAMBA_VERSION_REVISION=a# # -> "2.2.8a"# SAMBA_VERSION_REVISION=
svn commit: samba r9057 - in branches/SAMBA_3_0/source: .
Author: herb Date: 2005-08-04 15:07:17 + (Thu, 04 Aug 2005) New Revision: 9057 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9057 Log: fix cut-and-paste error Modified: branches/SAMBA_3_0/source/VERSION Changeset: Modified: branches/SAMBA_3_0/source/VERSION === --- branches/SAMBA_3_0/source/VERSION 2005-08-04 07:27:25 UTC (rev 9056) +++ branches/SAMBA_3_0/source/VERSION 2005-08-04 15:07:17 UTC (rev 9057) @@ -28,7 +28,7 @@ # so SAMBA's version will be # # .. # # # -# e.g. SAMBA_VERSION_PRE_RELEASE=a # +# e.g. SAMBA_VERSION_REVISION=a# # -> "2.2.8a"# SAMBA_VERSION_REVISION=
svn commit: lorikeet r393 - in trunk/sangria/src/LatestDesign: classes classes/AccountManager classes/ServerObjects test
Author: amit Date: 2005-08-04 08:57:40 + (Thu, 04 Aug 2005) New Revision: 393 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=393 Log: updated files with elaborated testing on the GroupManagerClass Added: trunk/sangria/src/LatestDesign/classes/AccountManager/ trunk/sangria/src/LatestDesign/classes/AccountManager/AccountManagerClass.py Removed: trunk/sangria/src/LatestDesign/classes/ServerObjects/AccountsClass.py Modified: trunk/sangria/src/LatestDesign/classes/ServerObjects/FileShareClass.py trunk/sangria/src/LatestDesign/classes/ServerObjects/PrintShareClass.py trunk/sangria/src/LatestDesign/classes/ServerObjects/ServerClass.py trunk/sangria/src/LatestDesign/test/test.py Changeset: Sorry, the patch is too large (808 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=393
svn commit: samba r9056 - in branches/SOC/SAMBA_3_0/source: include libmsrpc libmsrpc/test
Author: skel Date: 2005-08-04 07:27:25 + (Thu, 04 Aug 2005) New Revision: 9056 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9056 Log: added functions to manipulate privileges (lsa) and some test programs. added privlege constants and info class constsants (which need to be fixed) Added: branches/SOC/SAMBA_3_0/source/libmsrpc/test/ear.c branches/SOC/SAMBA_3_0/source/libmsrpc/test/lsaaddrights.c branches/SOC/SAMBA_3_0/source/libmsrpc/test/lsaenumprivs.c Modified: branches/SOC/SAMBA_3_0/source/include/libmsrpc.h branches/SOC/SAMBA_3_0/source/libmsrpc/cac_lsarpc.c branches/SOC/SAMBA_3_0/source/libmsrpc/test/Makefile Changeset: Sorry, the patch is too large (1194 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9056
