7 files changed, 34 insertions, 33 deletions
diff --git a/source4/lib/ldb/README_gcov.txt b/source4/lib/ldb/README_gcov.txt
index 02f090f69f..9684379c6e 100644
--- a/source4/lib/ldb/README_gcov.txt
+++ b/source4/lib/ldb/README_gcov.txt
@@ -25,7 +25,7 @@ You can also combine steps 2 to 4 like this:
      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").
 
diff --git a/source4/lib/ldb/samba/ldb_samba3.c b/source4/lib/ldb/samba/ldb_samba3.c
new file mode 100644
index 0000000000..6a7bfc6298
--- /dev/null
+++ b/source4/lib/ldb/samba/ldb_samba3.c
@@ -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"
+
diff --git a/source4/lib/samba3/secrets.c b/source4/lib/samba3/secrets.c
index 4aacffda34..6b629d1eff 100644
--- a/source4/lib/samba3/secrets.c
+++ b/source4/lib/samba3/secrets.c
@@ -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"
diff --git a/source4/lib/select.c b/source4/lib/select.c
index 066465c1be..a1b2e04065 100644
--- a/source4/lib/select.c
+++ b/source4/lib/select.c
@@ -51,7 +51,7 @@ void sys_select_signal(void)
 
 /*******************************************************************
  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.
 ********************************************************************/
 
diff --git a/source4/lib/substitute.c b/source4/lib/substitute.c
index a351db1af2..34a2ad9f82 100644
--- a/source4/lib/substitute.c
+++ b/source4/lib/substitute.c
@@ -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;
diff --git a/source4/lib/tdb_helper.c b/source4/lib/tdb_helper.c
deleted file mode 100644
index e29a8a7211..0000000000
--- a/source4/lib/tdb_helper.c
+++ /dev/null
@@ -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 */
-
-
diff --git a/source4/lib/unix_privs.c b/source4/lib/unix_privs.c
index 5cc7d5f26e..2ea4d1b2a0 100644
--- a/source4/lib/unix_privs.c
+++ b/source4/lib/unix_privs.c
@@ -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 @@ void *root_privileges(void)
 	talloc_set_destructor(s, privileges_destructor);
 	return s;
 }
-