Description: Undocumented upstream changes
 This patch has been created by dpkg-source during the package build
 but it might have accumulated changes from several uploads. Please
 check the changelog to (hopefully) learn more on those changes.

--- /dev/null
+++ krb5-appl-1.0.1/.gbp.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+pristine-tar=True
--- krb5-appl-1.0.1.orig/bsd/krlogin.c
+++ krb5-appl-1.0.1/bsd/krlogin.c
@@ -139,6 +139,7 @@ char copyright[] =
 #include <sys/ptyvar.h>
 #endif
 #endif
+#undef TIOCGLTC
 
 #ifndef TIOCPKT_NOSTOP
 /* These values are over-the-wire protocol, *not* local values */
--- krb5-appl-1.0.1.orig/bsd/Makefile.in
+++ krb5-appl-1.0.1/bsd/Makefile.in
@@ -9,9 +9,9 @@ SRCS= $(srcdir)/krcp.c $(srcdir)/krlogin
 	$(srcdir)/krlogind.c
 OBJS= krcp.o krlogin.o krsh.o kcmd.o forward.o login.o krshd.o krlogind.o
 
-UCB_RLOGIN = @UCB_RLOGIN@
-UCB_RSH = @UCB_RSH@
-UCB_RCP = @UCB_RCP@
+UCB_RLOGIN = /usr/bin/netkit-rlogin
+UCB_RSH = /usr/bin/netkit-rsh
+UCB_RCP = /usr/bin/netkit-rcp
 
 RSH=	-DKRB5_PATH_RLOGIN=\"$(CLIENT_BINDIR)/rlogin\"
 BSD=	-DUCB_RLOGIN=\"$(UCB_RLOGIN)\" \
--- krb5-appl-1.0.1.orig/bsd/login.c
+++ krb5-appl-1.0.1/bsd/login.c
@@ -122,6 +122,14 @@ int login_accept_passwd = 0;
 #define siglongjmp	longjmp
 #endif
 
+#ifndef MAXPATHLEN
+# define MAXPATHLEN 4096
+#endif
+
+#ifndef MAXHOSTNAMELEN
+# define MAXHOSTNAMELEN 256
+#endif
+
 #ifdef POSIX_SIGNALS
 typedef struct sigaction handler;
 #define handler_init(H,F)		(sigemptyset(&(H).sa_mask), \
--- krb5-appl-1.0.1.orig/bsd/krshd.c
+++ krb5-appl-1.0.1/bsd/krshd.c
@@ -488,6 +488,11 @@ int maxlogs;
 #define NCARGS 1024
 #endif
 
+#if NCARGS == INT_MAX
+#undef NCARGS
+#define NCARGS 4096
+#endif
+
 #define NMAX   16 
 
 int pid;
--- krb5-appl-1.0.1.orig/bsd/klogind.M
+++ krb5-appl-1.0.1/bsd/klogind.M
@@ -27,7 +27,7 @@ server is invoked by \fIinetd(8)\fP when
 the port indicated in /etc/inetd.conf.  A typical /etc/inetd.conf
 configuration line for \fIklogind\fP might be:
 
-klogin stream tcp nowait root /usr/cygnus/sbin/klogind klogind -e5c
+klogin stream tcp nowait root /usr/sbin/klogind klogind \-e5c
 
 When a service request is received, the following protocol is initiated:
 
@@ -56,7 +56,7 @@ by command line arguments passed by inet
 
 .IP \fB\-P\fP
 Prompt the user for a password.
-If the -P option is passed, then the password is verified in addition
+If the \-P option is passed, then the password is verified in addition
 to all other checks.
 
 .IP \fB\-e\fP
@@ -87,8 +87,8 @@ Ignore authenticator checksums if provid
 ignore authenticator checksusm presented by current Kerberos clients
 to protect initial connection information; it is the opposite of
 \fB-c\fP.  This option is provided because some older
-clients--particularly clients predating the release of Kerberos V5
-Beta5 (May 1995)--present bogus checksums that prevent Kerberos
+clients -- particularly clients predating the release of Kerberos V5
+Beta5 (May 1995) -- present bogus checksums that prevent Kerberos
 authentication from succeeding in the default mode.
 
 .PP
--- krb5-appl-1.0.1.orig/bsd/kshd.M
+++ krb5-appl-1.0.1/bsd/kshd.M
@@ -8,7 +8,7 @@
 .SH NAME
 kshd \- kerberized remote shell server
 .SH SYNOPSIS
-.B /usr/local/sbin/kshd 
+.B kshd 
 [
 .B \-kr45ec
 ]
@@ -30,7 +30,7 @@ server is invoked by \fIinetd(8c)\fP whe
 on the port indicated in /etc/inetd.conf.  A typical /etc/inetd.conf
 configuration line for \fIkrshd\fP might be:
 
-kshell	stream	tcp	nowait	root	/usr/local/sbin/kshd	kshd -5c
+kshell	stream	tcp	nowait	root	/usr/sbin/kshd	kshd \-5c
 
 When a service request is received, the following protocol is initiated:
 
@@ -107,8 +107,8 @@ Ignore authenticator checksums if provid
 ignore authenticator checksusm presented by current Kerberos clients
 to protect initial connection information; it is the opposite of
 \fB-c\fP.  This option is provided because some older
-clients--particularly clients predating the release of Kerberos V5
-Beta5 (May 1995)--present bogus checksums that prevent Kerberos
+clients -- particularly clients predating the release of Kerberos V5
+Beta5 (May 1995) -- present bogus checksums that prevent Kerberos
 authentication from succeeding in the default mode.
 
 
--- krb5-appl-1.0.1.orig/bsd/krlogind.c
+++ krb5-appl-1.0.1/bsd/krlogind.c
@@ -286,6 +286,10 @@ char *login_program = LOGIN_PROGRAM;
 #define MAXDNAME 256 /*per the rfc*/
 #endif
 
+#ifndef MAXPATHLEN
+# define MAXPATHLEN 4096
+#endif
+
 char		lusername[UT_NAMESIZE+1];
 char		rusername[UT_NAMESIZE+1];
 char            *krusername = 0;
--- krb5-appl-1.0.1.orig/libpty/sane_hostname.c
+++ krb5-appl-1.0.1/libpty/sane_hostname.c
@@ -27,6 +27,10 @@
 #include "socket-utils.h"
 #include "fake-addrinfo.h"
 
+#ifndef MAXHOSTNAMELEN
+# define MAXHOSTNAMELEN 256
+#endif
+
 static void
 downcase (char *s)
 {
--- krb5-appl-1.0.1.orig/telnet/telnetd/defs.h
+++ krb5-appl-1.0.1/telnet/telnetd/defs.h
@@ -38,6 +38,7 @@
  */
 #include <sys/types.h>
 #include <sys/param.h>
+#include <sys/ioctl.h>
 
 #ifndef	BSD
 # define	BSD 43
--- krb5-appl-1.0.1.orig/telnet/telnetd/telnetd.8
+++ krb5-appl-1.0.1/telnet/telnetd/telnetd.8
@@ -37,7 +37,7 @@ telnetd \-
 .SM DARPA TELNET
 protocol server
 .SH SYNOPSIS
-.B /usr/libexec/telnetd
+.B telnetd
 [\fB\-a\fP \fIauthmode\fP] [\fB\-B\fP] [\fB\-D\fP] [\fIdebugmode\fP]
 [\fB\-e\fP] [\fB\-h\fP] [\fB\-I\fP\fIinitid\fP] [\fB\-l\fP]
 [\fB\-k\fP] [\fB\-n\fP] [\fB\-r\fP\fIlowpty-highpty\fP] [\fB\-s\fP]
--- krb5-appl-1.0.1.orig/telnet/telnet/main.c
+++ krb5-appl-1.0.1/telnet/telnet/main.c
@@ -322,10 +322,14 @@ main(argc, argv)
 
 		if (setjmp(toplevel) != 0)
 			Exit(0);
-		if (tn(argp - args, args) == 1)
-			return (0);
-		else
-			return (1);
+		{
+			int ret = tn(argp - args, args);
+			switch (ret) {
+				case 1: return 0;
+				case 2: usage();
+				default: return 1;
+			}
+		}
 	}
 	(void)setjmp(toplevel);
 	for (;;) {
--- krb5-appl-1.0.1.orig/telnet/telnet/commands.c
+++ krb5-appl-1.0.1/telnet/telnet/commands.c
@@ -2467,8 +2467,7 @@ tn(argc, argv)
 	    continue;
 	}
     usage:
-	printf("usage: %s [-l user] [-a] host-name [port]\r\n", cmd);
-	return 0;
+	return 2;
     }
     if (hostp == 0)
 	goto usage;
--- krb5-appl-1.0.1.orig/telnet/telnet/sys_bsd.c
+++ krb5-appl-1.0.1/telnet/telnet/sys_bsd.c
@@ -44,6 +44,8 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/socket.h>
+#include <sys/ioctl.h>
+
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
--- krb5-appl-1.0.1.orig/gssftp/ftp/ftp_var.h
+++ krb5-appl-1.0.1/gssftp/ftp/ftp_var.h
@@ -70,6 +70,10 @@ typedef sigtype (*sig_t)();
 #define extern
 #endif
 
+#ifndef MAXPATHLEN
+# define MAXPATHLEN 4096
+#endif
+
 /*
  * Options and other state info.
  */
--- krb5-appl-1.0.1.orig/gssftp/ftp/ftp.M
+++ krb5-appl-1.0.1/gssftp/ftp/ftp.M
@@ -947,7 +947,7 @@ then forks a shell, using
 .IR popen (3)
 with the argument supplied, and reads from (writes to) stdout (stdin).
 If the shell command includes spaces, the argument must be quoted; e.g.
-``" ls -lt"''.  A particularly useful example of this mechanism is:
+``" ls \-lt"''.  A particularly useful example of this mechanism is:
 ``dir more''.
 .TP
 3.
--- krb5-appl-1.0.1.orig/gssftp/ftp/ftp.c
+++ krb5-appl-1.0.1/gssftp/ftp/ftp.c
@@ -150,6 +150,10 @@ unsigned char *ucbuf;
 #include "ftp_var.h"
 #include "secure.h"
 
+#ifndef MAXHOSTNAMELEN
+# define MAXHOSTNAMELEN 256
+#endif
+
 #ifdef GSSAPI
 void user_gss_error (OM_uint32, OM_uint32, char *);
 #endif
--- krb5-appl-1.0.1.orig/gssftp/ftpd/ftpd.M
+++ krb5-appl-1.0.1/gssftp/ftpd/ftpd.M
@@ -36,7 +36,7 @@
 ftpd \- DARPA Internet File Transfer Protocol server
 .SH SYNOPSIS
 .B ftpd
-[\fB\-A \fP|\fB -a\fP] [\fB\-C\fP] [\fB\-c\fP] [\fB\-d\fP] [\fB-E\fP]
+[\fB\-A \fP|\fB\-a\fP] [\fB\-C\fP] [\fB\-c\fP] [\fB\-d\fP] [\fB\-E\fP]
 [\fB\-l\fP] [\fB\-v\fP] [\fB\-T\fP \fImaxtimeout\fP] [\fB\-t\fP \fItimeout\fP]
 [\fB\-p\fP \fIport\fP] [\fB\-U\fP \fIftpusers-file\fP] [\fB\-u\fP \fIumask\fP]
 [\fB\-r\fP \fIrealm-file\fP] [\fB\-s\fP \fIsrvtab\fP]
@@ -75,7 +75,7 @@ Allow the CCC (Clear Command Channel) co
 less secure connections, and should probably only be used when debugging.
 .TP
 .B \-d
-Debugging information is written to the syslog.  (Identical to -v)
+Debugging information is written to the syslog.  (Identical to \-v)
 .TP
 .B \-E
 Don't allow passwords to be typed across unencrypted connections.
@@ -90,7 +90,7 @@ other statistics such as the number of b
 syslog as well.
 .TP
 .B \-v
-Debugging information is written to the syslog.  (Identical to -d)
+Debugging information is written to the syslog.  (Identical to \-d)
 .TP
 \fB\-T\fP \fImaxtimeout\fP
 A client may request a maximum timeout period allowed set to
@@ -191,7 +191,7 @@ give help information
 .sp -1
 .TP
 LIST
-give list files in a directory (``ls -lgA'')
+give list files in a directory (``ls \-lgA'')
 .sp -1
 .TP
 MIC
--- krb5-appl-1.0.1.orig/gssftp/ftpd/ftpd.c
+++ krb5-appl-1.0.1/gssftp/ftpd/ftpd.c
@@ -152,6 +152,14 @@ int have_creds;		/* User has credentials
 #include "ftpd_var.h"
 #include "secure.h"
 
+#ifndef MAXPATHLEN
+# define MAXPATHLEN 4096
+#endif
+
+#ifndef MAXHOSTNAMELEN
+# define MAXHOSTNAMELEN 256
+#endif
+
 extern	char *crypt();
 extern	char version[];
 extern	char *home;		/* pointer to home directory for glob */
