summaryrefslogtreecommitdiffstats
path: root/src/appl
diff options
context:
space:
mode:
Diffstat (limited to 'src/appl')
-rw-r--r--src/appl/bsd/ChangeLog27
-rw-r--r--src/appl/bsd/kcmd.c4
-rw-r--r--src/appl/bsd/login.M2
-rw-r--r--src/appl/bsd/login.c5
-rw-r--r--src/appl/bsd/loginpaths.h10
-rw-r--r--src/appl/bsd/v4rcp.c3
-rw-r--r--src/appl/gss-sample/ChangeLog6
-rw-r--r--src/appl/gss-sample/gss-client.c2
-rw-r--r--src/appl/gssftp/ftp/ChangeLog5
-rw-r--r--src/appl/gssftp/ftp/ftp.c5
-rw-r--r--src/appl/sample/sserver/ChangeLog7
-rw-r--r--src/appl/sample/sserver/sserver.M13
-rw-r--r--src/appl/simple/client/ChangeLog5
-rw-r--r--src/appl/simple/client/sim_client.c4
-rw-r--r--src/appl/simple/server/ChangeLog5
-rw-r--r--src/appl/simple/server/sim_server.c2
-rw-r--r--src/appl/telnet/telnet/ChangeLog22
-rw-r--r--src/appl/telnet/telnet/commands.c26
-rw-r--r--src/appl/telnet/telnet/configure.in2
-rw-r--r--src/appl/user_user/ChangeLog5
-rw-r--r--src/appl/user_user/client.c3
21 files changed, 132 insertions, 31 deletions
diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index f9aa5ad882..a0f9faf19c 100644
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,3 +1,30 @@
+Fri Dec 6 00:53:08 1996 Theodore Y. Ts'o <tytso@mit.edu>
+
+ * v4rcp.c: Extend the platform-specific braindamage so that
+ FreeBSD works. This whole file is eventually going to
+ need serious rototilling to make it even vaguely correct.
+ [PR #284]
+
+Fri Dec 6 00:02:25 1996 Tom Yu <tlyu@mit.edu>
+
+ * loginpaths.h: Add catch-all entries for LPATH and RPATH in case
+ we run across something that we haven't hardcoded paths for
+ yet. [267]
+
+Thu Dec 5 21:58:28 1996 Tom Yu <tlyu@mit.edu>
+
+ * login.M: v5srvtab -> krb5.keytab [279]
+
+Sun Nov 24 23:35:22 1996 Ezra Peisach <epeisach@mit.edu>
+
+ * login.c (try_afscall): Change to take pointer to function
+ instead of only calling setpag(). [krb5-appl/190]
+
+Fri Nov 22 15:46:46 1996 unknown <bjaspan@mit.edu>
+
+ * kcmd.c (kcmd): use sizeof instead of h_length to determine
+ number of bytes of addr to copy from DNS response [krb5-misc/211]
+
Thu Nov 14 14:30:28 1996 Barry Jaspan <bjaspan@mit.edu>
* krcp.c: don't print our own error message if kcmd returns -1 (it
diff --git a/src/appl/bsd/kcmd.c b/src/appl/bsd/kcmd.c
index 4b66c37953..6f4583596d 100644
--- a/src/appl/bsd/kcmd.c
+++ b/src/appl/bsd/kcmd.c
@@ -180,7 +180,7 @@ kcmd(sock, ahost, rport, locuser, remuser, cmd, fd2p, service, realm,
return (-1);
}
sin.sin_family = hp->h_addrtype;
- memcpy((caddr_t)&sin.sin_addr,hp->h_addr, hp->h_length);
+ memcpy((caddr_t)&sin.sin_addr,hp->h_addr, sizeof(sin.sin_addr));
sin.sin_port = rport;
if (connect(s, (struct sockaddr *)&sin, sizeof (sin)) >= 0)
break;
@@ -200,7 +200,7 @@ kcmd(sock, ahost, rport, locuser, remuser, cmd, fd2p, service, realm,
perror(0);
hp->h_addr_list++;
memcpy((caddr_t)&sin.sin_addr,hp->h_addr_list[0],
- hp->h_length);
+ sizeof(sin.sin_addr));
fprintf(stderr, "Trying %s...\n",
inet_ntoa(sin.sin_addr));
continue;
diff --git a/src/appl/bsd/login.M b/src/appl/bsd/login.M
index 0603d16bd2..f48fd0c40b 100644
--- a/src/appl/bsd/login.M
+++ b/src/appl/bsd/login.M
@@ -25,7 +25,7 @@ possible.) It will also attempt to run
.I aklog
to get \fIAFS\fP tokens for the user. The version 5 tickets will be
tested against a local
-.I v5srvtab
+.I krb5.keytab
if it is available, in order to verify the tickets, before letting the
user in. However, if the password matches the entry in
\fI/etc/passwd\fP the user will be unconditionally allowed (permitting
diff --git a/src/appl/bsd/login.c b/src/appl/bsd/login.c
index 7542a23a89..04045490d1 100644
--- a/src/appl/bsd/login.c
+++ b/src/appl/bsd/login.c
@@ -1023,7 +1023,8 @@ static sigtype sigsys ()
siglongjmp(setpag_buf, 1);
}
-static int try_afscall ()
+static int try_afscall (scall)
+ int (*scall)();
{
handler sa, osa;
volatile int retval = 0;
@@ -1032,7 +1033,7 @@ static int try_afscall ()
handler_init (sa, sigsys);
handler_swap (SIGSYS, sa, osa);
if (sigsetjmp(setpag_buf, 1) == 0) {
- setpag ();
+ (*scall)();
retval = 1;
}
handler_set (SIGSYS, osa);
diff --git a/src/appl/bsd/loginpaths.h b/src/appl/bsd/loginpaths.h
index 2f2de0bb81..99d28b091a 100644
--- a/src/appl/bsd/loginpaths.h
+++ b/src/appl/bsd/loginpaths.h
@@ -94,3 +94,13 @@
#define RPATH "/usr/bin:/bin"
#endif
#endif
+
+/* catch-all entries for operating systems we haven't looked up
+ hardcoded paths for */
+#ifndef LPATH
+#define LPATH "/usr/bin:/bin"
+#endif
+
+#ifndef RPATH
+#define RPATH "/usr/bin:/bin"
+#endif
diff --git a/src/appl/bsd/v4rcp.c b/src/appl/bsd/v4rcp.c
index 0a1ad33a0e..56db95c8d4 100644
--- a/src/appl/bsd/v4rcp.c
+++ b/src/appl/bsd/v4rcp.c
@@ -310,7 +310,8 @@ void lostconn();
int lostconn();
#endif
int errno;
-#ifndef __NetBSD__
+/* Kludge!!!! */
+#if (!defined(__NetBSD__) && !defined(__FreeBSD__))
extern char *sys_errlist[];
#endif
int iamremote, targetshouldbedirectory;
diff --git a/src/appl/gss-sample/ChangeLog b/src/appl/gss-sample/ChangeLog
index 5da0236f05..110e7224ad 100644
--- a/src/appl/gss-sample/ChangeLog
+++ b/src/appl/gss-sample/ChangeLog
@@ -1,3 +1,9 @@
+Fri Nov 22 15:48:02 1996 unknown <bjaspan@mit.edu>
+
+ * gss-client.c (connect_to_server): use sizeof instead of h_length
+ to determine number of bytes of addr to copy from DNS response
+ [krb5-misc/211]
+
Sun Oct 27 22:04:59 1996 Ezra Peisach <epeisach@mit.edu>
* configure.in: Add USE_GSSAPI_LIBRARY
diff --git a/src/appl/gss-sample/gss-client.c b/src/appl/gss-sample/gss-client.c
index 170bc63405..b91ea87aa5 100644
--- a/src/appl/gss-sample/gss-client.c
+++ b/src/appl/gss-sample/gss-client.c
@@ -79,7 +79,7 @@ int connect_to_server(host, port)
}
saddr.sin_family = hp->h_addrtype;
- memcpy((char *)&saddr.sin_addr, hp->h_addr, hp->h_length);
+ memcpy((char *)&saddr.sin_addr, hp->h_addr, sizeof(saddr.sin_addr));
saddr.sin_port = htons(port);
if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
diff --git a/src/appl/gssftp/ftp/ChangeLog b/src/appl/gssftp/ftp/ChangeLog
index 3262141e90..9d39c10aad 100644
--- a/src/appl/gssftp/ftp/ChangeLog
+++ b/src/appl/gssftp/ftp/ChangeLog
@@ -1,3 +1,8 @@
+Fri Nov 22 15:48:19 1996 unknown <bjaspan@mit.edu>
+
+ * ftp.c (hookup): use sizeof instead of h_length to determine
+ number of bytes of addr to copy from DNS response [krb5-misc/211]
+
Fri Sep 27 16:05:09 1996 Tom Yu <tlyu@mit.edu>
* cmds.c (setpeer): Apply jik's fix so "-n" actually works as
diff --git a/src/appl/gssftp/ftp/ftp.c b/src/appl/gssftp/ftp/ftp.c
index fb6a5632b5..0641416bc8 100644
--- a/src/appl/gssftp/ftp/ftp.c
+++ b/src/appl/gssftp/ftp/ftp.c
@@ -155,7 +155,7 @@ hookup(host, port)
}
hisctladdr.sin_family = hp->h_addrtype;
memcpy((caddr_t)&hisctladdr.sin_addr, hp->h_addr_list[0],
- hp->h_length);
+ sizeof(hisctladdr.sin_addr));
(void) strncpy(hostnamebuf, hp->h_name, sizeof(hostnamebuf));
}
hostname = hostnamebuf;
@@ -177,7 +177,8 @@ hookup(host, port)
perror((char *) 0);
hp->h_addr_list++;
memcpy((caddr_t)&hisctladdr.sin_addr,
- hp->h_addr_list[0], hp->h_length);
+ hp->h_addr_list[0],
+ sizeof(hisctladdr.sin_addr));
fprintf(stdout, "Trying %s...\n",
inet_ntoa(hisctladdr.sin_addr));
(void) close(s);
diff --git a/src/appl/sample/sserver/ChangeLog b/src/appl/sample/sserver/ChangeLog
index ba1d2974fe..be41b716c3 100644
--- a/src/appl/sample/sserver/ChangeLog
+++ b/src/appl/sample/sserver/ChangeLog
@@ -1,3 +1,10 @@
+Thu Dec 5 19:44:05 1996 Tom Yu <tlyu@mit.edu>
+
+ * sserver.M: remove ref's to "/krb5" [PR 279]
+
+ * sserver.M: v5srvtab -> krb5.keytab; also kdb5_edit -> kadmin [PR
+ 279]
+
Thu Nov 7 15:24:43 1996 Theodore Ts'o <tytso@rsts-11.mit.edu>
* sserver.c (main): Check the error return from
diff --git a/src/appl/sample/sserver/sserver.M b/src/appl/sample/sserver/sserver.M
index f0ea721b07..e879067e68 100644
--- a/src/appl/sample/sserver/sserver.M
+++ b/src/appl/sample/sserver/sserver.M
@@ -44,9 +44,8 @@ The service name used by \fIsserver\fP and \fIsclient\fP is
\fBsample\fP. Hence, \fIsserver\fP will require that there be a keytab
entry for the service "sample/hostname.domain.name@REALM.NAME". This
keytab is generated using the
-.IR krb5_edit(8)
-program. The keytab file is installed in whatever
-directory is defined by V5Srvtabdir (usually /etc) as "v5srvtab".
+.IR kadmin(8)
+program. The keytab file is usually installed as "/etc/krb5.keytab".
.PP
The
.B \-S
@@ -57,7 +56,7 @@ option allows for a different keytab than the default.
using a line in
/etc/inetd.conf that looks like this:
.PP
-sample stream tcp nowait root /krb5/sbin/sserver sserver
+sample stream tcp nowait root /usr/local/sbin/sserver sserver
.PP
Since \fBsample\fP is normally not a port defined in /etc/services, you will
usually have to add a line to /etc/services which looks like this:
@@ -66,7 +65,7 @@ sample 13135/tcp
.PP
When using \fIsclient,\fP you will first have to have an entry in the Kerberos
database, by using
-.IR kdb5_edit(8),
+.IR kadmin(8),
and then you have to get Kerberos
tickets, by using
.IR kinit(8).
@@ -109,10 +108,10 @@ didn't restart \fIinetd\fP after editing inetd.conf.
.PP
4) \fIsclient\fP returns the error:
.PP
-/krb5/bin/sclient: Server not found in Kerberos database while using sendauth
+sclient: Server not found in Kerberos database while using sendauth
.PP
This means that the "sample/hostname@LOCAL.REALM" service was not
-defined in the Kerberos database; it should be created using \fIkdb5_edit,\fP
+defined in the Kerberos database; it should be created using \fIkadmin,\fP
and a keytab file needs to be generated to make the key for that service
principal available for \fIssclient\fP.
.PP
diff --git a/src/appl/simple/client/ChangeLog b/src/appl/simple/client/ChangeLog
index 275d42bf20..db1136c43a 100644
--- a/src/appl/simple/client/ChangeLog
+++ b/src/appl/simple/client/ChangeLog
@@ -1,3 +1,8 @@
+Fri Nov 22 15:48:30 1996 unknown <bjaspan@mit.edu>
+
+ * sim_client.c (main): use sizeof instead of h_length to determine
+ number of bytes of addr to copy from DNS response [krb5-misc/211]
+
Thu Nov 7 15:26:10 1996 Theodore Ts'o <tytso@rsts-11.mit.edu>
* sim_client.c (main): Check the error return from
diff --git a/src/appl/simple/client/sim_client.c b/src/appl/simple/client/sim_client.c
index 9def2603ce..a573dfa54a 100644
--- a/src/appl/simple/client/sim_client.c
+++ b/src/appl/simple/client/sim_client.c
@@ -163,7 +163,7 @@ main(argc, argv)
/* Set server's address */
(void) memset((char *)&s_sock, 0, sizeof(s_sock));
- memcpy((char *)&s_sock.sin_addr, host->h_addr, host->h_length);
+ memcpy((char *)&s_sock.sin_addr, host->h_addr, sizeof(s_sock.sin_addr));
#ifdef DEBUG
printf("s_sock.sin_addr is %s\n", inet_ntoa(s_sock.sin_addr));
#endif
@@ -198,7 +198,7 @@ main(argc, argv)
fprintf(stderr, "%s: unknown host\n", hostname);
exit(1);
}
- memcpy((char *)&c_sock.sin_addr, host->h_addr, host->h_length);
+ memcpy((char *)&c_sock.sin_addr, host->h_addr, sizeof(c_sock.sin_addr));
#endif
diff --git a/src/appl/simple/server/ChangeLog b/src/appl/simple/server/ChangeLog
index 58042da37f..6e30ce4a4c 100644
--- a/src/appl/simple/server/ChangeLog
+++ b/src/appl/simple/server/ChangeLog
@@ -1,3 +1,8 @@
+Fri Nov 22 15:48:42 1996 unknown <bjaspan@mit.edu>
+
+ * sim_server.c (argv): use sizeof instead of h_length to determine
+ number of bytes of addr to copy from DNS response [krb5-misc/211]
+
Thu Nov 7 15:26:44 1996 Theodore Ts'o <tytso@rsts-11.mit.edu>
* sim_server.c (argv): Check the error return from
diff --git a/src/appl/simple/server/sim_server.c b/src/appl/simple/server/sim_server.c
index 551a4f36cd..255d786f25 100644
--- a/src/appl/simple/server/sim_server.c
+++ b/src/appl/simple/server/sim_server.c
@@ -151,7 +151,7 @@ char *argv[];
fprintf(stderr, "%s: host unknown\n", full_hname);
exit(1);
}
- memcpy((char *)&s_sock.sin_addr, host->h_addr, host->h_length);
+ memcpy((char *)&s_sock.sin_addr, host->h_addr, sizeof(s_sock.sin_addr));
/* Open socket */
if ((sock = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
diff --git a/src/appl/telnet/telnet/ChangeLog b/src/appl/telnet/telnet/ChangeLog
index 8080dba471..f58e8955f8 100644
--- a/src/appl/telnet/telnet/ChangeLog
+++ b/src/appl/telnet/telnet/ChangeLog
@@ -1,3 +1,25 @@
+Tue Nov 26 20:41:31 1996 Tom Yu <tlyu@voltage-multiplier.mit.edu>
+
+ * configure.in: Check for apra/inet.h
+
+ * commands.c: Remove explicit declaration of inet_addr, and
+ declare INADDR_NONE to be 0xffffffff again, but mask off the lower
+ 32 bits while doing the compare.
+
+Sat Nov 23 00:33:58 1996 Sam Hartman <hartmans@mit.edu>
+
+ * commands.c (tn): Patch from mycroft@mit.edu for Alpha NetBSD.
+ Comparing to -1 is not 64-bit clean.
+ [233]
+ (INADDR_NONE): Mycroft suggests using -1 not 0xffffffff if I have
+ to define it ourselves. [233]
+
+ Fri Nov 22 15:48:57 1996 unknown <bjaspan@mit.edu>
+
+ * commands.c (sourceroute): use sizeof instead of h_length to
+ determine number of bytes of addr to copy from DNS response
+ [krb5-misc/211]
+
Thu Nov 14 14:25:51 1996 Theodore Ts'o <tytso@rsts-11.mit.edu>
* sys_bsd.c(intr): Added checks to intr_waiting and intr_happened
diff --git a/src/appl/telnet/telnet/commands.c b/src/appl/telnet/telnet/commands.c
index cfd975e2fb..0b42efe621 100644
--- a/src/appl/telnet/telnet/commands.c
+++ b/src/appl/telnet/telnet/commands.c
@@ -44,6 +44,9 @@
#endif /* defined(unix) */
#include <sys/socket.h>
#include <netinet/in.h>
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif /* HAVE_ARPA_INET_H */
#ifdef CRAY
#include <fcntl.h>
#endif /* CRAY */
@@ -89,6 +92,9 @@
#ifndef MAXDNAME
#define MAXDNAME 256 /*per the rfc*/
#endif
+#ifndef INADDR_NONE
+#define INADDR_NONE 0xffffffff
+#endif
#if defined(IPPROTO_IP) && defined(IP_TOS)
int tos = -1;
@@ -2352,8 +2358,6 @@ ayt_status()
}
#endif
-unsigned long inet_addr();
-
int
tn(argc, argv)
int argc;
@@ -2443,10 +2447,10 @@ tn(argc, argv)
} else {
#endif
temp = inet_addr(hostp);
- if (temp != (unsigned long) -1) {
+ if (temp & 0xffffffff != INADDR_NONE) {
sin.sin_addr.s_addr = temp;
sin.sin_family = AF_INET;
- (void) strcpy(_hostname, hostp);
+ (void) strcpy(_hostname, hostp);
hostname = _hostname;
} else {
host = gethostbyname(hostp);
@@ -2454,9 +2458,10 @@ tn(argc, argv)
sin.sin_family = host->h_addrtype;
#if defined(h_addr) /* In 4.3, this is a #define */
memcpy((caddr_t)&sin.sin_addr,
- host->h_addr_list[0], host->h_length);
+ host->h_addr_list[0], sizeof(sin.sin_addr));
#else /* defined(h_addr) */
- memcpy((caddr_t)&sin.sin_addr, host->h_addr, host->h_length);
+ memcpy((caddr_t)&sin.sin_addr, host->h_addr,
+ sizeof(sin.sin_addr));
#endif /* defined(h_addr) */
strncpy(_hostname, host->h_name, sizeof(_hostname));
_hostname[sizeof(_hostname)-1] = '\0';
@@ -2546,9 +2551,9 @@ tn(argc, argv)
perror((char *)0);
host->h_addr_list++;
memcpy((caddr_t)&sin.sin_addr,
- host->h_addr_list[0], host->h_length);
+ host->h_addr_list[0], sizeof(sin.sin_addr));
memcpy((caddr_t)&hostaddr,
- host->h_addr_list[0], host->h_length);
+ host->h_addr_list[0], sizeof(sin.sin_addr));
(void) NetClose(net);
continue;
}
@@ -3055,9 +3060,10 @@ sourceroute(arg, cpp, lenp)
} else if (host = gethostbyname(cp)) {
#if defined(h_addr)
memcpy((caddr_t)&sin_addr,
- host->h_addr_list[0], host->h_length);
+ host->h_addr_list[0], sizeof(sin_addr));
#else
- memcpy((caddr_t)&sin_addr, host->h_addr, host->h_length);
+ memcpy((caddr_t)&sin_addr, host->h_addr,
+ sizeof(sin_addr));
#endif
} else {
*cpp = cp;
diff --git a/src/appl/telnet/telnet/configure.in b/src/appl/telnet/telnet/configure.in
index 619153f037..3d08e2f4a8 100644
--- a/src/appl/telnet/telnet/configure.in
+++ b/src/appl/telnet/telnet/configure.in
@@ -3,7 +3,7 @@ CONFIG_RULES
AC_PROG_INSTALL
AC_VFORK
AC_CHECK_HEADERS(string.h arpa/nameser.h)
-AC_HAVE_HEADERS(unistd.h sys/select.h stdlib.h)
+AC_HAVE_HEADERS(unistd.h sys/select.h stdlib.h arpa/inet.h)
AC_CHECK_LIB(termcap,main,AC_DEFINE(TERMCAP)
LIBS="$LIBS -ltermcap",
AC_CHECK_LIB(curses,setupterm,LIBS="$LIBS -lcurses")
diff --git a/src/appl/user_user/ChangeLog b/src/appl/user_user/ChangeLog
index 62651d0cbc..e00507592d 100644
--- a/src/appl/user_user/ChangeLog
+++ b/src/appl/user_user/ChangeLog
@@ -1,3 +1,8 @@
+Fri Nov 22 15:49:09 1996 unknown <bjaspan@mit.edu>
+
+ * client.c (argv): use sizeof instead of h_length to determine
+ number of bytes of addr to copy from DNS response [krb5-misc/211]
+
Thu Nov 7 15:36:15 1996 Theodore Ts'o <tytso@rsts-11.mit.edu>
* client.c (argv):
diff --git a/src/appl/user_user/client.c b/src/appl/user_user/client.c
index 4bee7089cd..2cf85ae941 100644
--- a/src/appl/user_user/client.c
+++ b/src/appl/user_user/client.c
@@ -128,7 +128,8 @@ char *argv[];
fprintf (stderr, "uu-client: unable to connect to \"%s\"\n", hname);
return 5;
}
- memcpy ((char *)&serv_net_addr.sin_addr, host->h_addr_list[i++], host->h_length);
+ memcpy ((char *)&serv_net_addr.sin_addr, host->h_addr_list[i++],
+ sizeof(serv_net_addr.sin_addr));
if (connect(s, (struct sockaddr *)&serv_net_addr, sizeof (serv_net_addr)) == 0)
break;
com_err ("uu-client", errno, "connecting to \"%s\" (%s).",
generated by cgit (git 2.34.1) at 2024-06-13 07:48:14 +0000