Author: jelmer Date: 2005-08-24 17:01:23 +0000 (Wed, 24 Aug 2005) New Revision: 9591
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9591 Log: - Remove empty file - Fix a couple of typo's - Fix build of lib/samba3/secrets.c for systems that don't have /usr/include/tdb.h... Added: branches/SAMBA_4_0/source/lib/ldb/samba/ldb_samba3.c Removed: branches/SAMBA_4_0/source/lib/tdb_helper.c Modified: branches/SAMBA_4_0/source/lib/ldb/README_gcov.txt branches/SAMBA_4_0/source/lib/samba3/secrets.c branches/SAMBA_4_0/source/lib/select.c branches/SAMBA_4_0/source/lib/substitute.c branches/SAMBA_4_0/source/lib/unix_privs.c branches/SAMBA_4_0/source/script/tests/test_pidl.sh Changeset: Modified: branches/SAMBA_4_0/source/lib/ldb/README_gcov.txt =================================================================== --- branches/SAMBA_4_0/source/lib/ldb/README_gcov.txt 2005-08-24 16:50:18 UTC (rev 9590) +++ branches/SAMBA_4_0/source/lib/ldb/README_gcov.txt 2005-08-24 17:01:23 UTC (rev 9591) @@ -25,7 +25,7 @@ make -sf Makefile.ldb clean all test-tdb gcov Note that you should not expect 100% coverage, as some error paths -(such as memory allocation failures) are verr hard to trigger. There +(such as memory allocation failures) are very hard to trigger. There are ways of working around this, but they are quite tricky (they involve allocation wrappers that "fork and fail on malloc"). Added: branches/SAMBA_4_0/source/lib/ldb/samba/ldb_samba3.c =================================================================== --- branches/SAMBA_4_0/source/lib/ldb/samba/ldb_samba3.c 2005-08-24 16:50:18 UTC (rev 9590) +++ branches/SAMBA_4_0/source/lib/ldb/samba/ldb_samba3.c 2005-08-24 17:01:23 UTC (rev 9591) @@ -0,0 +1,29 @@ +/* + ldb database library - Samba3 compatibility backend + + Copyright (C) Jelmer Vernooij 2005 + + ** NOTE! The following LGPL license applies to the ldb + ** library. This does NOT imply that all of Samba is released + ** under the LGPL + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#include "includes.h" +#include "ldb/ldb_map/ldb_map.h" +#include "ldb/include/ldb.h" +#include "ldb/include/ldb_private.h" + Property changes on: branches/SAMBA_4_0/source/lib/ldb/samba/ldb_samba3.c ___________________________________________________________________ Name: svn:eol-style + native Modified: branches/SAMBA_4_0/source/lib/samba3/secrets.c =================================================================== --- branches/SAMBA_4_0/source/lib/samba3/secrets.c 2005-08-24 16:50:18 UTC (rev 9590) +++ branches/SAMBA_4_0/source/lib/samba3/secrets.c 2005-08-24 17:01:23 UTC (rev 9591) @@ -25,7 +25,7 @@ such as the local SID and machine trust password */ #include "includes.h" -#include "tdb.h" +#include "lib/tdb/include/tdb.h" #include "lib/samba3/samba3.h" #include "system/filesys.h" #include "librpc/gen_ndr/ndr_security.h" Modified: branches/SAMBA_4_0/source/lib/select.c =================================================================== --- branches/SAMBA_4_0/source/lib/select.c 2005-08-24 16:50:18 UTC (rev 9590) +++ branches/SAMBA_4_0/source/lib/select.c 2005-08-24 17:01:23 UTC (rev 9591) @@ -51,7 +51,7 @@ /******************************************************************* Like select() but avoids the signal race using a pipe - it also guuarantees that fds on return only ever contains bits set + it also guarantees that fds on return only ever contains bits set for file descriptors that were readable. ********************************************************************/ Modified: branches/SAMBA_4_0/source/lib/substitute.c =================================================================== --- branches/SAMBA_4_0/source/lib/substitute.c 2005-08-24 16:50:18 UTC (rev 9590) +++ branches/SAMBA_4_0/source/lib/substitute.c 2005-08-24 17:01:23 UTC (rev 9591) @@ -22,7 +22,7 @@ #include "includes.h" #include "smb_server/smb_server.h" -/* oh bugger - I realy didn't want to have a top-level context +/* oh bugger - I really didn't want to have a top-level context anywhere, but until we change all lp_*() calls to take a context argument this is needed */ static struct substitute_context *sub; Deleted: branches/SAMBA_4_0/source/lib/tdb_helper.c =================================================================== --- branches/SAMBA_4_0/source/lib/tdb_helper.c 2005-08-24 16:50:18 UTC (rev 9590) +++ branches/SAMBA_4_0/source/lib/tdb_helper.c 2005-08-24 17:01:23 UTC (rev 9591) @@ -1,27 +0,0 @@ -/* - Unix SMB/CIFS implementation. - tdb utility functions - Copyright (C) Andrew Tridgell 1992-1998 - - 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 <fnmatch.h> - -/* these are little tdb utility functions that are meant to make - dealing with a tdb database a little less cumbersome in Samba */ - - Modified: branches/SAMBA_4_0/source/lib/unix_privs.c =================================================================== --- branches/SAMBA_4_0/source/lib/unix_privs.c 2005-08-24 16:50:18 UTC (rev 9590) +++ branches/SAMBA_4_0/source/lib/unix_privs.c 2005-08-24 17:01:23 UTC (rev 9591) @@ -31,7 +31,7 @@ talloc_free() this pointer. Note that this call is considered successful even if it does not - manage to gain too privileges, but it will call smb_abort() if it + manage to gain root privileges, but it will call smb_abort() if it fails to restore the privileges afterwards. The logic is that failing to gain root access can be caught by whatever operation needs to be run as root failing, but failing to lose the root @@ -67,4 +67,3 @@ talloc_set_destructor(s, privileges_destructor); return s; } - Modified: branches/SAMBA_4_0/source/script/tests/test_pidl.sh =================================================================== --- branches/SAMBA_4_0/source/script/tests/test_pidl.sh 2005-08-24 16:50:18 UTC (rev 9590) +++ branches/SAMBA_4_0/source/script/tests/test_pidl.sh 2005-08-24 17:01:23 UTC (rev 9591) @@ -1,7 +1,8 @@ #!/bin/sh -./build/pidl/tests/ndr_simple.pl -./build/pidl/tests/ndr_align.pl -./build/pidl/tests/ndr_alloc.pl -./build/pidl/tests/ndr_refptr.pl -./build/pidl/tests/ndr_string.pl -./build/pidl/tests/ndr_array.pl +PERL=perl +$PERL -Ibuild/pidl ./build/pidl/tests/ndr_simple.pl +$PERL -Ibuild/pidl ./build/pidl/tests/ndr_align.pl +$PERL -Ibuild/pidl ./build/pidl/tests/ndr_alloc.pl +$PERL -Ibuild/pidl ./build/pidl/tests/ndr_refptr.pl +$PERL -Ibuild/pidl ./build/pidl/tests/ndr_string.pl +$PERL -Ibuild/pidl ./build/pidl/tests/ndr_array.pl
