svn commit: samba r15372 - in branches/SAMBA_4_0/source/lib/ldb/tools: .
Author: abartlet
Date: 2006-05-01 06:49:02 + (Mon, 01 May 2006)
New Revision: 15372
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15372
Log:
Don't look at possibly undefined controls in failure cases.
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/lib/ldb/tools/ldbsearch.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/tools/ldbsearch.c
===
--- branches/SAMBA_4_0/source/lib/ldb/tools/ldbsearch.c 2006-05-01 01:41:57 UTC
(rev 15371)
+++ branches/SAMBA_4_0/source/lib/ldb/tools/ldbsearch.c 2006-05-01 06:49:02 UTC
(rev 15372)
@@ -89,9 +89,6 @@
ret = ldb_request(ldb, req);
if (ret != LDB_SUCCESS) {
printf("search failed - %s\n", ldb_errstring(ldb));
- if (req->op.search.res && req->op.search.res->controls)
{
-
handle_controls_reply(req->op.search.res->controls, req->controls);
- }
return -1;
}
svn commit: samba-web r970 - in trunk/projects: .
Author: jerry Date: 2006-05-01 03:45:34 + (Mon, 01 May 2006) New Revision: 970 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=970 Log: updating the summercode page a bit to point out the application requirements Modified: trunk/projects/summercode06.html Changeset: Modified: trunk/projects/summercode06.html === --- trunk/projects/summercode06.html2006-04-30 08:46:10 UTC (rev 969) +++ trunk/projects/summercode06.html2006-05-01 03:45:34 UTC (rev 970) @@ -7,12 +7,19 @@ The following is an outline of potential projects for those interested in working on Samba through http://code.google.com/soc/";>Google's -"Summer of Code" program. +"Summer of Code" program. This is just a holding area for project ideas. +The projects listed here may be updated as developers refine a project's +outline. Questions about Samba's participation in the program can be mailed +to mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED]. -This is just a holding area for project ideas. The projects listed here -may be updated as developers refine a project's outline. Questions about -Samba's participation in the program can be mailed to -mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED]. +If you are considering applying to SoC 2006, please make sure to read the +http://code.google.com/soc/studentfaq.html";>Student FAQ. Pay close +attention to http://code.google.com/soc/studentfaq.html#24";>Question 24 +as the review process for Samba applications will be stricter this year. +It is very important that convince us that you will be in fact able to the +work on the project you are proposing and that you understand the scope of the +problem. + Project Ideas @@ -123,7 +130,7 @@ For every connection there is one log file is written. These logs can later be replayed by nbench/dbench against any file system/server to reproduce the same workload. Implementation of the following things will allow to create - a specialized workload generator to test various usage scenarious based on + a specialized workload generator to test various usage scenarios based on real world applications: Add a functionality to post-process generated logs to create a combined @@ -163,10 +170,10 @@ ci-skads decoding and implementation The ci-skads protocol is used to implement remote full filesystem indexing (indexed search) between windows machines. We would like to - support this functionalilty in Samba, interfacing with existinig + support this functionality in Samba, interfacing with existing indexing tools on Unix systems (such as beagle). This would be a very challenging project, suitable for someone experienced with - analysing completely new protocols. Talk to [EMAIL PROTECTED] for + analyzing completely new protocols. Talk to [EMAIL PROTECTED] for details.
svn commit: samba r15371 - in branches/SAMBA_4_0/source: nbt_server rpc_server smb_server web_server winbind wrepl_server
Author: jelmer Date: 2006-05-01 01:41:57 + (Mon, 01 May 2006) New Revision: 15371 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15371 Log: Revert some of my previous patch as it was breaking the plain build Modified: branches/SAMBA_4_0/source/nbt_server/config.mk branches/SAMBA_4_0/source/rpc_server/config.mk branches/SAMBA_4_0/source/smb_server/config.mk branches/SAMBA_4_0/source/web_server/config.mk branches/SAMBA_4_0/source/winbind/config.mk branches/SAMBA_4_0/source/wrepl_server/config.mk Changeset: Modified: branches/SAMBA_4_0/source/nbt_server/config.mk === --- branches/SAMBA_4_0/source/nbt_server/config.mk 2006-05-01 01:34:04 UTC (rev 15370) +++ branches/SAMBA_4_0/source/nbt_server/config.mk 2006-05-01 01:41:57 UTC (rev 15371) @@ -68,6 +68,6 @@ irpc.o PRIVATE_PROTO_HEADER = nbt_server_proto.h PUBLIC_DEPENDENCIES = \ - LIBCLI_NBT NBTD_WINS NBTD_DGRAM process_model service + LIBCLI_NBT NBTD_WINS NBTD_DGRAM process_model # End SUBSYSTEM NBTD ### Modified: branches/SAMBA_4_0/source/rpc_server/config.mk === --- branches/SAMBA_4_0/source/rpc_server/config.mk 2006-05-01 01:34:04 UTC (rev 15370) +++ branches/SAMBA_4_0/source/rpc_server/config.mk 2006-05-01 01:41:57 UTC (rev 15371) @@ -218,8 +218,8 @@ PUBLIC_DEPENDENCIES = \ LIBCLI_AUTH \ LIBNDR \ - dcerpc \ - service + dcerpc + # # End SUBSYSTEM DCERPC Modified: branches/SAMBA_4_0/source/smb_server/config.mk === --- branches/SAMBA_4_0/source/smb_server/config.mk 2006-05-01 01:34:04 UTC (rev 15370) +++ branches/SAMBA_4_0/source/smb_server/config.mk 2006-05-01 01:41:57 UTC (rev 15371) @@ -18,8 +18,7 @@ PUBLIC_DEPENDENCIES = \ LIBPACKET \ SMB_PROTOCOL \ - SMB2_PROTOCOL \ - service + SMB2_PROTOCOL # End SUBSYSTEM SMB ### Modified: branches/SAMBA_4_0/source/web_server/config.mk === --- branches/SAMBA_4_0/source/web_server/config.mk 2006-05-01 01:34:04 UTC (rev 15370) +++ branches/SAMBA_4_0/source/web_server/config.mk 2006-05-01 01:41:57 UTC (rev 15371) @@ -9,6 +9,6 @@ OBJ_FILES = \ web_server.o \ http.o -PUBLIC_DEPENDENCIES = ESP LIBTLS smbcalls process_model service +PUBLIC_DEPENDENCIES = ESP LIBTLS smbcalls process_model # End SUBSYSTEM WEB ### Modified: branches/SAMBA_4_0/source/winbind/config.mk === --- branches/SAMBA_4_0/source/winbind/config.mk 2006-05-01 01:34:04 UTC (rev 15370) +++ branches/SAMBA_4_0/source/winbind/config.mk 2006-05-01 01:41:57 UTC (rev 15371) @@ -24,7 +24,7 @@ wb_cmd_list_trustdom.o \ wb_pam_auth.o PUBLIC_DEPENDENCIES = WB_HELPER RPC_NDR_LSA RPC_NDR_SAMR process_model \ - PAM_ERRORS service + PAM_ERRORS # End SUBSYSTEM WINBIND ### Modified: branches/SAMBA_4_0/source/wrepl_server/config.mk === --- branches/SAMBA_4_0/source/wrepl_server/config.mk2006-05-01 01:34:04 UTC (rev 15370) +++ branches/SAMBA_4_0/source/wrepl_server/config.mk2006-05-01 01:41:57 UTC (rev 15371) @@ -17,6 +17,6 @@ wrepl_out_helpers.o PRIVATE_PROTO_HEADER = wrepl_server_proto.h PUBLIC_DEPENDENCIES = \ - LIBCLI_WREPL WINSDB process_model service + LIBCLI_WREPL WINSDB process_model # End SUBSYSTEM WREPL_SRV ###
svn commit: samba r15370 - in branches/SAMBA_4_0/source: build/smb_build lib/ldb/tools lib/registry/tools nbt_server ntptr rpc_server smb_server web_server winbind wrepl_server
Author: jelmer
Date: 2006-05-01 01:34:04 + (Mon, 01 May 2006)
New Revision: 15370
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15370
Log:
Fix more dependencies for shared libs
Modified:
branches/SAMBA_4_0/source/build/smb_build/input.pm
branches/SAMBA_4_0/source/lib/ldb/tools/cmdline.c
branches/SAMBA_4_0/source/lib/ldb/tools/ldbdel.c
branches/SAMBA_4_0/source/lib/ldb/tools/ldbedit.c
branches/SAMBA_4_0/source/lib/ldb/tools/ldbmodify.c
branches/SAMBA_4_0/source/lib/ldb/tools/ldbrename.c
branches/SAMBA_4_0/source/lib/ldb/tools/ldbtest.c
branches/SAMBA_4_0/source/lib/registry/tools/regpatch.c
branches/SAMBA_4_0/source/lib/registry/tools/regshell.c
branches/SAMBA_4_0/source/nbt_server/config.mk
branches/SAMBA_4_0/source/ntptr/config.mk
branches/SAMBA_4_0/source/rpc_server/config.mk
branches/SAMBA_4_0/source/smb_server/config.mk
branches/SAMBA_4_0/source/web_server/config.mk
branches/SAMBA_4_0/source/winbind/config.mk
branches/SAMBA_4_0/source/wrepl_server/config.mk
Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/input.pm
===
--- branches/SAMBA_4_0/source/build/smb_build/input.pm 2006-05-01 00:01:25 UTC
(rev 15369)
+++ branches/SAMBA_4_0/source/build/smb_build/input.pm 2006-05-01 01:34:04 UTC
(rev 15370)
@@ -71,6 +71,7 @@
if ($mod->{OUTPUT_TYPE} eq "SHARED_LIBRARY") {
$mod->{INSTALLDIR} = "MODULESDIR/$mod->{SUBSYSTEM}";
+ push (@{$mod->{PRIVATE_DEPENDENCIES}}, $mod->{SUBSYSTEM});
} else {
push (@{$INPUT->{$mod->{SUBSYSTEM}}{INIT_FUNCTIONS}},
$mod->{INIT_FUNCTION}) if defined($mod->{INIT_FUNCTION});
}
Modified: branches/SAMBA_4_0/source/lib/ldb/tools/cmdline.c
===
--- branches/SAMBA_4_0/source/lib/ldb/tools/cmdline.c 2006-05-01 00:01:25 UTC
(rev 15369)
+++ branches/SAMBA_4_0/source/lib/ldb/tools/cmdline.c 2006-05-01 01:34:04 UTC
(rev 15370)
@@ -44,7 +44,7 @@
#ifdef _SAMBA_BUILD_
int r;
#endif
-int num_options = 0;
+int num_options = 0;
int opt;
struct poptOption popt_options[] = {
POPT_AUTOHELP
Modified: branches/SAMBA_4_0/source/lib/ldb/tools/ldbdel.c
===
--- branches/SAMBA_4_0/source/lib/ldb/tools/ldbdel.c2006-05-01 00:01:25 UTC
(rev 15369)
+++ branches/SAMBA_4_0/source/lib/ldb/tools/ldbdel.c2006-05-01 01:34:04 UTC
(rev 15370)
@@ -73,7 +73,7 @@
exit(1);
}
- int main(int argc, const char **argv)
+int main(int argc, const char **argv)
{
struct ldb_context *ldb;
int ret, i;
Modified: branches/SAMBA_4_0/source/lib/ldb/tools/ldbedit.c
===
--- branches/SAMBA_4_0/source/lib/ldb/tools/ldbedit.c 2006-05-01 00:01:25 UTC
(rev 15369)
+++ branches/SAMBA_4_0/source/lib/ldb/tools/ldbedit.c 2006-05-01 01:34:04 UTC
(rev 15370)
@@ -272,7 +272,7 @@
exit(1);
}
- int main(int argc, const char **argv)
+int main(int argc, const char **argv)
{
struct ldb_context *ldb;
struct ldb_result *result = NULL;
Modified: branches/SAMBA_4_0/source/lib/ldb/tools/ldbmodify.c
===
--- branches/SAMBA_4_0/source/lib/ldb/tools/ldbmodify.c 2006-05-01 00:01:25 UTC
(rev 15369)
+++ branches/SAMBA_4_0/source/lib/ldb/tools/ldbmodify.c 2006-05-01 01:34:04 UTC
(rev 15370)
@@ -84,7 +84,7 @@
return count;
}
- int main(int argc, const char **argv)
+int main(int argc, const char **argv)
{
struct ldb_context *ldb;
int count=0;
Modified: branches/SAMBA_4_0/source/lib/ldb/tools/ldbrename.c
===
--- branches/SAMBA_4_0/source/lib/ldb/tools/ldbrename.c 2006-05-01 00:01:25 UTC
(rev 15369)
+++ branches/SAMBA_4_0/source/lib/ldb/tools/ldbrename.c 2006-05-01 01:34:04 UTC
(rev 15370)
@@ -51,7 +51,7 @@
}
- int main(int argc, const char **argv)
+int main(int argc, const char **argv)
{
struct ldb_context *ldb;
int ret;
Modified: branches/SAMBA_4_0/source/lib/ldb/tools/ldbtest.c
===
--- branches/SAMBA_4_0/source/lib/ldb/tools/ldbtest.c 2006-05-01 00:01:25 UTC
(rev 15369)
+++ branches/SAMBA_4_0/source/lib/ldb/tools/ldbtest.c 2006-05-01 01:34:04 UTC
(rev 15370)
@@ -371,7 +371,7 @@
exit(1);
}
- int main(int argc, const char **argv)
+int main(int argc, const char **argv)
{
TALLOC_CTX *mem_ctx = talloc_new(NULL);
struct ldb_context *ldb;
Modified: branches/SAMBA_4_0/source/lib/registry/tools/regpatch.c
===
--- branches/SAMBA_4_0/source/lib/registry/tools/regpatch.c 2006-05-01
0
Re: svn commit: samba r15333 - in branches/SAMBA_3_0/source: .
On Sun, Apr 30, 2006 at 07:41:47PM -0400, Green, Paul wrote: > Jeremy, > > I went back to the C manual and read up on this. > > Declaring a function that takes no arguments by using an empty list (as > in "()") is the nonprototyped form. > Declaring the same function by using the a list consisting only of > "(void)" is the prototyped form. > > Your change is fine. Prototypes are good. I guess my PL/I was showing > thru. I apologize. > > Unfortunately, both our in-house C compiler and GCC both passed the > nonprototyped form. Who had the compiler that barfed at it? gcc gave warnings. Jeremy.
RE: svn commit: samba r15333 - in branches/SAMBA_3_0/source: .
Jeremy, I went back to the C manual and read up on this. Declaring a function that takes no arguments by using an empty list (as in "()") is the nonprototyped form. Declaring the same function by using the a list consisting only of "(void)" is the prototyped form. Your change is fine. Prototypes are good. I guess my PL/I was showing thru. I apologize. Unfortunately, both our in-house C compiler and GCC both passed the nonprototyped form. Who had the compiler that barfed at it? PG -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] On Behalf Of [EMAIL PROTECTED] Sent: Saturday, April 29, 2006 7:34 PM To: [EMAIL PROTECTED] Subject: svn commit: samba r15333 - in branches/SAMBA_3_0/source: . Author: jra Date: 2006-04-29 23:33:39 + (Sat, 29 Apr 2006) New Revision: 15333 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=1533 3 Log: Paulg broke the function prototyping of decl_static_XX. Needs to be (void), not (). Paulg please check this. Jeremy. Modified: branches/SAMBA_3_0/source/aclocal.m4 Changeset: Modified: branches/SAMBA_3_0/source/aclocal.m4 === --- branches/SAMBA_3_0/source/aclocal.m42006-04-29 23:33:36 UTC (rev 15332) +++ branches/SAMBA_3_0/source/aclocal.m42006-04-29 23:33:39 UTC (rev 15333) @@ -57,7 +57,7 @@ string_shared_modules="$string_shared_modules $1" elif test x"$DEST" = xSTATIC; then [init_static_modules_]translit([$4], [A-Z], [a-z])="$[init_static_modules_]translit([$4], [A-Z], [a-z]) $1_init();" - [decl_static_modules_]translit([$4], [A-Z], [a-z])="$[decl_static_modules_]translit([$4], [A-Z], [a-z]) extern NTSTATUS $1_init();" + [decl_static_modules_]translit([$4], [A-Z], [a-z])="$[decl_static_modules_]translit([$4], [A-Z], [a-z]) extern NTSTATUS $1_init(void);" string_static_modules="$string_static_modules $1" $4_STATIC="$$4_STATIC $2" AC_SUBST($4_STATIC)
svn commit: samba r15369 - in trunk/source/auth: .
Author: paulg
Date: 2006-05-01 00:01:25 + (Mon, 01 May 2006)
New Revision: 15369
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15369
Log:
Remove some dead code. -- paulg
Modified:
trunk/source/auth/auth_script.c
Changeset:
Modified: trunk/source/auth/auth_script.c
===
--- trunk/source/auth/auth_script.c 2006-04-30 23:49:39 UTC (rev 15368)
+++ trunk/source/auth/auth_script.c 2006-05-01 00:01:25 UTC (rev 15369)
@@ -140,15 +140,7 @@
return NT_STATUS_OK;
}
-/* Define this to build static. */
NTSTATUS auth_script_init(void)
{
return smb_register_auth(AUTH_INTERFACE_VERSION, "script",
auth_init_script);
}
-#if 0
-/* Define this to build shared. */
-NTSTATUS init_module(void)
-{
- return smb_register_auth(AUTH_INTERFACE_VERSION, "script",
auth_init_script);
-}
-#endif
Build status as of Mon May 1 00:00:02 2006
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2006-04-30 00:00:34.0 + +++ /home/build/master/cache/broken_results.txt 2006-05-01 00:00:05.0 + @@ -1,17 +1,17 @@ -Build status as of Sun Apr 30 00:00:02 2006 +Build status as of Mon May 1 00:00:02 2006 Build counts: Tree Total Broken Panic ccache 8 2 0 -distcc 14 2 0 -lorikeet-heimdal 31 24 0 +distcc 13 2 0 +lorikeet-heimdal 34 27 0 ppp 19 0 0 -rsync35 2 0 +rsync36 2 0 samba2 0 0 samba-docs 0 0 0 samba4 38 24 3 -samba_3_037 6 0 -smb-build25 0 0 -talloc 8 3 0 -tdb 32 4 0 +samba_3_038 7 0 +smb-build26 0 0 +talloc 8 5 0 +tdb 33 4 0
svn commit: samba r15368 - in branches/SAMBA_3_0/source/auth: .
Author: paulg
Date: 2006-04-30 23:49:39 + (Sun, 30 Apr 2006)
New Revision: 15368
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15368
Log:
Remove some dead code. -- paulg
Modified:
branches/SAMBA_3_0/source/auth/auth_script.c
Changeset:
Modified: branches/SAMBA_3_0/source/auth/auth_script.c
===
--- branches/SAMBA_3_0/source/auth/auth_script.c2006-04-30 23:11:59 UTC
(rev 15367)
+++ branches/SAMBA_3_0/source/auth/auth_script.c2006-04-30 23:49:39 UTC
(rev 15368)
@@ -140,15 +140,7 @@
return NT_STATUS_OK;
}
-/* Define this to build static. */
NTSTATUS auth_script_init(void)
{
return smb_register_auth(AUTH_INTERFACE_VERSION, "script",
auth_init_script);
}
-#if 0
-/* Define this to build shared. */
-NTSTATUS init_module(void)
-{
- return smb_register_auth(AUTH_INTERFACE_VERSION, "script",
auth_init_script);
-}
-#endif
svn commit: samba r15367 - in branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4: .
Author: jelmer
Date: 2006-04-30 23:11:59 + (Sun, 30 Apr 2006)
New Revision: 15367
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15367
Log:
Fix unused function warnings in generated EJS code.
Modified:
branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/EJS.pm
Changeset:
Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/EJS.pm
===
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/EJS.pm 2006-04-30
21:21:04 UTC (rev 15366)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/EJS.pm 2006-04-30
23:11:59 UTC (rev 15367)
@@ -422,15 +422,13 @@
# on the non-array elements
foreach my $e (@{$d->{ELEMENTS}}) {
next unless (grep(/in/, @{$e->{DIRECTION}}));
- next if (has_property($e, "length_is") ||
-has_property($e, "size_is"));
+ next if (has_property($e, "length_is") || has_property($e,
"size_is"));
EjsPullElementTop($e, $env);
}
foreach my $e (@{$d->{ELEMENTS}}) {
next unless (grep(/in/, @{$e->{DIRECTION}}));
- next unless (has_property($e, "length_is") ||
-has_property($e, "size_is"));
+ next unless (has_property($e, "length_is") || has_property($e,
"size_is"));
EjsPullElementTop($e, $env);
}
@@ -760,7 +758,7 @@
foreach my $d (@{$interface->{FUNCTIONS}}) {
next if not defined($d->{OPNUM});
- next if Parse::Pidl::Util::has_property($d, "noejs");
+ next if has_property($d, "noejs");
EjsPullFunction($d);
EjsPushFunction($d);
@@ -846,14 +844,17 @@
sub NeededFunction($$)
{
my ($fn,$needed) = @_;
+
$needed->{"pull_$fn->{NAME}"} = 1;
$needed->{"push_$fn->{NAME}"} = 1;
- foreach my $e (@{$fn->{ELEMENTS}}) {
- if (grep (/in/, @{$e->{DIRECTION}})) {
- $needed->{"pull_$e->{TYPE}"} = 1;
+
+ foreach (@{$fn->{ELEMENTS}}) {
+ next if (has_property($_, "subcontext")); #FIXME: Support
subcontexts
+ if (grep(/in/, @{$_->{DIRECTION}})) {
+ $needed->{"pull_$_->{TYPE}"} = 1;
}
- if (grep (/out/, @{$e->{DIRECTION}})) {
- $needed->{"push_$e->{TYPE}"} = 1;
+ if (grep(/out/, @{$_->{DIRECTION}})) {
+ $needed->{"push_$_->{TYPE}"} = 1;
}
}
}
@@ -861,20 +862,22 @@
sub NeededTypedef($$)
{
my ($t,$needed) = @_;
- if (Parse::Pidl::Util::has_property($t, "public")) {
- $needed->{"pull_$t->{NAME}"} = not
Parse::Pidl::Util::has_property($t, "noejs");
- $needed->{"push_$t->{NAME}"} = not
Parse::Pidl::Util::has_property($t, "noejs");
+
+ if (has_property($t, "public")) {
+ $needed->{"pull_$t->{NAME}"} = not has_property($t, "noejs");
+ $needed->{"push_$t->{NAME}"} = not has_property($t, "noejs");
}
- if ($t->{DATA}->{TYPE} ne "STRUCT" &&
- $t->{DATA}->{TYPE} ne "UNION") {
- return;
- }
- for my $e (@{$t->{DATA}->{ELEMENTS}}) {
- if ($needed->{"pull_$t->{NAME}"}) {
- $needed->{"pull_$e->{TYPE}"} = 1;
+
+ return if (($t->{DATA}->{TYPE} ne "STRUCT") and
+ ($t->{DATA}->{TYPE} ne "UNION"));
+
+ foreach (@{$t->{DATA}->{ELEMENTS}}) {
+ next if (has_property($_, "subcontext")); #FIXME: Support
subcontexts
+ unless (defined($needed->{"pull_$_->{TYPE}"})) {
+ $needed->{"pull_$_->{TYPE}"} =
$needed->{"pull_$t->{NAME}"};
}
- if ($needed->{"push_$t->{NAME}"}) {
- $needed->{"push_$e->{TYPE}"} = 1;
+ unless (defined($needed->{"push_$_->{TYPE}"})) {
+ $needed->{"push_$_->{TYPE}"} =
$needed->{"push_$t->{NAME}"};
}
}
}
@@ -884,12 +887,9 @@
sub NeededInterface($$)
{
my ($interface,$needed) = @_;
- foreach my $d (@{$interface->{FUNCTIONS}}) {
- NeededFunction($d, $needed);
- }
- foreach my $d (reverse @{$interface->{TYPES}}) {
- NeededTypedef($d, $needed);
- }
+
+ NeededFunction($_, $needed) foreach (@{$interface->{FUNCTIONS}});
+ NeededTypedef($_, $needed) foreach (reverse @{$interface->{TYPES}});
}
1;
svn commit: samba r15366 - in branches/SAMBA_4_0/source: auth/kerberos smb_server
Author: jelmer
Date: 2006-04-30 21:21:04 + (Sun, 30 Apr 2006)
New Revision: 15366
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15366
Log:
Use type name rather then typedef directly - fixes build on tcc
Modified:
branches/SAMBA_4_0/source/auth/kerberos/krb5_init_context.h
branches/SAMBA_4_0/source/smb_server/
Changeset:
Modified: branches/SAMBA_4_0/source/auth/kerberos/krb5_init_context.h
===
--- branches/SAMBA_4_0/source/auth/kerberos/krb5_init_context.h 2006-04-30
20:00:37 UTC (rev 15365)
+++ branches/SAMBA_4_0/source/auth/kerberos/krb5_init_context.h 2006-04-30
21:21:04 UTC (rev 15366)
@@ -19,7 +19,7 @@
*/
struct smb_krb5_context {
- krb5_context krb5_context;
+ struct krb5_context_data *krb5_context;
krb5_log_facility *logf;
};
Property changes on: branches/SAMBA_4_0/source/smb_server
___
Name: svn:ignore
- *.d
smb_server_proto.h
*.d
+ service_smb_proto.h
*.d
smb_server_proto.h
*.d
Re: svn commit: samba r15358 - in branches/SAMBA_4_0/source: lib/appweb/ejs lib/appweb/mpr lib/socket_wrapper libcli/ldap ntvfs/posix rpc_server/winreg torture/com torture/rpc
Hi Metze,
On Sun, 2006-04-30 at 16:18 +0200, Stefan (metze) Metzmacher wrote:
> -BEGIN PGP SIGNED MESSAGE-
> shouldn't this be BOOL, I think we should just use BOOL OR bool
> consistent in the whole tree.
Agreed.
>
> > + if (!asn1_read_BOOLEAN(data, &critical)) {
> > return False;
> > }
> > + critical = ctrl->critical;
>
> this should be
Thanks, I've fixed it.
Cheers,
Jelmer
--
Jelmer Vernooij <[EMAIL PROTECTED]> - http://samba.org/~jelmer/
signature.asc
Description: This is a digitally signed message part
svn commit: samba r15365 - in branches/SAMBA_4_0/source/libcli/ldap: .
Author: jelmer
Date: 2006-04-30 20:00:37 + (Sun, 30 Apr 2006)
New Revision: 15365
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15365
Log:
Fix error in my previous commit, caught by metze.
Modified:
branches/SAMBA_4_0/source/libcli/ldap/ldap_controls.c
Changeset:
Modified: branches/SAMBA_4_0/source/libcli/ldap/ldap_controls.c
===
--- branches/SAMBA_4_0/source/libcli/ldap/ldap_controls.c 2006-04-30
19:22:56 UTC (rev 15364)
+++ branches/SAMBA_4_0/source/libcli/ldap/ldap_controls.c 2006-04-30
20:00:37 UTC (rev 15365)
@@ -127,7 +127,7 @@
}
if (asn1_peek_tag(&data, ASN1_BOOLEAN)) {
- bool reverse;
+ BOOL reverse;
if (!asn1_read_BOOLEAN(&data, &reverse)) {
return False;
}
@@ -904,11 +904,11 @@
}
if (asn1_peek_tag(data, ASN1_BOOLEAN)) {
- bool critical;
+ BOOL critical;
if (!asn1_read_BOOLEAN(data, &critical)) {
return False;
}
- critical = ctrl->critical;
+ ctrl->critical = critical;
} else {
ctrl->critical = False;
}
svn commit: samba r15364 - in branches/SAMBA_4_0/source/lib/registry/tools: .
Author: jelmer
Date: 2006-04-30 19:22:56 + (Sun, 30 Apr 2006)
New Revision: 15364
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15364
Log:
Use global list of predefined keys
Modified:
branches/SAMBA_4_0/source/lib/registry/tools/regshell.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/registry/tools/regshell.c
===
--- branches/SAMBA_4_0/source/lib/registry/tools/regshell.c 2006-04-30
18:46:14 UTC (rev 15363)
+++ branches/SAMBA_4_0/source/lib/registry/tools/regshell.c 2006-04-30
19:22:56 UTC (rev 15364)
@@ -439,23 +439,11 @@
}
if (h) {
- uint32_t try_hkeys[] = {
- HKEY_CLASSES_ROOT,
- HKEY_CURRENT_USER,
- HKEY_LOCAL_MACHINE,
- HKEY_USERS,
- HKEY_PERFORMANCE_DATA,
- HKEY_CURRENT_CONFIG,
- HKEY_DYN_DATA,
- HKEY_PERFORMANCE_TEXT,
- HKEY_PERFORMANCE_NLSTEXT,
- 0
- };
int i;
- for (i = 0; try_hkeys[i]; i++) {
+ for (i = 0; reg_predefined_keys[i].handle; i++) {
WERROR err;
- err = reg_get_predefined_key(h, try_hkeys[i], &curkey);
+ err = reg_get_predefined_key(h,
reg_predefined_keys[i].handle, &curkey);
if (W_ERROR_IS_OK(err)) {
break;
} else {
svn commit: samba r15363 - in branches/SAMBA_4_0/source: auth auth/gensec build/smb_build lib/registry/tools lib/tls utils
Author: jelmer
Date: 2006-04-30 18:46:14 + (Sun, 30 Apr 2006)
New Revision: 15363
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15363
Log:
Fix dependencies for shared library
Modified:
branches/SAMBA_4_0/source/auth/config.mk
branches/SAMBA_4_0/source/auth/gensec/config.mk
branches/SAMBA_4_0/source/build/smb_build/makefile.pm
branches/SAMBA_4_0/source/build/smb_build/summary.pm
branches/SAMBA_4_0/source/lib/registry/tools/regtree.c
branches/SAMBA_4_0/source/lib/tls/tlscert.c
branches/SAMBA_4_0/source/utils/ntlm_auth.c
Changeset:
Modified: branches/SAMBA_4_0/source/auth/config.mk
===
--- branches/SAMBA_4_0/source/auth/config.mk2006-04-30 18:45:43 UTC (rev
15362)
+++ branches/SAMBA_4_0/source/auth/config.mk2006-04-30 18:46:14 UTC (rev
15363)
@@ -6,7 +6,7 @@
[SUBSYSTEM::auth_sam]
PRIVATE_PROTO_HEADER = auth_sam.h
-OBJ_FILES = sam.o auth_sam_reply.o
+OBJ_FILES = sam.o auth_sam_reply.o ntlm_check.o
PUBLIC_DEPENDENCIES = SAMDB
###
@@ -71,7 +71,6 @@
OBJ_FILES = \
auth.o \
auth_util.o \
- ntlm_check.o \
auth_simple.o
PUBLIC_DEPENDENCIES = LIBSECURITY process_model SAMDB
# End SUBSYSTEM auth
Modified: branches/SAMBA_4_0/source/auth/gensec/config.mk
===
--- branches/SAMBA_4_0/source/auth/gensec/config.mk 2006-04-30 18:45:43 UTC
(rev 15362)
+++ branches/SAMBA_4_0/source/auth/gensec/config.mk 2006-04-30 18:46:14 UTC
(rev 15363)
@@ -8,7 +8,7 @@
PUBLIC_PROTO_HEADER = gensec_proto.h
OBJ_FILES = gensec.o
PUBLIC_DEPENDENCIES = \
- CREDENTIALS LIBSAMBA-UTIL LIBCRYPTO
+ CREDENTIALS LIBSAMBA-UTIL LIBCRYPTO ASN1_UTIL
# End SUBSYSTEM gensec
#
@@ -28,7 +28,7 @@
SUBSYSTEM = gensec
INIT_FUNCTION = gensec_gssapi_init
OBJ_FILES = gensec_gssapi.o
-PUBLIC_DEPENDENCIES = KERBEROS auth
+PUBLIC_DEPENDENCIES = KERBEROS auth HEIMDAL_GSSAPI
# End MODULE gensec_gssapi
@@ -38,6 +38,7 @@
SUBSYSTEM = gensec
INIT_FUNCTION = gensec_spnego_init
PRIVATE_PROTO_HEADER = spnego_proto.h
+PRIVATE_DEPENDENCIES = ASN1_UTIL
OBJ_FILES = spnego.o \
spnego_parse.o
# End MODULE gensec_spnego
Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2006-04-30
18:45:43 UTC (rev 15362)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2006-04-30
18:46:14 UTC (rev 15363)
@@ -339,6 +339,7 @@
#
$ctx->{TARGET}: \$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST)
[EMAIL PROTECTED] Linking \$@
+ [EMAIL PROTECTED] -f \$@
[EMAIL PROTECTED](STLD) \$(STLD_FLAGS) \$@
\$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST)
__EOD__
Modified: branches/SAMBA_4_0/source/build/smb_build/summary.pm
===
--- branches/SAMBA_4_0/source/build/smb_build/summary.pm2006-04-30
18:45:43 UTC (rev 15362)
+++ branches/SAMBA_4_0/source/build/smb_build/summary.pm2006-04-30
18:46:14 UTC (rev 15363)
@@ -55,9 +55,9 @@
? "yes" : "no (install GNU make >= 3.81)") .
"\n";
- print "Using shared libraries internally (experimental): " .
+ print "Using shared libraries: " .
(enabled($config->{BLDSHARED})
- ? "yes" : "no (try --enable-dso)") .
+ ? "yes" : "no (not supported on this system)") .
"\n";
print "\n";
Modified: branches/SAMBA_4_0/source/lib/registry/tools/regtree.c
===
--- branches/SAMBA_4_0/source/lib/registry/tools/regtree.c 2006-04-30
18:45:43 UTC (rev 15362)
+++ branches/SAMBA_4_0/source/lib/registry/tools/regtree.c 2006-04-30
18:46:14 UTC (rev 15363)
@@ -99,13 +99,13 @@
POPT_TABLEEND
};
- registry_init();
-
pc = poptGetContext(argv[0], argc, (const char **) argv,
long_options,0);
while((opt = poptGetNextOpt(pc)) != -1) {
}
+ registry_init();
+
if (remote) {
error = reg_open_remote(&h, NULL, cmdline_credentials, remote,
NULL);
} else if (backend) {
Modified: branches/SAMBA_4_0/source/lib/tls/tlscert.c
===
--- branches/SAMBA_4_0/source/lib/tls/tlscert.c 2006-04-30 18:45:43 UTC (rev
15362)
+++ branches/SAMBA_4_0/source/lib/tls/tlscert.c 2006-04-30 18:46:14 UTC (rev
15363)
@@ -30,6 +30,7 @@
#define UNIT_NAME "Samba - temporary autogenerated certificate"
#define COMMON_NAME "Samba"
#define LIFETIME 700*24*60*60
+#
svn commit: samba r15362 - in branches/SAMBA_4_0/source/lib: .
Author: jelmer
Date: 2006-04-30 18:45:43 + (Sun, 30 Apr 2006)
New Revision: 15362
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15362
Log:
Consider anything non-zero a failure, bnio not just -1
Modified:
branches/SAMBA_4_0/source/lib/db_wrap.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/db_wrap.c
===
--- branches/SAMBA_4_0/source/lib/db_wrap.c 2006-04-30 16:09:00 UTC (rev
15361)
+++ branches/SAMBA_4_0/source/lib/db_wrap.c 2006-04-30 18:45:43 UTC (rev
15362)
@@ -32,6 +32,7 @@
#include "lib/events/events.h"
#include "lib/tdb/include/tdb.h"
#include "lib/ldb/include/ldb.h"
+#include "lib/ldb/include/ldb_errors.h"
#include "lib/ldb/samba/ldif_handlers.h"
#include "db_wrap.h"
@@ -123,7 +124,7 @@
}
ret = ldb_connect(ldb, real_url, flags, options);
- if (ret == -1) {
+ if (ret != LDB_SUCCESS) {
talloc_free(ldb);
return NULL;
}
svn commit: samba r15361 - in branches/SAMBA_4_0/source/lib/registry: . common tools
Author: jelmer
Date: 2006-04-30 16:09:00 + (Sun, 30 Apr 2006)
New Revision: 15361
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15361
Log:
Export table of predefined registry keys
Modified:
branches/SAMBA_4_0/source/lib/registry/common/reg_interface.c
branches/SAMBA_4_0/source/lib/registry/registry.h
branches/SAMBA_4_0/source/lib/registry/tools/regtree.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/registry/common/reg_interface.c
===
--- branches/SAMBA_4_0/source/lib/registry/common/reg_interface.c
2006-04-30 14:34:30 UTC (rev 15360)
+++ branches/SAMBA_4_0/source/lib/registry/common/reg_interface.c
2006-04-30 16:09:00 UTC (rev 15361)
@@ -34,7 +34,7 @@
static struct reg_init_function_entry *reg_find_backend_entry(const char
*name);
/** Register a new backend. */
-_PUBLIC_ NTSTATUS registry_register(const void *_hive_ops)
+_PUBLIC_ NTSTATUS registry_register(const void *_hive_ops)
{
const struct hive_operations *hive_ops = _hive_ops;
struct reg_init_function_entry *entry = backends;
@@ -90,11 +90,7 @@
return reg_find_backend_entry(backend) != NULL?True:False;
}
-static const struct {
- uint32_t handle;
- const char *name;
-} predef_names[] =
-{
+const struct reg_predefined_key reg_predefined_keys[] = {
{HKEY_CLASSES_ROOT,"HKEY_CLASSES_ROOT" },
{HKEY_CURRENT_USER,"HKEY_CURRENT_USER" },
{HKEY_LOCAL_MACHINE, "HKEY_LOCAL_MACHINE" },
@@ -111,12 +107,12 @@
_PUBLIC_ int reg_list_predefs(TALLOC_CTX *mem_ctx, char ***predefs, uint32_t
**hkeys)
{
int i;
- *predefs = talloc_array(mem_ctx, char *, ARRAY_SIZE(predef_names));
- *hkeys = talloc_array(mem_ctx, uint32_t, ARRAY_SIZE(predef_names));
+ *predefs = talloc_array(mem_ctx, char *,
ARRAY_SIZE(reg_predefined_keys));
+ *hkeys = talloc_array(mem_ctx, uint32_t,
ARRAY_SIZE(reg_predefined_keys));
- for (i = 0; predef_names[i].name; i++) {
- (*predefs)[i] = talloc_strdup(mem_ctx, predef_names[i].name);
- (*hkeys)[i] = predef_names[i].handle;
+ for (i = 0; reg_predefined_keys[i].name; i++) {
+ (*predefs)[i] = talloc_strdup(mem_ctx,
reg_predefined_keys[i].name);
+ (*hkeys)[i] = reg_predefined_keys[i].handle;
}
return i;
@@ -126,8 +122,8 @@
_PUBLIC_ const char *reg_get_predef_name(uint32_t hkey)
{
int i;
- for (i = 0; predef_names[i].name; i++) {
- if (predef_names[i].handle == hkey) return predef_names[i].name;
+ for (i = 0; reg_predefined_keys[i].name; i++) {
+ if (reg_predefined_keys[i].handle == hkey) return
reg_predefined_keys[i].name;
}
return NULL;
@@ -138,8 +134,8 @@
{
int i;
- for (i = 0; predef_names[i].name; i++) {
- if (!strcasecmp(predef_names[i].name, name)) return
reg_get_predefined_key(ctx, predef_names[i].handle, key);
+ for (i = 0; reg_predefined_keys[i].name; i++) {
+ if (!strcasecmp(reg_predefined_keys[i].name, name)) return
reg_get_predefined_key(ctx, reg_predefined_keys[i].handle, key);
}
DEBUG(1, ("No predefined key with name '%s'\n", name));
Modified: branches/SAMBA_4_0/source/lib/registry/registry.h
===
--- branches/SAMBA_4_0/source/lib/registry/registry.h 2006-04-30 14:34:30 UTC
(rev 15360)
+++ branches/SAMBA_4_0/source/lib/registry/registry.h 2006-04-30 16:09:00 UTC
(rev 15361)
@@ -36,6 +36,13 @@
#define HKEY_PERFORMANCE_TEXT 0x8050
#define HKEY_PERFORMANCE_NLSTEXT 0x8060
+struct reg_predefined_key {
+ uint32_t handle;
+ const char *name;
+};
+
+extern const struct reg_predefined_key reg_predefined_keys[];
+
#defineREG_DELETE -1
/*
@@ -145,6 +152,8 @@
struct reg_init_function_entry *prev, *next;
};
+/* Representing differences between registry files */
+
struct reg_diff_value
{
char *name;
Modified: branches/SAMBA_4_0/source/lib/registry/tools/regtree.c
===
--- branches/SAMBA_4_0/source/lib/registry/tools/regtree.c 2006-04-30
14:34:30 UTC (rev 15360)
+++ branches/SAMBA_4_0/source/lib/registry/tools/regtree.c 2006-04-30
16:09:00 UTC (rev 15361)
@@ -125,10 +125,10 @@
if (!h) {
print_tree(0, root, fullpath, no_values);
} else {
- for(i = HKEY_CLASSES_ROOT; i < HKEY_PERFORMANCE_NLSTEXT; i++) {
- error = reg_get_predefined_key(h, i, &root);
+ for(i = 0; reg_predefined_keys[i].handle; i++) {
+ error = reg_get_predefined_key(h,
reg_predefined_keys[i].handle, &root);
if (!W_ERROR_IS_OK(error)) {
- fprintf(stderr, "Ski
svn commit: samba r15360 - branches/SAMBA_3_0/source/passdb trunk/source/passdb
Author: vlendec
Date: 2006-04-30 14:34:30 + (Sun, 30 Apr 2006)
New Revision: 15360
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15360
Log:
Fix bug # 3741. One more place where the algorithmic mapping needs to stay.
Volker
Modified:
branches/SAMBA_3_0/source/passdb/lookup_sid.c
trunk/source/passdb/lookup_sid.c
Changeset:
Modified: branches/SAMBA_3_0/source/passdb/lookup_sid.c
===
--- branches/SAMBA_3_0/source/passdb/lookup_sid.c 2006-04-30 14:14:46 UTC
(rev 15359)
+++ branches/SAMBA_3_0/source/passdb/lookup_sid.c 2006-04-30 14:34:30 UTC
(rev 15360)
@@ -128,11 +128,30 @@
* the expansion of group names coming in from smb.conf
*/
- if ((flags & LOOKUP_NAME_GROUP) &&
- (lookup_unix_group_name(name, &sid))) {
- domain = talloc_strdup(tmp_ctx, unix_groups_domain_name());
- type = SID_NAME_DOM_GRP;
- goto ok;
+ if (flags & LOOKUP_NAME_GROUP) {
+ struct group *grp;
+
+ /* If we are using the smbpasswd backend, we need to use the
+* algorithmic mapping for the unix group we find. This is
+* necessary because when creating the NT token from the unix
+* gid list we got from initgroups() we use gid_to_sid() that
+* uses algorithmic mapping if pdb_rid_algorithm() is true. */
+
+ if (pdb_rid_algorithm() && ((grp = getgrnam(name)) != NULL) &&
+ (grp->gr_gid < max_algorithmic_gid())) {
+ domain = talloc_strdup(tmp_ctx, get_global_sam_name());
+ sid_compose(&sid, get_global_sam_sid(),
+ pdb_gid_to_group_rid(grp->gr_gid));
+ type = SID_NAME_DOM_GRP;
+ goto ok;
+ }
+
+ if (lookup_unix_group_name(name, &sid)) {
+ domain = talloc_strdup(tmp_ctx,
+ unix_groups_domain_name());
+ type = SID_NAME_DOM_GRP;
+ goto ok;
+ }
}
/* Now the guesswork begins, we haven't been given an explicit
Modified: trunk/source/passdb/lookup_sid.c
===
--- trunk/source/passdb/lookup_sid.c2006-04-30 14:14:46 UTC (rev 15359)
+++ trunk/source/passdb/lookup_sid.c2006-04-30 14:34:30 UTC (rev 15360)
@@ -128,11 +128,30 @@
* the expansion of group names coming in from smb.conf
*/
- if ((flags & LOOKUP_NAME_GROUP) &&
- (lookup_unix_group_name(name, &sid))) {
- domain = talloc_strdup(tmp_ctx, unix_groups_domain_name());
- type = SID_NAME_DOM_GRP;
- goto ok;
+ if (flags & LOOKUP_NAME_GROUP) {
+ struct group *grp;
+
+ /* If we are using the smbpasswd backend, we need to use the
+* algorithmic mapping for the unix group we find. This is
+* necessary because when creating the NT token from the unix
+* gid list we got from initgroups() we use gid_to_sid() that
+* uses algorithmic mapping if pdb_rid_algorithm() is true. */
+
+ if (pdb_rid_algorithm() && ((grp = getgrnam(name)) != NULL) &&
+ (grp->gr_gid < max_algorithmic_gid())) {
+ domain = talloc_strdup(tmp_ctx, get_global_sam_name());
+ sid_compose(&sid, get_global_sam_sid(),
+ pdb_gid_to_group_rid(grp->gr_gid));
+ type = SID_NAME_DOM_GRP;
+ goto ok;
+ }
+
+ if (lookup_unix_group_name(name, &sid)) {
+ domain = talloc_strdup(tmp_ctx,
+ unix_groups_domain_name());
+ type = SID_NAME_DOM_GRP;
+ goto ok;
+ }
}
/* Now the guesswork begins, we haven't been given an explicit
Re: svn commit: samba r15358 - in branches/SAMBA_4_0/source: lib/appweb/ejs lib/appweb/mpr lib/socket_wrapper libcli/ldap ntvfs/posix rpc_server/winreg torture/com torture/rpc
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
[EMAIL PROTECTED] schrieb:
Hi Jelmer,
> Modified: branches/SAMBA_4_0/source/libcli/ldap/ldap_controls.c
> ===
> --- branches/SAMBA_4_0/source/libcli/ldap/ldap_controls.c 2006-04-30
> 06:44:19 UTC (rev 15357)
> +++ branches/SAMBA_4_0/source/libcli/ldap/ldap_controls.c 2006-04-30
> 13:54:03 UTC (rev 15358)
> @@ -127,9 +127,11 @@
> }
>
> if (asn1_peek_tag(&data, ASN1_BOOLEAN)) {
> - if (!asn1_read_BOOLEAN(&data, &(lssc[num]->reverse))) {
> + bool reverse;
> + if (!asn1_read_BOOLEAN(&data, &reverse)) {
> return False;
> }
> + lssc[num]->reverse = reverse;
> }
>
> if (!asn1_end_tag(&data)) {
> @@ -902,9 +904,11 @@
> }
>
> if (asn1_peek_tag(data, ASN1_BOOLEAN)) {
> - if (!asn1_read_BOOLEAN(data, &(ctrl->critical))) {
> + bool critical;
shouldn't this be BOOL, I think we should just use BOOL OR bool
consistent in the whole tree.
> + if (!asn1_read_BOOLEAN(data, &critical)) {
> return False;
> }
> + critical = ctrl->critical;
this should be
ctr1->critical = critical;
> } else {
> ctrl->critical = False;
> }
metze
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.0 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFEVMcgm70gjA5TCD8RAgL0AJ40g09ArPI9gwC6mP/QsN6zdf0+cgCfTyQ4
bRvZh0tRIlslD/rM90TIqHM=
=/+Cg
-END PGP SIGNATURE-
svn commit: samba r15359 - branches/SAMBA_3_0/source/smbd trunk/source/smbd
Author: vlendec
Date: 2006-04-30 14:14:46 + (Sun, 30 Apr 2006)
New Revision: 15359
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15359
Log:
Fix typo
Modified:
branches/SAMBA_3_0/source/smbd/share_access.c
trunk/source/smbd/share_access.c
Changeset:
Modified: branches/SAMBA_3_0/source/smbd/share_access.c
===
--- branches/SAMBA_3_0/source/smbd/share_access.c 2006-04-30 13:54:03 UTC
(rev 15358)
+++ branches/SAMBA_3_0/source/smbd/share_access.c 2006-04-30 14:14:46 UTC
(rev 15359)
@@ -204,7 +204,8 @@
if (!token_contains_name_in_list(username,
lp_servicename(snum), token,
lp_valid_users(snum))) {
- DEBUG(10, ("User %s no in 'valid users'\n", username));
+ DEBUG(10, ("User %s not in 'valid users'\n",
+ username));
return False;
}
}
Modified: trunk/source/smbd/share_access.c
===
--- trunk/source/smbd/share_access.c2006-04-30 13:54:03 UTC (rev 15358)
+++ trunk/source/smbd/share_access.c2006-04-30 14:14:46 UTC (rev 15359)
@@ -204,7 +204,8 @@
if (!token_contains_name_in_list(username,
lp_servicename(snum), token,
lp_valid_users(snum))) {
- DEBUG(10, ("User %s no in 'valid users'\n", username));
+ DEBUG(10, ("User %s not in 'valid users'\n",
+ username));
return False;
}
}
svn commit: samba r15358 - in branches/SAMBA_4_0/source: lib/appweb/ejs lib/appweb/mpr lib/socket_wrapper libcli/ldap ntvfs/posix rpc_server/winreg torture/com torture/rpc
Author: jelmer
Date: 2006-04-30 13:54:03 + (Sun, 30 Apr 2006)
New Revision: 15358
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15358
Log:
Fix some compiler warnings / type safety. Found by tcc
Modified:
branches/SAMBA_4_0/source/lib/appweb/ejs/ejsLib.c
branches/SAMBA_4_0/source/lib/appweb/mpr/miniMpr.h
branches/SAMBA_4_0/source/lib/socket_wrapper/socket_wrapper.c
branches/SAMBA_4_0/source/libcli/ldap/ldap_controls.c
branches/SAMBA_4_0/source/ntvfs/posix/pvfs_resolve.c
branches/SAMBA_4_0/source/rpc_server/winreg/rpc_winreg.c
branches/SAMBA_4_0/source/torture/com/simple.c
branches/SAMBA_4_0/source/torture/rpc/winreg.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/appweb/ejs/ejsLib.c
===
--- branches/SAMBA_4_0/source/lib/appweb/ejs/ejsLib.c 2006-04-30 06:44:19 UTC
(rev 15357)
+++ branches/SAMBA_4_0/source/lib/appweb/ejs/ejsLib.c 2006-04-30 13:54:03 UTC
(rev 15358)
@@ -64,8 +64,8 @@
this is a workaround for the use of global variables in ejs
*/
struct ejs_state_ctx {
- struct MprVar master;
- struct MprArray *ejsList;
+ MprVar master;
+ MprArray *ejsList;
};
void *ejs_save_state(void)
Modified: branches/SAMBA_4_0/source/lib/appweb/mpr/miniMpr.h
===
--- branches/SAMBA_4_0/source/lib/appweb/mpr/miniMpr.h 2006-04-30 06:44:19 UTC
(rev 15357)
+++ branches/SAMBA_4_0/source/lib/appweb/mpr/miniMpr.h 2006-04-30 13:54:03 UTC
(rev 15358)
@@ -185,10 +185,7 @@
#ifndef __cplusplus
typedef unsigned char uchar;
-#ifndef __bool_true_false_are_defined
-typedef intbool;
#endif
-#endif
/*
* Porters: put other operating system type defines here
Modified: branches/SAMBA_4_0/source/lib/socket_wrapper/socket_wrapper.c
===
--- branches/SAMBA_4_0/source/lib/socket_wrapper/socket_wrapper.c
2006-04-30 06:44:19 UTC (rev 15357)
+++ branches/SAMBA_4_0/source/lib/socket_wrapper/socket_wrapper.c
2006-04-30 13:54:03 UTC (rev 15358)
@@ -462,7 +462,7 @@
child_si->protocol = parent_si->protocol;
child_si->bound = 1;
- ret = real_getsockname(fd, &un_my_addr, &un_my_addrlen);
+ ret = real_getsockname(fd, (struct sockaddr *)&un_my_addr,
&un_my_addrlen);
if (ret == -1) return ret;
ret = sockaddr_convert_from_un(child_si, &un_my_addr, un_my_addrlen,
Modified: branches/SAMBA_4_0/source/libcli/ldap/ldap_controls.c
===
--- branches/SAMBA_4_0/source/libcli/ldap/ldap_controls.c 2006-04-30
06:44:19 UTC (rev 15357)
+++ branches/SAMBA_4_0/source/libcli/ldap/ldap_controls.c 2006-04-30
13:54:03 UTC (rev 15358)
@@ -127,9 +127,11 @@
}
if (asn1_peek_tag(&data, ASN1_BOOLEAN)) {
- if (!asn1_read_BOOLEAN(&data, &(lssc[num]->reverse))) {
+ bool reverse;
+ if (!asn1_read_BOOLEAN(&data, &reverse)) {
return False;
}
+ lssc[num]->reverse = reverse;
}
if (!asn1_end_tag(&data)) {
@@ -902,9 +904,11 @@
}
if (asn1_peek_tag(data, ASN1_BOOLEAN)) {
- if (!asn1_read_BOOLEAN(data, &(ctrl->critical))) {
+ bool critical;
+ if (!asn1_read_BOOLEAN(data, &critical)) {
return False;
}
+ critical = ctrl->critical;
} else {
ctrl->critical = False;
}
Modified: branches/SAMBA_4_0/source/ntvfs/posix/pvfs_resolve.c
===
--- branches/SAMBA_4_0/source/ntvfs/posix/pvfs_resolve.c2006-04-30
06:44:19 UTC (rev 15357)
+++ branches/SAMBA_4_0/source/ntvfs/posix/pvfs_resolve.c2006-04-30
13:54:03 UTC (rev 15358)
@@ -548,7 +548,7 @@
NTSTATUS pvfs_resolve_name_fd(struct pvfs_state *pvfs, int fd,
struct pvfs_filename *name)
{
- dev_t device = 0;
+ dev_t device = (dev_t)0;
ino_t inode = 0;
if (name->exists) {
Modified: branches/SAMBA_4_0/source/rpc_server/winreg/rpc_winreg.c
===
--- branches/SAMBA_4_0/source/rpc_server/winreg/rpc_winreg.c2006-04-30
06:44:19 UTC (rev 15357)
+++ branches/SAMBA_4_0/source/rpc_server/winreg/rpc_winreg.c2006-04-30
13:54:03 UTC (rev 15358)
@@ -219,7 +219,7 @@
/* the client can optionally pass a NULL for type, meaning they don't
want that back */
if (r->in.type != NULL) {
- r->out.type = talloc(mem_ctx, uint32_t);
+ r->out.type = talloc(mem_ctx, enum winreg_Type);
*r->out.t
svn commit: samba-docs r943 - in trunk/smbdotconf/winbind: .
Author: vlendec Date: 2006-04-30 13:01:08 + (Sun, 30 Apr 2006) New Revision: 943 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-docs&rev=943 Log: Clarify smb.conf entry Modified: trunk/smbdotconf/winbind/idmapbackend.xml Changeset: Modified: trunk/smbdotconf/winbind/idmapbackend.xml === --- trunk/smbdotconf/winbind/idmapbackend.xml 2006-04-29 12:21:22 UTC (rev 942) +++ trunk/smbdotconf/winbind/idmapbackend.xml 2006-04-30 13:01:08 UTC (rev 943) @@ -6,7 +6,7 @@ The purpose of the idmap backend parameter is to allow idmap to NOT use the local idmap - tdb file to obtain SID to UID / GID mappings, but instead to obtain them from a common + tdb file to obtain SID to UID / GID mappings for unmapped SIDs, but instead to obtain them from a common LDAP backend. This way all domain members and controllers will have the same UID and GID to SID mappings. This avoids the risk of UID / GID inconsistencies across UNIX / Linux systems that are sharing information over protocols other than SMB/CIFS (ie: NFS).
svn commit: samba-web r969 - in trunk/projects: .
Author: tridge Date: 2006-04-30 08:46:10 + (Sun, 30 Apr 2006) New Revision: 969 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=969 Log: added some project ideas Modified: trunk/projects/summercode06.html Changeset: Modified: trunk/projects/summercode06.html === --- trunk/projects/summercode06.html2006-04-28 15:26:51 UTC (rev 968) +++ trunk/projects/summercode06.html2006-04-30 08:46:10 UTC (rev 969) @@ -144,6 +144,29 @@ call.) When (and if) to commit and what message to attach could be configurable options. - + Automated testing against Windows + The Samba project does extensive automated testing on + build.samba.org, but its all Samba<->Samba testing. Our testing + against Windows is currently manual. We would like to use vmware or + another virtual machine environment to allow for fully automated + testing against Windows machines, both as clients and servers. Talk + to [EMAIL PROTECTED] for details. + Re-implement smbclient in ejs + Samba4 now has an embedded javascript interpreter, which is used + for both web configuration and for command line tools. The + interpreter has access to the extensive internal C library of + Samba. I would like smbclient to be rewritten in js, making it much + more easily extendable by administrators. Talk to [EMAIL PROTECTED] + for details. + + ci-skads decoding and implementation + The ci-skads protocol is used to implement remote full filesystem + indexing (indexed search) between windows machines. We would like to + support this functionalilty in Samba, interfacing with existinig + indexing tools on Unix systems (such as beagle). This would be a + very challenging project, suitable for someone experienced with + analysing completely new protocols. Talk to [EMAIL PROTECTED] for + details. +
