applied patch by varmojfekoj to allow gssapi functionality to be build as a

    separate plugin (so that gssapi and plain tcp functionality can be
    individually distributed). Also inclulded some other enhancements, most
    importantly initial compatibility mode system

1 files changed, 0 insertions, 48 deletions

diff --git a/tcpsyslog.h b/tcpsyslog.h
index 811d769f..c547d399 100644
--- a/tcpsyslog.h
+++ b/tcpsyslog.h
@@ -26,60 +26,12 @@
 #define	TCPSYSLOG_H_INCLUDED 1
 
 #include <netdb.h>
-#if defined(SYSLOG_INET) && defined(USE_GSSAPI)
-#include <gssapi/gssapi.h>
-#endif
 
 typedef enum _TCPFRAMINGMODE {
 		TCP_FRAMING_OCTET_STUFFING = 0, /* traditional LF-delimited */
 		TCP_FRAMING_OCTET_COUNTING = 1  /* -transport-tls like octet count */
 	} TCPFRAMINGMODE;
 
-struct TCPSession {
-	int sock;
-	int iMsg; /* index of next char to store in msg */
-	int bAtStrtOfFram;	/* are we at the very beginning of a new frame? */
-	int iOctetsRemain;	/* Number of Octets remaining in message */
-	TCPFRAMINGMODE eFraming;
-	char msg[MAXLINE+1];
-	char *fromHost;
-#if defined(SYSLOG_INET) && defined(USE_GSSAPI)
-	OM_uint32 gss_flags;
-	gss_ctx_id_t gss_context;
-	char allowedMethods;
-#endif
-};
-
-/* static data */
-extern int  *sockTCPLstn;
-extern char *TCPLstnPort;
-extern int bEnableTCP;
-extern struct TCPSession *pTCPSessions;
-#if defined(SYSLOG_INET) && defined(USE_GSSAPI)
-extern char *gss_listen_service_name;
-
-#define ALLOWEDMETHOD_GSS 2
-#endif
-
-#define ALLOWEDMETHOD_TCP 1
-
-/* prototypes */
-void deinit_tcp_listener(void);
-int *create_tcp_socket(void);
-int TCPSessGetNxtSess(int iCurr);
-int TCPSessAccept(int fd);
-void TCPSessPrepareClose(int iTCPSess);
-void TCPSessClose(int iSess);
-int TCPSessDataRcvd(int iTCPSess, char *pData, int iLen);
-void configureTCPListen(char *cOptarg);
-#if defined(SYSLOG_INET) && defined(USE_GSSAPI)
-int TCPSessGSSInit(void);
-int TCPSessGSSAccept(int fd);
-int TCPSessGSSRecv(int fd, void *buf, size_t buf_len);
-void TCPSessGSSClose(int sess);
-void TCPSessGSSDeinit(void);
-#endif
-
 /* TCP Send support (shall go into its own module later) */
 int TCPSendCreateSocket(struct addrinfo *addrDest);
 int TCPSend(void *pData, char *msg, size_t len, TCPFRAMINGMODE rqdFraming,