Use new library libkadm. Compilation cleanup

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

diff --git a/src/kadmin/kpasswd/ChangeLog b/src/kadmin/kpasswd/ChangeLog
index 35e992e4df8233853659f14460cd576862bcc96a..e6d64deee7559b1b2cff0a83fdf4647cdd56726e 100644 (file)
--- a/src/kadmin/kpasswd/ChangeLog
+++ b/src/kadmin/kpasswd/ChangeLog
@@ -1,3 +1,9 @@
+
+Fri Apr 28 10:14:12 EDT 1995   Paul Park       (pjpark@mit.edu)
+       * Use new library libkadm.  Remove unused reference to libkdb5.
+       * Use size_t instead of int for size calculations.
+       * Remove inclusion of some unnecessary system include files.
+
 Thu Apr 27 16:46:10 EDT 1995   Paul Park       (pjpark@mit.edu)
 
        Initial implementation of new kpasswd which uses new administrative

diff --git a/src/kadmin/kpasswd/Makefile.in b/src/kadmin/kpasswd/Makefile.in
index caf36352c5d96aa715939c107e9db5995ee51b30..7937b65e2aebc168f369ad7f00692664cc45d77f 100644 (file)
--- a/src/kadmin/kpasswd/Makefile.in
+++ b/src/kadmin/kpasswd/Makefile.in
@@ -4,12 +4,12 @@ LDFLAGS = -g
 COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
 SSLIB=$(BUILDTOP)/util/ss/libss.a
 DBMLIB=
-KDBLIB=$(TOPLIBD)/libkdb5.a 
+KADMLIB=$(TOPLIBD)/libkadm.a
 
 all::
 
-KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) $(DBMLIB)
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) $(DBMLIB)
+KLIB = $(KADMLIB) $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) $(DBMLIB)
+DEPKLIB = $(KADMLIB) $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) $(DBMLIB)
 
 SRCS = \
        $(srcdir)/kpasswd.c

diff --git a/src/kadmin/kpasswd/kpasswd.c b/src/kadmin/kpasswd/kpasswd.c
index 8239e2e9f7d27518420d59c3ca650716f8099269..e2f287ba75be8f96234457cda3d276c5f03ba7aa 100644 (file)
--- a/src/kadmin/kpasswd/kpasswd.c
+++ b/src/kadmin/kpasswd/kpasswd.c
@@ -31,11 +31,7 @@
 /*
  * Include files.
  */
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/param.h>
-
-#include "krb5.h"
+#include "k5-int.h"
 #include "adm_defs.h"
 #include "adm.h"
 
@@ -258,7 +254,7 @@ main(argc, argv)
     /* From now on, all error legs via 'goto cleanup' */
 
     if (name) {
-       int prompt_len;
+       size_t prompt_len;
 
        prompt_len = strlen(kpwd_old_pwd_name_fmt) - 2 + strlen(name) + 1;
        opwd_prompt = (char *) malloc(prompt_len);