From 171da1df111c65696f78cb523986468c56113d26 Mon Sep 17 00:00:00 2001
From: Ken Raeburn <raeburn@mit.edu>
Date: Wed, 1 Nov 2006 00:31:38 +0000
Subject: [PATCH] * cnv_tkt_skey.c (krb524_convert_princs): Move here, make
 static. * conv_princ.c: Deleted. * Makefile.in (SRCS, SERVER_OBJS): Updated
 accordingly.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18752 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/krb524/Makefile.in    |  7 +------
 src/krb524/cnv_tkt_skey.c | 15 +++++++++++++++
 src/krb524/conv_princ.c   | 40 ---------------------------------------
 3 files changed, 16 insertions(+), 46 deletions(-)
 delete mode 100644 src/krb524/conv_princ.c

diff --git a/src/krb524/Makefile.in b/src/krb524/Makefile.in
index 37193cdac..acc121aa8 100644
--- a/src/krb524/Makefile.in
+++ b/src/krb524/Makefile.in
@@ -48,7 +48,6 @@ LOCALINCLUDES= $(KRB4_INCLUDES) -I. -I$(srcdir)
 
 # Library sources
 SRCS	= \
-	$(srcdir)/conv_princ.c \
 	$(srcdir)/cnv_tkt_skey.c \
 	$(srcdir)/libinit.c	\
     $(srcdir)/krb524.c
@@ -77,7 +76,7 @@ all-windows:: $(OUTPRE)k524init.exe $(K524LIB)
 krb524test: test.o $(KRB5_DEPLIB) $(KRB4COMPAT_DEPLIBS)
 	$(CC_LINK) -o krb524test test.o $(KRB5_LIB) $(KRB4COMPAT_LIBS)
 
-SERVER_OBJS= krb524d.o cnv_tkt_skey.o conv_princ.o
+SERVER_OBJS= krb524d.o cnv_tkt_skey.o
 CLIENT_OBJS= $(OUTPRE)k524init.$(OBJEXT)
 
 krb524d: $(SERVER_OBJS) $(KADMSRV_DEPLIBS) $(KRB5_DEPLIB) $(KRB4COMPAT_DEPLIBS) $(APPUTILS_DEPLIB)
@@ -109,10 +108,6 @@ clean-unix::
 # Makefile dependencies follow.  This must be the last section in
 # the Makefile.in file
 #
-$(OUTPRE)conv_princ.$(OBJEXT): $(KRB_ERR_H_DEP) $(BUILDTOP)/include/krb5/krb5.h \
-  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/kerberosIV/des.h \
-  $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/krb5.h \
-  conv_princ.c
 $(OUTPRE)cnv_tkt_skey.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
   $(KRB_ERR_H_DEP) $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
   $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-err.h \
diff --git a/src/krb524/cnv_tkt_skey.c b/src/krb524/cnv_tkt_skey.c
index 97d8bbfdd..217eb40a8 100644
--- a/src/krb524/cnv_tkt_skey.c
+++ b/src/krb524/cnv_tkt_skey.c
@@ -60,6 +60,21 @@
 
 static int krb524d_debug = 0;
 
+static int
+krb524_convert_princs(context, client, server, pname, pinst, prealm, 
+		      sname, sinst, srealm)
+     krb5_context context;
+     krb5_principal client, server;
+     char *pname, *pinst, *prealm, *sname, *sinst, *srealm;
+{
+     int ret;
+     
+     if ((ret = krb5_524_conv_principal(context, client, pname, pinst, 
+					prealm)))
+	  return ret;
+     
+     return krb5_524_conv_principal(context, server, sname, sinst, srealm);
+}
 /*
  * Convert a v5 ticket for server to a v4 ticket, using service key
  * skey for both.
diff --git a/src/krb524/conv_princ.c b/src/krb524/conv_princ.c
deleted file mode 100644
index 5ec2940d7..000000000
--- a/src/krb524/conv_princ.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 1994 by OpenVision Technologies, Inc.
- * 
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appears in all copies and
- * that both that copyright notice and this permission notice appear in
- * supporting documentation, and that the name of OpenVision not be used
- * in advertising or publicity pertaining to distribution of the software
- * without specific, written prior permission. OpenVision makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- * 
- * OPENVISION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL OPENVISION BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
- * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include "krb5.h"
-#include <krb.h>
-#include "krb524d.h"
-
-int krb524_convert_princs(context, client, server, pname, pinst, prealm, 
-			  sname, sinst, srealm)
-     krb5_context context;
-     krb5_principal client, server;
-     char *pname, *pinst, *prealm, *sname, *sinst, *srealm;
-{
-     int ret;
-     
-     if ((ret = krb5_524_conv_principal(context, client, pname, pinst, 
-					prealm)))
-	  return ret;
-     
-     return krb5_524_conv_principal(context, server, sname, sinst, srealm);
-}
-- 
2.26.2