diff options
Diffstat (limited to 'imap/src/osdep')
| -rw-r--r-- | imap/src/osdep/unix/Makefile | 3 | ||||
| -rw-r--r-- | imap/src/osdep/unix/env_unix.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/imap/src/osdep/unix/Makefile b/imap/src/osdep/unix/Makefile index a38d15fb..14975c82 100644 --- a/imap/src/osdep/unix/Makefile +++ b/imap/src/osdep/unix/Makefile @@ -110,6 +110,7 @@ LOCKPGM= LOCKPGM1=/usr/libexec/mlock LOCKPGM2=/usr/sbin/mlock LOCKPGM3=/etc/mlock +LOCKPGM4=/usr/bin/mlock # Default formats for creating new mailboxes and for empty mailboxes in the @@ -984,7 +985,7 @@ onceenv: -DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \ -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" \ -DLOCKPGM1=\"$(LOCKPGM1)\" -DLOCKPGM2=\"$(LOCKPGM2)\" \ - -DLOCKPGM3=\"$(LOCKPGM3)\" > OSCFLAGS + -DLOCKPGM3=\"$(LOCKPGM3)\" -DLOCKPGM4=\"$(LOCKPGM4)\" > OSCFLAGS echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE echo $(OS) > OSTYPE diff --git a/imap/src/osdep/unix/env_unix.c b/imap/src/osdep/unix/env_unix.c index b13d5066..d1bb1f02 100644 --- a/imap/src/osdep/unix/env_unix.c +++ b/imap/src/osdep/unix/env_unix.c @@ -1203,7 +1203,8 @@ long dotlock_lock (char *file,DOTLOCK *base,int fd) if (closedBox || !lockpgm); /* can't do on closed box or disabled */ else if ((*lockpgm && stat (lockpgm,&sb)) || (!*lockpgm && stat (lockpgm = LOCKPGM1,&sb) && - stat (lockpgm = LOCKPGM2,&sb) && stat (lockpgm = LOCKPGM3,&sb))) + stat (lockpgm = LOCKPGM2,&sb) && stat (lockpgm = LOCKPGM3,&sb) && + stat (lockpgm = LOCKPGM4,&sb))) lockpgm = NIL; /* disable if can't find lockpgm */ else if (pipe (pi) >= 0) { /* make command pipes */ long cf; |