Make use of mkstemp() unconditional (vs. mktemp()).

Merged from nmh. Thanks to Lyndon Nerenberg.

diff --git a/configure.ac b/configure.ac
index c81fe610df764f529c3ba737139ff90984e805cd..8c9262ba447415038d704e63d0cea71654e71b42 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -364,7 +364,7 @@ dnl ---------------
 dnl CHECK FUNCTIONS
 dnl ---------------
 AC_CHECK_FUNCS(waitpid sigaction sigprocmask sigblock sigsetmask \
-               sighold sigrelse lstat tzset mkstemp \
+               sighold sigrelse lstat tzset \
                getutent nl_langinfo mbtowc wcwidth)
 
 dnl sigsetjmp may be a macro

diff --git a/sbr/lock_file.c b/sbr/lock_file.c
index 983d9d70d437ad6b6365f0c37bc3a65e6c32c003..6b74068cc121a0309d627b58fa463513933c945f 100644 (file)
--- a/sbr/lock_file.c
+++ b/sbr/lock_file.c
@@ -435,18 +435,8 @@ lockit(struct lockinfo *li)
        curlock = li->curlock;
        tmplock = li->tmplock;
 
-#ifdef HAVE_MKSTEMP
        if ((fd = mkstemp(tmplock)) == -1)
                return -1;
-#else
-       if (mktemp(tmplock) == NULL)
-               return -1;
-       if (unlink(tmplock) == -1 && errno != ENOENT)
-               return -1;
-       /* create the temporary lock file */
-       if ((fd = creat(tmplock, 0600)) == -1)
-               return -1;
-#endif
 
 #if 0
        /* write our process id into lock file */