svn rev #21478: branches/mskrb-integ/src/ appl/bsd/ appl/gssftp/ftp/ appl/gssftp/ftpd/ ...

[hartmans@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=21478
Commit By: hartmans
Log Message: 
Merge trunk at R21453 into mskrb-integ.

Conflicts:

	src/clients/kinit/kinit.c
	src/clients/kvno/kvno.c
	src/kdc/do_as_req.c
	src/kdc/main.c
	src/lib/gssapi/krb5/init_sec_context.c


Changed Files:
U   branches/mskrb-integ/src/BADSYMS
U   branches/mskrb-integ/src/aclocal.m4
U   branches/mskrb-integ/src/appl/bsd/Makefile.in
D   branches/mskrb-integ/src/appl/bsd/compat_recv.c
U   branches/mskrb-integ/src/appl/bsd/configure.in
U   branches/mskrb-integ/src/appl/bsd/defines.h
U   branches/mskrb-integ/src/appl/bsd/forward.c
U   branches/mskrb-integ/src/appl/bsd/kcmd.c
U   branches/mskrb-integ/src/appl/bsd/klogind.M
U   branches/mskrb-integ/src/appl/bsd/krcp.c
U   branches/mskrb-integ/src/appl/bsd/krlogin.c
U   branches/mskrb-integ/src/appl/bsd/krlogind.c
U   branches/mskrb-integ/src/appl/bsd/krsh.c
U   branches/mskrb-integ/src/appl/bsd/krshd.c
U   branches/mskrb-integ/src/appl/bsd/login.M
U   branches/mskrb-integ/src/appl/bsd/login.c
U   branches/mskrb-integ/src/appl/bsd/rlogin.M
D   branches/mskrb-integ/src/appl/bsd/v4rcp.M
D   branches/mskrb-integ/src/appl/bsd/v4rcp.c
U   branches/mskrb-integ/src/appl/gssftp/ftp/Makefile.in
U   branches/mskrb-integ/src/appl/gssftp/ftp/ftp.M
U   branches/mskrb-integ/src/appl/gssftp/ftp/ftp.c
U   branches/mskrb-integ/src/appl/gssftp/ftp/main.c
U   branches/mskrb-integ/src/appl/gssftp/ftp/secure.c
U   branches/mskrb-integ/src/appl/gssftp/ftpd/Makefile.in
U   branches/mskrb-integ/src/appl/gssftp/ftpd/ftpcmd.y
U   branches/mskrb-integ/src/appl/gssftp/ftpd/ftpd.M
U   branches/mskrb-integ/src/appl/gssftp/ftpd/ftpd.c
U   branches/mskrb-integ/src/appl/telnet/configure.in
U   branches/mskrb-integ/src/appl/telnet/libtelnet/Makefile.in
U   branches/mskrb-integ/src/appl/telnet/libtelnet/auth-proto.h
U   branches/mskrb-integ/src/appl/telnet/libtelnet/auth.c
D   branches/mskrb-integ/src/appl/telnet/libtelnet/kerberos.c
U   branches/mskrb-integ/src/appl/telnet/telnet/Makefile.in
U   branches/mskrb-integ/src/appl/telnet/telnet/main.c
U   branches/mskrb-integ/src/appl/telnet/telnetd/Makefile.in
U   branches/mskrb-integ/src/clients/kcpytkt/Makefile.in
U   branches/mskrb-integ/src/clients/kdeltkt/Makefile.in
U   branches/mskrb-integ/src/clients/kdestroy/Makefile.in
U   branches/mskrb-integ/src/clients/kdestroy/kdestroy.M
U   branches/mskrb-integ/src/clients/kdestroy/kdestroy.c
U   branches/mskrb-integ/src/clients/kinit/Makefile.in
U   branches/mskrb-integ/src/clients/kinit/kinit.M
U   branches/mskrb-integ/src/clients/kinit/kinit.c
U   branches/mskrb-integ/src/clients/klist/Makefile.in
U   branches/mskrb-integ/src/clients/klist/klist.M
U   branches/mskrb-integ/src/clients/klist/klist.c
U   branches/mskrb-integ/src/clients/kvno/Makefile.in
U   branches/mskrb-integ/src/clients/kvno/kvno.M
U   branches/mskrb-integ/src/clients/kvno/kvno.c
U   branches/mskrb-integ/src/config/pre.in
U   branches/mskrb-integ/src/config/shlib.conf
U   branches/mskrb-integ/src/config/winexclude.sed
U   branches/mskrb-integ/src/include/k5-int.h
U   branches/mskrb-integ/src/include/osconf.hin
U   branches/mskrb-integ/src/kadmin/dbutil/Makefile.in
D   branches/mskrb-integ/src/kadmin/dbutil/dumpv4.c
U   branches/mskrb-integ/src/kadmin/dbutil/kdb5_util.M
U   branches/mskrb-integ/src/kadmin/dbutil/kdb5_util.c
U   branches/mskrb-integ/src/kadmin/dbutil/kdb5_util.h
D   branches/mskrb-integ/src/kadmin/dbutil/loadv4.c
U   branches/mskrb-integ/src/kadmin/ktutil/Makefile.in
U   branches/mskrb-integ/src/kadmin/ktutil/ktutil.c
U   branches/mskrb-integ/src/kadmin/ktutil/ktutil.h
U   branches/mskrb-integ/src/kadmin/ktutil/ktutil_funcs.c
D   branches/mskrb-integ/src/kdc/.saberinit
U   branches/mskrb-integ/src/kdc/Makefile.in
U   branches/mskrb-integ/src/kdc/dispatch.c
U   branches/mskrb-integ/src/kdc/do_as_req.c
D   branches/mskrb-integ/src/kdc/fakeka.M
D   branches/mskrb-integ/src/kdc/fakeka.c
U   branches/mskrb-integ/src/kdc/kdc_util.h
D   branches/mskrb-integ/src/kdc/kerberos_v4.c
U   branches/mskrb-integ/src/kdc/krb5kdc.M
U   branches/mskrb-integ/src/kdc/main.c
U   branches/mskrb-integ/src/krb5-config.in
U   branches/mskrb-integ/src/lib/gssapi/krb5/init_sec_context.c
D   branches/mskrb-integ/src/lib/krb5/asn.1/.saberinit
U   branches/mskrb-integ/src/lib/krb5/ccache/ccapi/stdcc.c
U   branches/mskrb-integ/src/lib/krb5/ccache/ccfns.c
U   branches/mskrb-integ/src/lib/krb5/krb/Makefile.in
U   branches/mskrb-integ/src/lib/krb5/krb/conv_creds.c
D   branches/mskrb-integ/src/lib/krb5/krb/v4lifetime.c
U   branches/mskrb-integ/src/lib/krb5/os/Makefile.in
U   branches/mskrb-integ/src/lib/krb5/os/accessor.c
D   branches/mskrb-integ/src/lib/krb5/os/send524.c
U   branches/mskrb-integ/src/tests/dejagnu/config/default.exp
U   branches/mskrb-integ/src/tests/dejagnu/krb-root/rlogin.exp
U   branches/mskrb-integ/src/tests/dejagnu/krb-standalone/gssftp.exp
U   branches/mskrb-integ/src/util/profile/prof_init.c
U   branches/mskrb-integ/src/util/ss/execute_cmd.c