Permalink
Browse files

merge 18132:18156 from trunk

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/mechglue@18157 dc483132-0cff-0310-8789-dd5450dbe970
  • Loading branch information...
tlyu
tlyu committed Jun 16, 2006
1 parent e4bf5e6 commit 03794f59426ff1aba6706a750fb78e77c9e28992
Showing with 480 additions and 613 deletions.
  1. +1 −1 src/appl/gssftp/ftp/Makefile.in
  2. +6 −6 src/appl/gssftp/ftp/cmds.c
  3. +1 −0 src/appl/gssftp/ftpd/Makefile.in
  4. +2 −2 src/appl/gssftp/ftpd/ftpcmd.y
  5. +1 −2 src/appl/gssftp/ftpd/ftpd.c
  6. +1 −1 src/appl/gssftp/ftpd/ftpd_var.h
  7. +0 −33 src/appl/telnet/libtelnet/Makefile.4.4
  8. +0 −67 src/appl/telnet/libtelnet/Makefile.generic
  9. +1 −1 src/appl/telnet/libtelnet/Makefile.in
  10. +1 −1 src/appl/telnet/libtelnet/kerberos5.c
  11. +0 −73 src/appl/telnet/telnet/Makefile.4.4
  12. +0 −89 src/appl/telnet/telnet/Makefile.generic
  13. +1 −1 src/appl/telnet/telnet/Makefile.in
  14. +1 −1 src/appl/telnet/telnet/network.c
  15. +2 −2 src/appl/telnet/telnet/telnet.c
  16. +0 −36 src/appl/telnet/telnetd/Makefile.4.4
  17. +0 −71 src/appl/telnet/telnetd/Makefile.generic
  18. +1 −1 src/appl/telnet/telnetd/Makefile.in
  19. +1 −1 src/appl/telnet/telnetd/state.c
  20. +1 −1 src/config/pre.in
  21. +14 −1 src/config/shlib.conf
  22. +11 −0 src/configure.in
  23. +2 −0 src/include/k5-int.h
  24. +0 −30 src/include/krb5/locate.h
  25. +2 −2 src/kadmin/cli/kadmin.c
  26. +2 −1 src/krb5-config.in
  27. +2 −1 src/lib/gssapi/Makefile.in
  28. +0 −10 src/lib/gssapi/generic/Makefile.in
  29. +2 −0 src/lib/gssapi/krb5/Makefile.in
  30. +5 −0 src/lib/gssapi/krb5/gssapiP_krb5.h
  31. +0 −2 src/lib/gssapi/krb5/rel_oid.c
  32. +1 −0 src/lib/gssapi/libgssapi_krb5.exports
  33. +212 −1 src/lib/gssapi/mechglue/Makefile.in
  34. +14 −1 src/lib/gssapi/spnego/Makefile.in
  35. +169 −151 src/lib/kadm5/clnt/client_rpc.c
  36. +1 −1 src/lib/kadm5/srv/server_acl.c
  37. +4 −4 src/lib/kadm5/srv/server_misc.c
  38. +2 −2 src/lib/krb4/kparse.c
  39. +1 −1 src/lib/krb5/ccache/ccbase.c
  40. +1 −1 src/lib/krb5/keytab/ktbase.c
  41. +2 −2 src/lib/krb5/krb/conv_princ.c
  42. +4 −4 src/lib/krb5/os/hst_realm.c
  43. +2 −2 src/lib/krb5/os/sn2princ.c
  44. +1 −1 src/lib/krb5/rcache/rc_io.c
  45. +1 −1 src/plugins/kdb/db2/libdb2/hash/hash.c
  46. +2 −2 src/tests/asn.1/utility.c
  47. +2 −2 src/util/support/Makefile.in
@@ -5,7 +5,7 @@ BUILDTOP=$(REL)..$(S)..$(S)..
#
# appl/gssftp/ftp/Makefile.in
#
-DEFINES = -DGSSAPI -DFTP_BUFSIZ=10240
+DEFINES = -DGSSAPI -DFTP_BUFSIZ=65535
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
View
@@ -725,14 +725,14 @@ void mput(argc, argv)
if (mflag && confirm(argv[0], cp)) {
tp = cp;
if (mcase) {
- while (*tp && !islower((int) (*tp))) {
+ while (*tp && !islower((unsigned char) (*tp))) {
tp++;
}
if (!*tp) {
tp = cp;
tp2 = tmpbuf;
while ((*tp2 = *tp) != 0) {
- if (isupper((int) *tp2)) {
+ if (isupper((unsigned char) *tp2)) {
*tp2 = 'a' + *tp2 - 'A';
}
tp++;
@@ -864,14 +864,14 @@ static int getit(argc, argv, restartit, rmode)
if (loc && mcase) {
char *tp = argv[1], *tp2, tmpbuf[MAXPATHLEN];
- while (*tp && !islower((int) *tp)) {
+ while (*tp && !islower((unsigned char) *tp)) {
tp++;
}
if (!*tp) {
tp = argv[2];
tp2 = tmpbuf;
while ((*tp2 = *tp) != 0) {
- if (isupper((int) *tp2)) {
+ if (isupper((unsigned char) *tp2)) {
*tp2 = 'a' + *tp2 - 'A';
}
tp++;
@@ -994,14 +994,14 @@ void mget(argc, argv)
if (mflag && confirm(argv[0], cp)) {
tp = cp;
if (mcase) {
- while (*tp && !islower((int) *tp)) {
+ while (*tp && !islower((unsigned char) *tp)) {
tp++;
}
if (!*tp) {
tp = cp;
tp2 = tmpbuf;
while ((*tp2 = *tp) != 0) {
- if (isupper((int) *tp2)) {
+ if (isupper((unsigned char) *tp2)) {
*tp2 = 'a' + *tp2 - 'A';
}
tp++;
@@ -111,3 +111,4 @@ $(OUTPRE)secure.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
$(SRCTOP)/include/kerberosIV/des.h $(SRCTOP)/include/kerberosIV/krb.h \
$(srcdir)/../arpa/ftp.h $(srcdir)/../ftp/secure.c secure.h
$(OUTPRE)getdtablesize.$(OBJEXT): $(srcdir)/../../bsd/getdtablesize.c
+$(OUTPRE)setenv.$(OBJEXT): $(srcdir)/../../bsd/setenv.c
@@ -971,7 +971,7 @@ urgsafe_getc(f)
* getline - a hacked up version of fgets to ignore TELNET escape codes.
*/
char *
-getline(s, n, iop)
+ftpd_getline(s, n, iop)
char *s;
int n;
register FILE *iop;
@@ -1213,7 +1213,7 @@ yylex()
case CMD:
(void) signal(SIGALRM, toolong);
(void) alarm((unsigned) timeout);
- if (getline(cbuf, sizeof(cbuf)-1, stdin) == NULL) {
+ if (ftpd_getline(cbuf, sizeof(cbuf)-1, stdin) == NULL) {
reply(221, "You could at least say goodbye.");
dologout(0);
}
@@ -176,7 +176,6 @@ extern char version[];
extern char *home; /* pointer to home directory for glob */
extern FILE *ftpd_popen(), *fopen(), *freopen();
extern int ftpd_pclose(), fclose();
-extern char *getline();
extern char cbuf[];
extern off_t restart_point;
@@ -2139,7 +2138,7 @@ myoob(sig)
if (!transflag)
return;
cp = tmpline;
- if (getline(cp, sizeof(tmpline), stdin) == NULL) {
+ if (ftpd_getline(cp, sizeof(tmpline), stdin) == NULL) {
reply(221, "You could at least say goodbye.");
dologout(0);
}
@@ -89,7 +89,7 @@ extern void lreply(int, char *, ...)
/* ftpcmd.y */
void upper(char *);
-char *getline(char *, int, FILE *);
+char *ftpd_getline(char *, int, FILE *);
#endif /* FTPD_VAR_H__ */
/* popen.c */
@@ -1,33 +0,0 @@
-# @(#)Makefile 8.2 (Berkeley) 12/15/93
-
-LIB= telnet
-SRCS= auth.c encrypt.c genget.c getent.c misc.c
-SRCS+= kerberos.c enc_des.c
-#SRCS+= kerberos5.c
-CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DHAS_CGETENT
-CFLAGS+= -DKRB4 -DDES_ENCRYPTION -I/usr/include/kerberosIV
-
-# These are the sources that have encryption stuff in them.
-CRYPT_SRC= auth.c enc-proto.h enc_des.c encrypt.c
-CRYPT_SRC+= encrypt.h kerberos.c kerberos5.c krb4encpwd.c
-CRYPT_SRC+= misc.c spx.c Makefile
-NOCRYPT_DIR=${.CURDIR}/Nocrypt
-
-.include <bsd.lib.mk>
-
-nocrypt:
-#ifdef ENCRYPTION
- @for i in ${CRYPT_SRC}; do \
- if [ ! -d ${NOCRYPT_DIR} ]; then \
- echo Creating subdirectory ${NOCRYPT_DIR}; \
- mkdir ${NOCRYPT_DIR}; \
- fi; \
- echo ${NOCRYPT_DIR}/$$i; \
- unifdef -UENCRYPTION ${.CURDIR}/$$i | \
- sed "s/ || defined(ENCRYPTION)//" > ${NOCRYPT_DIR}/$$i; \
- done
-
-placeholder:
-#else /* ENCRYPTION */
- @echo "Encryption code already removed."
-#endif /* ENCRYPTION */
@@ -1,67 +0,0 @@
-#
-# Copyright (c) 1991 The Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted provided
-# that: (1) source distributions retain this entire copyright notice and
-# comment, and (2) distributions including binaries display the following
-# acknowledgement: ``This product includes software developed by the
-# University of California, Berkeley and its contributors'' in the
-# documentation or other materials provided with the distribution and in
-# all advertising materials mentioning features or use of this software.
-# Neither the name of the University nor the names of its contributors may
-# be used to endorse or promote products derived from this software without
-# specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile.generic 5.5 (Berkeley) 3/1/91
-#
-
-LIB= libtelnet.a
-SRCS= auth.c encrypt.c genget.c \
- misc.c kerberos.c kerberos5.c forward.c spx.c enc_des.c \
- rsaencpwd.c krb4encpwd.c read_password.c \
- setenv.c getent.c strdup.c strcasecmp.c \
- strchr.c strrchr.c strftime.c strerror.c \
- ${LIB_SRC}
-
-OBJS= auth.o encrypt.o genget.o \
- misc.o kerberos.o kerberos5.o forward.o spx.o enc_des.o \
- rsaencpwd.o krb4encpwd.o read_password.o \
- ${LIB_OBJ}
-
-TELNET_H= ../arpa/telnet.h
-
-CFLAGS= ${LCCFLAGS} ${DEFINES} ${INCLUDES}
-
-${LIB}: ${OBJS}
- rm -f ${LIB}
- ${AR} ${ARFLAGS} ${LIB} `lorder ${OBJS} | tsort`
- @if [ ${RANLIB} != NONE ]; \
- then echo ${RANLIB} ${LIB}; ${RANLIB} ${LIB}; fi
-
-clean cleandir:
- rm -f *.o ${LIB} core a.out
-
-auth.o: ${TELNET_H}
-auth.o: encrypt.h
-auth.o: auth.h
-auth.o: misc-proto.h
-encrypt.o: ${TELNET_H}
-encrypt.o: encrypt.h
-encrypt.o: misc.h
-kerberos.o: ${TELNET_H}
-kerberos.o: encrypt.h
-kerberos.o: auth.h
-kerberos.o: misc.h
-kerberos5.o: ${TELNET_H}
-kerberos5.o: encrypt.h
-kerberos5.o: auth.h
-kerberos5.o: misc.h
-misc.o: misc.h
-enc_des.o: ${TELNET_H}
-enc_des.o: encrypt.h
-enc_des.o: key-proto.h
-enc_des.o: misc-proto.h
@@ -26,7 +26,7 @@ BUILDTOP=$(REL)..$(S)..$(S)..
AUTH_DEF=-DAUTHENTICATION -DENCRYPTION -DDES_ENCRYPTION -DKRB5 -DFORWARD \
-UNO_LOGIN_F -DLOGIN_CAP_F -DLOGIN_PROGRAM=KRB5_PATH_LOGIN
LOCALINCLUDES=-I.. -I$(srcdir)/.. @KRB4_INCLUDES@
-DEFINES = $(AUTH_DEF)
+DEFINES = -DTELNET_BUFSIZE=65535 $(AUTH_DEF)
LIBOBJS=@LIBOBJS@
SETENVSRC=@SETENVSRC@
@@ -99,7 +99,7 @@ static void kerberos5_forward(Authenticator *);
#endif /* FORWARD */
-static unsigned char str_data[8192] = {IAC, SB, TELOPT_AUTHENTICATION, 0,
+static unsigned char str_data[TELNET_BUFSIZE] = {IAC, SB, TELOPT_AUTHENTICATION, 0,
AUTHTYPE_KERBEROS_V5, };
/*static unsigned char str_name[1024] = { IAC, SB, TELOPT_AUTHENTICATION,
TELQUAL_NAME, };*/
@@ -1,73 +0,0 @@
-#
-# Copyright (c) 1990 The Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
-# may be used to endorse or promote products derived from this software
-# without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
-#
-
-PROG= telnet
-
-CFLAGS+=-DTERMCAP -DKLUDGELINEMODE -DUSE_TERMIO -DAUTHENTICATION -DENCRYPTION
-CFLAGS+=-DENV_HACK
-CFLAGS+=-I${.CURDIR}/../../lib
-
-CFLAGS+= -DKRB4
-
-LDADD= -ltermcap -ltelnet
-LDADD+= -lkrb -ldes
-DPADD= ${LIBTERMCAP}
-
-SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c telnet.c \
- terminal.c tn3270.c utilities.c
-
-# These are the sources that have encryption stuff in them.
-CRYPT_SRC= authenc.c commands.c externs.h main.c network.c
-CRYPT_SRC+= ring.c ring.h telnet.c terminal.c utilities.c Makefile
-NOCRYPT_DIR=${.CURDIR}/Nocrypt
-
-.include <bsd.prog.mk>
-
-nocrypt:
-#ifdef ENCRYPTION
- @for i in ${CRYPT_SRC}; do \
- if [ ! -d ${NOCRYPT_DIR} ]; then \
- echo Creating subdirectory ${NOCRYPT_DIR}; \
- mkdir ${NOCRYPT_DIR}; \
- fi; \
- echo ${NOCRYPT_DIR}/$$i; \
- unifdef -UENCRYPTION ${.CURDIR}/$$i | \
- sed "s/ || defined(ENCRYPTION)//" > ${NOCRYPT_DIR}/$$i; \
- done
-
-placeholder:
-#else /* ENCRYPTION */
- @echo "Encryption code already removed."
-#endif /* ENCRYPTION */
@@ -1,89 +0,0 @@
-#
-# Copyright (c) 1991 The Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted provided
-# that: (1) source distributions retain this entire copyright notice and
-# comment, and (2) distributions including binaries display the following
-# acknowledgement: ``This product includes software developed by the
-# University of California, Berkeley and its contributors'' in the
-# documentation or other materials provided with the distribution and in
-# all advertising materials mentioning features or use of this software.
-# Neither the name of the University nor the names of its contributors may
-# be used to endorse or promote products derived from this software without
-# specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#)Makefile.generic 5.5 (Berkeley) 3/1/91
-#
-
-INCLUDES= -I..
-ARPA_TELNET= ../arpa/telnet.h
-
-SRCS= commands.c main.c network.c ring.c \
- sys_bsd.c telnet.c terminal.c \
- utilities.c ${GETOPT_SRC}
-
-CFLAGS= ${LCCFLAGS} ${INCLUDES} ${DEFINES}
-
-ALLHC= ${SRCS} \
- defines.h externs.h fdset.h general.h \
- ring.h types.h
-
-OBJS= authenc.o commands.o main.o network.o ring.o sys_bsd.o \
- telnet.o terminal.o utilities.o ${GETOPT_OBJ}
-MAN= telnet.0
-
-#
-# These next three lines are not needed in 4.4BSD
-#
-.SUFFIXES: .0 .1
-.1.0:
- nroff -man -h $< > $@
-
-all: telnet
-
-telnet: ${OBJS} ${LIBPATH}
- ${CC} -o $@ ${CFLAGS} ${OBJS} ${LIBS}
-
-clean: FRC
- rm -f ${OBJS} core errs l.errs telnet
-
-cleandir: clean
- rm -f ${MAN} tags .depend
-
-clist: FRC ${SRCS}
- @for i in ${SRCS} ; \
- do (echo ${DIRPATH}$$i); done
-
-hclist: FRC ${ALLHC}
- @for i in ${ALLHC} ; \
- do (echo ${DIRPATH}$$i); done
-
-depend: FRC ${SRCS}
- mkdep ${CFLAGS} `make clist`
-
-install: ${MAN} FRC
- install -s -o bin -g bin -m 755 telnet ${DEST}
- install -c -o bin -g bin -m 444 telnet.0 ${DESTDIR}/usr/man/cat1
-
-lint: FRC ${SRCS}
- lint ${CFLAGS} `make clist`
-
-tags: FRC ${SRCS}
- ctags `make hclist`
-
-FRC:
-
-authenc.o: defines.h externs.h general.h ring.h types.h ${ARPA_TELNET}
-commands.o: defines.h externs.h general.h ring.h types.h ${ARPA_TELNET}
-main.o: defines.h externs.h ring.h
-network.o: defines.h externs.h fdset.h ring.h ${ARPA_TELNET}
-ring.o: general.h ring.h
-sys_bsd.o: defines.h externs.h fdset.h ring.h types.h ${ARPA_TELNET}
-telnet.o: defines.h externs.h general.h ring.h types.h ${ARPA_TELNET}
-terminal.o: externs.h ring.h types.h ${ARPA_TELNET}
-tn3270.o: defines.h externs.h fdset.h general.h ring.h ${ARPA_TELNET}
-utilities.o: defines.h externs.h fdset.h general.h ring.h ${ARPA_TELNET}
Oops, something went wrong.

0 comments on commit 03794f5

Please sign in to comment.