Merge more KfM krb4 things

Implement *_in_tkt_creds, mk_req_creds, and rd_req_int functions.

Implement KfM krb4 kadm password changing, mostly by pulling in the
client side of the kadm library into the krb4 library.

Do some more header file cleanup of des.h and krb.h.

Remove some ancient krb4 dead weight.

Some Mac-specific functionality still needs to be merged.

ticket: 1189
status: open

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

5 files changed, 13 insertions, 373 deletions

diff --git a/src/kadmin/v4server/ChangeLog b/src/kadmin/v4server/ChangeLog
index 256c60f..cdae969 100644
--- a/src/kadmin/v4server/ChangeLog
+++ b/src/kadmin/v4server/ChangeLog
@@ -1,3 +1,15 @@
+2002-11-26  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in (OBJS): Remove kadm_stream.o and kadm_err.o.  Also,
+	remove references to kadm_err.et.
+
+	* kadm_err.et: Remove.  It lives in lib/krb4 now.
+
+	* kadm_server.h: Remove some prototypes that were moved to
+	kadm.h.
+
+	* kadm_stream.c: Remove.  It lives in lib/krb4 now.
+
 2002-11-01  Tom Yu  <tlyu@mit.edu>
 
 	* kadm_ser_wrap.c (kadm_ser_in): Apply fix for MITKRB5-SA-2002-002
diff --git a/src/kadmin/v4server/Makefile.in b/src/kadmin/v4server/Makefile.in
index 0260d4e..e6120d1 100644
--- a/src/kadmin/v4server/Makefile.in
+++ b/src/kadmin/v4server/Makefile.in
@@ -13,14 +13,10 @@ LOCALINCLUDES = $(KRB4_INCLUDES) -I. -I$(srcdir)
 
 PROG = kadmind4
 OBJS = kadm_server.o admin_server.o kadm_ser_wrap.o \
-	kadm_funcs.o kadm_stream.o kadm_supp.o acl_files.o kadm_err.o
+	kadm_funcs.o kadm_supp.o acl_files.o
 
 all:: $(PROG)
 
-kadm_err.c kadm_err.h: kadm_err.et
-
-$(OBJS): kadm_err.h
-
 $(PROG): $(OBJS) $(KADMCLNT_DEPLIBS) $(KDB5_DEPLIBS) $(KRB4COMPAT_DEPLIBS)
 	$(CC_LINK) -o $(PROG) $(OBJS) $(KADMCLNT_LIBS) $(KDB5_LIBS) \
 		$(KRB4COMPAT_LIBS) $(HESIOD_LIBS)
diff --git a/src/kadmin/v4server/kadm_err.et b/src/kadmin/v4server/kadm_err.et
deleted file mode 100644
index 07ab9da..0000000
--- a/src/kadmin/v4server/kadm_err.et
+++ /dev/null
@@ -1,58 +0,0 @@
-#	kadmin.v4/server/kadm_err.et
-#
-# Copyright 1988 by the Massachusetts Institute of Technology.
-#
-# For copying and distribution information, please see the file
-# <mit-copyright.h>.
-#
-# Kerberos administration server error table
-#
-	et	kadm
-
-# KADM_SUCCESS, as all success codes should be, is zero
-
-ec KADM_RCSID,		"$Header$"
-# /* Building and unbuilding the packet errors */
-ec KADM_NO_REALM,	"Cannot fetch local realm"
-ec KADM_NO_CRED,	"Unable to fetch credentials"
-ec KADM_BAD_KEY,	"Bad key supplied"
-ec KADM_NO_ENCRYPT,	"Can't encrypt data"
-ec KADM_NO_AUTH,	"Cannot encode/decode authentication info"
-ec KADM_WRONG_REALM,	"Principal attemping change is in wrong realm"
-ec KADM_NO_ROOM,	"Packet is too large"
-ec KADM_BAD_VER,	"Version number is incorrect"
-ec KADM_BAD_CHK,	"Checksum does not match"
-ec KADM_NO_READ,	"Unsealing private data failed"
-ec KADM_NO_OPCODE,	"Unsupported operation"
-ec KADM_NO_HOST,	"Could not find administrating host"
-ec KADM_UNK_HOST,	"Administrating host name is unknown"
-ec KADM_NO_SERV,	"Could not find service name in services database"
-ec KADM_NO_SOCK,	"Could not create socket"
-ec KADM_NO_CONN,	"Could not connect to server"
-ec KADM_NO_HERE,	"Could not fetch local socket address"
-ec KADM_NO_MAST,	"Could not fetch master key"
-ec KADM_NO_VERI,	"Could not verify master key"
-
-# /* From the server side routines */
-ec KADM_INUSE,		"Entry already exists in database"
-ec KADM_UK_SERROR,	"Database store error"
-ec KADM_UK_RERROR,	"Database read error"
-ec KADM_UNAUTH,		"Insufficient access to perform requested operation"
-# KADM_DATA isn't really an error, but...
-ec KADM_DATA,		"Data is available for return to client"
-ec KADM_NOENTRY,	"No such entry in the database"
-
-ec KADM_NOMEM,		"Memory exhausted"
-ec KADM_NO_HOSTNAME,	"Could not fetch system hostname"
-ec KADM_NO_BIND,	"Could not bind port"
-ec KADM_LENGTH_ERROR,	"Length mismatch problem"
-ec KADM_ILL_WILDCARD,	"Illegal use of wildcard"
-
-ec KADM_DB_INUSE,	"Database locked or in use"
-
-ec KADM_INSECURE_PW,	"Insecure password rejected"
-ec KADM_PW_MISMATCH,	"Cleartext password and DES key did not match"
-
-ec KADM_NOT_SERV_PRINC,	"Invalid principal for change srvtab request"
-ec KADM_REALM_TOO_LONG, "Realm name too long"
-end
diff --git a/src/kadmin/v4server/kadm_server.h b/src/kadmin/v4server/kadm_server.h
index 45007b4..6578716 100644
--- a/src/kadmin/v4server/kadm_server.h
+++ b/src/kadmin/v4server/kadm_server.h
@@ -94,18 +94,6 @@ void prin_vals(Kadm_vals *);
 void kadm_prin_to_vals(u_char *, Kadm_vals *, Principal *);
 void kadm_vals_to_prin(u_char *, Principal *, Kadm_vals *);
 
-/* kadm_stream.c */
-int stv_char(u_char *, u_char *, int, int);
-int stv_short(u_char *, u_short *, int, int);
-int stv_long(u_char *, krb5_ui_4 *, int, int);
-int stv_string(u_char *, char *, int, int, int);
-int stream_to_vals(u_char *, Kadm_vals *, int);
-int vals_to_stream(Kadm_vals *, u_char **);
-int vts_string(char *, u_char **, int);
-int vts_short(u_short, u_char **, int);
-int vts_long(krb5_ui_4, u_char **, int);
-int vts_char(u_char, u_char **, int);
-
 /* acl_files.c */
 int acl_add(char *, char *);
 int acl_delete(char *, char *);
diff --git a/src/kadmin/v4server/kadm_stream.c b/src/kadmin/v4server/kadm_stream.c
deleted file mode 100644
index d2a3cdb..0000000
--- a/src/kadmin/v4server/kadm_stream.c
+++ /dev/null
@@ -1,298 +0,0 @@
-/*
- * kadmin/v4server/kadm_stream.c
- *
- * Copyright 1988 by the Massachusetts Institute of Technology.
- *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>.
- *
- * Stream conversion functions for Kerberos administration server
- */
-
-
-#include <mit-copyright.h>
-#include <string.h>
-#include "k5-int.h"
-
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#else
-extern char *malloc(), *calloc(), *realloc();
-#endif
-
-static int check_field_header(u_char *, u_char *, int);
-static int build_field_header(u_char *, u_char **);
-
-
-/*
-  kadm_stream.c
-  this holds the stream support routines for the kerberos administration server
-
-    vals_to_stream: converts a vals struct to a stream for transmission
-       internals build_field_header, vts_[string, char, long, short]
-    stream_to_vals: converts a stream to a vals struct
-       internals check_field_header, stv_[string, char, long, short]
-    error: prints out a kadm error message, returns
-    fatal: prints out a kadm fatal error message, exits
-*/
-
-#include "kadm.h"
-#include "kadm_server.h"
-
-#define min(a,b) (((a) < (b)) ? (a) : (b))
-
-/* 
-vals_to_stream
-  recieves    : kadm_vals *, u_char *
-  returns     : a realloced and filled in u_char *
-     
-this function creates a byte-stream representation of the kadm_vals structure
-*/
-int
-vals_to_stream(dt_in, dt_out)
-Kadm_vals *dt_in;
-u_char **dt_out;
-{
-  int vsloop, stsize;		/* loop counter, stream size */
-
-  stsize = build_field_header(dt_in->fields, dt_out);
-  for (vsloop=31; vsloop>=0; vsloop--)
-    if (IS_FIELD(vsloop,dt_in->fields)) {
-      switch (vsloop) {
-      case KADM_NAME:
-	  stsize+=vts_string(dt_in->name, dt_out, stsize);
-	  break;
-      case KADM_INST:
-	  stsize+=vts_string(dt_in->instance, dt_out, stsize);
-	  break;
-      case KADM_EXPDATE:
-	  stsize+=vts_long(dt_in->exp_date, dt_out, stsize);
-	  break;
-      case KADM_ATTR:
-	  stsize+=vts_short(dt_in->attributes, dt_out, stsize);
-	  break;
-      case KADM_MAXLIFE:
-	  stsize+=vts_char(dt_in->max_life, dt_out, stsize);
-	  break;
-      case KADM_DESKEY: 
-	  stsize+=vts_long(dt_in->key_high, dt_out, stsize); 
-	  stsize+=vts_long(dt_in->key_low, dt_out, stsize); 
-	  break;
-      default:
-	  break;
-      }
-}
-  return(stsize);
-}  
-
-static int
-build_field_header(cont, st)
-u_char *cont;			/* container for fields data */
-u_char **st;			/* stream */
-{
-  *st = (u_char *) malloc (4);
-  memcpy((char *) *st, (char *) cont, 4);
-  return 4;			/* return pointer to current stream location */
-}
-
-int
-vts_string(dat, st, loc)
-char *dat;			/* a string to put on the stream */
-u_char **st;			/* base pointer to the stream */
-int loc;			/* offset into the stream for current data */
-{
-  *st = (u_char *) realloc ((char *)*st, (unsigned) (loc + strlen(dat) + 1));
-  memcpy((char *)(*st + loc), dat, strlen(dat)+1);
-  return strlen(dat)+1;
-}
-
-int
-vts_short(dat, st, loc)
-u_short dat;			/* the attributes field */
-u_char **st;			/* a base pointer to the stream */
-int loc;			/* offset into the stream for current data */
-{
-  u_short temp;			/* to hold the net order short */
-
-  temp = htons(dat);		/* convert to network order */
-  *st = (u_char *) realloc ((char *)*st, (unsigned)(loc + sizeof(u_short)));
-  memcpy((char *)(*st + loc), (char *) &temp, sizeof(u_short));
-  return sizeof(u_short);
-}
-
-int
-vts_long(dat, st, loc)
-krb5_ui_4 dat;			/* the attributes field */
-u_char **st;			/* a base pointer to the stream */
-int loc;			/* offset into the stream for current data */
-{
-  krb5_ui_4 temp;			/* to hold the net order short */
-
-  temp = htonl(dat);		/* convert to network order */
-  *st = (u_char *) realloc ((char *)*st, (unsigned)(loc + sizeof(krb5_ui_4)));
-  memcpy((char *)(*st + loc), (char *) &temp, sizeof(krb5_ui_4));
-  return sizeof(krb5_ui_4);
-}
-
-    
-int
-vts_char(dat, st, loc)
-u_char dat;			/* the attributes field */
-u_char **st;			/* a base pointer to the stream */
-int loc;			/* offset into the stream for current data */
-{
-  *st = (u_char *) realloc ((char *)*st, (unsigned)(loc + sizeof(u_char)));
-  (*st)[loc] = (u_char) dat;
-  return 1;
-}
-    
-/* 
-stream_to_vals
-  recieves    : u_char *, kadm_vals *
-  returns     : a kadm_vals filled in according to u_char *
-     
-this decodes a byte stream represntation of a vals struct into kadm_vals
-*/
-int
-stream_to_vals(dt_in, dt_out, maxlen)
-u_char *dt_in;
-Kadm_vals *dt_out;
-int maxlen;				/* max length to use */
-{
-  register int vsloop, stsize;		/* loop counter, stream size */
-  register int status;
-  krb5_ui_4 l_trans;
-
-  memset((char *) dt_out, 0, sizeof(*dt_out));
-
-  stsize = check_field_header(dt_in, dt_out->fields, maxlen);
-  if (stsize < 0)
-      return(-1);
-  for (vsloop=31; vsloop>=0; vsloop--)
-    if (IS_FIELD(vsloop,dt_out->fields))
-      switch (vsloop) {
-      case KADM_NAME:
-	  if ((status = stv_string(dt_in, dt_out->name, stsize,
-				   sizeof(dt_out->name), maxlen)) < 0)
-	      return(-1);
-	  stsize += status;
-	  break;
-      case KADM_INST:
-	  if ((status = stv_string(dt_in, dt_out->instance, stsize,
-				   sizeof(dt_out->instance), maxlen)) < 0)
-	      return(-1);
-	  stsize += status;
-	  break;
-      case KADM_EXPDATE:
-	  if ((status = stv_long(dt_in, &l_trans, stsize,
-				 maxlen)) < 0)
-	      return(-1);
-	  dt_out->exp_date = l_trans;
-	  stsize += status;
-	  break;
-      case KADM_ATTR:
-	  if ((status = stv_short(dt_in, &dt_out->attributes, stsize,
-				  maxlen)) < 0)
-	      return(-1);
-	  stsize += status;
-	  break;
-      case KADM_MAXLIFE:
-	  if ((status = stv_char(dt_in, &dt_out->max_life, stsize,
-				 maxlen)) < 0)
-	      return(-1);
-	  stsize += status;
-	  break;
-      case KADM_DESKEY:
-	  if ((status = stv_long(dt_in, &l_trans, stsize,
-				    maxlen)) < 0)
-	      return(-1);
-	  dt_out->key_high = l_trans;
-	  stsize += status;
-	  if ((status = stv_long(dt_in, &l_trans, stsize,
-				    maxlen)) < 0)
-	      return(-1);
-	  dt_out->key_low = l_trans;
-	  stsize += status;
-	  break;
-      default:
-	  break;
-      }
-  return stsize;
-}  
-
-static int
-check_field_header(st, cont, maxlen)
-u_char *st;			/* stream */
-u_char *cont;			/* container for fields data */
-int maxlen;
-{
-  if (4 > maxlen)
-      return(-1);
-  memcpy((char *) cont, (char *) st, 4);
-  return 4;			/* return pointer to current stream location */
-}
-
-int
-stv_string(st, dat, loc, stlen, maxlen)
-register u_char *st;		/* base pointer to the stream */
-char *dat;			/* a string to read from the stream */
-register int loc;		/* offset into the stream for current data */
-int stlen;			/* max length of string to copy in */
-int maxlen;			/* max length of input stream */
-{
-  int maxcount;				/* max count of chars to copy */
-
-  maxcount = min(maxlen - loc, stlen);
-
-  (void) strncpy(dat, (char *)st + loc, maxcount);
-
-  if (dat[maxcount-1]) /* not null-term --> not enuf room */
-      return(-1);
-  return strlen(dat)+1;
-}
-
-int
-stv_short(st, dat, loc, maxlen)
-u_char *st;			/* a base pointer to the stream */
-u_short *dat;			/* the attributes field */
-int loc;			/* offset into the stream for current data */
-int maxlen;
-{
-  u_short temp;			/* to hold the net order short */
-
-  if (loc + sizeof(u_short) > maxlen)
-      return(-1);
-  memcpy((char *) &temp, (char *) st+ loc, sizeof(u_short));
-  *dat = ntohs(temp);		/* convert to network order */
-  return sizeof(u_short);
-}
-
-int
-stv_long(st, dat, loc, maxlen)
-u_char *st;			/* a base pointer to the stream */
-krb5_ui_4 *dat;			/* the attributes field */
-int loc;			/* offset into the stream for current data */
-int maxlen;			/* maximum length of st */
-{
-  krb5_ui_4 temp;			/* to hold the net order short */
-
-  if (loc + sizeof(krb5_ui_4) > maxlen)
-      return(-1);
-  memcpy((char *) &temp, (char *) st + loc, sizeof(krb5_ui_4));
-  *dat = ntohl(temp);		/* convert to network order */
-  return sizeof(krb5_ui_4);
-}
-    
-int
-stv_char(st, dat, loc, maxlen)
-u_char *st;			/* a base pointer to the stream */
-u_char *dat;			/* the attributes field */
-int loc;			/* offset into the stream for current data */
-int maxlen;
-{
-  if (loc + 1 > maxlen)
-      return(-1);
-  *dat = *(st + loc);
-  return 1;
-}
-