Hello community,
here is the log from the commit of package krb5-appl for openSUSE:Factory
checked in at Mon Aug 22 16:16:29 CEST 2011.
--------
--- krb5-appl/krb5-appl.changes 2011-07-06 15:51:40.000000000 +0200
+++ /mounts/work_src_done/STABLE/krb5-appl/krb5-appl.changes 2011-08-21
16:16:42.000000000 +0200
@@ -1,0 +2,6 @@
+Sun Aug 21 14:15:31 UTC 2011 - m...@novell.com
+
+- update to version 1.0.2
+ * include MITKRB5-SA-2011-005
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
krb5-appl-1.0.1.tar.bz2
krb5-appl-MITKRB5-SA-2011-005.dif
New:
----
krb5-appl-1.0.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ krb5-appl.spec ++++++
--- /var/tmp/diff_new_pack.QeGQUc/_old 2011-08-22 16:16:08.000000000 +0200
+++ /var/tmp/diff_new_pack.QeGQUc/_new 2011-08-22 16:16:08.000000000 +0200
@@ -17,7 +17,7 @@
# norootforbuild
-%define srcRoot krb5-appl-1.0.1/
+%define srcRoot krb5-appl-1.0.2/
%define vendorFiles %{_builddir}/%{srcRoot}/vendor-files/
%define krb5docdir %{_defaultdocdir}/krb5
@@ -25,18 +25,17 @@
License: MIT License (or similar)
Url: http://web.mit.edu/kerberos/www/
BuildRequires: bison krb5-devel libcom_err-devel ncurses-devel
-Version: 1.0.1
-Release: 3
+Version: 1.0.2
+Release: 1
Summary: MIT Kerberos5 Implementation--Applications
Group: Productivity/Networking/Security
-Source0: krb5-appl-1.0.1.tar.bz2
+Source0: krb5-appl-%{version}.tar.bz2
Source1: vendor-files.tar.bz2
Source2: README.Source
Source3: spx.c
Patch1: krb5-appl-1.0-fix-ftp-var-used-uninitialized.dif
Patch2: krb5-appl-1.0-fix-var-used-before-value-set.dif
Patch3: krb5-appl-1.0-fix-path-in-manpages.dif
-Patch4: krb5-appl-MITKRB5-SA-2011-005.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -110,7 +109,6 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
%build
%{?suse_update_config:%{suse_update_config -f}}
++++++ krb5-appl-1.0-fix-ftp-var-used-uninitialized.dif ++++++
--- /var/tmp/diff_new_pack.QeGQUc/_old 2011-08-22 16:16:09.000000000 +0200
+++ /var/tmp/diff_new_pack.QeGQUc/_new 2011-08-22 16:16:09.000000000 +0200
@@ -1,8 +1,8 @@
-Index: krb5-appl-1.0-alpha1/gssftp/ftp/ftp.c
+Index: krb5-appl-1.0.2/gssftp/ftp/ftp.c
===================================================================
---- krb5-appl-1.0-alpha1.orig/gssftp/ftp/ftp.c
-+++ krb5-appl-1.0-alpha1/gssftp/ftp/ftp.c
-@@ -1919,7 +1919,7 @@ int do_auth()
+--- krb5-appl-1.0.2.orig/gssftp/ftp/ftp.c
++++ krb5-appl-1.0.2/gssftp/ftp/ftp.c
+@@ -1923,7 +1923,7 @@ int do_auth()
#ifdef GSSAPI
if (command("AUTH %s", "GSSAPI") == CONTINUE) {
++++++ krb5-appl-1.0-fix-path-in-manpages.dif ++++++
--- /var/tmp/diff_new_pack.QeGQUc/_old 2011-08-22 16:16:09.000000000 +0200
+++ /var/tmp/diff_new_pack.QeGQUc/_new 2011-08-22 16:16:09.000000000 +0200
@@ -1,29 +1,20 @@
-Index: krb5-appl-1.0-alpha1/bsd/klogind.M
+Index: krb5-appl-1.0.2/bsd/klogind.M
===================================================================
---- krb5-appl-1.0-alpha1.orig/bsd/klogind.M
-+++ krb5-appl-1.0-alpha1/bsd/klogind.M
+--- krb5-appl-1.0.2.orig/bsd/klogind.M
++++ krb5-appl-1.0.2/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/lib/mit/sbin/klogind klogind -e5c
+-klogin stream tcp nowait root /usr/local/sbin/klogind klogind \-e5c
++klogin stream tcp nowait root /usr/lib/mit/sbin/klogind klogind \-e5c
When a service request is received, the following protocol is initiated:
-Index: krb5-appl-1.0-alpha1/bsd/kshd.M
+Index: krb5-appl-1.0.2/bsd/kshd.M
===================================================================
---- krb5-appl-1.0-alpha1.orig/bsd/kshd.M
-+++ krb5-appl-1.0-alpha1/bsd/kshd.M
-@@ -8,7 +8,7 @@
- .SH NAME
- kshd \- kerberized remote shell server
- .SH SYNOPSIS
--.B /usr/local/sbin/kshd
-+.B /usr/lib/mit/sbin/kshd
- [
- .B \-kr45ec
- ]
+--- krb5-appl-1.0.2.orig/bsd/kshd.M
++++ krb5-appl-1.0.2/bsd/kshd.M
@@ -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:
@@ -33,16 +24,3 @@
When a service request is received, the following protocol is initiated:
-Index: krb5-appl-1.0-alpha1/telnet/telnetd/telnetd.8
-===================================================================
---- krb5-appl-1.0-alpha1.orig/telnet/telnetd/telnetd.8
-+++ krb5-appl-1.0-alpha1/telnet/telnetd/telnetd.8
-@@ -37,7 +37,7 @@ telnetd \-
- .SM DARPA TELNET
- protocol server
- .SH SYNOPSIS
--.B /usr/libexec/telnetd
-+.B /usr/lib/mit/sbin/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.tar.bz2 -> krb5-appl-1.0.2.tar.bz2 ++++++
++++ 16830 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/krb5-appl-1.0.1/autoconf.h.in new/krb5-appl-1.0.2/autoconf.h.in
--- old/krb5-appl-1.0.1/autoconf.h.in 2010-05-22 14:17:14.000000000 +0200
+++ new/krb5-appl-1.0.2/autoconf.h.in 2011-07-11 21:39:01.000000000 +0200
@@ -42,12 +42,18 @@
/* Define to 1 if you have the `getenv' function. */
#undef HAVE_GETENV
+/* Define to 1 if you have the `gethostbyname_r' function. */
+#undef HAVE_GETHOSTBYNAME_R
+
/* Define to 1 if you have the `getnameinfo' function. */
#undef HAVE_GETNAMEINFO
/* Define to 1 if you have the `getopt' function. */
#undef HAVE_GETOPT
+/* Define to 1 if you have the `getservbyname_r' function. */
+#undef HAVE_GETSERVBYNAME_R
+
/* Define to 1 if you have the `gettosbyname' function. */
#undef HAVE_GETTOSBYNAME
@@ -228,46 +234,46 @@
/* Define to 1 if the system has the type `struct sockaddr_storage'. */
#undef HAVE_STRUCT_SOCKADDR_STORAGE
-/* Define to 1 if `ut_addr' is member of `struct utmpx'. */
+/* Define to 1 if `ut_addr' is a member of `struct utmpx'. */
#undef HAVE_STRUCT_UTMPX_UT_ADDR
-/* Define to 1 if `ut_exit' is member of `struct utmpx'. */
+/* Define to 1 if `ut_exit' is a member of `struct utmpx'. */
#undef HAVE_STRUCT_UTMPX_UT_EXIT
-/* Define to 1 if `ut_host' is member of `struct utmpx'. */
+/* Define to 1 if `ut_host' is a member of `struct utmpx'. */
#undef HAVE_STRUCT_UTMPX_UT_HOST
-/* Define to 1 if `ut_id' is member of `struct utmpx'. */
+/* Define to 1 if `ut_id' is a member of `struct utmpx'. */
#undef HAVE_STRUCT_UTMPX_UT_ID
-/* Define to 1 if `ut_pid' is member of `struct utmpx'. */
+/* Define to 1 if `ut_pid' is a member of `struct utmpx'. */
#undef HAVE_STRUCT_UTMPX_UT_PID
-/* Define to 1 if `ut_syslen' is member of `struct utmpx'. */
+/* Define to 1 if `ut_syslen' is a member of `struct utmpx'. */
#undef HAVE_STRUCT_UTMPX_UT_SYSLEN
-/* Define to 1 if `ut_type' is member of `struct utmpx'. */
+/* Define to 1 if `ut_type' is a member of `struct utmpx'. */
#undef HAVE_STRUCT_UTMPX_UT_TYPE
-/* Define to 1 if `ut_addr' is member of `struct utmp'. */
+/* Define to 1 if `ut_addr' is a member of `struct utmp'. */
#undef HAVE_STRUCT_UTMP_UT_ADDR
-/* Define to 1 if `ut_exit' is member of `struct utmp'. */
+/* Define to 1 if `ut_exit' is a member of `struct utmp'. */
#undef HAVE_STRUCT_UTMP_UT_EXIT
-/* Define to 1 if `ut_host' is member of `struct utmp'. */
+/* Define to 1 if `ut_host' is a member of `struct utmp'. */
#undef HAVE_STRUCT_UTMP_UT_HOST
-/* Define to 1 if `ut_id' is member of `struct utmp'. */
+/* Define to 1 if `ut_id' is a member of `struct utmp'. */
#undef HAVE_STRUCT_UTMP_UT_ID
-/* Define to 1 if `ut_pid' is member of `struct utmp'. */
+/* Define to 1 if `ut_pid' is a member of `struct utmp'. */
#undef HAVE_STRUCT_UTMP_UT_PID
-/* Define to 1 if `ut_syslen' is member of `struct utmp'. */
+/* Define to 1 if `ut_syslen' is a member of `struct utmp'. */
#undef HAVE_STRUCT_UTMP_UT_SYSLEN
-/* Define to 1 if `ut_type' is member of `struct utmp'. */
+/* Define to 1 if `ut_type' is a member of `struct utmp'. */
#undef HAVE_STRUCT_UTMP_UT_TYPE
/* Define if sys_errlist in libc */
@@ -369,6 +375,9 @@
/* Define if varargs available and compiles */
#undef HAVE_VARARGS_H
+/* Define to 1 if you have the `vasprintf' function. */
+#undef HAVE_VASPRINTF
+
/* Define to 1 if you have the `vfork' function. */
#undef HAVE_VFORK
@@ -378,9 +387,6 @@
/* Define to 1 if you have the `vhangup' function. */
#undef HAVE_VHANGUP
-/* Define to 1 if you have the `vsnprintf' function. */
-#undef HAVE_VSNPRINTF
-
/* Define to 1 if you have the `waitpid' function. */
#undef HAVE_WAITPID
@@ -390,10 +396,10 @@
/* Define to 1 if `vfork' works. */
#undef HAVE_WORKING_VFORK
-/* Define to 1 if you have the file `AC_File'. */
+/* Define to 1 if you have the file `/etc/environment'. */
#undef HAVE__ETC_ENVIRONMENT
-/* Define to 1 if you have the file `AC_File'. */
+/* Define to 1 if you have the file `/etc/TIMEZONE'. */
#undef HAVE__ETC_TIMEZONE
/* Define to 1 if you have the `_getpty' function. */
@@ -427,6 +433,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/krb5-appl-1.0.1/bsd/klogind.M new/krb5-appl-1.0.2/bsd/klogind.M
--- old/krb5-appl-1.0.1/bsd/klogind.M 2008-12-15 21:29:01.000000000 +0100
+++ new/krb5-appl-1.0.2/bsd/klogind.M 2011-07-11 21:29:34.000000000 +0200
@@ -27,7 +27,7 @@
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/local/sbin/klogind klogind \-e5c
When a service request is received, the following protocol is initiated:
@@ -56,7 +56,7 @@
.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 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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/krb5-appl-1.0.1/bsd/krlogin.c new/krb5-appl-1.0.2/bsd/krlogin.c
--- old/krb5-appl-1.0.1/bsd/krlogin.c 2009-11-05 21:15:06.000000000 +0100
+++ new/krb5-appl-1.0.2/bsd/krlogin.c 2011-07-11 21:30:25.000000000 +0200
@@ -139,6 +139,7 @@
#include <sys/ptyvar.h>
#endif
#endif
+#undef TIOCGLTC
#ifndef TIOCPKT_NOSTOP
/* These values are over-the-wire protocol, *not* local values */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/krb5-appl-1.0.1/bsd/krlogind.c new/krb5-appl-1.0.2/bsd/krlogind.c
--- old/krb5-appl-1.0.1/bsd/krlogind.c 2009-11-21 21:29:19.000000000 +0100
+++ new/krb5-appl-1.0.2/bsd/krlogind.c 2011-07-11 21:30:25.000000000 +0200
@@ -286,6 +286,10 @@
#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;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/krb5-appl-1.0.1/bsd/krshd.c new/krb5-appl-1.0.2/bsd/krshd.c
--- old/krb5-appl-1.0.1/bsd/krshd.c 2009-11-16 11:27:04.000000000 +0100
+++ new/krb5-appl-1.0.2/bsd/krshd.c 2011-07-11 21:31:31.000000000 +0200
@@ -171,6 +171,13 @@
+#ifdef HAVE_UTMP_H
+#include <utmp.h>
+#endif
+
+#ifndef UT_NAMESIZE /* linux defines it directly in <utmp.h> */
+#define UT_NAMESIZE sizeof(((struct utmp *)0)->ut_name)
+#endif
#define MAXRETRIES 4
@@ -438,7 +445,7 @@
#include <tmpdir.h>
char tmpdir[64] = "TMPDIR=";
#else
-char username[20] = "USER=";
+char username[UT_NAMESIZE + 6] = "USER=";
#endif
char homedir[64] = "HOME=";
@@ -488,7 +495,12 @@
#define NCARGS 1024
#endif
-#define NMAX 16
+#if NCARGS == INT_MAX
+#undef NCARGS
+#define NCARGS 4096
+#endif
+
+#define NMAX UT_NAMESIZE
int pid;
char locuser[NMAX+1];
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/krb5-appl-1.0.1/bsd/kshd.M new/krb5-appl-1.0.2/bsd/kshd.M
--- old/krb5-appl-1.0.1/bsd/kshd.M 2006-06-12 20:19:26.000000000 +0200
+++ new/krb5-appl-1.0.2/bsd/kshd.M 2011-07-11 21:29:34.000000000 +0200
@@ -8,7 +8,7 @@
.SH NAME
kshd \- kerberized remote shell server
.SH SYNOPSIS
-.B /usr/local/sbin/kshd
+.B kshd
[
.B \-kr45ec
]
@@ -107,8 +107,8 @@
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.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/krb5-appl-1.0.1/bsd/login.c new/krb5-appl-1.0.2/bsd/login.c
--- old/krb5-appl-1.0.1/bsd/login.c 2009-11-21 21:29:19.000000000 +0100
+++ new/krb5-appl-1.0.2/bsd/login.c 2011-07-11 21:30:25.000000000 +0200
@@ -122,6 +122,14 @@
#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), \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/krb5-appl-1.0.1/configure.ac new/krb5-appl-1.0.2/configure.ac
--- old/krb5-appl-1.0.1/configure.ac 2010-05-22 14:08:50.000000000 +0200
+++ new/krb5-appl-1.0.2/configure.ac 2011-07-11 21:34:17.000000000 +0200
@@ -103,13 +103,13 @@
;;
esac
-AC_CHECK_FUNCS(_getpty cgetent getcwd getenv gettosbyname getusershell getutmp)
-AC_CHECK_FUNCS(getutmpx grantpt inet_aton initgroups isatty killpg killpg)
-AC_CHECK_FUNCS(line_push ptsname revoke rmufile rresvport_af)
-AC_CHECK_FUNCS(seteuid setlogin setpgid setpriority setresuid setreuid)
-AC_CHECK_FUNCS(setutent setutsent setutxent strsave tcgetpgrp tcsetpgrp)
-AC_CHECK_FUNCS(ttyname unsetenv updwtmp updwtmpx utimes utmpname utmpxname)
-AC_CHECK_FUNCS(vhangup vsnprintf waitpid)
+AC_CHECK_FUNCS(_getpty cgetent getcwd getenv gethostbyname_r getservbyname_r)
+AC_CHECK_FUNCS(gettosbyname getusershell getutmp getutmpx grantpt inet_aton)
+AC_CHECK_FUNCS(initgroups isatty killpg killpg line_push ptsname revoke)
+AC_CHECK_FUNCS(rmufile rresvport_af seteuid setlogin setpgid setpriority)
+AC_CHECK_FUNCS(setresuid setreuid setutent setutsent setutxent strsave)
+AC_CHECK_FUNCS(tcgetpgrp tcsetpgrp ttyname unsetenv updwtmp updwtmpx utimes)
+AC_CHECK_FUNCS(utmpname utmpxname vasprintf vhangup waitpid)
# Check for functions found in libutil.
old_LIBS="$LIBS"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/krb5-appl-1.0.1/gssftp/ftp/ftp.M new/krb5-appl-1.0.2/gssftp/ftp/ftp.M
--- old/krb5-appl-1.0.1/gssftp/ftp/ftp.M 2008-12-15 21:31:53.000000000
+0100
+++ new/krb5-appl-1.0.2/gssftp/ftp/ftp.M 2011-07-11 21:29:34.000000000
+0200
@@ -947,7 +947,7 @@
.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.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/krb5-appl-1.0.1/gssftp/ftp/ftp.c new/krb5-appl-1.0.2/gssftp/ftp/ftp.c
--- old/krb5-appl-1.0.1/gssftp/ftp/ftp.c 2009-11-20 16:29:22.000000000
+0100
+++ new/krb5-appl-1.0.2/gssftp/ftp/ftp.c 2011-07-11 21:30:25.000000000
+0200
@@ -150,6 +150,10 @@
#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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/krb5-appl-1.0.1/gssftp/ftp/ftp_var.h
new/krb5-appl-1.0.2/gssftp/ftp/ftp_var.h
--- old/krb5-appl-1.0.1/gssftp/ftp/ftp_var.h 2009-11-05 21:15:06.000000000
+0100
+++ new/krb5-appl-1.0.2/gssftp/ftp/ftp_var.h 2011-07-11 21:30:25.000000000
+0200
@@ -70,6 +70,10 @@
#define extern
#endif
+#ifndef MAXPATHLEN
+# define MAXPATHLEN 4096
+#endif
+
/*
* Options and other state info.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/krb5-appl-1.0.1/gssftp/ftpd/ftpd.M new/krb5-appl-1.0.2/gssftp/ftpd/ftpd.M
--- old/krb5-appl-1.0.1/gssftp/ftpd/ftpd.M 2009-01-28 06:42:11.000000000
+0100
+++ new/krb5-appl-1.0.2/gssftp/ftpd/ftpd.M 2011-07-11 21:29:34.000000000
+0200
@@ -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 @@
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 @@
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 @@
.sp -1
.TP
LIST
-give list files in a directory (``ls -lgA'')
+give list files in a directory (``ls \-lgA'')
.sp -1
.TP
MIC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/krb5-appl-1.0.1/gssftp/ftpd/ftpd.c new/krb5-appl-1.0.2/gssftp/ftpd/ftpd.c
--- old/krb5-appl-1.0.1/gssftp/ftpd/ftpd.c 2009-11-18 06:07:46.000000000
+0100
+++ new/krb5-appl-1.0.2/gssftp/ftpd/ftpd.c 2011-07-11 21:33:58.000000000
+0200
@@ -152,6 +152,14 @@
#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 */
@@ -797,7 +805,7 @@
if (strcmp(line, name) == 0)
return (1);
if (strncmp(line, name, strlen(name)) == 0) {
- int i = strlen(name) + 1;
+ int i = strlen(name);
/* Make sure foo doesn't match foobar */
if (line[i] == '\0' || !isspace((int) line[i]))
@@ -986,8 +994,14 @@
#endif
}
- (void) krb5_setegid((gid_t)pw->pw_gid);
- (void) initgroups(pw->pw_name, pw->pw_gid);
+ if (setgid((gid_t)pw->pw_gid) < 0) {
+ reply(550, "Can't set gid.");
+ goto bad;
+ }
+ if (geteuid() == 0 && initgroups(pw->pw_name, pw->pw_gid) < 0) {
+ reply(550, "Can't initialize groups.");
+ goto bad;
+ }
/* open wtmp before chroot */
(void) snprintf(ttyline, sizeof(ttyline), "ftp%ld", (long) getpid());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/krb5-appl-1.0.1/k5-util.h new/krb5-appl-1.0.2/k5-util.h
--- old/krb5-appl-1.0.1/k5-util.h 2009-07-08 23:22:07.000000000 +0200
+++ new/krb5-appl-1.0.2/k5-util.h 2011-07-11 21:33:58.000000000 +0200
@@ -69,19 +69,8 @@
#elif defined(HAVE_SETREUID)
# define krb5_seteuid(EUID) setreuid(geteuid(), (uid_t)(EUID))
#else
- /* You need to add a case to deal with this operating system.*/
+# error "You need to add a case to deal with this operating system."
# define krb5_seteuid(EUID) (errno = EPERM, -1)
#endif
-#ifdef HAVE_SETEGID
-# define krb5_setegid(EGID) (setegid((gid_t)(EGID)))
-#elif defined(HAVE_SETRESGID)
-# define krb5_setegid(EGID) (setresgid(getgid(), (gid_t)(EGID), getegid()))
-#elif defined(HAVE_SETREGID)
-# define krb5_setegid(EGID) (setregid(getegid(), (gid_t)(EGID)))
-#else
- /* You need to add a case to deal with this operating system.*/
-# define krb5_setegid(EGID) (errno = EPERM, -1)
-#endif
-
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/krb5-appl-1.0.1/libpty/sane_hostname.c
new/krb5-appl-1.0.2/libpty/sane_hostname.c
--- old/krb5-appl-1.0.1/libpty/sane_hostname.c 2009-11-05 21:15:06.000000000
+0100
+++ new/krb5-appl-1.0.2/libpty/sane_hostname.c 2011-07-11 21:30:25.000000000
+0200
@@ -27,6 +27,10 @@
#include "socket-utils.h"
#include "fake-addrinfo.h"
+#ifndef MAXHOSTNAMELEN
+# define MAXHOSTNAMELEN 256
+#endif
+
static void
downcase (char *s)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/krb5-appl-1.0.1/telnet/telnet/commands.c
new/krb5-appl-1.0.2/telnet/telnet/commands.c
--- old/krb5-appl-1.0.1/telnet/telnet/commands.c 2009-11-05
21:15:06.000000000 +0100
+++ new/krb5-appl-1.0.2/telnet/telnet/commands.c 2011-07-11
21:30:55.000000000 +0200
@@ -2467,8 +2467,7 @@
continue;
}
usage:
- printf("usage: %s [-l user] [-a] host-name [port]\r\n", cmd);
- return 0;
+ return 2;
}
if (hostp == 0)
goto usage;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/krb5-appl-1.0.1/telnet/telnet/main.c
new/krb5-appl-1.0.2/telnet/telnet/main.c
--- old/krb5-appl-1.0.1/telnet/telnet/main.c 2009-11-05 21:15:06.000000000
+0100
+++ new/krb5-appl-1.0.2/telnet/telnet/main.c 2011-07-11 21:30:55.000000000
+0200
@@ -322,10 +322,14 @@
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 (;;) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/krb5-appl-1.0.1/telnet/telnet/sys_bsd.c
new/krb5-appl-1.0.2/telnet/telnet/sys_bsd.c
--- old/krb5-appl-1.0.1/telnet/telnet/sys_bsd.c 2009-07-08 23:22:07.000000000
+0200
+++ new/krb5-appl-1.0.2/telnet/telnet/sys_bsd.c 2011-07-11 21:30:25.000000000
+0200
@@ -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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/krb5-appl-1.0.1/telnet/telnetd/defs.h
new/krb5-appl-1.0.2/telnet/telnetd/defs.h
--- old/krb5-appl-1.0.1/telnet/telnetd/defs.h 2006-06-12 21:59:35.000000000
+0200
+++ new/krb5-appl-1.0.2/telnet/telnetd/defs.h 2011-07-11 21:30:25.000000000
+0200
@@ -38,6 +38,7 @@
*/
#include <sys/types.h>
#include <sys/param.h>
+#include <sys/ioctl.h>
#ifndef BSD
# define BSD 43
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/krb5-appl-1.0.1/telnet/telnetd/telnetd.8
new/krb5-appl-1.0.2/telnet/telnetd/telnetd.8
--- old/krb5-appl-1.0.1/telnet/telnetd/telnetd.8 2004-11-15
22:25:41.000000000 +0100
+++ new/krb5-appl-1.0.2/telnet/telnetd/telnetd.8 2011-07-11
21:29:34.000000000 +0200
@@ -37,7 +37,7 @@
.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]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/krb5-appl-1.0.1/tests/config/default.exp
new/krb5-appl-1.0.2/tests/config/default.exp
--- old/krb5-appl-1.0.1/tests/config/default.exp 2009-07-10
22:35:46.000000000 +0200
+++ new/krb5-appl-1.0.2/tests/config/default.exp 2011-07-11
21:33:00.000000000 +0200
@@ -1436,7 +1436,7 @@
set spawnid $spawn_id
set pid [exp_pid]
- set markstr "===MARK $pid [clock format [clock seconds]] ==="
+ set markstr "===MARK $pid ==="
puts $f $markstr
flush $f
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/krb5-appl-1.0.1/tests/resolve/resolve.c
new/krb5-appl-1.0.2/tests/resolve/resolve.c
--- old/krb5-appl-1.0.1/tests/resolve/resolve.c 2009-07-10 22:35:46.000000000
+0200
+++ new/krb5-appl-1.0.2/tests/resolve/resolve.c 2011-07-11 21:33:37.000000000
+0200
@@ -43,15 +43,7 @@
#include "autoconf.h"
#include <stdio.h>
-
-#if STDC_HEADERS
#include <string.h>
-#else
-#ifndef HAVE_STRCHR
-#define strchr index
-#endif
-char *strchr();
-#endif
#ifdef HAVE_SYS_PARAM_H
#include <sys/param.h>
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
