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.

diff --git a/source/Makefile.in b/source/Makefile.in
index 05238b868d5a3a749037b1905dd94060c918f74a..73931ef65164ddeeaf5c6379d8e3e4e842c5ded7 100644 (file)
--- a/source/Makefile.in
+++ b/source/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/source/script/installman.sh b/source/script/installman.sh
index 12e49fcda3feb75681847e7d6d5a52dee090f3a6..b3422e5b3d1a9b2977364b93f684cf6da7894549 100755 (executable)
--- a/source/script/installman.sh
+++ b/source/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/source/smbd/oplock.c b/source/smbd/oplock.c
index e0e1658a781613b67ac8e2d5bd62d604c8276d95..19a3afa9981e8264eac1698b6bffa01b23bc6714 100644 (file)
--- a/source/smbd/oplock.c
+++ b/source/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",