summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarkm <markm@FreeBSD.org>1995-09-10 14:59:51 +0000
committermarkm <markm@FreeBSD.org>1995-09-10 14:59:51 +0000
commitacf48f4555769cbedf1cfb2ff6262ac51f6b07c0 (patch)
treeffc1fe47931117d3df8da498e0fab1319329acfb
parentfa1e84085a6073041ad315c65c287ad37e687ef3 (diff)
downloadFreeBSD-src-acf48f4555769cbedf1cfb2ff6262ac51f6b07c0.zip
FreeBSD-src-acf48f4555769cbedf1cfb2ff6262ac51f6b07c0.tar.gz
Updating /usr/include/kerberosIV/des.h so eBones will build breaks
rcp and rlogin. (patch supplied) Submitted by: John Capo <jc@irbs.com>
-rw-r--r--bin/rcp/rcp.c4
-rw-r--r--usr.bin/rlogin/krb.h13
-rw-r--r--usr.bin/rlogin/krcmd.c2
3 files changed, 4 insertions, 15 deletions
diff --git a/bin/rcp/rcp.c b/bin/rcp/rcp.c
index 56478682..7e8c5c6 100644
--- a/bin/rcp/rcp.c
+++ b/bin/rcp/rcp.c
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: rcp.c,v 1.3 1995/03/19 13:29:14 joerg Exp $
+ * $Id: rcp.c,v 1.4 1995/05/30 00:07:06 rgrimes Exp $
*/
#ifndef lint
@@ -72,6 +72,8 @@ static char sccsid[] = "@(#)rcp.c 8.2 (Berkeley) 4/2/94";
#include <kerberosIV/des.h>
#include <kerberosIV/krb.h>
+#include "../../usr.bin/rlogin/krb.h"
+
char dst_realm_buf[REALM_SZ];
char *dest_realm = NULL;
int use_kerberos = 1;
diff --git a/usr.bin/rlogin/krb.h b/usr.bin/rlogin/krb.h
index 469af1c..07213f4 100644
--- a/usr.bin/rlogin/krb.h
+++ b/usr.bin/rlogin/krb.h
@@ -33,19 +33,6 @@
* @(#)krb.h 8.1 (Berkeley) 6/6/93
*/
-/*
- * XXX
- * These should be in a kerberos include file.
- */
-void des_clear_key __P(());
-int des_read __P((int, char *, int));
-void des_set_key __P((C_Block, Key_schedule));
-int des_write __P((int, char *, int));
-int krb_net_read __P((int, char *, int));
-char *krb_realmofhost __P((char *));
-int krb_sendauth __P((long, int, KTEXT, char *, char *, char *,
- u_long, MSG_DAT *, CREDENTIALS *, Key_schedule,
- struct sockaddr_in *, struct sockaddr_in *, char *));
int krcmd __P((char **, u_short, char *, char *, int *, char *));
int krcmd_mutual __P((char **, u_short, char *, char *, int *,
char *, CREDENTIALS *, Key_schedule));
diff --git a/usr.bin/rlogin/krcmd.c b/usr.bin/rlogin/krcmd.c
index 209bf93..c5eee4f 100644
--- a/usr.bin/rlogin/krcmd.c
+++ b/usr.bin/rlogin/krcmd.c
@@ -93,7 +93,7 @@ krcmd(ahost, rport, remuser, cmd, fd2p, realm)
SERVICE_NAME,
realm,
(CREDENTIALS *) NULL, /* credentials not used */
- (bit_64 *) NULL, /* key schedule not used */
+ 0, /* key schedule not used */
(MSG_DAT *) NULL, /* MSG_DAT not used */
(struct sockaddr_in *) NULL, /* local addr not used */
(struct sockaddr_in *) NULL, /* foreign addr not used */
OpenPOWER on IntegriCloud