Index: krb4/aclocal.m4 diff -u krb4/aclocal.m4:1.38 krb4/aclocal.m4:1.38.2.1 --- krb4/aclocal.m4:1.38 Sun May 18 20:47:30 1997 +++ krb4/aclocal.m4 Mon Jun 23 13:48:46 1997 @@ -1,5 +1,5 @@ dnl -dnl $Id: aclocal.m4,v 1.38 1997/05/18 18:47:30 assar Exp $ +dnl $Id: aclocal.m4,v 1.38.2.1 1997/06/23 11:48:46 joda Exp $ dnl dnl @@ -329,7 +329,6 @@ AC_DEFUN(AC_GROK_TYPE, [ AC_CACHE_VAL(ac_cv_type_$1, AC_TRY_COMPILE([ -#include "confdefs.h" #ifdef HAVE_SYS_TYPES_H #include #endif Index: krb4/appl/ftp/ftpd/popen.c diff -u krb4/appl/ftp/ftpd/popen.c:1.16 krb4/appl/ftp/ftpd/popen.c:1.16.2.1 --- krb4/appl/ftp/ftpd/popen.c:1.16 Sun Jun 1 05:14:06 1997 +++ krb4/appl/ftp/ftpd/popen.c Mon Jun 23 13:46:25 1997 @@ -37,7 +37,7 @@ #ifdef HAVE_CONFIG_H #include -RCSID("$Id: popen.c,v 1.16 1997/06/01 03:14:06 assar Exp $"); +RCSID("$Id: popen.c,v 1.16.2.1 1997/06/23 11:46:25 joda Exp $"); #endif #include @@ -125,8 +125,8 @@ return (NULL); /* break up string into pieces */ + foo = NULL; for (argc = 0, cp = program;; cp = NULL) { - foo = NULL; if (!(argv[argc++] = strtok_r(cp, " \t\n", &foo))) break; } Index: krb4/appl/kpopper/pop_init.c diff -u krb4/appl/kpopper/pop_init.c:1.29 krb4/appl/kpopper/pop_init.c:1.29.2.1 --- krb4/appl/kpopper/pop_init.c:1.29 Wed Apr 23 23:27:40 1997 +++ krb4/appl/kpopper/pop_init.c Mon Jun 23 13:39:37 1997 @@ -5,7 +5,7 @@ */ #include -RCSID("$Id: pop_init.c,v 1.29 1997/04/23 21:27:40 assar Exp $"); +RCSID("$Id: pop_init.c,v 1.29.2.1 1997/06/23 11:39:37 joda Exp $"); static int @@ -64,7 +64,6 @@ int c; int len; int options = 0; - int sp = 0; /* Socket pointer */ char * trace_file_name = "/tmp/popper-trace"; int inetd = 0; int portnum = 0; @@ -161,7 +160,7 @@ /* Get the address and socket of the client to whom I am speaking */ len = sizeof(cs); - if (getpeername(sp,(struct sockaddr *)&cs,&len) < 0){ + if (getpeername(STDIN_FILENO, (struct sockaddr *)&cs, &len) < 0){ pop_log(p,POP_PRIORITY, "Unable to obtain socket and address of client, err = %d",errno); exit (1); @@ -220,14 +219,14 @@ } /* Create input file stream for TCP/IP communication */ - if ((p->input = fdopen(sp,"r")) == NULL){ + if ((p->input = fdopen(STDIN_FILENO,"r")) == NULL){ pop_log(p,POP_PRIORITY, "Unable to open communication stream for input, err = %d",errno); exit (1); } /* Create output file stream for TCP/IP communication */ - if ((p->output = fdopen(sp,"w")) == NULL){ + if ((p->output = fdopen(STDOUT_FILENO,"w")) == NULL){ pop_log(p,POP_PRIORITY, "Unable to open communication stream for output, err = %d",errno); exit (1); Index: krb4/doc/Makefile.in diff -u krb4/doc/Makefile.in:1.10 krb4/doc/Makefile.in:1.10.2.1 --- krb4/doc/Makefile.in:1.10 Tue May 6 05:05:55 1997 +++ krb4/doc/Makefile.in Mon Jun 23 13:45:27 1997 @@ -1,4 +1,4 @@ -# $Id: Makefile.in,v 1.10 1997/05/06 03:05:55 joda Exp $ +# $Id: Makefile.in,v 1.10.2.1 1997/06/23 11:45:27 joda Exp $ SHELL = /bin/sh @@ -22,6 +22,9 @@ $(INSTALL_DATA) kth-krb.info $(infodir)/kth-krb.info; \ else \ $(INSTALL_DATA) $(srcdir)/kth-krb.info $(infodir)/kth-krb.info; \ + fi + if test -e $(infodir)/dir ; then :; else \ + $(INSTALL_DATA) $(srcdir)/dir $(infodir)/dir; \ fi if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ install-info --dir-file=$(infodir)/dir $(infodir)/kth-krb.info; \ Index: krb4/doc/dir diff -u /dev/null krb4/doc/dir:1.1.2.1 --- /dev/null Mon Jun 23 13:49:01 1997 +++ krb4/doc/dir Mon Jun 23 13:45:28 1997 @@ -0,0 +1,17 @@ +$Id: dir,v 1.1.2.1 1997/06/23 11:45:28 joda Exp $ +This is the file .../info/dir, which contains the topmost node of the +Info hierarchy. The first time you invoke Info you start off +looking at that node, which is (dir)Top. + +File: dir Node: Top This is the top of the INFO tree + + This (the Directory node) gives a menu of major topics. + Typing "q" exits, "?" lists all Info commands, "d" returns here, + "h" gives a primer for first-timers, + "mEmacs" visits the Emacs topic, etc. + + In Emacs, you can click mouse button 2 on a menu item or cross reference + to select it. + +* Menu: + Index: krb4/doc/install.texi diff -u krb4/doc/install.texi:1.3 krb4/doc/install.texi:1.3.2.1 --- krb4/doc/install.texi:1.3 Sun May 25 21:11:57 1997 +++ krb4/doc/install.texi Mon Jun 23 13:45:28 1997 @@ -65,7 +65,7 @@ If you have to traverse a firewall and it uses the SocksV5 protocol (@cite{RFC 1928}), you can build with socks-support. Point @var{dir} to the directory where you have socks5 installed. For more information -about socks see @kbd{http://www.socks.nec.com/}. +about socks see @url{http://www.socks.nec.com/}. @item @kbd{--with-readline=}@var{dir} @cindex readline Index: krb4/doc/intro.texi diff -u krb4/doc/intro.texi:1.1 krb4/doc/intro.texi:1.1.2.1 --- krb4/doc/intro.texi:1.1 Mon May 5 21:43:46 1997 +++ krb4/doc/intro.texi Mon Jun 23 13:45:29 1997 @@ -50,7 +50,7 @@ It should work on anything that is almost POSIX, has an ANSI C compiler, a dbm library (for the server side), and BSD Sockets. -A web-page is available at @kbd{http://www.pdc.kth.se/kth-krb/}. +A web-page is available at @url{http://www.pdc.kth.se/kth-krb/}. @heading Bug reports Index: krb4/doc/kth-krb.texi diff -u krb4/doc/kth-krb.texi:1.71 krb4/doc/kth-krb.texi:1.71.2.1 --- krb4/doc/kth-krb.texi:1.71 Sun May 25 23:31:00 1997 +++ krb4/doc/kth-krb.texi Mon Jun 23 13:45:29 1997 @@ -1,6 +1,6 @@ \input texinfo @c -*- texinfo -*- @c %**start of header -@c $Id: kth-krb.texi,v 1.71 1997/05/25 21:31:00 assar Exp $ +@c $Id: kth-krb.texi,v 1.71.2.1 1997/06/23 11:45:29 joda Exp $ @setfilename kth-krb.info @settitle KTH-KRB @iftex @@ -14,10 +14,12 @@ @syncodeindex pg cp @c %**end of header +@ifinfo @dircategory Kerberos @direntry * Kth-krb: (kth-krb). The Kerberos IV distribution from KTH @end direntry +@end ifinfo @c title page @titlepage @@ -27,7 +29,7 @@ @subtitle 1997 @author Johan Danielsson @author Assar Westerlund -@author last updated $Date: 1997/05/25 21:31:00 $ +@author last updated $Date: 1997/06/23 11:45:29 $ @def@copynext{@vskip 20pt plus 1fil@penalty-1000} @def@copyrightstart{} Index: krb4/doc/setup.texi diff -u krb4/doc/setup.texi:1.3 krb4/doc/setup.texi:1.3.2.1 --- krb4/doc/setup.texi:1.3 Sun May 25 21:11:21 1997 +++ krb4/doc/setup.texi Mon Jun 23 13:45:30 1997 @@ -482,7 +482,7 @@ minutes. @cindex NTP. One good way to synchronize the time is NTP (Network Time Protocol), see -@code{http://www.eecis.udel.edu/~ntp/}. +@url{http://www.eecis.udel.edu/~ntp/}. If you need to run the client programs on a machine where you do not have root-access, you can hopefully just use the binaries and no Index: krb4/lib/krb/netread.c diff -u krb4/lib/krb/netread.c:1.6 krb4/lib/krb/netread.c:1.6.2.1 --- krb4/lib/krb/netread.c:1.6 Sun Mar 23 04:53:15 1997 +++ krb4/lib/krb/netread.c Mon Jun 23 13:37:49 1997 @@ -21,7 +21,7 @@ #include "krb_locl.h" -RCSID("$Id: netread.c,v 1.6 1997/03/23 03:53:15 joda Exp $"); +RCSID("$Id: netread.c,v 1.6.2.1 1997/06/23 11:37:49 joda Exp $"); /* * krb_net_read() reads from the file descriptor "fd" to the buffer @@ -40,7 +40,11 @@ char *buf = v; do { +#ifdef WIN32 + cc = recv(fd, buf, len, 0); +#else cc = read(fd, buf, len); +#endif if (cc < 0) return(cc); /* errno is already set */ else if (cc == 0) { Index: krb4/lib/krb/netwrite.c diff -u krb4/lib/krb/netwrite.c:1.7 krb4/lib/krb/netwrite.c:1.7.2.1 --- krb4/lib/krb/netwrite.c:1.7 Sun Mar 23 04:53:15 1997 +++ krb4/lib/krb/netwrite.c Mon Jun 23 13:37:49 1997 @@ -21,7 +21,7 @@ #include "krb_locl.h" -RCSID("$Id: netwrite.c,v 1.7 1997/03/23 03:53:15 joda Exp $"); +RCSID("$Id: netwrite.c,v 1.7.2.1 1997/06/23 11:37:49 joda Exp $"); /* * krb_net_write() writes "len" bytes from "buf" to the file @@ -40,7 +40,11 @@ const char *buf = (const char*)v; do { +#ifdef WIN32 + cc = send(fd, buf, wrlen, 0); +#else cc = write(fd, buf, wrlen); +#endif if (cc < 0) return(cc); else {