1.1 --- a/AUTHORS	Sat Jan 14 18:44:48 2012 +0100
     1.2 +++ b/AUTHORS	Sat Jan 14 21:36:58 2012 +0100
     1.3 @@ -16,9 +16,6 @@
     1.4  src/md5/md5.*
     1.5  by Solar Designer (in the Public Domain)
     1.6  
     1.7 -src/libident/*
     1.8 -by Peter Eriksson (in the Public Domain)
     1.9 -
    1.10  admin/rmail
    1.11  by luciano l. mannucci and Wietse Venema (no license applies)
    1.12  

     2.1 --- a/INSTALL	Sat Jan 14 18:44:48 2012 +0100
     2.2 +++ b/INSTALL	Sat Jan 14 21:36:58 2012 +0100
     2.3 @@ -66,16 +66,6 @@
     2.4  prefer another location than /etc/masqmail/.
     2.5  
     2.6  
     2.7 ---enable-ident
     2.8 -enables RFC 1413 support. If you have the libident dynamic library
     2.9 -installed, this will be linked, otherwise it will be statically linked
    2.10 -using the sources included in the package. Ident support brings few
    2.11 -advantages. If mail is received from machines that run identd, the
    2.12 -Received headers and log messages include a user name too. Additionally
    2.13 -a user can remove queued mail if it had been sent by himself from another
    2.14 -machine running identd. In any case: You cannot trust the ident
    2.15 -information more than you trust the specific remote machine.
    2.16 -
    2.17  --disable-resolver
    2.18  disables resolver support. Without the resolver functions, masqmail
    2.19  uses only gethostbyname() to resolve DNS names, and you cannot send

     3.1 --- a/Makefile.in	Sat Jan 14 18:44:48 2012 +0100
     3.2 +++ b/Makefile.in	Sat Jan 14 21:36:58 2012 +0100
     3.3 @@ -123,7 +123,6 @@
     3.4  GLIB_CFLAGS = @GLIB_CFLAGS@
     3.5  GLIB_LIBS = @GLIB_LIBS@
     3.6  GREP = @GREP@
     3.7 -IDENT_LIBS = @IDENT_LIBS@
     3.8  INSTALL = @INSTALL@
     3.9  INSTALL_DATA = @INSTALL_DATA@
    3.10  INSTALL_PROGRAM = @INSTALL_PROGRAM@
    3.11 @@ -174,7 +173,6 @@
    3.12  docdir = @docdir@
    3.13  dvidir = @dvidir@
    3.14  exec_prefix = @exec_prefix@
    3.15 -has_ident = @has_ident@
    3.16  host_alias = @host_alias@
    3.17  htmldir = @htmldir@
    3.18  includedir = @includedir@

     4.1 --- a/acconfig.h	Sat Jan 14 18:44:48 2012 +0100
     4.2 +++ b/acconfig.h	Sat Jan 14 21:36:58 2012 +0100
     4.3 @@ -10,8 +10,6 @@
     4.4  
     4.5  #undef ENABLE_AUTH
     4.6  
     4.7 -#undef ENABLE_IDENT
     4.8 -
     4.9  #undef CONF_DIR
    4.10  
    4.11  #undef DATA_DIR

     5.1 --- a/config.h.in	Sat Jan 14 18:44:48 2012 +0100
     5.2 +++ b/config.h.in	Sat Jan 14 21:36:58 2012 +0100
     5.3 @@ -11,8 +11,6 @@
     5.4  
     5.5  #undef ENABLE_AUTH
     5.6  
     5.7 -#undef ENABLE_IDENT
     5.8 -
     5.9  #undef CONF_DIR
    5.10  
    5.11  #undef DATA_DIR
    5.12 @@ -37,9 +35,6 @@
    5.13  /* If debugging is enabled */
    5.14  #undef ENABLE_DEBUG
    5.15  
    5.16 -/* If ident is enabled */
    5.17 -#undef ENABLE_IDENT
    5.18 -
    5.19  /* If the resolver is to be used */
    5.20  #undef ENABLE_RESOLVER
    5.21  

     6.1 --- a/configure	Sat Jan 14 18:44:48 2012 +0100
     6.2 +++ b/configure	Sat Jan 14 21:36:58 2012 +0100
     6.3 @@ -611,8 +611,6 @@
     6.4  with_logdir
     6.5  USE_LIBLOCKFILE
     6.6  LOCKFILE_LIBS
     6.7 -IDENT_LIBS
     6.8 -has_ident
     6.9  MD5_LIBS
    6.10  BASE64_LIBS
    6.11  with_group
    6.12 @@ -713,7 +711,6 @@
    6.13  with_group
    6.14  enable_debug
    6.15  enable_auth
    6.16 -enable_ident
    6.17  with_liblockfile
    6.18  with_logdir
    6.19  with_spooldir
    6.20 @@ -1354,7 +1351,6 @@
    6.21    --disable-resolver      disable resolver support
    6.22    --disable-debug         disable debugging
    6.23    --disable-auth          disable AUTH (RFC 2554) client support
    6.24 -  --enable-ident          enable ident (RFC 1413) support
    6.25  
    6.26  Optional Packages:
    6.27    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
    6.28 @@ -5179,64 +5175,6 @@
    6.29  fi
    6.30  
    6.31  
    6.32 -IDENT_LIBS=''
    6.33 -# Check whether --enable-ident was given.
    6.34 -if test "${enable_ident+set}" = set; then :
    6.35 -  enableval=$enable_ident; if test "x$enable_ident" != 'xno'; then
    6.36 -		ident_enabled='yes'
    6.37 -	fi
    6.38 -fi
    6.39 -
    6.40 -
    6.41 -if test "x$ident_enabled" = xyes; then
    6.42 -
    6.43 -$as_echo "#define ENABLE_IDENT 1" >>confdefs.h
    6.44 -
    6.45 -	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ident_id in -lident" >&5
    6.46 -$as_echo_n "checking for ident_id in -lident... " >&6; }
    6.47 -if ${ac_cv_lib_ident_ident_id+:} false; then :
    6.48 -  $as_echo_n "(cached) " >&6
    6.49 -else
    6.50 -  ac_check_lib_save_LIBS=$LIBS
    6.51 -LIBS="-lident  $LIBS"
    6.52 -cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    6.53 -/* end confdefs.h.  */
    6.54 -
    6.55 -/* Override any GCC internal prototype to avoid an error.
    6.56 -   Use char because int might match the return type of a GCC
    6.57 -   builtin and then its argument prototype would still apply.  */
    6.58 -#ifdef __cplusplus
    6.59 -extern "C"
    6.60 -#endif
    6.61 -char ident_id ();
    6.62 -int
    6.63 -main ()
    6.64 -{
    6.65 -return ident_id ();
    6.66 -  ;
    6.67 -  return 0;
    6.68 -}
    6.69 -_ACEOF
    6.70 -if ac_fn_c_try_link "$LINENO"; then :
    6.71 -  ac_cv_lib_ident_ident_id=yes
    6.72 -else
    6.73 -  ac_cv_lib_ident_ident_id=no
    6.74 -fi
    6.75 -rm -f core conftest.err conftest.$ac_objext \
    6.76 -    conftest$ac_exeext conftest.$ac_ext
    6.77 -LIBS=$ac_check_lib_save_LIBS
    6.78 -fi
    6.79 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ident_ident_id" >&5
    6.80 -$as_echo "$ac_cv_lib_ident_ident_id" >&6; }
    6.81 -if test "x$ac_cv_lib_ident_ident_id" = xyes; then :
    6.82 -  IDENT_LIBS='-lident'
    6.83 -else
    6.84 -  IDENT_LIBS='libident/libident.a'
    6.85 -fi
    6.86 -
    6.87 -fi
    6.88 -
    6.89 -
    6.90  
    6.91  # Check whether --with-liblockfile was given.
    6.92  if test "${with_liblockfile+set}" = set; then :
    6.93 @@ -5378,7 +5316,7 @@
    6.94  	fi
    6.95  fi
    6.96  
    6.97 -ac_config_files="$ac_config_files Makefile src/Makefile src/base64/Makefile src/md5/Makefile src/libident/Makefile man/Makefile"
    6.98 +ac_config_files="$ac_config_files Makefile src/Makefile src/base64/Makefile src/md5/Makefile man/Makefile"
    6.99  
   6.100  cat >confcache <<\_ACEOF
   6.101  # This file is a shell script that caches the results of configure
   6.102 @@ -6115,7 +6053,6 @@
   6.103      "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
   6.104      "src/base64/Makefile") CONFIG_FILES="$CONFIG_FILES src/base64/Makefile" ;;
   6.105      "src/md5/Makefile") CONFIG_FILES="$CONFIG_FILES src/md5/Makefile" ;;
   6.106 -    "src/libident/Makefile") CONFIG_FILES="$CONFIG_FILES src/libident/Makefile" ;;
   6.107      "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
   6.108  
   6.109    *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;

     7.1 --- a/configure.ac	Sat Jan 14 18:44:48 2012 +0100
     7.2 +++ b/configure.ac	Sat Jan 14 21:36:58 2012 +0100
     7.3 @@ -142,21 +142,6 @@
     7.4  fi
     7.5  AC_SUBST(MD5_LIBS)
     7.6  
     7.7 -dnl ident support (default is to not use it)
     7.8 -IDENT_LIBS=''
     7.9 -AC_ARG_ENABLE(ident,
    7.10 -	[  --enable-ident          enable ident (RFC 1413) support],
    7.11 -	if test "x$enable_ident" != 'xno'; then
    7.12 -		ident_enabled='yes'
    7.13 -	fi,
    7.14 -	)
    7.15 -AC_SUBST(has_ident)
    7.16 -if test "x$ident_enabled" = xyes; then
    7.17 -	AC_DEFINE(ENABLE_IDENT, 1, [If ident is enabled])
    7.18 -	AC_CHECK_LIB(ident, ident_id, IDENT_LIBS='-lident', IDENT_LIBS='libident/libident.a')
    7.19 -fi
    7.20 -AC_SUBST(IDENT_LIBS)
    7.21 -
    7.22  dnl liblockfile
    7.23  AC_ARG_WITH(liblockfile,
    7.24  	[  --with-liblockfile      use liblock (for Debian)],
    7.25 @@ -226,6 +211,5 @@
    7.26  	src/Makefile \
    7.27  	src/base64/Makefile \
    7.28  	src/md5/Makefile \
    7.29 -	src/libident/Makefile \
    7.30  	man/Makefile
    7.31  	)

     8.1 --- a/docs/INSTALL.linux	Sat Jan 14 18:44:48 2012 +0100
     8.2 +++ b/docs/INSTALL.linux	Sat Jan 14 21:36:58 2012 +0100
     8.3 @@ -8,8 +8,6 @@
     8.4  
     8.5  	./configure --with-liblockfile
     8.6  
     8.7 -(You might like to add `--enable-ident'.)
     8.8 -
     8.9  You can also build your own Debian package with
    8.10  
    8.11  	dpkg-buildpackage -rfakeroot

     9.1 --- a/docs/simple-local-setup	Sat Jan 14 18:44:48 2012 +0100
     9.2 +++ b/docs/simple-local-setup	Sat Jan 14 21:36:58 2012 +0100
     9.3 @@ -16,9 +16,9 @@
     9.4  
     9.5  Follow the description in INSTALL.
     9.6  
     9.7 -A common configure call would be:
     9.8 +Most times it's simply:
     9.9  
    9.10 -    ./configure --enable-ident
    9.11 +    ./configure
    9.12  
    9.13  
    9.14  Configuration

    10.1 --- a/docs/simple-relay-setup	Sat Jan 14 18:44:48 2012 +0100
    10.2 +++ b/docs/simple-relay-setup	Sat Jan 14 21:36:58 2012 +0100
    10.3 @@ -17,9 +17,9 @@
    10.4  
    10.5  Follow the description in INSTALL.
    10.6  
    10.7 -A common configure call would be:
    10.8 +Most times it's simply:
    10.9  
   10.10 -    ./configure --enable-ident
   10.11 +    ./configure
   10.12  
   10.13  
   10.14  Configuration

    11.1 --- a/man/Makefile.in	Sat Jan 14 18:44:48 2012 +0100
    11.2 +++ b/man/Makefile.in	Sat Jan 14 21:36:58 2012 +0100
    11.3 @@ -95,7 +95,6 @@
    11.4  GLIB_CFLAGS = @GLIB_CFLAGS@
    11.5  GLIB_LIBS = @GLIB_LIBS@
    11.6  GREP = @GREP@
    11.7 -IDENT_LIBS = @IDENT_LIBS@
    11.8  INSTALL = @INSTALL@
    11.9  INSTALL_DATA = @INSTALL_DATA@
   11.10  INSTALL_PROGRAM = @INSTALL_PROGRAM@
   11.11 @@ -146,7 +145,6 @@
   11.12  docdir = @docdir@
   11.13  dvidir = @dvidir@
   11.14  exec_prefix = @exec_prefix@
   11.15 -has_ident = @has_ident@
   11.16  host_alias = @host_alias@
   11.17  htmldir = @htmldir@
   11.18  includedir = @includedir@

    12.1 --- a/man/masqmail.conf.5	Sat Jan 14 18:44:48 2012 +0100
    12.2 +++ b/man/masqmail.conf.5	Sat Jan 14 21:36:58 2012 +0100
    12.3 @@ -335,8 +335,7 @@
    12.4  
    12.5  received_host - the host the mail was received from
    12.6  
    12.7 -ident - the ident, this is either the ident delivered by the ident protocol
    12.8 -or the user id of the sender if the message was received locally.
    12.9 +ident - the user id of the sender if the message was received locally.
   12.10  
   12.11  return_path_local - the local part of the return path (sender).
   12.12  
   12.13 @@ -413,14 +412,6 @@
   12.14  use:
   12.15  \fI/usr/bin/mservdetect localhost 224\fP
   12.16  
   12.17 -
   12.18 -.TP
   12.19 -\fBident_trusted_nets = \fIlist\fR
   12.20 -
   12.21 -\fIlist\fR is a list of networks of the form a.b.c.d/e (e.g. 192.168.1.0/24),
   12.22 -from which the ident given by the ident protocol will be trusted,
   12.23 -so a user can delete his mail from the queue if the ident is identical to his login name.
   12.24 -
   12.25  .TP
   12.26  \fBerrmsg_file = \fIfile\fR
   12.27  

    13.1 --- a/src/Makefile.am	Sat Jan 14 18:44:48 2012 +0100
    13.2 +++ b/src/Makefile.am	Sat Jan 14 21:36:58 2012 +0100
    13.3 @@ -1,4 +1,4 @@
    13.4 -SUBDIRS=base64 md5 libident
    13.5 +SUBDIRS=base64 md5
    13.6  
    13.7  AM_CFLAGS=@CFLAGS@ @GLIB_CFLAGS@ -D_GNU_SOURCE -DG_DISABLE_DEPRECATED
    13.8  
    13.9 @@ -80,8 +80,8 @@
   13.10  	resolvtest.c\
   13.11  	lookup.c
   13.12  
   13.13 -masqmail_LDADD=@RESOLV_LIBS@ @GLIB_LIBS@ @LOCKFILE_LIBS@ @MD5_LIBS@ @BASE64_LIBS@ @IDENT_LIBS@
   13.14 +masqmail_LDADD=@RESOLV_LIBS@ @GLIB_LIBS@ @LOCKFILE_LIBS@ @MD5_LIBS@ @BASE64_LIBS@
   13.15  smtpsend_LDADD=@RESOLV_LIBS@ @GLIB_LIBS@ @MD5_LIBS@ @BASE64_LIBS@
   13.16  mservdetect_LDADD=@GLIB_LIBS@
   13.17  readtest_LDADD=@GLIB_LIBS@
   13.18 -resolvtest_LDADD=@RESOLV_LIBS@ @GLIB_LIBS@ @IDENT_LIBS@
   13.19 +resolvtest_LDADD=@RESOLV_LIBS@ @GLIB_LIBS@

    14.1 --- a/src/Makefile.in	Sat Jan 14 18:44:48 2012 +0100
    14.2 +++ b/src/Makefile.in	Sat Jan 14 21:36:58 2012 +0100
    14.3 @@ -154,7 +154,6 @@
    14.4  GLIB_CFLAGS = @GLIB_CFLAGS@
    14.5  GLIB_LIBS = @GLIB_LIBS@
    14.6  GREP = @GREP@
    14.7 -IDENT_LIBS = @IDENT_LIBS@
    14.8  INSTALL = @INSTALL@
    14.9  INSTALL_DATA = @INSTALL_DATA@
   14.10  INSTALL_PROGRAM = @INSTALL_PROGRAM@
   14.11 @@ -205,7 +204,6 @@
   14.12  docdir = @docdir@
   14.13  dvidir = @dvidir@
   14.14  exec_prefix = @exec_prefix@
   14.15 -has_ident = @has_ident@
   14.16  host_alias = @host_alias@
   14.17  htmldir = @htmldir@
   14.18  includedir = @includedir@
   14.19 @@ -235,7 +233,7 @@
   14.20  with_logdir = @with_logdir@
   14.21  with_spooldir = @with_spooldir@
   14.22  with_user = @with_user@
   14.23 -SUBDIRS = base64 md5 libident
   14.24 +SUBDIRS = base64 md5
   14.25  AM_CFLAGS = @CFLAGS@ @GLIB_CFLAGS@ -D_GNU_SOURCE -DG_DISABLE_DEPRECATED
   14.26  masqmail_SOURCES = \
   14.27  	dotlock.h\
   14.28 @@ -311,11 +309,11 @@
   14.29  	resolvtest.c\
   14.30  	lookup.c
   14.31  
   14.32 -masqmail_LDADD = @RESOLV_LIBS@ @GLIB_LIBS@ @LOCKFILE_LIBS@ @MD5_LIBS@ @BASE64_LIBS@ @IDENT_LIBS@
   14.33 +masqmail_LDADD = @RESOLV_LIBS@ @GLIB_LIBS@ @LOCKFILE_LIBS@ @MD5_LIBS@ @BASE64_LIBS@
   14.34  smtpsend_LDADD = @RESOLV_LIBS@ @GLIB_LIBS@ @MD5_LIBS@ @BASE64_LIBS@
   14.35  mservdetect_LDADD = @GLIB_LIBS@
   14.36  readtest_LDADD = @GLIB_LIBS@
   14.37 -resolvtest_LDADD = @RESOLV_LIBS@ @GLIB_LIBS@ @IDENT_LIBS@
   14.38 +resolvtest_LDADD = @RESOLV_LIBS@ @GLIB_LIBS@
   14.39  all: all-recursive
   14.40  
   14.41  .SUFFIXES:

    15.1 --- a/src/accept.c	Sat Jan 14 18:44:48 2012 +0100
    15.2 +++ b/src/accept.c	Sat Jan 14 21:36:58 2012 +0100
    15.3 @@ -375,13 +375,8 @@
    15.4  		/* received from remote */
    15.5  		DEBUG(5) debugf("adding 'Received:' header (5)\n");
    15.6  		hdr = create_header(HEAD_RECEIVED,
    15.7 -#ifdef ENABLE_IDENT
    15.8 -		    "Received: from %s (ident=%s)\n\tby %s with %s (%s %s)\n\tid %s%s; %s\n",
    15.9 -		    msg->received_host, msg->ident ? msg->ident : "unknown",
   15.10 -#else
   15.11  		    "Received: from %s\n\tby %s with %s (%s %s)\n\tid %s%s; %s\n",
   15.12  		    msg->received_host,
   15.13 -#endif
   15.14  		    conf.host_name, prot_names[msg->received_prot], PACKAGE,
   15.15  		    VERSION, msg->uid, for_string ? for_string : "",
   15.16  		    rec_timestamp());

    16.1 --- a/src/base64/Makefile.in	Sat Jan 14 18:44:48 2012 +0100
    16.2 +++ b/src/base64/Makefile.in	Sat Jan 14 21:36:58 2012 +0100
    16.3 @@ -96,7 +96,6 @@
    16.4  GLIB_CFLAGS = @GLIB_CFLAGS@
    16.5  GLIB_LIBS = @GLIB_LIBS@
    16.6  GREP = @GREP@
    16.7 -IDENT_LIBS = @IDENT_LIBS@
    16.8  INSTALL = @INSTALL@
    16.9  INSTALL_DATA = @INSTALL_DATA@
   16.10  INSTALL_PROGRAM = @INSTALL_PROGRAM@
   16.11 @@ -147,7 +146,6 @@
   16.12  docdir = @docdir@
   16.13  dvidir = @dvidir@
   16.14  exec_prefix = @exec_prefix@
   16.15 -has_ident = @has_ident@
   16.16  host_alias = @host_alias@
   16.17  htmldir = @htmldir@
   16.18  includedir = @includedir@

    17.1 --- a/src/conf.c	Sat Jan 14 18:44:48 2012 +0100
    17.2 +++ b/src/conf.c	Sat Jan 14 21:36:58 2012 +0100
    17.3 @@ -249,50 +249,6 @@
    17.4  	return iface;
    17.5  }
    17.6  
    17.7 -#ifdef ENABLE_IDENT  /* so far used for that only */
    17.8 -static struct in_addr*
    17.9 -parse_network(gchar *line, gint def_port)
   17.10 -{
   17.11 -	gchar buf[256];
   17.12 -	gchar *p, *q;
   17.13 -	struct in_addr addr, mask_addr, net_addr, *p_net_addr;
   17.14 -	guint n;
   17.15 -
   17.16 -	DEBUG(9) fprintf(stderr, "parse_network: %s\n", line);
   17.17 -
   17.18 -	p = line;
   17.19 -	q = buf;
   17.20 -	while (*p && (*p != '/') && (q < buf + 255))
   17.21 -		*(q++) = *(p++);
   17.22 -	*q = '\0';
   17.23 -
   17.24 -	if ((addr.s_addr = inet_addr(buf)) == INADDR_NONE) {
   17.25 -		fprintf(stderr, "'%s' is not a valid address (must be ip)\n", buf);
   17.26 -		exit(1);
   17.27 -	}
   17.28 -
   17.29 -	if (*p) {
   17.30 -		guint i;
   17.31 -		p++;
   17.32 -		i = atoi(p);
   17.33 -		if ((i >= 0) && (i <= 32))
   17.34 -			n = i ? ~((1 << (32 - i)) - 1) : 0;
   17.35 -		else {
   17.36 -			fprintf(stderr, "'%d' is not a valid net mask (must be >= 0 and <= 32)\n", i);
   17.37 -			exit(1);
   17.38 -		}
   17.39 -	} else
   17.40 -		n = 0;
   17.41 -
   17.42 -	mask_addr.s_addr = htonl(n);
   17.43 -	net_addr.s_addr = mask_addr.s_addr & addr.s_addr;
   17.44 -
   17.45 -	p_net_addr = g_malloc(sizeof(struct in_addr));
   17.46 -	p_net_addr->s_addr = net_addr.s_addr;
   17.47 -	return p_net_addr;
   17.48 -}
   17.49 -#endif
   17.50 -
   17.51  static gboolean
   17.52  eat_comments(FILE *in)
   17.53  {
   17.54 @@ -544,20 +500,6 @@
   17.55  				g_free(node->data);
   17.56  			}
   17.57  			g_list_free(tmp_list);
   17.58 -		} else if (strcmp(lval, "ident_trusted_nets") == 0) {
   17.59 -#ifdef ENABLE_IDENT
   17.60 -			GList *node;
   17.61 -			GList *tmp_list = parse_list(rval, FALSE);
   17.62 -
   17.63 -			conf.ident_trusted_nets = NULL;
   17.64 -			foreach(tmp_list, node) {
   17.65 -				conf.ident_trusted_nets = g_list_append(conf.ident_trusted_nets, parse_network((gchar *) (node->data), 25));
   17.66 -				g_free(node->data);
   17.67 -			}
   17.68 -			g_list_free(tmp_list);
   17.69 -#else
   17.70 -			logwrite(LOG_WARNING, "%s ignored: not compiled with ident support\n", lval);
   17.71 -#endif
   17.72  		} else if (strncmp(lval, "query_routes.", 13) == 0) {
   17.73  			GList *file_list = parse_list(rval, FALSE);
   17.74  			table_pair *pair = create_pair(lval+13, file_list);

    18.1 --- a/src/libident/INSTALL	Sat Jan 14 18:44:48 2012 +0100
    18.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    18.3 @@ -1,14 +0,0 @@
    18.4 -To build the libident library for a supported target, just type:
    18.5 -
    18.6 -	make <target>
    18.7 -
    18.8 -where target can be one of:
    18.9 -
   18.10 -	sunos5, sunos4, svr4, bsd, linux, nextstep3.0 or nextstep3.1
   18.11 -
   18.12 -For other systems you'll need to hack the Makefile (please do send
   18.13 -me any patches you make so I can include them into the next version!)
   18.14 -
   18.15 -			- Peter Eriksson <pen@lysator.liu.se>, 18 Oct 1994
   18.16 -
   18.17 -

    19.1 --- a/src/libident/Makefile.am	Sat Jan 14 18:44:48 2012 +0100
    19.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    19.3 @@ -1,15 +0,0 @@
    19.4 -EXTRA_DIST=README_MASQMAIL
    19.5 -
    19.6 -AM_CFLAGS=@CFLAGS@ -D_GNU_SOURCE -DHAVE_ANSIHEADERS
    19.7 -
    19.8 -noinst_LIBRARIES=libident.a
    19.9 -
   19.10 -libident_a_SOURCES=\
   19.11 -	ident.h\
   19.12 -	ident.c\
   19.13 -	id_open.c\
   19.14 -	id_close.c\
   19.15 -	id_query.c\
   19.16 -	id_parse.c\
   19.17 -	support.c\
   19.18 -	version.c

    20.1 --- a/src/libident/Makefile.in	Sat Jan 14 18:44:48 2012 +0100
    20.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    20.3 @@ -1,453 +0,0 @@
    20.4 -# Makefile.in generated by automake 1.11.1 from Makefile.am.
    20.5 -# @configure_input@
    20.6 -
    20.7 -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
    20.8 -# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
    20.9 -# Inc.
   20.10 -# This Makefile.in is free software; the Free Software Foundation
   20.11 -# gives unlimited permission to copy and/or distribute it,
   20.12 -# with or without modifications, as long as this notice is preserved.
   20.13 -
   20.14 -# This program is distributed in the hope that it will be useful,
   20.15 -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
   20.16 -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
   20.17 -# PARTICULAR PURPOSE.
   20.18 -
   20.19 -@SET_MAKE@
   20.20 -
   20.21 -VPATH = @srcdir@
   20.22 -pkgdatadir = $(datadir)/@PACKAGE@
   20.23 -pkgincludedir = $(includedir)/@PACKAGE@
   20.24 -pkglibdir = $(libdir)/@PACKAGE@
   20.25 -pkglibexecdir = $(libexecdir)/@PACKAGE@
   20.26 -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
   20.27 -install_sh_DATA = $(install_sh) -c -m 644
   20.28 -install_sh_PROGRAM = $(install_sh) -c
   20.29 -install_sh_SCRIPT = $(install_sh) -c
   20.30 -INSTALL_HEADER = $(INSTALL_DATA)
   20.31 -transform = $(program_transform_name)
   20.32 -NORMAL_INSTALL = :
   20.33 -PRE_INSTALL = :
   20.34 -POST_INSTALL = :
   20.35 -NORMAL_UNINSTALL = :
   20.36 -PRE_UNINSTALL = :
   20.37 -POST_UNINSTALL = :
   20.38 -subdir = src/libident
   20.39 -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
   20.40 -	INSTALL
   20.41 -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
   20.42 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac
   20.43 -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
   20.44 -	$(ACLOCAL_M4)
   20.45 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
   20.46 -CONFIG_HEADER = $(top_builddir)/config.h
   20.47 -CONFIG_CLEAN_FILES =
   20.48 -CONFIG_CLEAN_VPATH_FILES =
   20.49 -LIBRARIES = $(noinst_LIBRARIES)
   20.50 -AR = ar
   20.51 -ARFLAGS = cru
   20.52 -libident_a_AR = $(AR) $(ARFLAGS)
   20.53 -libident_a_LIBADD =
   20.54 -am_libident_a_OBJECTS = ident.$(OBJEXT) id_open.$(OBJEXT) \
   20.55 -	id_close.$(OBJEXT) id_query.$(OBJEXT) id_parse.$(OBJEXT) \
   20.56 -	support.$(OBJEXT) version.$(OBJEXT)
   20.57 -libident_a_OBJECTS = $(am_libident_a_OBJECTS)
   20.58 -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
   20.59 -depcomp = $(SHELL) $(top_srcdir)/depcomp
   20.60 -am__depfiles_maybe = depfiles
   20.61 -am__mv = mv -f
   20.62 -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
   20.63 -	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
   20.64 -CCLD = $(CC)
   20.65 -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
   20.66 -SOURCES = $(libident_a_SOURCES)
   20.67 -DIST_SOURCES = $(libident_a_SOURCES)
   20.68 -ETAGS = etags
   20.69 -CTAGS = ctags
   20.70 -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
   20.71 -ACLOCAL = @ACLOCAL@
   20.72 -AMTAR = @AMTAR@
   20.73 -AUTOCONF = @AUTOCONF@
   20.74 -AUTOHEADER = @AUTOHEADER@
   20.75 -AUTOMAKE = @AUTOMAKE@
   20.76 -AWK = @AWK@
   20.77 -BASE64_LIBS = @BASE64_LIBS@
   20.78 -CC = @CC@
   20.79 -CCDEPMODE = @CCDEPMODE@
   20.80 -CFLAGS = @CFLAGS@
   20.81 -CPP = @CPP@
   20.82 -CPPFLAGS = @CPPFLAGS@
   20.83 -CYGPATH_W = @CYGPATH_W@
   20.84 -DEFS = @DEFS@
   20.85 -DEPDIR = @DEPDIR@
   20.86 -ECHO_C = @ECHO_C@
   20.87 -ECHO_N = @ECHO_N@
   20.88 -ECHO_T = @ECHO_T@
   20.89 -EGREP = @EGREP@
   20.90 -EXEEXT = @EXEEXT@
   20.91 -GLIB_CFLAGS = @GLIB_CFLAGS@
   20.92 -GLIB_LIBS = @GLIB_LIBS@
   20.93 -GREP = @GREP@
   20.94 -IDENT_LIBS = @IDENT_LIBS@
   20.95 -INSTALL = @INSTALL@
   20.96 -INSTALL_DATA = @INSTALL_DATA@
   20.97 -INSTALL_PROGRAM = @INSTALL_PROGRAM@
   20.98 -INSTALL_SCRIPT = @INSTALL_SCRIPT@
   20.99 -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  20.100 -LDFLAGS = @LDFLAGS@
  20.101 -LIBOBJS = @LIBOBJS@
  20.102 -LIBS = @LIBS@
  20.103 -LOCKFILE_LIBS = @LOCKFILE_LIBS@
  20.104 -LTLIBOBJS = @LTLIBOBJS@
  20.105 -MAKEINFO = @MAKEINFO@
  20.106 -MD5_LIBS = @MD5_LIBS@
  20.107 -MKDIR_P = @MKDIR_P@
  20.108 -OBJEXT = @OBJEXT@
  20.109 -PACKAGE = @PACKAGE@
  20.110 -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
  20.111 -PACKAGE_NAME = @PACKAGE_NAME@
  20.112 -PACKAGE_STRING = @PACKAGE_STRING@
  20.113 -PACKAGE_TARNAME = @PACKAGE_TARNAME@
  20.114 -PACKAGE_URL = @PACKAGE_URL@
  20.115 -PACKAGE_VERSION = @PACKAGE_VERSION@
  20.116 -PATH_SEPARATOR = @PATH_SEPARATOR@
  20.117 -PKG_CONFIG = @PKG_CONFIG@
  20.118 -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
  20.119 -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
  20.120 -RANLIB = @RANLIB@
  20.121 -RESOLV_LIBS = @RESOLV_LIBS@
  20.122 -SET_MAKE = @SET_MAKE@
  20.123 -SHELL = @SHELL@
  20.124 -STRIP = @STRIP@
  20.125 -USE_LIBLOCKFILE = @USE_LIBLOCKFILE@
  20.126 -VERSION = @VERSION@
  20.127 -abs_builddir = @abs_builddir@
  20.128 -abs_srcdir = @abs_srcdir@
  20.129 -abs_top_builddir = @abs_top_builddir@
  20.130 -abs_top_srcdir = @abs_top_srcdir@
  20.131 -ac_ct_CC = @ac_ct_CC@
  20.132 -am__include = @am__include@
  20.133 -am__leading_dot = @am__leading_dot@
  20.134 -am__quote = @am__quote@
  20.135 -am__tar = @am__tar@
  20.136 -am__untar = @am__untar@
  20.137 -bindir = @bindir@
  20.138 -build_alias = @build_alias@
  20.139 -builddir = @builddir@
  20.140 -datadir = @datadir@
  20.141 -datarootdir = @datarootdir@
  20.142 -docdir = @docdir@
  20.143 -dvidir = @dvidir@
  20.144 -exec_prefix = @exec_prefix@
  20.145 -has_ident = @has_ident@
  20.146 -host_alias = @host_alias@
  20.147 -htmldir = @htmldir@
  20.148 -includedir = @includedir@
  20.149 -infodir = @infodir@
  20.150 -install_sh = @install_sh@
  20.151 -libdir = @libdir@
  20.152 -libexecdir = @libexecdir@
  20.153 -localedir = @localedir@
  20.154 -localstatedir = @localstatedir@
  20.155 -mandir = @mandir@
  20.156 -mkdir_p = @mkdir_p@
  20.157 -oldincludedir = @oldincludedir@
  20.158 -pdfdir = @pdfdir@
  20.159 -prefix = @prefix@
  20.160 -program_transform_name = @program_transform_name@
  20.161 -psdir = @psdir@
  20.162 -sbindir = @sbindir@
  20.163 -sharedstatedir = @sharedstatedir@
  20.164 -srcdir = @srcdir@
  20.165 -sysconfdir = @sysconfdir@
  20.166 -target_alias = @target_alias@
  20.167 -top_build_prefix = @top_build_prefix@
  20.168 -top_builddir = @top_builddir@
  20.169 -top_srcdir = @top_srcdir@
  20.170 -with_confdir = @with_confdir@
  20.171 -with_group = @with_group@
  20.172 -with_logdir = @with_logdir@
  20.173 -with_spooldir = @with_spooldir@
  20.174 -with_user = @with_user@
  20.175 -EXTRA_DIST = README_MASQMAIL
  20.176 -AM_CFLAGS = @CFLAGS@ -D_GNU_SOURCE -DHAVE_ANSIHEADERS
  20.177 -noinst_LIBRARIES = libident.a
  20.178 -libident_a_SOURCES = \
  20.179 -	ident.h\
  20.180 -	ident.c\
  20.181 -	id_open.c\
  20.182 -	id_close.c\
  20.183 -	id_query.c\
  20.184 -	id_parse.c\
  20.185 -	support.c\
  20.186 -	version.c
  20.187 -
  20.188 -all: all-am
  20.189 -
  20.190 -.SUFFIXES:
  20.191 -.SUFFIXES: .c .o .obj
  20.192 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
  20.193 -	@for dep in $?; do \
  20.194 -	  case '$(am__configure_deps)' in \
  20.195 -	    *$$dep*) \
  20.196 -	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
  20.197 -	        && { if test -f $@; then exit 0; else break; fi; }; \
  20.198 -	      exit 1;; \
  20.199 -	  esac; \
  20.200 -	done; \
  20.201 -	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libident/Makefile'; \
  20.202 -	$(am__cd) $(top_srcdir) && \
  20.203 -	  $(AUTOMAKE) --gnu src/libident/Makefile
  20.204 -.PRECIOUS: Makefile
  20.205 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  20.206 -	@case '$?' in \
  20.207 -	  *config.status*) \
  20.208 -	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
  20.209 -	  *) \
  20.210 -	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
  20.211 -	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
  20.212 -	esac;
  20.213 -
  20.214 -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  20.215 -	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  20.216 -
  20.217 -$(top_srcdir)/configure:  $(am__configure_deps)
  20.218 -	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  20.219 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  20.220 -	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  20.221 -$(am__aclocal_m4_deps):
  20.222 -
  20.223 -clean-noinstLIBRARIES:
  20.224 -	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
  20.225 -libident.a: $(libident_a_OBJECTS) $(libident_a_DEPENDENCIES) 
  20.226 -	-rm -f libident.a
  20.227 -	$(libident_a_AR) libident.a $(libident_a_OBJECTS) $(libident_a_LIBADD)
  20.228 -	$(RANLIB) libident.a
  20.229 -
  20.230 -mostlyclean-compile:
  20.231 -	-rm -f *.$(OBJEXT)
  20.232 -
  20.233 -distclean-compile:
  20.234 -	-rm -f *.tab.c
  20.235 -
  20.236 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/id_close.Po@am__quote@
  20.237 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/id_open.Po@am__quote@
  20.238 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/id_parse.Po@am__quote@
  20.239 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/id_query.Po@am__quote@
  20.240 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ident.Po@am__quote@
  20.241 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/support.Po@am__quote@
  20.242 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version.Po@am__quote@
  20.243 -
  20.244 -.c.o:
  20.245 -@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
  20.246 -@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  20.247 -@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  20.248 -@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  20.249 -@am__fastdepCC_FALSE@	$(COMPILE) -c $<
  20.250 -
  20.251 -.c.obj:
  20.252 -@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
  20.253 -@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  20.254 -@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  20.255 -@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  20.256 -@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
  20.257 -
  20.258 -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  20.259 -	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  20.260 -	unique=`for i in $$list; do \
  20.261 -	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  20.262 -	  done | \
  20.263 -	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
  20.264 -	      END { if (nonempty) { for (i in files) print i; }; }'`; \
  20.265 -	mkid -fID $$unique
  20.266 -tags: TAGS
  20.267 -
  20.268 -TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  20.269 -		$(TAGS_FILES) $(LISP)
  20.270 -	set x; \
  20.271 -	here=`pwd`; \
  20.272 -	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  20.273 -	unique=`for i in $$list; do \
  20.274 -	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  20.275 -	  done | \
  20.276 -	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
  20.277 -	      END { if (nonempty) { for (i in files) print i; }; }'`; \
  20.278 -	shift; \
  20.279 -	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
  20.280 -	  test -n "$$unique" || unique=$$empty_fix; \
  20.281 -	  if test $$# -gt 0; then \
  20.282 -	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
  20.283 -	      "$$@" $$unique; \
  20.284 -	  else \
  20.285 -	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
  20.286 -	      $$unique; \
  20.287 -	  fi; \
  20.288 -	fi
  20.289 -ctags: CTAGS
  20.290 -CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  20.291 -		$(TAGS_FILES) $(LISP)
  20.292 -	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  20.293 -	unique=`for i in $$list; do \
  20.294 -	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  20.295 -	  done | \
  20.296 -	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
  20.297 -	      END { if (nonempty) { for (i in files) print i; }; }'`; \
  20.298 -	test -z "$(CTAGS_ARGS)$$unique" \
  20.299 -	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
  20.300 -	     $$unique
  20.301 -
  20.302 -GTAGS:
  20.303 -	here=`$(am__cd) $(top_builddir) && pwd` \
  20.304 -	  && $(am__cd) $(top_srcdir) \
  20.305 -	  && gtags -i $(GTAGS_ARGS) "$$here"
  20.306 -
  20.307 -distclean-tags:
  20.308 -	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  20.309 -
  20.310 -distdir: $(DISTFILES)
  20.311 -	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
  20.312 -	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
  20.313 -	list='$(DISTFILES)'; \
  20.314 -	  dist_files=`for file in $$list; do echo $$file; done | \
  20.315 -	  sed -e "s|^$$srcdirstrip/||;t" \
  20.316 -	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
  20.317 -	case $$dist_files in \
  20.318 -	  */*) $(MKDIR_P) `echo "$$dist_files" | \
  20.319 -			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
  20.320 -			   sort -u` ;; \
  20.321 -	esac; \
  20.322 -	for file in $$dist_files; do \
  20.323 -	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
  20.324 -	  if test -d $$d/$$file; then \
  20.325 -	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
  20.326 -	    if test -d "$(distdir)/$$file"; then \
  20.327 -	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
  20.328 -	    fi; \
  20.329 -	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
  20.330 -	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
  20.331 -	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
  20.332 -	    fi; \
  20.333 -	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
  20.334 -	  else \
  20.335 -	    test -f "$(distdir)/$$file" \
  20.336 -	    || cp -p $$d/$$file "$(distdir)/$$file" \
  20.337 -	    || exit 1; \
  20.338 -	  fi; \
  20.339 -	done
  20.340 -check-am: all-am
  20.341 -check: check-am
  20.342 -all-am: Makefile $(LIBRARIES)
  20.343 -installdirs:
  20.344 -install: install-am
  20.345 -install-exec: install-exec-am
  20.346 -install-data: install-data-am
  20.347 -uninstall: uninstall-am
  20.348 -
  20.349 -install-am: all-am
  20.350 -	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
  20.351 -
  20.352 -installcheck: installcheck-am
  20.353 -install-strip:
  20.354 -	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
  20.355 -	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
  20.356 -	  `test -z '$(STRIP)' || \
  20.357 -	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
  20.358 -mostlyclean-generic:
  20.359 -
  20.360 -clean-generic:
  20.361 -
  20.362 -distclean-generic:
  20.363 -	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
  20.364 -	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
  20.365 -
  20.366 -maintainer-clean-generic:
  20.367 -	@echo "This command is intended for maintainers to use"
  20.368 -	@echo "it deletes files that may require special tools to rebuild."
  20.369 -clean: clean-am
  20.370 -
  20.371 -clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
  20.372 -
  20.373 -distclean: distclean-am
  20.374 -	-rm -rf ./$(DEPDIR)
  20.375 -	-rm -f Makefile
  20.376 -distclean-am: clean-am distclean-compile distclean-generic \
  20.377 -	distclean-tags
  20.378 -
  20.379 -dvi: dvi-am
  20.380 -
  20.381 -dvi-am:
  20.382 -
  20.383 -html: html-am
  20.384 -
  20.385 -html-am:
  20.386 -
  20.387 -info: info-am
  20.388 -
  20.389 -info-am:
  20.390 -
  20.391 -install-data-am:
  20.392 -
  20.393 -install-dvi: install-dvi-am
  20.394 -
  20.395 -install-dvi-am:
  20.396 -
  20.397 -install-exec-am:
  20.398 -
  20.399 -install-html: install-html-am
  20.400 -
  20.401 -install-html-am:
  20.402 -
  20.403 -install-info: install-info-am
  20.404 -
  20.405 -install-info-am:
  20.406 -
  20.407 -install-man:
  20.408 -
  20.409 -install-pdf: install-pdf-am
  20.410 -
  20.411 -install-pdf-am:
  20.412 -
  20.413 -install-ps: install-ps-am
  20.414 -
  20.415 -install-ps-am:
  20.416 -
  20.417 -installcheck-am:
  20.418 -
  20.419 -maintainer-clean: maintainer-clean-am
  20.420 -	-rm -rf ./$(DEPDIR)
  20.421 -	-rm -f Makefile
  20.422 -maintainer-clean-am: distclean-am maintainer-clean-generic
  20.423 -
  20.424 -mostlyclean: mostlyclean-am
  20.425 -
  20.426 -mostlyclean-am: mostlyclean-compile mostlyclean-generic
  20.427 -
  20.428 -pdf: pdf-am
  20.429 -
  20.430 -pdf-am:
  20.431 -
  20.432 -ps: ps-am
  20.433 -
  20.434 -ps-am:
  20.435 -
  20.436 -uninstall-am:
  20.437 -
  20.438 -.MAKE: install-am install-strip
  20.439 -
  20.440 -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
  20.441 -	clean-noinstLIBRARIES ctags distclean distclean-compile \
  20.442 -	distclean-generic distclean-tags distdir dvi dvi-am html \
  20.443 -	html-am info info-am install install-am install-data \
  20.444 -	install-data-am install-dvi install-dvi-am install-exec \
  20.445 -	install-exec-am install-html install-html-am install-info \
  20.446 -	install-info-am install-man install-pdf install-pdf-am \
  20.447 -	install-ps install-ps-am install-strip installcheck \
  20.448 -	installcheck-am installdirs maintainer-clean \
  20.449 -	maintainer-clean-generic mostlyclean mostlyclean-compile \
  20.450 -	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
  20.451 -	uninstall-am
  20.452 -
  20.453 -
  20.454 -# Tell versions [3.59,3.63) of GNU make to not export all variables.
  20.455 -# Otherwise a system limit (for SysV at least) may be exceeded.
  20.456 -.NOEXPORT:

    21.1 --- a/src/libident/README	Sat Jan 14 18:44:48 2012 +0100
    21.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    21.3 @@ -1,77 +0,0 @@
    21.4 -COPYRIGHT ISSUES:
    21.5 -
    21.6 -	This version of 'libident' is hereby released into the
    21.7 -	Public Domain. It may be distributed for a fee or without
    21.8 -	a fee. We only ask you not to pretend you wrote it.
    21.9 -
   21.10 -If you make any changes, please send sources or a diff of it to
   21.11 -us (pen@lysator.liu.se or pell@lysator.liu.se), so we can keep
   21.12 -_one_ unified version of libident available...
   21.13 -
   21.14 -
   21.15 -FTP SITE:
   21.16 -
   21.17 -The official FTP site and location for libident is:
   21.18 -
   21.19 -	ftp://ftp.lysator.liu.se/pub/ident/libs
   21.20 -
   21.21 -
   21.22 -COMMENTS:
   21.23 -
   21.24 -This is the second stab at a small library to interface to the Ident
   21.25 -protocol server. Maybe this will work correctly on some machines.. :-)
   21.26 - 
   21.27 -The ident-tester.c file is a small daemon (to be started from Inetd)
   21.28 -that does an ident lookup on you if you telnet into it. Can be used
   21.29 -to verify that your Ident server is working correctly.
   21.30 - 
   21.31 -I'm currently running this "ident-tester" on port 114 at lysator.liu.se
   21.32 -(130.236.254.1) if you wish to test your server.
   21.33 - 
   21.34 -/Peter Eriksson <pen@lysator.liu.se>, 1 Aug 1992
   21.35 -
   21.36 -
   21.37 -This library now contains some higher-level routines, as well as a
   21.38 -similar test program to test these (lookup-tester).
   21.39 -
   21.40 -/Pär Emanuelsson <pell@lysator.liu.se>, 4 April 1993
   21.41 -
   21.42 -
   21.43 -Support for NextStep 3.1 added.
   21.44 -
   21.45 -/Michael Kuch <kuch@mailserv.zdv.uni-tuebingen.de>, 13 Aug 1993
   21.46 -
   21.47 -
   21.48 -Updated the ident.h header file to work with Linux, and reorganized the
   21.49 -Makefile for easier compilation...
   21.50 -
   21.51 -/Peter Eriksson, 18 Oct 1994
   21.52 -
   21.53 -
   21.54 -Added the copyright notice at the top.
   21.55 -
   21.56 -/Peter Eriksson, 29 Nov 1994
   21.57 -
   21.58 -
   21.59 -For release 0.18:
   21.60 -
   21.61 -Added some bug fixes and improvements from Jean-Philippe Martin-Flatin
   21.62 -(syj@ecmwf.int).
   21.63 -
   21.64 -/Peter Eriksson, 5 Oct 1995
   21.65 -
   21.66 -
   21.67 -For release 0.20:
   21.68 -
   21.69 -Some cleanup of the distribution, and some bug fixes in the
   21.70 -ident-tester.c source. Perhaps it should be called 1.0? (Perhaps
   21.71 -it should use GNU Autoconf...)
   21.72 -
   21.73 -/Peter Eriksson, 13 Nov 1996
   21.74 -
   21.75 -
   21.76 -For release 0.21:
   21.77 -
   21.78 -A couple of minor fixes (mainly support for 2.11BSD).
   21.79 -
   21.80 -/Peter Eriksson, 17 Jan 1997

    22.1 --- a/src/libident/README_MASQMAIL	Sat Jan 14 18:44:48 2012 +0100
    22.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    22.3 @@ -1,8 +0,0 @@
    22.4 -This is from libident 0.22 (though the version string says 0.21?). I
    22.5 -have not changed it, except that I replaced the Makefile with a
    22.6 -Makefile.am.
    22.7 -
    22.8 -I also did not include the example programs and the man page in the
    22.9 -masqmail source tarball.
   22.10 -
   22.11 -Oliver Kurth, Fri Oct  6 15:11:07 CEST 2000

    23.1 --- a/src/libident/id_close.c	Sat Jan 14 18:44:48 2012 +0100
    23.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    23.3 @@ -1,28 +0,0 @@
    23.4 -/*
    23.5 -** id_close.c                            Close a connection to an IDENT server
    23.6 -**
    23.7 -** Author: Peter Eriksson <pen@lysator.liu.se>
    23.8 -*/
    23.9 -
   23.10 -#ifdef NeXT3
   23.11 -#  include <libc.h>
   23.12 -#endif
   23.13 -
   23.14 -#ifdef HAVE_ANSIHEADERS
   23.15 -#  include <stdlib.h>
   23.16 -#  include <unistd.h>
   23.17 -#endif
   23.18 -
   23.19 -#define IN_LIBIDENT_SRC
   23.20 -#include "ident.h"
   23.21 -
   23.22 -int
   23.23 -id_close __P1(ident_t *, id)
   23.24 -{
   23.25 -	int res;
   23.26 -
   23.27 -	res = close(id->fd);
   23.28 -	free(id);
   23.29 -
   23.30 -	return res;
   23.31 -}

    24.1 --- a/src/libident/id_open.c	Sat Jan 14 18:44:48 2012 +0100
    24.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    24.3 @@ -1,158 +0,0 @@
    24.4 -/*
    24.5 -** id_open.c                 Establish/initiate a connection to an IDENT server
    24.6 -**
    24.7 -** Author: Peter Eriksson <pen@lysator.liu.se>
    24.8 -** Fixes: Pär Emanuelsson <pell@lysator.liu.se>
    24.9 -*/
   24.10 -
   24.11 -#ifdef NeXT3
   24.12 -#  include <libc.h>
   24.13 -#endif
   24.14 -
   24.15 -#include <stdio.h>
   24.16 -#include <errno.h>
   24.17 -#include <fcntl.h>
   24.18 -
   24.19 -#ifdef HAVE_ANSIHEADERS
   24.20 -#  include <stdlib.h>
   24.21 -#  include <string.h>
   24.22 -#  include <unistd.h>
   24.23 -#  if !defined(__sgi) && !defined(VMS)
   24.24 -#    define bzero(p,l)     memset(p, 0, l)
   24.25 -#  endif
   24.26 -#endif
   24.27 -
   24.28 -#include <sys/types.h>
   24.29 -#include <sys/socket.h>
   24.30 -#include <sys/wait.h>
   24.31 -#include <sys/time.h>
   24.32 -#include <sys/file.h>
   24.33 -
   24.34 -#define IN_LIBIDENT_SRC
   24.35 -#include "ident.h"
   24.36 -
   24.37 -#include <arpa/inet.h>
   24.38 -
   24.39 -#ifdef _AIX
   24.40 -#  include <sys/select.h>
   24.41 -#endif
   24.42 -
   24.43 -
   24.44 -/*
   24.45 -ident_t *id_open __P3(struct in_addr *, laddr, struct in_addr *, faddr, struct timeval *, timeout)
   24.46 -*/
   24.47 -
   24.48 -ident_t*
   24.49 -id_open __P((__STRUCT_IN_ADDR_P laddr, __STRUCT_IN_ADDR_P faddr, __STRUCT_TIMEVAL_P timeout))
   24.50 -{
   24.51 -	ident_t *id;
   24.52 -	int res, tmperrno;
   24.53 -	struct sockaddr_in sin_laddr, sin_faddr;
   24.54 -	fd_set rs, ws, es;
   24.55 -#ifndef OLD_SETSOCKOPT
   24.56 -	int on = 1;
   24.57 -	struct linger linger;
   24.58 -#endif
   24.59 -
   24.60 -	if ((id = (ident_t *) malloc(sizeof(*id))) == 0)
   24.61 -		return 0;
   24.62 -
   24.63 -	if ((id->fd = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
   24.64 -		free(id);
   24.65 -		return 0;
   24.66 -	}
   24.67 -
   24.68 -	if (timeout) {
   24.69 -		if ((res = fcntl(id->fd, F_GETFL, 0)) < 0)
   24.70 -			goto ERROR;
   24.71 -
   24.72 -#ifndef VMS
   24.73 -		if (fcntl(id->fd, F_SETFL, res | FNDELAY) < 0)
   24.74 -			goto ERROR;
   24.75 -#endif
   24.76 -	}
   24.77 -
   24.78 -	/* We silently ignore errors if we can't change LINGER */
   24.79 -#ifdef OLD_SETSOCKOPT
   24.80 -	/* Old style setsockopt() */
   24.81 -	(void) setsockopt(id->fd, SOL_SOCKET, SO_DONTLINGER);
   24.82 -	(void) setsockopt(id->fd, SOL_SOCKET, SO_REUSEADDR);
   24.83 -#else
   24.84 -	/* New style setsockopt() */
   24.85 -	linger.l_onoff = 0;
   24.86 -	linger.l_linger = 0;
   24.87 -
   24.88 -	(void) setsockopt(id->fd, SOL_SOCKET, SO_LINGER, (void *) &linger, sizeof(linger));
   24.89 -	(void) setsockopt(id->fd, SOL_SOCKET, SO_REUSEADDR, (void *) &on, sizeof(on));
   24.90 -#endif
   24.91 -
   24.92 -	id->buf[0] = '\0';
   24.93 -
   24.94 -	bzero((char *) &sin_laddr, sizeof(sin_laddr));
   24.95 -	sin_laddr.sin_family = AF_INET;
   24.96 -	sin_laddr.sin_addr = *laddr;
   24.97 -	sin_laddr.sin_port = 0;
   24.98 -
   24.99 -	if (bind(id->fd, (struct sockaddr *) &sin_laddr, sizeof(sin_laddr)) < 0) {
  24.100 -#ifdef DEBUG
  24.101 -		perror("libident: bind");
  24.102 -#endif
  24.103 -		goto ERROR;
  24.104 -	}
  24.105 -
  24.106 -	bzero((char *) &sin_faddr, sizeof(sin_faddr));
  24.107 -	sin_faddr.sin_family = AF_INET;
  24.108 -	sin_faddr.sin_addr = *faddr;
  24.109 -	sin_faddr.sin_port = htons(IDPORT);
  24.110 -
  24.111 -	errno = 0;
  24.112 -	res = connect(id->fd, (struct sockaddr *) &sin_faddr, sizeof(sin_faddr));
  24.113 -	if (res < 0 && errno != EINPROGRESS) {
  24.114 -#ifdef DEBUG
  24.115 -		perror("libident: connect");
  24.116 -#endif
  24.117 -		goto ERROR;
  24.118 -	}
  24.119 -
  24.120 -	if (timeout) {
  24.121 -		FD_ZERO(&rs);
  24.122 -		FD_ZERO(&ws);
  24.123 -		FD_ZERO(&es);
  24.124 -
  24.125 -		FD_SET(id->fd, &rs);
  24.126 -		FD_SET(id->fd, &ws);
  24.127 -		FD_SET(id->fd, &es);
  24.128 -
  24.129 -#ifdef __hpux
  24.130 -		if ((res = select(FD_SETSIZE, (int *) &rs, (int *) &ws, (int *) &es, timeout)) < 0)
  24.131 -#else
  24.132 -		if ((res = select(FD_SETSIZE, &rs, &ws, &es, timeout)) < 0)
  24.133 -#endif
  24.134 -		{
  24.135 -#ifdef DEBUG
  24.136 -			perror("libident: select");
  24.137 -#endif
  24.138 -			goto ERROR;
  24.139 -		}
  24.140 -
  24.141 -		if (res == 0) {
  24.142 -			errno = ETIMEDOUT;
  24.143 -			goto ERROR;
  24.144 -		}
  24.145 -
  24.146 -		if (FD_ISSET(id->fd, &es))
  24.147 -			goto ERROR;
  24.148 -
  24.149 -		if (!FD_ISSET(id->fd, &rs) && !FD_ISSET(id->fd, &ws))
  24.150 -			goto ERROR;
  24.151 -	}
  24.152 -
  24.153 -	return id;
  24.154 -
  24.155 -  ERROR:
  24.156 -	tmperrno = errno;  /* Save, so close() won't erase it */
  24.157 -	close(id->fd);
  24.158 -	free(id);
  24.159 -	errno = tmperrno;
  24.160 -	return 0;
  24.161 -}

    25.1 --- a/src/libident/id_parse.c	Sat Jan 14 18:44:48 2012 +0100
    25.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    25.3 @@ -1,215 +0,0 @@
    25.4 -/*
    25.5 -** id_parse.c                    Receive and parse a reply from an IDENT server
    25.6 -**
    25.7 -** Author: Peter Eriksson <pen@lysator.liu.se>
    25.8 -** Fiddling: Pär Emanuelsson <pell@lysator.liu.se>
    25.9 -*/
   25.10 -
   25.11 -#ifdef NeXT3
   25.12 -#  include <libc.h>
   25.13 -#endif
   25.14 -
   25.15 -#include <stdio.h>
   25.16 -#include <string.h>
   25.17 -#include <errno.h>
   25.18 -#include <ctype.h>
   25.19 -
   25.20 -#ifdef HAVE_ANSIHEADERS
   25.21 -#  include <stdlib.h>
   25.22 -#  include <string.h>
   25.23 -#  include <unistd.h>
   25.24 -#endif
   25.25 -
   25.26 -#include <sys/types.h>
   25.27 -#include <sys/wait.h>
   25.28 -#include <sys/time.h>
   25.29 -
   25.30 -#ifdef _AIX
   25.31 -#  include <sys/select.h>
   25.32 -#endif
   25.33 -
   25.34 -#ifdef _AIX
   25.35 -#  include <sys/select.h>
   25.36 -#endif
   25.37 -#ifdef VMS
   25.38 -#  include <sys/socket.h>  /* for fd_set */
   25.39 -#endif
   25.40 -#define IN_LIBIDENT_SRC
   25.41 -#include "ident.h"
   25.42 -
   25.43 -
   25.44 -/*
   25.45 -int
   25.46 -id_parse __P7(ident_t *, id,
   25.47 -              struct timeval *, timeout,
   25.48 -              int *, lport,
   25.49 -              int *, fport,
   25.50 -              char **, identifier,
   25.51 -              char **, opsys,
   25.52 -              char **, charset)
   25.53 -*/
   25.54 -
   25.55 -int
   25.56 -id_parse __P((ident_t * id,
   25.57 -            __STRUCT_TIMEVAL_P timeout,
   25.58 -            int *lport,
   25.59 -            int *fport,
   25.60 -            char **identifier,
   25.61 -            char **opsys,
   25.62 -            char **charset))
   25.63 -{
   25.64 -	char c, *cp, *tmp_charset;
   25.65 -	fd_set rs;
   25.66 -	int pos, res = 0, lp, fp;
   25.67 -
   25.68 -	errno = 0;
   25.69 -
   25.70 -	tmp_charset = 0;
   25.71 -
   25.72 -	if (!id)
   25.73 -		return -1;
   25.74 -	if (lport)
   25.75 -		*lport = 0;
   25.76 -	if (fport)
   25.77 -		*fport = 0;
   25.78 -	if (identifier)
   25.79 -		*identifier = 0;
   25.80 -	if (opsys)
   25.81 -		*opsys = 0;
   25.82 -	if (charset)
   25.83 -		*charset = 0;
   25.84 -
   25.85 -	pos = strlen(id->buf);
   25.86 -
   25.87 -	if (timeout) {
   25.88 -		FD_ZERO(&rs);
   25.89 -		FD_SET(id->fd, &rs);
   25.90 -
   25.91 -#ifdef __hpux
   25.92 -		if ((res = select(FD_SETSIZE, (int *) &rs, (int *) 0, (int *) 0, timeout)) < 0)
   25.93 -#else
   25.94 -		if ((res = select(FD_SETSIZE, &rs, (fd_set *) 0, (fd_set *) 0, timeout)) < 0)
   25.95 -#endif
   25.96 -			return -1;
   25.97 -
   25.98 -		if (res == 0) {
   25.99 -			errno = ETIMEDOUT;
  25.100 -			return -1;
  25.101 -		}
  25.102 -	}
  25.103 -
  25.104 -	/* Every octal value is allowed except 0, \n and \r */
  25.105 -	while (pos < sizeof(id->buf)
  25.106 -	       && (res = read(id->fd, id->buf + pos, 1)) == 1
  25.107 -	       && id->buf[pos] != '\n' && id->buf[pos] != '\r')
  25.108 -		pos++;
  25.109 -
  25.110 -	if (res < 0)
  25.111 -		return -1;
  25.112 -
  25.113 -	if (res == 0) {
  25.114 -		errno = ENOTCONN;
  25.115 -		return -1;
  25.116 -	}
  25.117 -
  25.118 -	if (id->buf[pos] != '\n' && id->buf[pos] != '\r')
  25.119 -		return 0;  /* Not properly terminated string */
  25.120 -
  25.121 -	id->buf[pos++] = '\0';
  25.122 -
  25.123 -	/*
  25.124 -	 ** Get first field (<lport> , <fport>)
  25.125 -	 */
  25.126 -	cp = id_strtok(id->buf, ":", &c);
  25.127 -	if (!cp)
  25.128 -		return -2;
  25.129 -
  25.130 -	if (sscanf(cp, " %d , %d", &lp, &fp) != 2) {
  25.131 -		if (identifier) {
  25.132 -			*identifier = id_strdup(cp);
  25.133 -			if (*identifier == NULL)
  25.134 -				return -4;
  25.135 -		}
  25.136 -		return -2;
  25.137 -	}
  25.138 -
  25.139 -	if (lport)
  25.140 -		*lport = lp;
  25.141 -	if (fport)
  25.142 -		*fport = fp;
  25.143 -
  25.144 -	/*
  25.145 -	 ** Get second field (USERID or ERROR)
  25.146 -	 */
  25.147 -	cp = id_strtok((char *) 0, ":", &c);
  25.148 -	if (!cp)
  25.149 -		return -2;
  25.150 -
  25.151 -	if (strcmp(cp, "ERROR") == 0) {
  25.152 -		cp = id_strtok((char *) 0, "\n\r", &c);
  25.153 -		if (!cp)
  25.154 -			return -2;
  25.155 -
  25.156 -		if (identifier) {
  25.157 -			*identifier = id_strdup(cp);
  25.158 -			if (*identifier == NULL)
  25.159 -				return -4;
  25.160 -		}
  25.161 -
  25.162 -		return 2;
  25.163 -	} else if (strcmp(cp, "USERID") == 0) {
  25.164 -		/*
  25.165 -		 ** Get first subfield of third field <opsys>
  25.166 -		 */
  25.167 -		cp = id_strtok((char *) 0, ",:", &c);
  25.168 -		if (!cp)
  25.169 -			return -2;
  25.170 -
  25.171 -		if (opsys) {
  25.172 -			*opsys = id_strdup(cp);
  25.173 -			if (*opsys == NULL)
  25.174 -				return -4;
  25.175 -		}
  25.176 -
  25.177 -		/*
  25.178 -		 ** We have a second subfield (<charset>)
  25.179 -		 */
  25.180 -		if (c == ',') {
  25.181 -			cp = id_strtok((char *) 0, ":", &c);
  25.182 -			if (!cp)
  25.183 -				return -2;
  25.184 -
  25.185 -			tmp_charset = cp;
  25.186 -			if (charset) {
  25.187 -				*charset = id_strdup(cp);
  25.188 -				if (*charset == NULL)
  25.189 -					return -4;
  25.190 -			}
  25.191 -
  25.192 -			/*
  25.193 -			 ** We have even more subfields - ignore them
  25.194 -			 */
  25.195 -			if (c == ',')
  25.196 -				id_strtok((char *) 0, ":", &c);
  25.197 -		}
  25.198 -
  25.199 -		if (tmp_charset && strcmp(tmp_charset, "OCTET") == 0)
  25.200 -			cp = id_strtok((char *) 0, (char *) 0, &c);
  25.201 -		else
  25.202 -			cp = id_strtok((char *) 0, "\n\r", &c);
  25.203 -
  25.204 -		if (identifier) {
  25.205 -			*identifier = id_strdup(cp);
  25.206 -			if (*identifier == NULL)
  25.207 -				return -4;
  25.208 -		}
  25.209 -		return 1;
  25.210 -	} else {
  25.211 -		if (identifier) {
  25.212 -			*identifier = id_strdup(cp);
  25.213 -			if (*identifier == NULL)
  25.214 -				return -4;
  25.215 -		}
  25.216 -		return -3;
  25.217 -	}
  25.218 -}

    26.1 --- a/src/libident/id_query.c	Sat Jan 14 18:44:48 2012 +0100
    26.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    26.3 @@ -1,82 +0,0 @@
    26.4 -/*
    26.5 -** id_query.c                             Transmit a query to an IDENT server
    26.6 -**
    26.7 -** Author: Peter Eriksson <pen@lysator.liu.se>
    26.8 -*/
    26.9 -
   26.10 -#ifdef NeXT3
   26.11 -#  include <libc.h>
   26.12 -#endif
   26.13 -
   26.14 -#include <stdio.h>
   26.15 -#include <errno.h>
   26.16 -#include <signal.h>
   26.17 -
   26.18 -#ifdef HAVE_ANSIHEADERS
   26.19 -#  include <stdlib.h>
   26.20 -#  include <string.h>
   26.21 -#  include <unistd.h>
   26.22 -#endif
   26.23 -
   26.24 -#include <sys/types.h>
   26.25 -#include <sys/wait.h>
   26.26 -#include <sys/time.h>
   26.27 -
   26.28 -#ifdef _AIX
   26.29 -#  include <sys/select.h>
   26.30 -#endif
   26.31 -
   26.32 -#ifdef _AIX
   26.33 -#  include <sys/select.h>
   26.34 -#endif
   26.35 -#ifdef VMS
   26.36 -#  include <sys/socket.h>  /* for fd_set */
   26.37 -#endif
   26.38 -#define IN_LIBIDENT_SRC
   26.39 -#include "ident.h"
   26.40 -
   26.41 -
   26.42 -/*
   26.43 -int
   26.44 -id_query __P4(ident_t *, id, int, lport, int, fport, struct timeval *, timeout)
   26.45 -*/
   26.46 -
   26.47 -int
   26.48 -id_query __P((ident_t * id, int lport, int fport, __STRUCT_TIMEVAL_P timeout))
   26.49 -{
   26.50 -#ifdef SIGRETURNTYPE
   26.51 -	SIGRETURNTYPE(*old_sig) ();
   26.52 -#else
   26.53 -	void (*old_sig) __P((int));
   26.54 -#endif
   26.55 -	int res;
   26.56 -	char buf[80];
   26.57 -	fd_set ws;
   26.58 -
   26.59 -	sprintf(buf, "%d , %d\r\n", lport, fport);
   26.60 -
   26.61 -	if (timeout) {
   26.62 -		FD_ZERO(&ws);
   26.63 -		FD_SET(id->fd, &ws);
   26.64 -
   26.65 -#ifdef __hpux
   26.66 -		if ((res = select(FD_SETSIZE, (int *) 0, (int *) &ws, (int *) 0, timeout)) < 0)
   26.67 -#else
   26.68 -		if ((res = select(FD_SETSIZE, (fd_set *) 0, &ws, (fd_set *) 0, timeout)) < 0)
   26.69 -#endif
   26.70 -			return -1;
   26.71 -
   26.72 -		if (res == 0) {
   26.73 -			errno = ETIMEDOUT;
   26.74 -			return -1;
   26.75 -		}
   26.76 -	}
   26.77 -
   26.78 -	old_sig = signal(SIGPIPE, SIG_IGN);
   26.79 -
   26.80 -	res = write(id->fd, buf, strlen(buf));
   26.81 -
   26.82 -	signal(SIGPIPE, old_sig);
   26.83 -
   26.84 -	return res;
   26.85 -}

    27.1 --- a/src/libident/ident.c	Sat Jan 14 18:44:48 2012 +0100
    27.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    27.3 @@ -1,136 +0,0 @@
    27.4 -/*
    27.5 -** ident.c  High-level calls to the ident lib
    27.6 -**
    27.7 -** Author: Pär Emanuelsson <pell@lysator.liu.se>
    27.8 -** Hacked by: Peter Eriksson <pen@lysator.liu.se>
    27.9 -*/
   27.10 -
   27.11 -#ifdef NeXT3
   27.12 -#  include <libc.h>
   27.13 -#endif
   27.14 -
   27.15 -#include <stdio.h>
   27.16 -
   27.17 -#ifdef HAVE_ANSIHEADERS
   27.18 -#  include <stdlib.h>
   27.19 -#  include <string.h>
   27.20 -#endif
   27.21 -
   27.22 -#include <errno.h>
   27.23 -
   27.24 -#include <sys/types.h>
   27.25 -#include <sys/socket.h>
   27.26 -
   27.27 -#define IN_LIBIDENT_SRC
   27.28 -#include "ident.h"
   27.29 -
   27.30 -#include <arpa/inet.h>
   27.31 -
   27.32 -
   27.33 -
   27.34 -
   27.35 -/* Do a complete ident query and return result */
   27.36 -
   27.37 -IDENT*
   27.38 -ident_lookup __P2(int, fd, int, timeout)
   27.39 -{
   27.40 -	struct sockaddr_in localaddr, remoteaddr;
   27.41 -	int len;
   27.42 -
   27.43 -	len = sizeof(remoteaddr);
   27.44 -	if (getpeername(fd, (struct sockaddr *) &remoteaddr, &len) < 0)
   27.45 -		return 0;
   27.46 -
   27.47 -	len = sizeof(localaddr);
   27.48 -	if (getsockname(fd, (struct sockaddr *) &localaddr, &len) < 0)
   27.49 -		return 0;
   27.50 -
   27.51 -	return ident_query(&localaddr.sin_addr, &remoteaddr.sin_addr, ntohs(localaddr.sin_port), ntohs(remoteaddr.sin_port), timeout);
   27.52 -}
   27.53 -
   27.54 -
   27.55 -IDENT*
   27.56 -ident_query __P5(struct in_addr *, laddr, struct in_addr *, raddr, int, lport, int, rport, int, timeout)
   27.57 -{
   27.58 -	int res;
   27.59 -	ident_t *id;
   27.60 -	struct timeval timout;
   27.61 -	IDENT *ident = 0;
   27.62 -
   27.63 -
   27.64 -	timout.tv_sec = timeout;
   27.65 -	timout.tv_usec = 0;
   27.66 -
   27.67 -	if (timeout)
   27.68 -		id = id_open(laddr, raddr, &timout);
   27.69 -	else
   27.70 -		id = id_open(laddr, raddr, (struct timeval *) 0);
   27.71 -
   27.72 -	if (!id) {
   27.73 -		errno = EINVAL;
   27.74 -		return 0;
   27.75 -	}
   27.76 -
   27.77 -	if (timeout)
   27.78 -		res = id_query(id, rport, lport, &timout);
   27.79 -	else
   27.80 -		res = id_query(id, rport, lport, (struct timeval *) 0);
   27.81 -
   27.82 -	if (res < 0) {
   27.83 -		id_close(id);
   27.84 -		return 0;
   27.85 -	}
   27.86 -
   27.87 -	ident = (IDENT *) malloc(sizeof(IDENT));
   27.88 -	if (!ident) {
   27.89 -		id_close(id);
   27.90 -		return 0;
   27.91 -	}
   27.92 -
   27.93 -	if (timeout)
   27.94 -		res = id_parse(id, &timout, &ident->lport, &ident->fport, &ident->identifier, &ident->opsys, &ident->charset);
   27.95 -	else
   27.96 -		res = id_parse(id, (struct timeval *) 0, &ident->lport, &ident->fport, &ident->identifier, &ident->opsys, &ident->charset);
   27.97 -
   27.98 -	if (res != 1) {
   27.99 -		free(ident);
  27.100 -		id_close(id);
  27.101 -		return 0;
  27.102 -	}
  27.103 -
  27.104 -	id_close(id);
  27.105 -	return ident;  /* At last! */
  27.106 -}
  27.107 -
  27.108 -
  27.109 -char*
  27.110 -ident_id __P2(int, fd, int, timeout)
  27.111 -{
  27.112 -	IDENT *ident;
  27.113 -	char *id = 0;
  27.114 -
  27.115 -	ident = ident_lookup(fd, timeout);
  27.116 -	if (ident && ident->identifier && *ident->identifier) {
  27.117 -		id = id_strdup(ident->identifier);
  27.118 -		if (id == NULL)
  27.119 -			return NULL;
  27.120 -	}
  27.121 -
  27.122 -	ident_free(ident);
  27.123 -	return id;
  27.124 -}
  27.125 -
  27.126 -
  27.127 -void
  27.128 -ident_free __P1(IDENT *, id)
  27.129 -{
  27.130 -	if (!id)
  27.131 -		return;
  27.132 -	if (id->identifier)
  27.133 -		free(id->identifier);
  27.134 -	if (id->opsys)
  27.135 -		free(id->opsys);
  27.136 -	if (id->charset)
  27.137 -		free(id->charset);
  27.138 -	free(id);
  27.139 -}

    28.1 --- a/src/libident/ident.h	Sat Jan 14 18:44:48 2012 +0100
    28.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    28.3 @@ -1,181 +0,0 @@
    28.4 -/*
    28.5 -** ident.h
    28.6 -**
    28.7 -** Author: Peter Eriksson <pen@lysator.liu.se>
    28.8 -** Intruder: Pär Emanuelsson <pell@lysator.liu.se>
    28.9 -*/
   28.10 -
   28.11 -#ifndef __IDENT_H__
   28.12 -#define __IDENT_H__
   28.13 -
   28.14 -#ifdef __cplusplus
   28.15 -extern "C" {
   28.16 -#endif
   28.17 -
   28.18 -/* Sigh */
   28.19 -#ifdef __STDC__
   28.20 -#  if __STDC__ == 1
   28.21 -#    define IS_STDC 1
   28.22 -#  endif
   28.23 -#endif
   28.24 -
   28.25 -#ifdef __P
   28.26 -#  undef __P
   28.27 -#endif
   28.28 -
   28.29 -#ifdef IS_STDC
   28.30 -#  define __P(AL) AL
   28.31 -
   28.32 -#ifdef IN_LIBIDENT_SRC
   28.33 -
   28.34 -#  define __P1(t1,a1) \
   28.35 -    (t1 a1)
   28.36 -
   28.37 -#  define __P2(t1,a1,t2,a2) \
   28.38 -    (t1 a1, t2 a2)
   28.39 -
   28.40 -#  define __P3(t1,a1,t2,a2,t3,a3) \
   28.41 -    (t1 a1, t2 a2, t3 a3)
   28.42 -
   28.43 -#  define __P4(t1,a1,t2,a2,t3,a3,t4,a4) \
   28.44 -    (t1 a1, t2 a2, t3 a3, t4 a4)
   28.45 -
   28.46 -#  define __P5(t1,a1,t2,a2,t3,a3,t4,a4,t5,a5) \
   28.47 -    (t1 a1, t2 a2, t3 a3, t4 a4, t5 a5)
   28.48 -
   28.49 -#  define __P7(t1,a1,t2,a2,t3,a3,t4,a4,t5,a5,t6,a6,t7,a7) \
   28.50 -    (t1 a1, t2 a2, t3 a3, t4 a4, t5 a5, t6 a6, t7 a7)
   28.51 -#endif
   28.52 -
   28.53 -#else
   28.54 -
   28.55 -#  define __P(AL) ()
   28.56 -
   28.57 -#ifdef IN_LIBIDENT_SRC
   28.58 -
   28.59 -#  define __P1(t1,a1)                     (a1) \
   28.60 -    t1 a1;
   28.61 -#  define __P2(t1,a1,t2,a2)               (a1, a2) \
   28.62 -    t1 a1; \
   28.63 -    t2 a2;
   28.64 -#  define __P3(t1,a1,t2,a2,t3,a3)         (a1, a2, a3) \
   28.65 -    t1 a1; \
   28.66 -    t2 a2; \
   28.67 -    t3 a3;
   28.68 -#  define __P4(t1,a1,t2,a2,t3,a3,t4,a4)   (a1, a2, a3, a4) \
   28.69 -    t1 a1; \
   28.70 -    t2 a2; \
   28.71 -    t3 a3; \
   28.72 -    t4 a4;
   28.73 -#  define __P5(t1,a1,t2,a2,t3,a3,t4,a4,t5,a5)   (a1, a2, a3, a4, a5) \
   28.74 -    t1 a1; \
   28.75 -    t2 a2; \
   28.76 -    t3 a3; \
   28.77 -    t4 a4; \
   28.78 -    t5 a5;
   28.79 -#  define __P7(t1,a1,t2,a2,t3,a3,t4,a4,t5,a5,t6,a6,t7,a7) \
   28.80 -    (a1, a2, a3, a4, a5, a6, a7) \
   28.81 -    t1 a1; \
   28.82 -    t2 a2; \
   28.83 -    t3 a3; \
   28.84 -    t4 a4; \
   28.85 -    t5 a5; \
   28.86 -    t6 a6; \
   28.87 -    t7 a7;
   28.88 -#endif
   28.89 -#endif
   28.90 -
   28.91 -#ifdef IS_STDC
   28.92 -#  undef IS_STDC
   28.93 -#endif
   28.94 -
   28.95 -#ifdef _AIX
   28.96 -#  include <sys/select.h>
   28.97 -#endif
   28.98 -#ifdef __sgi
   28.99 -#  include <bstring.h>
  28.100 -#endif
  28.101 -#include <sys/types.h>
  28.102 -#include <netinet/in.h>
  28.103 -#include <sys/time.h>
  28.104 -
  28.105 -#if defined(VMS) && !defined(FD_SETSIZE)
  28.106 -#  define FD_SETSIZE 64
  28.107 -#endif
  28.108 -
  28.109 -/*
  28.110 - * Sigh, GCC v2 complains when using undefined struct tags
  28.111 - * in function prototypes...
  28.112 - */
  28.113 -#if defined(__GNUC__) && !defined(INADDR_ANY)
  28.114 -#  define __STRUCT_IN_ADDR_P void *
  28.115 -#else
  28.116 -#  define __STRUCT_IN_ADDR_P struct in_addr *
  28.117 -#endif
  28.118 -
  28.119 -#if defined(__GNUC__) && !defined(DST_NONE)
  28.120 -#  define __STRUCT_TIMEVAL_P void *
  28.121 -#else
  28.122 -#  define __STRUCT_TIMEVAL_P struct timeval *
  28.123 -#endif
  28.124 -
  28.125 -#if defined(__sgi) && defined(_POSIX_SOURCE)
  28.126 -#  undef  __STRUCT_TIMEVAL_P
  28.127 -#  define __STRUCT_TIMEVAL_P void *
  28.128 -#endif
  28.129 -
  28.130 -#ifndef IDBUFSIZE
  28.131 -#  define IDBUFSIZE 2048
  28.132 -#endif
  28.133 -
  28.134 -#ifndef IDPORT
  28.135 -#  define IDPORT 113
  28.136 -#endif
  28.137 -
  28.138 -	typedef struct {
  28.139 -		int fd;
  28.140 -		char buf[IDBUFSIZE];
  28.141 -	} ident_t;
  28.142 -
  28.143 -	typedef struct {
  28.144 -		int lport;  /* Local port */
  28.145 -		int fport;  /* Far (remote) port */
  28.146 -		char *identifier;  /* Normally user name */
  28.147 -		char *opsys;  /* OS */
  28.148 -		char *charset;  /* Charset (what did you expect?) */
  28.149 -	} IDENT;  /* For higher-level routines */
  28.150 -
  28.151 -/* Low-level calls and macros */
  28.152 -#define id_fileno(ID) ((ID)->fd)
  28.153 -
  28.154 -	extern ident_t *id_open __P((__STRUCT_IN_ADDR_P laddr, __STRUCT_IN_ADDR_P faddr, __STRUCT_TIMEVAL_P timeout));
  28.155 -
  28.156 -	extern int id_close __P((ident_t * id));
  28.157 -
  28.158 -	extern int id_query __P((ident_t * id, int lport, int fport, __STRUCT_TIMEVAL_P timeout));
  28.159 -
  28.160 -	extern int id_parse __P((ident_t * id, __STRUCT_TIMEVAL_P timeout, int *lport, int *fport, char **identifier, char **opsys, char **charset));
  28.161 -
  28.162 -/* High-level calls */
  28.163 -
  28.164 -	extern IDENT *ident_lookup __P((int fd, int timeout));
  28.165 -
  28.166 -	extern char *ident_id __P((int fd, int timeout));
  28.167 -
  28.168 -	extern IDENT *ident_query __P((__STRUCT_IN_ADDR_P laddr, __STRUCT_IN_ADDR_P raddr, int lport, int rport, int timeout));
  28.169 -
  28.170 -	extern void ident_free __P((IDENT * id));
  28.171 -
  28.172 -	extern char id_version[];
  28.173 -
  28.174 -#ifdef IN_LIBIDENT_SRC
  28.175 -
  28.176 -	extern char *id_strdup __P((char *str));
  28.177 -	extern char *id_strtok __P((char *cp, char *cs, char *dc));
  28.178 -
  28.179 -#endif
  28.180 -
  28.181 -#ifdef __cplusplus
  28.182 -}
  28.183 -#endif
  28.184 -#endif

    29.1 --- a/src/libident/support.c	Sat Jan 14 18:44:48 2012 +0100
    29.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    29.3 @@ -1,83 +0,0 @@
    29.4 -/*
    29.5 -** support.c
    29.6 -**
    29.7 -** Author: Pr Emanuelsson <pell@lysator.liu.se>
    29.8 -** Hacked by: Peter Eriksson <pen@lysator.liu.se>
    29.9 -*/
   29.10 -#include <stdio.h>
   29.11 -#include <ctype.h>
   29.12 -
   29.13 -#ifdef HAVE_ANSIHEADERS
   29.14 -#  include <stdlib.h>
   29.15 -#  include <string.h>
   29.16 -#else
   29.17 -#  define strchr(str, c) index(str, c)
   29.18 -#endif
   29.19 -
   29.20 -#define IN_LIBIDENT_SRC
   29.21 -#include "ident.h"
   29.22 -
   29.23 -
   29.24 -char*
   29.25 -id_strdup __P1(char *, str)
   29.26 -{
   29.27 -	char *cp;
   29.28 -
   29.29 -	cp = (char *) malloc(strlen(str) + 1);
   29.30 -	if (cp == NULL) {
   29.31 -#ifdef DEBUG
   29.32 -		perror("libident: malloc");
   29.33 -#endif
   29.34 -		return NULL;
   29.35 -	}
   29.36 -
   29.37 -	strcpy(cp, str);
   29.38 -
   29.39 -	return cp;
   29.40 -}
   29.41 -
   29.42 -
   29.43 -char*
   29.44 -id_strtok __P3(char *, cp, char *, cs, char *, dc)
   29.45 -{
   29.46 -	static char *bp = 0;
   29.47 -
   29.48 -	if (cp)
   29.49 -		bp = cp;
   29.50 -
   29.51 -	/*
   29.52 -	 ** No delimitor cs - return whole buffer and point at end
   29.53 -	 */
   29.54 -	if (!cs) {
   29.55 -		while (*bp)
   29.56 -			bp++;
   29.57 -		return cs;
   29.58 -	}
   29.59 -
   29.60 -	/*
   29.61 -	 ** Skip leading spaces
   29.62 -	 */
   29.63 -	while (isspace(*bp))
   29.64 -		bp++;
   29.65 -
   29.66 -	/*
   29.67 -	 ** No token found?
   29.68 -	 */
   29.69 -	if (!*bp)
   29.70 -		return 0;
   29.71 -
   29.72 -	cp = bp;
   29.73 -	while (*bp && !strchr(cs, *bp))
   29.74 -		bp++;
   29.75 -
   29.76 -	/*
   29.77 -	 ** Remove trailing spaces
   29.78 -	 */
   29.79 -	*dc = *bp;
   29.80 -	for (dc = bp - 1; dc > cp && isspace(*dc); dc--);
   29.81 -	*++dc = '\0';
   29.82 -
   29.83 -	bp++;
   29.84 -
   29.85 -	return cp;
   29.86 -}

    30.1 --- a/src/libident/version.c	Sat Jan 14 18:44:48 2012 +0100
    30.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    30.3 @@ -1,1 +0,0 @@
    30.4 -char id_version[] = "0.21";

    31.1 --- a/src/listen.c	Sat Jan 14 18:44:48 2012 +0100
    31.2 +++ b/src/listen.c	Sat Jan 14 21:36:58 2012 +0100
    31.3 @@ -57,18 +57,7 @@
    31.4  	gchar *ident = NULL;
    31.5  
    31.6  	rem_host = g_strdup(inet_ntoa(sock_addr->sin_addr));
    31.7 -#ifdef ENABLE_IDENT
    31.8 -	{
    31.9 -		gchar *id = NULL;
   31.10 -		if ((id = (gchar *) ident_id(sock, 60))) {
   31.11 -			ident = g_strdup(id);
   31.12 -		}
   31.13 -		logwrite(LOG_NOTICE, "connect from host %s, port %hd ident=%s\n", rem_host,
   31.14 -		         ntohs(sock_addr->sin_port), ident ? ident : "(unknown)");
   31.15 -	}
   31.16 -#else
   31.17  	logwrite(LOG_NOTICE, "connect from host %s, port %hd\n", rem_host, ntohs(sock_addr->sin_port));
   31.18 -#endif
   31.19  
   31.20  	/* start child for connection: */
   31.21  	signal(SIGCHLD, sigchld_handler);
   31.22 @@ -84,10 +73,6 @@
   31.23  	} else if (pid < 0) {
   31.24  		logwrite(LOG_WARNING, "could not fork for incoming smtp connection: %s\n", strerror(errno));
   31.25  	}
   31.26 -#ifdef ENABLE_IDENT
   31.27 -	if (ident != NULL)
   31.28 -		g_free(ident);
   31.29 -#endif
   31.30  
   31.31  	close(sock);
   31.32  	close(dup_sock);

    32.1 --- a/src/masqmail.c	Sat Jan 14 18:44:48 2012 +0100
    32.2 +++ b/src/masqmail.c	Sat Jan 14 21:36:58 2012 +0100
    32.3 @@ -77,26 +77,6 @@
    32.4  	raise(sig);
    32.5  }
    32.6  
    32.7 -#ifdef ENABLE_IDENT  /* so far used for that only */
    32.8 -static gboolean
    32.9 -is_in_netlist(gchar *host, GList *netlist)
   32.10 -{
   32.11 -	guint hostip = inet_addr(host);
   32.12 -	struct in_addr addr;
   32.13 -
   32.14 -	addr.s_addr = hostip;
   32.15 -	if (addr.s_addr != INADDR_NONE) {
   32.16 -		GList *node;
   32.17 -		foreach(netlist, node) {
   32.18 -			struct in_addr *net = (struct in_addr *) (node->data);
   32.19 -			if ((addr.s_addr & net->s_addr) == net->s_addr)
   32.20 -				return TRUE;
   32.21 -		}
   32.22 -	}
   32.23 -	return FALSE;
   32.24 -}
   32.25 -#endif
   32.26 -
   32.27  /*
   32.28  **  argv: the original argv
   32.29  **  argp: number of arg (may get modified!)
   32.30 @@ -361,12 +341,8 @@
   32.31  			continue;
   32.32  		}
   32.33  
   32.34 -		if ( (msg->received_host || (msg->received_prot != PROT_LOCAL))
   32.35 -#ifdef ENABLE_IDENT
   32.36 -		    && !is_in_netlist(msg->received_host, conf.ident_trusted_nets)
   32.37 -#endif
   32.38 -		) {
   32.39 -			fprintf(stderr, "message %s was not received locally or from a trusted network\n", *id);
   32.40 +		if (msg->received_host || (msg->received_prot != PROT_LOCAL)) {
   32.41 +			fprintf(stderr, "message %s was not received locally\n", *id);
   32.42  			continue;
   32.43  		}
   32.44  
   32.45 @@ -407,7 +383,6 @@
   32.46  {
   32.47  	gchar *with_resolver = "";
   32.48  	gchar *with_auth = "";
   32.49 -	gchar *with_ident = "";
   32.50  
   32.51  #ifdef ENABLE_RESOLVER
   32.52  	with_resolver = " +resolver";
   32.53 @@ -415,12 +390,8 @@
   32.54  #ifdef ENABLE_AUTH
   32.55  	with_auth = " +auth";
   32.56  #endif
   32.57 -#ifdef ENABLE_IDENT
   32.58 -	with_ident = " +ident";
   32.59 -#endif
   32.60  
   32.61 -	printf("%s %s%s%s%s\n", PACKAGE, VERSION, with_resolver, with_auth,
   32.62 -			with_ident);
   32.63 +	printf("%s %s%s%s\n", PACKAGE, VERSION, with_resolver, with_auth);
   32.64  }
   32.65  
   32.66  void

    33.1 --- a/src/masqmail.h	Sat Jan 14 18:44:48 2012 +0100
    33.2 +++ b/src/masqmail.h	Sat Jan 14 21:36:58 2012 +0100
    33.3 @@ -41,10 +41,6 @@
    33.4  
    33.5  #include <glib.h>
    33.6  
    33.7 -#ifdef ENABLE_IDENT
    33.8 -#include "libident/ident.h"
    33.9 -#endif
   33.10 -
   33.11  #include "lookup.h"
   33.12  
   33.13  typedef struct _interface {
   33.14 @@ -152,8 +148,6 @@
   33.15  	gboolean defer_all;
   33.16  	gboolean do_relay;
   33.17  
   33.18 -	GList *ident_trusted_nets;
   33.19 -
   33.20  	gboolean do_queue;
   33.21  
   33.22  	gboolean do_verbose;

    34.1 --- a/src/md5/Makefile.in	Sat Jan 14 18:44:48 2012 +0100
    34.2 +++ b/src/md5/Makefile.in	Sat Jan 14 21:36:58 2012 +0100
    34.3 @@ -92,7 +92,6 @@
    34.4  GLIB_CFLAGS = @GLIB_CFLAGS@
    34.5  GLIB_LIBS = @GLIB_LIBS@
    34.6  GREP = @GREP@
    34.7 -IDENT_LIBS = @IDENT_LIBS@
    34.8  INSTALL = @INSTALL@
    34.9  INSTALL_DATA = @INSTALL_DATA@
   34.10  INSTALL_PROGRAM = @INSTALL_PROGRAM@
   34.11 @@ -143,7 +142,6 @@
   34.12  docdir = @docdir@
   34.13  dvidir = @dvidir@
   34.14  exec_prefix = @exec_prefix@
   34.15 -has_ident = @has_ident@
   34.16  host_alias = @host_alias@
   34.17  htmldir = @htmldir@
   34.18  includedir = @includedir@