Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/crypto/dist/krb4 resolve import conflicts
details: https://anonhg.NetBSD.org/src/rev/826e862c176d
branches: trunk
changeset: 536253:826e862c176d
user: joda <joda%NetBSD.org@localhost>
date: Thu Sep 12 12:33:10 2002 +0000
description:
resolve import conflicts
diffstat:
crypto/dist/krb4/admin/ext_srvtab.c | 3 +-
crypto/dist/krb4/admin/kdb_util.c | 3 +-
crypto/dist/krb4/admin/kstash.c | 3 +-
crypto/dist/krb4/appl/bsd/kcmd.c | 3 +-
crypto/dist/krb4/appl/bsd/login.c | 17 ++--
crypto/dist/krb4/appl/bsd/rlogind.c | 3 +-
crypto/dist/krb4/appl/bsd/su.c | 2 +-
crypto/dist/krb4/appl/kauth/kauth.c | 5 +-
crypto/dist/krb4/appl/kauth/rkinit.c | 5 +-
crypto/dist/krb4/appl/kip/kipd.c | 3 +-
crypto/dist/krb4/appl/kx/krb4.c | 3 +-
crypto/dist/krb4/appl/otp/otp.c | 3 +-
crypto/dist/krb4/kadmin/ksrvutil.c | 7 +-
crypto/dist/krb4/kadmin/ksrvutil_get.c | 7 +-
crypto/dist/krb4/lib/auth/pam/pam.c | 3 +-
crypto/dist/krb4/lib/kadm/kadm_cli_wrap.c | 11 +-
crypto/dist/krb4/lib/kadm/kadm_locl.h | 5 +-
crypto/dist/krb4/lib/kafs/kafs.3 | 60 ++++++++-------
crypto/dist/krb4/lib/kdb/kdb_locl.h | 5 +-
crypto/dist/krb4/lib/kdb/krb_kdb_utils.c | 3 +-
crypto/dist/krb4/lib/krb/decomp_ticket.c | 3 +-
crypto/dist/krb4/lib/krb/encrypt_ktext.c | 3 +-
crypto/dist/krb4/lib/krb/extra.c | 3 +-
crypto/dist/krb4/lib/krb/get_krbrlm.c | 29 ++++---
crypto/dist/krb4/lib/krb/kdc_reply.c | 3 +-
crypto/dist/krb4/lib/krb/klog.h | 2 +-
crypto/dist/krb4/lib/krb/krb-archaeology.h | 2 +-
crypto/dist/krb4/lib/krb/krb-protos.h | 3 +-
crypto/dist/krb4/lib/krb/krb.equiv.5 | 4 +-
crypto/dist/krb4/lib/krb/krb.h.in | 5 +-
crypto/dist/krb4/lib/krb/krb_locl.h | 12 ++-
crypto/dist/krb4/lib/krb/logging.c | 3 +-
crypto/dist/krb4/lib/krb/mk_priv.c | 3 +-
crypto/dist/krb4/lib/krb/mk_safe.c | 5 +-
crypto/dist/krb4/lib/krb/rd_priv.c | 3 +-
crypto/dist/krb4/lib/krb/rd_safe.c | 3 +-
crypto/dist/krb4/lib/krb/rw.c | 3 +-
crypto/dist/krb4/lib/krb/send_to_kdc.c | 3 +-
crypto/dist/krb4/lib/krb/str2key.c | 3 +-
crypto/dist/krb4/lib/krb/tf_util.c | 3 +-
crypto/dist/krb4/lib/roken/resolve.c | 107 +++++++++++++++++++++++-----
crypto/dist/krb4/lib/roken/snprintf.c | 7 +-
crypto/dist/krb4/slave/kprop.c | 3 +-
43 files changed, 241 insertions(+), 128 deletions(-)
diffs (truncated from 1208 to 300 lines):
diff -r d863251c72e7 -r 826e862c176d crypto/dist/krb4/admin/ext_srvtab.c
--- a/crypto/dist/krb4/admin/ext_srvtab.c Thu Sep 12 12:22:01 2002 +0000
+++ b/crypto/dist/krb4/admin/ext_srvtab.c Thu Sep 12 12:33:10 2002 +0000
@@ -9,7 +9,8 @@
#include "adm_locl.h"
-RCSID("$Id: ext_srvtab.c,v 1.2 2002/07/20 08:36:21 grant Exp $");
+__RCSID("$KTH-KRB: ext_srvtab.c,v 1.20 2001/09/02 23:58:56 assar Exp $"
+ "$NetBSD: ext_srvtab.c,v 1.3 2002/09/12 12:33:10 joda Exp $");
static des_cblock master_key;
static des_cblock session_key;
diff -r d863251c72e7 -r 826e862c176d crypto/dist/krb4/admin/kdb_util.c
--- a/crypto/dist/krb4/admin/kdb_util.c Thu Sep 12 12:22:01 2002 +0000
+++ b/crypto/dist/krb4/admin/kdb_util.c Thu Sep 12 12:33:10 2002 +0000
@@ -16,7 +16,8 @@
#include "adm_locl.h"
#include <getarg.h>
-RCSID("$Id: kdb_util.c,v 1.2 2002/07/20 08:36:21 grant Exp $");
+__RCSID("$KTH-KRB: kdb_util.c,v 1.46 2001/02/20 23:07:49 assar Exp $"
+ "$NetBSD: kdb_util.c,v 1.3 2002/09/12 12:33:10 joda Exp $");
static des_cblock master_key, new_master_key;
static des_key_schedule master_key_schedule, new_master_key_schedule;
diff -r d863251c72e7 -r 826e862c176d crypto/dist/krb4/admin/kstash.c
--- a/crypto/dist/krb4/admin/kstash.c Thu Sep 12 12:22:01 2002 +0000
+++ b/crypto/dist/krb4/admin/kstash.c Thu Sep 12 12:33:10 2002 +0000
@@ -10,7 +10,8 @@
#include "adm_locl.h"
-RCSID("$Id: kstash.c,v 1.2 2002/07/20 08:36:21 grant Exp $");
+__RCSID("$KTH-KRB: kstash.c,v 1.11 2001/02/20 23:07:49 assar Exp $"
+ "$NetBSD: kstash.c,v 1.3 2002/09/12 12:33:10 joda Exp $");
/* change this later, but krblib_dbm needs it for now */
diff -r d863251c72e7 -r 826e862c176d crypto/dist/krb4/appl/bsd/kcmd.c
--- a/crypto/dist/krb4/appl/bsd/kcmd.c Thu Sep 12 12:22:01 2002 +0000
+++ b/crypto/dist/krb4/appl/bsd/kcmd.c Thu Sep 12 12:33:10 2002 +0000
@@ -33,7 +33,8 @@
#include "bsd_locl.h"
-RCSID("$Id: kcmd.c,v 1.2 2002/07/20 08:36:21 grant Exp $");
+__RCSID("$KTH-KRB: kcmd.c,v 1.23 2001/09/17 04:57:22 assar Exp $"
+ "$NetBSD: kcmd.c,v 1.3 2002/09/12 12:33:10 joda Exp $");
#define START_PORT 5120 /* arbitrary */
diff -r d863251c72e7 -r 826e862c176d crypto/dist/krb4/appl/bsd/login.c
--- a/crypto/dist/krb4/appl/bsd/login.c Thu Sep 12 12:22:01 2002 +0000
+++ b/crypto/dist/krb4/appl/bsd/login.c Thu Sep 12 12:33:10 2002 +0000
@@ -45,7 +45,8 @@
#include <sys/capability.h>
#endif
-RCSID("$Id: login.c,v 1.2 2002/07/20 08:36:21 grant Exp $");
+__RCSID("$KTH-KRB: login.c,v 1.133 2002/08/28 18:54:46 joda Exp $"
+ "$NetBSD: login.c,v 1.3 2002/09/12 12:33:10 joda Exp $");
#ifdef OTP
#include <otp.h>
@@ -65,7 +66,7 @@
static RETSIGTYPE timedout (int);
static int doremotelogin (char *);
void login_fbtab (char *, uid_t, gid_t);
-#ifdef KERBEROS
+#ifdef KRB4
int klogin (struct passwd *, char *, char *, char *);
#endif
@@ -78,7 +79,7 @@
static u_int login_timeout;
-#ifdef KERBEROS
+#ifdef KRB4
int notickets = 1;
int noticketsdontcomplain = 1;
char *instance;
@@ -362,7 +363,7 @@
}
rootlogin = 0;
rval = 1;
-#ifdef KERBEROS
+#ifdef KRB4
if ((instance = strchr(username, '.')) != NULL) {
if (strcmp(instance, ".root") == 0)
rootlogin = 1;
@@ -489,7 +490,7 @@
* If trying to log in as root without Kerberos,
* but with insecure terminal, refuse the login attempt.
*/
-#ifdef KERBEROS
+#ifdef KRB4
if (authok == 0)
#endif
if (pwd && !rval && rootlogin && !rootterm(tty)
@@ -663,7 +664,7 @@
strlcpy(term, stypeof(tty), sizeof(term));
/* set up a somewhat censored environment. */
sysv_newenv(argc, argv, pwd, term, pflag);
-#ifdef KERBEROS
+#ifdef KRB4
if (krbtkfile_env)
esetenv("KRBTKFILE", krbtkfile_env, 1);
#endif
@@ -680,7 +681,7 @@
syslog(LOG_NOTICE, "ROOT LOGIN (%s) ON %s", username, tty);
}
-#ifdef KERBEROS
+#ifdef KRB4
if (!quietlog && notickets == 1 && !noticketsdontcomplain)
printf("Warning: no Kerberos tickets issued.\n");
#endif
@@ -855,7 +856,7 @@
return 1;
}
-#ifdef KERBEROS
+#ifdef KRB4
#define NBUFSIZ (UT_NAMESIZE + 1 + 5) /* .root suffix */
#else
#define NBUFSIZ (UT_NAMESIZE + 1)
diff -r d863251c72e7 -r 826e862c176d crypto/dist/krb4/appl/bsd/rlogind.c
--- a/crypto/dist/krb4/appl/bsd/rlogind.c Thu Sep 12 12:22:01 2002 +0000
+++ b/crypto/dist/krb4/appl/bsd/rlogind.c Thu Sep 12 12:33:10 2002 +0000
@@ -42,7 +42,8 @@
#include "bsd_locl.h"
-RCSID("$Id: rlogind.c,v 1.3 2001/09/17 12:21:41 assar Exp $");
+__RCSID("$KTH-KRB: rlogind.c,v 1.118 2002/09/09 15:19:11 joda Exp $"
+ "$NetBSD: rlogind.c,v 1.4 2002/09/12 12:33:11 joda Exp $");
extern int __check_rhosts_file;
diff -r d863251c72e7 -r 826e862c176d crypto/dist/krb4/appl/bsd/su.c
--- a/crypto/dist/krb4/appl/bsd/su.c Thu Sep 12 12:22:01 2002 +0000
+++ b/crypto/dist/krb4/appl/bsd/su.c Thu Sep 12 12:33:10 2002 +0000
@@ -33,7 +33,7 @@
#include "bsd_locl.h"
-RCSID ("$Id: su.c,v 1.3 2001/09/17 12:21:41 assar Exp $");
+RCSID ("$Id: su.c,v 1.4 2002/09/12 12:33:11 joda Exp $");
#ifdef SYSV_SHADOW
#include "sysv_shadow.h"
diff -r d863251c72e7 -r 826e862c176d crypto/dist/krb4/appl/kauth/kauth.c
--- a/crypto/dist/krb4/appl/kauth/kauth.c Thu Sep 12 12:22:01 2002 +0000
+++ b/crypto/dist/krb4/appl/kauth/kauth.c Thu Sep 12 12:33:10 2002 +0000
@@ -41,7 +41,8 @@
#include "kauth.h"
-RCSID("$Id: kauth.c,v 1.2 2002/07/20 08:36:22 grant Exp $");
+__RCSID("$KTH-KRB: kauth.c,v 1.102 2002/05/24 17:17:25 bg Exp $"
+ "$NetBSD: kauth.c,v 1.3 2002/09/12 12:33:11 joda Exp $");
krb_principal princ;
static char srvtab[MaxPathLen];
@@ -310,7 +311,7 @@
do{
snprintf(tf, sizeof(tf), "%s%u_%u", TKT_ROOT, (unsigned)getuid(),
(unsigned)(getpid()*time(0)));
- f = open(tf, O_CREAT|O_EXCL|O_RDWR);
+ f = open(tf, O_CREAT|O_EXCL|O_RDWR, 0600);
}while(f < 0);
close(f);
unlink(tf);
diff -r d863251c72e7 -r 826e862c176d crypto/dist/krb4/appl/kauth/rkinit.c
--- a/crypto/dist/krb4/appl/kauth/rkinit.c Thu Sep 12 12:22:01 2002 +0000
+++ b/crypto/dist/krb4/appl/kauth/rkinit.c Thu Sep 12 12:33:10 2002 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
+ * Copyright (c) 1995-2002 Kungliga Tekniska Högskolan
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
@@ -33,7 +33,8 @@
#include "kauth.h"
-RCSID("$Id: rkinit.c,v 1.2 2002/07/20 08:36:22 grant Exp $");
+__RCSID("$KTH-KRB: rkinit.c,v 1.25 2002/04/26 12:23:26 joda Exp $"
+ "$NetBSD: rkinit.c,v 1.3 2002/09/12 12:33:11 joda Exp $");
static struct in_addr *
getalladdrs (char *hostname, unsigned *count)
diff -r d863251c72e7 -r 826e862c176d crypto/dist/krb4/appl/kip/kipd.c
--- a/crypto/dist/krb4/appl/kip/kipd.c Thu Sep 12 12:22:01 2002 +0000
+++ b/crypto/dist/krb4/appl/kip/kipd.c Thu Sep 12 12:33:10 2002 +0000
@@ -33,7 +33,8 @@
#include "kip.h"
-RCSID("$Id: kipd.c,v 1.3 2001/09/17 12:21:41 assar Exp $");
+__RCSID("$KTH-KRB: kipd.c,v 1.23 2002/09/09 15:57:23 joda Exp $"
+ "$NetBSD: kipd.c,v 1.4 2002/09/12 12:33:11 joda Exp $");
static int
recv_conn (int sock, des_cblock *key, des_key_schedule schedule,
diff -r d863251c72e7 -r 826e862c176d crypto/dist/krb4/appl/kx/krb4.c
--- a/crypto/dist/krb4/appl/kx/krb4.c Thu Sep 12 12:22:01 2002 +0000
+++ b/crypto/dist/krb4/appl/kx/krb4.c Thu Sep 12 12:33:10 2002 +0000
@@ -33,7 +33,8 @@
#include "kx.h"
-RCSID("$Id: krb4.c,v 1.2 2002/07/20 08:36:22 grant Exp $");
+__RCSID("$KTH-KRB: krb4.c,v 1.8 2000/10/08 13:19:22 assar Exp $"
+ "$NetBSD: krb4.c,v 1.3 2002/09/12 12:33:12 joda Exp $");
#ifdef KRB4
diff -r d863251c72e7 -r 826e862c176d crypto/dist/krb4/appl/otp/otp.c
--- a/crypto/dist/krb4/appl/otp/otp.c Thu Sep 12 12:22:01 2002 +0000
+++ b/crypto/dist/krb4/appl/otp/otp.c Thu Sep 12 12:33:10 2002 +0000
@@ -34,7 +34,8 @@
#include "otp_locl.h"
#include <getarg.h>
-RCSID("$Id: otp.c,v 1.2 2002/07/20 08:36:22 grant Exp $");
+__RCSID("$KTH-KRB: otp.c,v 1.33 2001/02/20 01:44:46 assar Exp $"
+ "$NetBSD: otp.c,v 1.3 2002/09/12 12:33:12 joda Exp $");
static int listp;
static int deletep;
diff -r d863251c72e7 -r 826e862c176d crypto/dist/krb4/kadmin/ksrvutil.c
--- a/crypto/dist/krb4/kadmin/ksrvutil.c Thu Sep 12 12:22:01 2002 +0000
+++ b/crypto/dist/krb4/kadmin/ksrvutil.c Thu Sep 12 12:33:10 2002 +0000
@@ -30,7 +30,8 @@
#include "kadm_locl.h"
-RCSID("$Id: ksrvutil.c,v 1.2 2002/07/20 08:36:22 grant Exp $");
+__RCSID("$KTH-KRB: ksrvutil.c,v 1.53 2002/06/07 16:10:15 joda Exp $"
+ "$NetBSD: ksrvutil.c,v 1.3 2002/09/12 12:33:12 joda Exp $");
#include "ksrvutil.h"
@@ -265,7 +266,7 @@
fprintf(stderr, "{list | change | add | get | delete}\n");
fprintf(stderr, " -i causes the program to ask for "
"confirmation before changing keys.\n");
- fprintf(stderr, " -k causes the key to printed for list or change.\n");
+ fprintf(stderr, " -k causes the key to be printed for list or change.\n");
fprintf(stderr, " -u creates one keyfile for each principal "
"(only used with `get')\n");
exit(1);
@@ -590,7 +591,7 @@
} else {
strlcpy (sname, databuf, sizeof(sname));
safe_read_stdin("Instance: ", databuf, sizeof(databuf));
- strlcpy (sinst, databuf, sizeof(databuf));
+ strlcpy (sinst, databuf, sizeof(sinst));
}
safe_read_stdin("Realm: ", databuf, sizeof(databuf));
diff -r d863251c72e7 -r 826e862c176d crypto/dist/krb4/kadmin/ksrvutil_get.c
--- a/crypto/dist/krb4/kadmin/ksrvutil_get.c Thu Sep 12 12:22:01 2002 +0000
+++ b/crypto/dist/krb4/kadmin/ksrvutil_get.c Thu Sep 12 12:33:10 2002 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995 - 2001 Kungliga Tekniska Högskolan
+ * Copyright (c) 1995 - 2002 Kungliga Tekniska Högskolan
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
@@ -34,7 +34,8 @@
#include "kadm_locl.h"
#include "ksrvutil.h"
-RCSID("$Id: ksrvutil_get.c,v 1.2 2002/07/20 08:36:22 grant Exp $");
+__RCSID("$KTH-KRB: ksrvutil_get.c,v 1.46 2002/08/15 11:32:33 joda Exp $"
+ "$NetBSD: ksrvutil_get.c,v 1.3 2002/09/12 12:33:12 joda Exp $");
#define BAD_PW 1
#define GOOD_PW 0
@@ -103,7 +104,7 @@
printf("Incorrect admin password.\n");
goto bad;
default:
- com_err("kadmin", status+krb_err_base,
+ com_err("kadmin", status+ERROR_TABLE_BASE_krb,
"while getting password tickets");
goto bad;
}
diff -r d863251c72e7 -r 826e862c176d crypto/dist/krb4/lib/auth/pam/pam.c
--- a/crypto/dist/krb4/lib/auth/pam/pam.c Thu Sep 12 12:22:01 2002 +0000
+++ b/crypto/dist/krb4/lib/auth/pam/pam.c Thu Sep 12 12:33:10 2002 +0000
@@ -33,7 +33,8 @@
#ifdef HAVE_CONFIG_H
Home |
Main Index |
Thread Index |
Old Index