From: Theodore Tso <tytso@mit.edu>
Date: Wed, 1 Dec 1993 21:54:02 +0000 (+0000)
Subject: Moved KRB5_TGS_NAME to krb5.h, from base-defs.h (where it didn't belong)
X-Git-Tag: krb5-1.0-beta3~126
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cd3d2b72262b88be26ace32cca1a550a92cffa5b;p=krb5.git

Moved KRB5_TGS_NAME to krb5.h, from base-defs.h (where it didn't belong)

Added flag argument to krb5_recvauth()

Removed declaration of two internal routines (krb5_generate_authenticator and
find_preauthenticator).

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

diff --git a/src/include/krb5/base-defs.h b/src/include/krb5/base-defs.h
index 9d285e7e7..f6810b8e5 100644
--- a/src/include/krb5/base-defs.h
+++ b/src/include/krb5/base-defs.h
@@ -142,8 +142,4 @@ typedef const krb5_principal_data *krb5_const_principal;
 #define	krb5_princ_name(princ) (princ)->data
 #define	krb5_princ_component(princ,i) ((princ)->data + i)
 
-/* The name of the Kerberos ticket granting service... and its size */
-#define	KRB5_TGS_NAME		"krbtgt"
-#define KRB5_TGS_NAME_SIZE	6
-
 #endif /* KRB5_BASE_DEFS__ */
diff --git a/src/include/krb5/func-proto.h b/src/include/krb5/func-proto.h
index d1541fcc7..950e676e6 100644
--- a/src/include/krb5/func-proto.h
+++ b/src/include/krb5/func-proto.h
@@ -438,17 +438,13 @@ krb5_error_code krb5_recvauth PROTOTYPE((krb5_pointer,
 					 krb5_rdreq_key_proc,
 					 krb5_pointer,
 					 char *,
+					 krb5_int32, 
 					 krb5_int32 *,
 					 krb5_principal*,
 					 krb5_ticket **,
 					 krb5_authenticator **));
 
 
-krb5_error_code  
-krb5_generate_authenticator PROTOTYPE(( krb5_authenticator *, krb5_principal,
-				       const krb5_checksum *, krb5_keyblock *,
-				       krb5_int32, krb5_authdata ** ));
-
 #ifdef NARROW_PROTOTYPES
 krb5_error_code krb5_walk_realm_tree
     PROTOTYPE((const krb5_data *,
diff --git a/src/include/krb5/krb5.h b/src/include/krb5/krb5.h
index 15a4bddcc..7c3c22379 100644
--- a/src/include/krb5/krb5.h
+++ b/src/include/krb5/krb5.h
@@ -285,4 +285,12 @@ typedef struct _krb5_pwd_data {
     passwd_phrase_element **element;
 } krb5_pwd_data;
 
+/* The name of the Kerberos ticket granting service... and its size */
+#define	KRB5_TGS_NAME		"krbtgt"
+#define KRB5_TGS_NAME_SIZE	6
+
+/* flags for recvauth */
+#define KRB5_RECVAUTH_SKIP_VERSION	0x0001
+#define KRB5_RECVAUTH_BADAUTHVERS	0x0002
+
 #endif /* KRB5_GENERAL__ */
diff --git a/src/include/krb5/preauth.h b/src/include/krb5/preauth.h
index 34164f5c5..fe24ac8f1 100644
--- a/src/include/krb5/preauth.h
+++ b/src/include/krb5/preauth.h
@@ -53,9 +53,6 @@ typedef struct _krb5_preauth_ops {
 #define KRB5_PREAUTH_FLAGS_ENCRYPT	0x00000001
 #define KRB5_PREAUTH_FLAGS_HARDWARE	0x00000002
 
-krb5_error_code find_preauthenticator
-    PROTOTYPE((int type, krb5_preauth_ops **Preauth_proc));
-
 #if 0
 krb5_error_code get_random_padata
     PROTOTYPE((krb5_principal client, krb5_address **src_addr,