From: Theodore Tso <tytso@mit.edu>
Date: Sat, 22 Apr 1995 00:35:43 +0000 (+0000)
Subject: krb5.h: krb5_princ_aref() doesn't work, and isn't used anywhere.
X-Git-Tag: krb5-1.0-beta5~313
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3b674e99b062c1b345dbc9386da886465b0838ed;p=krb5.git

krb5.h: krb5_princ_aref() doesn't work, and isn't used anywhere.
	Removed.  (So all of macros.h is gone.)

krb5.h, k5-int.h: Moved struct _krb5_context to k5-int.h

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

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index 6537129a1..f547242bf 100644
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,8 @@
+Fri Apr 21 08:58:50 1995  Theodore Y. Ts'o  <tytso@lurch.mit.edu>
+
+	* krb5.h: krb5_princ_aref() doesn't work, and isn't used anywhere.
+		Removed.
+
 Thu Apr 20 12:15:54 1995 Keith Vetter (keithv@fusion.com)
 
 	* krb5.h: Needs SIZEOF_INT, SIZEOF_LONG defined for the PC.
diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index 6f6069143..e071eabab 100644
--- a/src/include/k5-int.h
+++ b/src/include/k5-int.h
@@ -7,6 +7,9 @@
  * John Gilmore, Cygnus Support, Sat Jan 21 22:45:52 PST 1995
  */
 
+#ifndef _KRB5_INT_H
+#define _KRB5_INT_H
+
 #include "k5-config.h"
 
 #include "krb5.h"
@@ -30,3 +33,14 @@
 #include "preauth.h"
 #include "rsa-md5.h"
 /* #include "krb5/wordsize.h" -- comes in through base-defs.h. */
+#include "profile.h"
+
+struct _krb5_context {
+	krb5_magic	magic;
+	krb5_enctype  FAR *etypes;
+	int		etype_count;
+	void	      FAR *os_context;
+	char	      FAR *default_realm;
+	profile_t     profile;
+};
+#endif /* _KRB5_INT_H */
diff --git a/src/include/krb5.h b/src/include/krb5.h
index c1a8323a8..a76f55008 100644
--- a/src/include/krb5.h
+++ b/src/include/krb5.h
@@ -268,13 +268,9 @@ typedef struct _krb5_fulladdr {
  * end "hostaddr.h"
  */
 
-typedef struct _krb5_context {
-	krb5_magic	magic;
-	krb5_enctype  FAR *etypes;
-	int		etype_count;
-	void	      FAR *os_context;
-	char	      FAR *default_realm;
-} FAR * krb5_context;
+
+struct _krb5_context;
+typedef struct _krb5_context FAR * krb5_context;
 
 struct _krb5_auth_context;
 typedef struct _krb5_auth_context krb5_auth_context;
@@ -672,16 +668,6 @@ extern int krb5_max_cksum;		/* max entry in array */
  * end "proto.h"
  */
 
-/*
- * begin "macros.h"
- */
-
-#define krb5_princ_aref(princ, n, plen) (char FAR *)(*plen = princ[n]->length, princ[n]->data)
-
-/*
- * end "macros.h"
- */
-
 /*
  * begin "error_def.h"
  */