From 62251ae673bcc761cd7765680394f9e7cac5d480 Mon Sep 17 00:00:00 2001 From: Paul Park Date: Fri, 28 Apr 1995 19:18:09 +0000 Subject: [PATCH] Use new library libkadm. Compilation cleanup git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5623 dc483132-0cff-0310-8789-dd5450dbe970 --- src/kadmin/kpasswd/ChangeLog | 6 ++++++ src/kadmin/kpasswd/Makefile.in | 6 +++--- src/kadmin/kpasswd/kpasswd.c | 8 ++------ 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/kadmin/kpasswd/ChangeLog b/src/kadmin/kpasswd/ChangeLog index 35e992e4d..e6d64deee 100644 --- 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 caf36352c..7937b65e2 100644 --- 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 8239e2e9f..e2f287ba7 100644 --- a/src/kadmin/kpasswd/kpasswd.c +++ b/src/kadmin/kpasswd/kpasswd.c @@ -31,11 +31,7 @@ /* * Include files. */ -#include -#include -#include - -#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); -- 2.26.2