(lisp1): Add image.elc, international/fontset.elc, dnd.elc, mwheel.elc,

[gnu-emacs] / lib-src / pop.h

diff --git a/lib-src/pop.h b/lib-src/pop.h
index 7a56947a36a6b367a06abe996e05834cecab6fea..eed24a89934f3c272c72755a73ebf47b89402fbd 100644 (file)
--- a/lib-src/pop.h
+++ b/lib-src/pop.h
@@ -1,5 +1,6 @@
 /* pop.h: Header file for the "pop.c" client POP3 protocol.
-   Copyright (c) 1991,1993 Free Software Foundation, Inc.
+   Copyright (C) 1991, 1993, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc.
    Written by Jonathan Kamens, jik@security.ov.com.
 
 This file is part of GNU Emacs.
@@ -16,8 +17,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #include <stdio.h>
 
@@ -36,7 +37,6 @@ struct _popserver
   int buffer_size, buffer_index;
   int in_multi;
   int trash_started;
-  void *extra;
 };
 
 typedef struct _popserver *popserver;
@@ -48,30 +48,6 @@ typedef struct _popserver *popserver;
 #define POP_NO_KERBEROS        (1<<0)
 #define POP_NO_HESIOD  (1<<1)
 #define POP_NO_GETPASS         (1<<2)
-#define POP_NO_GSSAPI  (1<<3)  /* don't use the GSSAPI */
-#define POP_NO_NOPROT  (1<<4)  /* prohibit no protection; this *only* */
-                               /* makes sense if you use GSSAPI */
-#define POP_NO_INTEG   (1<<5)  /* don't use plain integrity */
-#define POP_NO_ENCRYPT (1<<6)  /* don't use encryption */
-
-/*
- * GSSAPI documentation
- *
- * This version will attempt to perform a GSSAPI handshake first; if this
- * fails, then it will attempt standard POP authentication.  Note that
- * library conflicts may prevent the use of this with the Kerberos
- * kpop hack.
- *
- * If you specify POP_NO_NOPROT and this library is unable to provide either
- * integrity protection or encryption, pop_open() will fail.  The pop_open()
- * call will attempt the highest level protection available; i.e., if both
- * server and client support encryption (and you do not provide the
- * POP_NO_ENCRYPT flag), that will be used; if both server and client support
- * integrity protection (and you do not provide the POP_NO_INTEG flag), that
- * will be used.  If neither of these are available, and you have not
- * specified the POP_NO_NOPROT flag, then this will be a normal, unprotected
- * connection.
- */
 
 #ifdef __STDC__
 #define _ARGS(a) a
@@ -106,3 +82,6 @@ extern int pop_quit _ARGS((popserver server));
 extern void pop_close _ARGS((popserver));
 
 #undef _ARGS
+
+/* arch-tag: 76cc5f58-8e86-48fa-bc72-a7c6cb1c4f1c
+   (do not change this comment) */