summaryrefslogtreecommitdiffstats
path: root/src/kadmin
diff options
context:
space:
mode:
Diffstat (limited to 'src/kadmin')
-rw-r--r--src/kadmin/cli/ChangeLog10
-rw-r--r--src/kadmin/cli/kadmin.M17
-rw-r--r--src/kadmin/cli/kadmin.c2
-rw-r--r--src/kadmin/passwd/ChangeLog20
-rw-r--r--src/kadmin/passwd/configure.in22
-rw-r--r--src/kadmin/passwd/kpasswd.c2
-rw-r--r--src/kadmin/passwd/unit-test/Makefile.in6
-rw-r--r--src/kadmin/server/ChangeLog4
-rw-r--r--src/kadmin/server/ovsec_kadmd.c10
-rw-r--r--src/kadmin/testing/scripts/ChangeLog4
-rw-r--r--src/kadmin/testing/scripts/save_files.sh2
-rw-r--r--src/kadmin/testing/util/ChangeLog13
-rw-r--r--src/kadmin/testing/util/tcl_kadm5.c1
-rw-r--r--src/kadmin/testing/util/tcl_ovsec_kadm.c1
-rw-r--r--src/kadmin/testing/util/test.c4
-rw-r--r--src/kadmin/v4server/ChangeLog6
-rw-r--r--src/kadmin/v4server/kadm_ser_wrap.c2
17 files changed, 100 insertions, 26 deletions
diff --git a/src/kadmin/cli/ChangeLog b/src/kadmin/cli/ChangeLog
index 9c28f25e1d..3f8f2ec48e 100644
--- a/src/kadmin/cli/ChangeLog
+++ b/src/kadmin/cli/ChangeLog
@@ -3,6 +3,16 @@ Tue Dec 3 15:39:11 1996 Barry Jaspan <bjaspan@mit.edu>
* kadmin.c (kadmin_addprinc): print warning/notice about no policy
and default policy [krb5-admin/252]
+Thu Dec 5 19:30:22 1996 Tom Yu <tlyu@mit.edu>
+
+ * kadmin.M: Missed a ref to /krb5. [279]
+
+ * kadmin.M: Change example to no longer use /krb5. [PR 279]
+
+ * kadmin.M: v5srvtab -> krb5.keytab [PR 279]
+
+ * kadmin.c (DEFAULT_KEYTAB): v5srvtab -> krb5.keytab [PR 278]
+
Wed Nov 13 14:29:02 1996 Tom Yu <tlyu@mit.edu>
* Makefile.in (clean-unix): Remove getdate.c and kadmin_ct.c.
diff --git a/src/kadmin/cli/kadmin.M b/src/kadmin/cli/kadmin.M
index f0f8913f15..a74874ff96 100644
--- a/src/kadmin/cli/kadmin.M
+++ b/src/kadmin/cli/kadmin.M
@@ -676,7 +676,7 @@ is added, ignoring multiple keys with the same encryption type but
different salt types. If the
.B \-k
argument is not specified, the default keytab
-.I /etc/v5srvtab
+.I /etc/krb5.keytab
is used. If the
.B \-q
option is specified, less verbose status information is displayed.
@@ -695,13 +695,10 @@ command.
.RS
.TP
EXAMPLE:
-kadmin: ktadd -k /krb5/kadmind.keytab kadmin/admin kadmin/changepw
-Entry for principal kadmin/admin@ATHENA.MIT.EDU with
+kadmin: ktadd -k /tmp/foo-new-keytab host/foo.mit.edu
+Entry for principal host/foo.mit.edu@ATHENA.MIT.EDU with
kvno 3, encryption type DES-CBC-CRC added to keytab
- WRFILE:/krb5/kadmind.keytab.
-Entry for principal kadmin/changepw@ATHENA.MIT.EDU
- with kvno 3, encryption type DES-CBC-CRC added to keytab
- WRFILE:/krb5/kadmind.keytab.
+ WRFILE:/tmp/foo-new-keytab
kadmin:
.RE
.fi
@@ -716,7 +713,7 @@ parsed as an integer, and all entries whose kvno match that integer are
removed. If the
.B \-k
argument is not specifeid, the default keytab
-.I /etc/v5srvtab
+.I /etc/krb5.keytab
is used. If the
.B \-q
option is specified, less verbose status information is displayed.
@@ -725,9 +722,9 @@ option is specified, less verbose status information is displayed.
.RS
.TP
EXAMPLE:
-kadmin: ktremove -k /krb5/kadmind.keytab kadmin/admin
+kadmin: ktremove -k /usr/local/var/krb5kdc/kadmind.keytab kadmin/admin
Entry for principal kadmin/admin with kvno 3 removed
- from keytab WRFILE:/krb5/kadmind.keytab.
+ from keytab WRFILE:/usr/local/var/krb5kdc/kadmind.keytab.
kadmin:
.RE
.fi
diff --git a/src/kadmin/cli/kadmin.c b/src/kadmin/cli/kadmin.c
index a684a2e58a..b881681d24 100644
--- a/src/kadmin/cli/kadmin.c
+++ b/src/kadmin/cli/kadmin.c
@@ -428,7 +428,7 @@ char *kadmin_startup(argc, argv)
exit(1);
}
{
-#define DEFAULT_KEYTAB "WRFILE:/etc/v5srvtab"
+#define DEFAULT_KEYTAB "WRFILE:/etc/krb5.keytab"
/* XXX krb5_defkeyname is an internal library global and
should go away */
extern char *krb5_defkeyname;
diff --git a/src/kadmin/passwd/ChangeLog b/src/kadmin/passwd/ChangeLog
index 5b50393154..2436ec681a 100644
--- a/src/kadmin/passwd/ChangeLog
+++ b/src/kadmin/passwd/ChangeLog
@@ -1,3 +1,23 @@
+Wed Nov 27 13:50:03 1996 Theodore Y. Ts'o <tytso@mit.edu>
+
+ * configure.in: Link against kdb5 explicitly on all systems except
+ BSD systems, due to hairy shared library issues. [PR#257]
+ n.b., this is only a short-term fix for the 1.0 release.
+ The correct long-term fix is to not require kadm5 clients
+ to need to link against libkdb5 at all.
+
+Fri Nov 22 18:42:02 1996 Sam Hartman <hartmans@planet-zorp.MIT.EDU>
+
+ * configure.in: Do not link against kdb5 because this causes
+ NetBSD getpwuid to fail. [228]
+
+ * kpasswd.c (kpasswd): Remove cast from uid_t to int. [228]
+
+Wed Nov 20 16:00:49 1996 Barry Jaspan <bjaspan@mit.edu>
+
+ * unit-test/Makefile.in (unit-test-): warn more loudly about unrun
+ tests
+
Wed Nov 13 19:23:15 1996 Tom Yu <tlyu@mit.edu>
* unit-test/Makefile.in (clean): Remove logfiles.
diff --git a/src/kadmin/passwd/configure.in b/src/kadmin/passwd/configure.in
index 2331e44d0d..874f3385b5 100644
--- a/src/kadmin/passwd/configure.in
+++ b/src/kadmin/passwd/configure.in
@@ -7,8 +7,28 @@ AC_PROG_AWK
USE_KADMCLNT_LIBRARY
USE_GSSAPI_LIBRARY
USE_GSSRPC_LIBRARY
-USE_KDB5_LIBRARY
USE_DYN_LIBRARY
+
+dnl
+dnl The following is a kludge to get around a shared library problem
+dnl for NetBSD and Linux. We have to include -lkdb5 under Linux, and
+dnl we can't include -lkdb5 under NetBSD, due to various breakages in
+dnl each system's shared library implementation
+dnl
+AC_MSG_CHECKING([for build host])
+AC_CACHE_VAL(krb5_cv_host, [export CC
+AC_CANONICAL_HOST
+krb5_cv_host=$host])
+AC_MSG_RESULT($krb5_cv_host)
+case $krb5_cv_host in
+*-*-*bsd*)
+ echo "Skipping USE KDB5 LIBRARY on BSD to avoid libdb incompatibilites"
+ ;;
+*)
+ USE_KDB5_LIBRARY
+ ;;
+esac
+
KRB5_LIBRARIES
V5_USE_SHARED_LIB
V5_AC_OUTPUT_MAKEFILE
diff --git a/src/kadmin/passwd/kpasswd.c b/src/kadmin/passwd/kpasswd.c
index e425280b64..48cb4ccc59 100644
--- a/src/kadmin/passwd/kpasswd.c
+++ b/src/kadmin/passwd/kpasswd.c
@@ -137,7 +137,7 @@ kpasswd(context, argc, argv)
/* if either krb5_cc failed check the passwd file */
if (code != 0) {
- pw = getpwuid((int) getuid());
+ pw = getpwuid( getuid());
if (pw == NULL) {
com_err(whoami, 0, string_text(KPW_STR_NOT_IN_PASSWD_FILE));
return(MISC_EXIT_STATUS);
diff --git a/src/kadmin/passwd/unit-test/Makefile.in b/src/kadmin/passwd/unit-test/Makefile.in
index f2192df942..8ffc57f2cc 100644
--- a/src/kadmin/passwd/unit-test/Makefile.in
+++ b/src/kadmin/passwd/unit-test/Makefile.in
@@ -1,8 +1,10 @@
check unit-test:: unit-test-@DO_TEST@
unit-test-:
- @echo "The kpasswd tests require Perl, Tcl, and runtest"
- @echo "No tests run here"
+ @echo "+++"
+ @echo "+++ WARNING: kpasswd unit tests not run."
+ @echo "+++ Either tcl, runtest, or Perl is unavailable."
+ @echo "+++"
unit-test-ok:: unit-test-setup unit-test-body unit-test-cleanup
diff --git a/src/kadmin/server/ChangeLog b/src/kadmin/server/ChangeLog
index a8b9acdbd5..23897964a5 100644
--- a/src/kadmin/server/ChangeLog
+++ b/src/kadmin/server/ChangeLog
@@ -3,6 +3,10 @@ Wed Dec 4 15:29:30 1996 Barry Jaspan <bjaspan@mit.edu>
* ovsec_kadmd.c (main): fix duplicated error strings
[krb5-admin/234]
+Tue Nov 19 16:48:50 1996 Barry Jaspan <bjaspan@mit.edu>
+
+ * ovsec_kadmd.c: don't syslog \n's
+
Wed Nov 13 14:29:34 1996 Tom Yu <tlyu@mit.edu>
* ovsec_kadmd.c (main): Note that krb5_defkeyname is an internal
diff --git a/src/kadmin/server/ovsec_kadmd.c b/src/kadmin/server/ovsec_kadmd.c
index 0a0ff80020..bcacd72cec 100644
--- a/src/kadmin/server/ovsec_kadmd.c
+++ b/src/kadmin/server/ovsec_kadmd.c
@@ -183,7 +183,7 @@ int main(int argc, char *argv[])
if (ret = kadm5_get_config_params(context, NULL, NULL, &params,
&params)) {
- krb5_klog_syslog(LOG_ERR, "%s: %s while initializing, aborting\n",
+ krb5_klog_syslog(LOG_ERR, "%s: %s while initializing, aborting",
whoami, error_message(ret));
fprintf(stderr, "%s: %s while initializing, aborting\n",
whoami, error_message(ret));
@@ -197,7 +197,7 @@ int main(int argc, char *argv[])
if ((params.mask & REQUIRED_PARAMS) != REQUIRED_PARAMS) {
krb5_klog_syslog(LOG_ERR, "%s: Missing required configuration values "
- "while initializing, aborting\n", whoami,
+ "while initializing, aborting", whoami,
(params.mask & REQUIRED_PARAMS) ^ REQUIRED_PARAMS);
fprintf(stderr, "%s: Missing required configuration values "
"(%x) while initializing, aborting\n", whoami,
@@ -726,7 +726,7 @@ void log_badauth(OM_uint32 major, OM_uint32 minor,
krb5_klog_syslog(LOG_NOTICE, "Authentication attempt failed: %s, GSS-API "
"error strings are:", a);
log_badauth_display_status(" ", major, minor);
- krb5_klog_syslog(LOG_NOTICE, " GSS-API error strings complete.\n");
+ krb5_klog_syslog(LOG_NOTICE, " GSS-API error strings complete.");
}
void log_badauth_display_status(char *msg, OM_uint32 major, OM_uint32 minor)
@@ -754,11 +754,11 @@ void log_badauth_display_status_1(char *m, OM_uint32 code, int type,
GSS_C_MECH_CODE, 1);
} else
krb5_klog_syslog(LOG_ERR, "GSS-API authentication error %s: "
- "recursive failure!\n", msg);
+ "recursive failure!", msg);
return;
}
- krb5_klog_syslog(LOG_NOTICE, "%s %s\n", m, (char *)msg.value);
+ krb5_klog_syslog(LOG_NOTICE, "%s %s", m, (char *)msg.value);
(void) gss_release_buffer(&minor_stat, &msg);
if (!msg_ctx)
diff --git a/src/kadmin/testing/scripts/ChangeLog b/src/kadmin/testing/scripts/ChangeLog
index 73dcd5a80e..bfc97a89ea 100644
--- a/src/kadmin/testing/scripts/ChangeLog
+++ b/src/kadmin/testing/scripts/ChangeLog
@@ -3,6 +3,10 @@ Tue Dec 3 15:28:53 1996 Barry Jaspan <bjaspan@mit.edu>
* init_db: be verbose when $SRVTCL doesn't exist, instead of just
failing [krb5-admin/245]
+Thu Dec 5 19:34:09 1996 Tom Yu <tlyu@mit.edu>
+
+ * save_files.sh (files): Also save /etc/krb5.keytab. [PR 278]
+
Thu Nov 14 15:28:16 1996 Barry Jaspan <bjaspan@mit.edu>
* env-setup.shin, init_db, save_files.sh, start_servers,
diff --git a/src/kadmin/testing/scripts/save_files.sh b/src/kadmin/testing/scripts/save_files.sh
index 14fe892d48..72182036f7 100644
--- a/src/kadmin/testing/scripts/save_files.sh
+++ b/src/kadmin/testing/scripts/save_files.sh
@@ -15,7 +15,7 @@ done
# /.secure/etc/passwd /etc/athena/inetd.conf"
files="/etc/krb.conf /etc/krb.realms /etc/athena/krb.conf \
- /etc/athena/krb.realms /etc/v5srvtab"
+ /etc/athena/krb.realms /etc/v5srvtab /etc/krb5.keytab"
name=`basename $0`
diff --git a/src/kadmin/testing/util/ChangeLog b/src/kadmin/testing/util/ChangeLog
index e324ed6e6c..698414ab25 100644
--- a/src/kadmin/testing/util/ChangeLog
+++ b/src/kadmin/testing/util/ChangeLog
@@ -1,3 +1,16 @@
+Fri Dec 6 00:04:10 1996 Theodore Y. Ts'o <tytso@mit.edu>
+
+ * test.c: Change test looking for tcl 7.05 and greater to be tcl
+ 7.04 and greater, since BSDI ships with tcl 7.04, and
+ needs this change. [PR#282]
+
+Thu Dec 5 22:47:27 1996 Theodore Y. Ts'o <tytso@mit.edu>
+
+ * tcl_ovsec_kadm.c:
+ * tcl_kadm5.c: Remove #include of <malloc.h>, which is not
+ guaranteed to be there. #include of <stdlib.h> is all you
+ need for malloc(), per ANSI. [PR#281]
+
Wed Nov 13 09:55:05 1996 Ezra Peisach <epeisach@mit.edu>
* Makefile.in (clean): Remove built programs.
diff --git a/src/kadmin/testing/util/tcl_kadm5.c b/src/kadmin/testing/util/tcl_kadm5.c
index 2aa36636d9..409f02396c 100644
--- a/src/kadmin/testing/util/tcl_kadm5.c
+++ b/src/kadmin/testing/util/tcl_kadm5.c
@@ -4,7 +4,6 @@
#define USE_KADM5_API_VERSION 2
#include <kadm5/admin.h>
#include <com_err.h>
-#include <malloc.h>
#include <k5-int.h>
#include <errno.h>
#include <stdlib.h>
diff --git a/src/kadmin/testing/util/tcl_ovsec_kadm.c b/src/kadmin/testing/util/tcl_ovsec_kadm.c
index 0c6aaac9cb..40a854e951 100644
--- a/src/kadmin/testing/util/tcl_ovsec_kadm.c
+++ b/src/kadmin/testing/util/tcl_ovsec_kadm.c
@@ -4,7 +4,6 @@
#define USE_KADM5_API_VERSION 1
#include <kadm5/admin.h>
#include <com_err.h>
-#include <malloc.h>
#include <k5-int.h>
#include <errno.h>
#include <stdlib.h>
diff --git a/src/kadmin/testing/util/test.c b/src/kadmin/testing/util/test.c
index 75a0fc25f9..f9da052389 100644
--- a/src/kadmin/testing/util/test.c
+++ b/src/kadmin/testing/util/test.c
@@ -1,8 +1,8 @@
#include <tcl.h>
-#define IS_TCL_7_5 ((TCL_MAJOR_VERSION * 100 + TCL_MINOR_VERSION) >= 705)
+#define _TCL_MAIN ((TCL_MAJOR_VERSION * 100 + TCL_MINOR_VERSION) >= 704)
-#if IS_TCL_7_5
+#if _TCL_MAIN
int
main(argc, argv)
int argc; /* Number of command-line arguments. */
diff --git a/src/kadmin/v4server/ChangeLog b/src/kadmin/v4server/ChangeLog
index 7572a6380d..2966ad1004 100644
--- a/src/kadmin/v4server/ChangeLog
+++ b/src/kadmin/v4server/ChangeLog
@@ -1,3 +1,9 @@
+Fri Nov 22 15:49:27 1996 unknown <bjaspan@mit.edu>
+
+ * kadm_ser_wrap.c (endif ): use sizeof instead of h_length to
+ determine number of bytes of addr to copy from DNS response
+ [krb5-misc/211]
+
Wed Nov 13 19:24:00 1996 Tom Yu <tlyu@mit.edu>
* Makefile.in (clean): Remove kadm_err.h and kadm_err.c.
diff --git a/src/kadmin/v4server/kadm_ser_wrap.c b/src/kadmin/v4server/kadm_ser_wrap.c
index 3d4c045eda..7ea289f241 100644
--- a/src/kadmin/v4server/kadm_ser_wrap.c
+++ b/src/kadmin/v4server/kadm_ser_wrap.c
@@ -82,7 +82,7 @@ kadm_ser_init(inter, realm)
if ((hp = gethostbyname(hostname)) == NULL)
return KADM_NO_HOSTNAME;
memcpy((char *) &server_parm.admin_addr.sin_addr.s_addr, hp->h_addr,
- hp->h_length);
+ sizeof(server_parm.admin_addr.sin_addr.s_addr));
server_parm.admin_addr.sin_port = sep->s_port;
/* setting up the database */
mkey_name = KRB5_KDB_M_NAME;
generated by cgit (git 2.34.1) at 2024-06-13 01:48:27 +0000