Merge V1_0_FREEZE_3 into the mainline. (Note this merge does *not*

include the doc subtree!!)

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9632 dc483132-0cff-0310-8789-dd5450dbe970

4 files changed, 46 insertions, 4 deletions

diff --git a/src/kadmin/passwd/ChangeLog b/src/kadmin/passwd/ChangeLog
index 5b50393..2436ec6 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 2331e44..874f338 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 e425280..48cb4cc 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 f2192df..8ffc57f 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