From 3b4a9ff3809ee05a7f06c3eaddd1e5a6e35bfc49 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Mon, 16 Nov 1998 23:28:59 +0000
Subject: Makefile.in: Re-added quotes round ROFF call for DGUX.
 script/installman.sh: Make installman ignore ROFF argument if it is "".
 smbd/oplock.c: Move location of oplock test file to lockdir. Jeremy. (This
 used to be commit 6c25a3314243997508b0b2da4bfa10bb979e9c10)

---
 source3/Makefile.in          | 2 +-
 source3/script/installman.sh | 2 +-
 source3/smbd/oplock.c        | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'source3')

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 05238b868d..73931ef651 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -440,7 +440,7 @@ revert:
 	@$(SHELL) $(srcdir)/script/revert.sh $(BINDIR) $(PROGS) $(SCRIPTS)
 
 installman:
-	@$(SHELL) $(srcdir)/script/installman.sh $(MANDIR) $(srcdir) @ROFF@
+	@$(SHELL) $(srcdir)/script/installman.sh $(MANDIR) $(srcdir) "@ROFF@"
 
 uninstall: uninstallman uninstallbin uninstallscripts uninstallcp
 
diff --git a/source3/script/installman.sh b/source3/script/installman.sh
index 12e49fcda3..b3422e5b3d 100755
--- a/source3/script/installman.sh
+++ b/source3/script/installman.sh
@@ -29,7 +29,7 @@ for sect in 1 5 7 8 ; do
  
        if (rm -f $FNAME && touch $FNAME); then
          rm $FNAME
-         if [ ! "$GROFF" ] ; then
+         if [ x$GROFF = x ] ; then
            cp $s $m              # Copy raw nroff 
          else
            echo "\t$FNAME"       # groff'ing can be slow, give the user
diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index e0e1658a78..19a3afa998 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -1048,8 +1048,7 @@ void check_kernel_oplocks(void)
     set_process_capability(KERNEL_OPLOCK_CAPABILITY,True);
     set_inherited_process_capability(KERNEL_OPLOCK_CAPABILITY,True);
 
-    slprintf( tmpname, sizeof(tmpname)-1, "/tmp/ot.%d.XXXXXX", (unsigned int)getpid());
-    mktemp(tmpname);
+	slprintf(tmpname,sizeof(tmpname)-1, "%/koplock.%d", lp_lockdir(), (int)getpid());
 
     if(pipe(pfd) != 0) {
       DEBUG(0,("check_kernel_oplocks: Unable to create pipe. Error was %s\n",
-- 
cgit