summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2003-04-03 01:51:11 +0000
committerJeremy Allison <jra@samba.org>2003-04-03 01:51:11 +0000
commit28ff00ab40089882957d230161c4e9ededf0965d (patch)
treec5183114eab43989a9911dbd5aa6f700b89f8d61
parentab0bd4b63c2d08d336fb087705ec258d3ee04abc (diff)
downloadsamba-28ff00ab40089882957d230161c4e9ededf0965d.tar.gz
samba-28ff00ab40089882957d230161c4e9ededf0965d.tar.bz2
samba-28ff00ab40089882957d230161c4e9ededf0965d.zip
Fixup swat warning.
Fix winbindd dual mode in the same was as in APP_HEAD. "Ken Cross" <kcross@nssolutions.com> noticed the problem. Jeremy. (This used to be commit 214b217b276f43edfddd1664afaae0fa6b2c319f)
-rw-r--r--source3/nsswitch/winbindd_dual.c6
-rw-r--r--source3/web/swat.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/source3/nsswitch/winbindd_dual.c b/source3/nsswitch/winbindd_dual.c
index 207757bcea..3597171005 100644
--- a/source3/nsswitch/winbindd_dual.c
+++ b/source3/nsswitch/winbindd_dual.c
@@ -159,6 +159,12 @@ void do_dual_daemon(void)
return;
}
close(fdpair[1]);
+
+ /* tdb needs special fork handling */
+ if (tdb_reopen_all() == -1) {
+ DEBUG(0,("tdb_reopen_all failed.\n"));
+ _exit(0);
+ }
if (!winbind_setup_common())
_exit(0);
diff --git a/source3/web/swat.c b/source3/web/swat.c
index 9a133e1330..fa319bb3ae 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -1262,7 +1262,7 @@ static void printers_page(void)
int main(int argc, char *argv[])
{
int opt;
- char *page;
+ const char *page;
poptContext pc;
struct poptOption long_options[] = {
POPT_AUTOHELP