* pop_send.c (pop_send): Only update last_msg if executing a RETR.

	From John Brezak <brezak@apollo.hp.com>.
[from 0927]
	* configure.in: use KRB5_POSIX_LOCKS (from epeisach).
[from 0961]

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4678 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/appl/popper/ChangeLog b/src/appl/popper/ChangeLog
index 1a69c1699c303ff263a725d7fb1be53674853120..6e61891a0d89a288d1765c1a522a92979e54c6aa 100644 (file)
--- a/src/appl/popper/ChangeLog
+++ b/src/appl/popper/ChangeLog
@@ -1,3 +1,12 @@
+Fri Nov 18 01:15:58 1994  Mark Eichin  <eichin@cygnus.com>
+
+       * configure.in: use KRB5_POSIX_LOCKS (from epeisach).
+
+Fri Nov 18 00:20:24 1994  Mark Eichin  <eichin@cygnus.com>
+
+       * pop_send.c (pop_send): Only update last_msg if executing a RETR.
+       From John Brezak <brezak@apollo.hp.com>.
+
 Wed Nov  2 21:09:38 1994  Theodore Y. Ts'o  (tytso@dcl)
 
        * popper.h: NULL should not be used as a character assignment

diff --git a/src/appl/popper/configure.in b/src/appl/popper/configure.in
index 7dec9792919cfb1c34dfe5ee28abd9330a101309..ef547d9c87d1eb464e3ba1018bfe0068a34a9932 100644 (file)
--- a/src/appl/popper/configure.in
+++ b/src/appl/popper/configure.in
@@ -12,13 +12,7 @@ AC_CHECK_LIB(ndbm,main)
 AC_CHECK_LIB(dbm,main)
 CHECK_WAIT_TYPE
 CHECK_FCNTL
-
-AC_HEADER_CHECK(flock.h,[echo found flock.h for non-posix locks],
-AC_COMPILE_CHECK([POSIX file locking -- structs and flags],
-[#include <sys/types.h>
-#include <fcntl.h>],
-[struct flock f; 1+F_SETLK;], 
-AC_DEFINE(POSIX_FILE_LOCKS)))
+KRB5_POSIX_LOCKS
 
 AC_HAVE_HEADERS(strings.h)
 AC_HEADER_CHECK(unistd.h,AC_DEFINE(HAS_UNISTD_H))

diff --git a/src/appl/popper/pop_send.c b/src/appl/popper/pop_send.c
index 92397777190d83c9129d2bc879915f1456b49259..b92db7c0a5ca192f86bae26c874a183279698dc8 100644 (file)
--- a/src/appl/popper/pop_send.c
+++ b/src/appl/popper/pop_send.c
@@ -91,6 +91,11 @@ POP     *   p;
     (void)fputs(".\r\n",p->output);
     (void)fflush(p->output);
 
+    /*  If retrieving, update the last-message-accessed number 
+       if it is lower than the retrieved message */
+    if ((mp->retr_flag == TRUE) && (p->last_msg < msg_num))
+      p->last_msg = msg_num;
+ 
     return(POP_SUCCESS);
 }