Commit on the whole tree to make a checkpoint for a working windows world

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

8 files changed, 31 insertions, 369 deletions

diff --git a/src/lib/ChangeLog b/src/lib/ChangeLog
index b535b3a90..9fb50b64b 100644
--- a/src/lib/ChangeLog
+++ b/src/lib/ChangeLog
@@ -1,3 +1,8 @@
+Thu Mar 30 15:46:23 1995 Keith Vetter (keithv@fusion.com)
+
+	* libkrb5.def: removed the masses of exported files, leaving just
+	   the ones needed by telnet and cns plus the gssapi ones.
+
 Tue Mar 28 18:26:01 1995  John Gilmore  (gnu at toad.com)
 
 	* Makefile.in (clean-mac):  Add.
diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index 5a5aa5a88..d34555da7 100644
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,3 +1,8 @@
+Thu Mar 30 16:00:30 1995 Keith Vetter (keithv@fusion.com)
+
+	* accept_sec_context.c: fixed wrong level of indirection on a 
+           parameter to getauthenticator.
+
 Mon Mar 27 07:56:26 1995 Chris Provenzano (proven@mit.edu)
 
         * accept_sec_context.c: Use new calling convention for krb5_rd_req()
diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c
index 29dedca3c..3f35197e5 100644
--- a/src/lib/gssapi/krb5/accept_sec_context.c
+++ b/src/lib/gssapi/krb5/accept_sec_context.c
@@ -142,7 +142,7 @@ krb5_gss_accept_sec_context(context, minor_status, context_handle,
       return(GSS_S_FAILURE);
    }
 
-   krb5_auth_con_getauthenticator(context, &auth_context, &authdat);
+   krb5_auth_con_getauthenticator(context, auth_context, &authdat);
 
    /* verify that the checksum is correct */
 
diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index b8dcaa646..5322c1463 100644
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,7 @@
+Thu Mar 30 15:49:27 1995 Keith Vetter (keithv@fusion.com)
+
+	* rd_req.c: removed unused local variable.
+
 Tue Mar 28 18:34:20 1995  John Gilmore  (gnu at toad.com)
 
 	* rd_req_sim.c:  Really remove the file.
diff --git a/src/lib/krb5/krb/rd_req.c b/src/lib/krb5/krb/rd_req.c
index 33f12cc71..7c569fb94 100644
--- a/src/lib/krb5/krb/rd_req.c
+++ b/src/lib/krb5/krb/rd_req.c
@@ -56,7 +56,6 @@ krb5_rd_req(context, auth_context, inbuf, server, keytab,
     krb5_error_code 	  retval;
     krb5_ap_req 	* request;
     krb5_auth_context	* new_auth_context;
-    krb5_rcache           new_rcache;
     krb5_keytab           new_keytab = NULL;
 
     if (!krb5_is_ap_req(inbuf))
diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index 69e77c55a..3fb5d675d 100644
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,3 +1,8 @@
+Thu Mar 30 15:54:54 1995 Keith Vetter (keithv@fusion.com)
+
+	* localaddr.c: in Windows/Mac code, fixed bug due to wrong level
+           of indirection on memcpy call.
+
 Tue Mar 28 19:22:28 1995 Keith Vetter (keithv@fusion.com)
 
         For Windows, added calls to get the default config, realms and
diff --git a/src/lib/krb5/os/localaddr.c b/src/lib/krb5/os/localaddr.c
index 54ca6ea5e..f8fb0f93e 100644
--- a/src/lib/krb5/os/localaddr.c
+++ b/src/lib/krb5/os/localaddr.c
@@ -264,8 +264,8 @@ krb5_os_localaddr (krb5_address ***addr) {
         free(*addr);
         return ENOMEM;
     } else {
-        memcpy ((char *)(*addr)[0]->contents,
-                (char *)&hostrec->h_addr,
+        memcpy ((*addr)[0]->contents,
+                hostrec->h_addr,
                 (*addr)[0]->length);
     }
 	/* FIXME, deal with the case where gethostent returns multiple addrs */
diff --git a/src/lib/libkrb5.def b/src/lib/libkrb5.def
index c566d5b3b..3afbd0c4a 100644
--- a/src/lib/libkrb5.def
+++ b/src/lib/libkrb5.def
@@ -12,385 +12,29 @@ HEAPSIZE  8192
 EXPORTS
 	WEP                                     @1 RESIDENTNAME
 	LIBMAIN                         	@2
-	ASN12KRB5_BUF
-	ASN1BUF_CREATE
-	ASN1BUF_DESTROY
-	ASN1BUF_ENSURE_SPACE
-	ASN1BUF_EXPAND
-	ASN1BUF_FREE
-	ASN1BUF_HEX_UNPARSE
-	ASN1BUF_IMBED
-	ASN1BUF_INSERT_CHARSTRING
-	ASN1BUF_INSERT_OCTET
-	ASN1BUF_INSERT_OCTETSTRING
-	ASN1BUF_LEN
-	ASN1BUF_REMAINS
-	ASN1BUF_REMOVE_CHARSTRING
-	ASN1BUF_REMOVE_OCTET
-	ASN1BUF_REMOVE_OCTETSTRING
-	ASN1BUF_SIZE
-	ASN1BUF_SYNC
-	ASN1BUF_UNPARSE
-	ASN1BUF_WRAP_DATA
-	ASN1_DECODE_ADDRTYPE
-	ASN1_DECODE_AP_OPTIONS
-	ASN1_DECODE_AUTHDATATYPE
-	ASN1_DECODE_AUTHDATA_ELT
-	ASN1_DECODE_AUTHORIZATION_DATA
-	ASN1_DECODE_CHARSTRING
-	ASN1_DECODE_CHECKSUM
-	ASN1_DECODE_CKSUMTYPE
-	ASN1_DECODE_ENCRYPTED_DATA
-	ASN1_DECODE_ENCRYPTION_KEY
-	ASN1_DECODE_ENCTYPE
-	ASN1_DECODE_ENC_KDC_REP_PART
-	ASN1_DECODE_GENERALSTRING
-	ASN1_DECODE_GENERALTIME
-	ASN1_DECODE_HOST_ADDRESS
-	ASN1_DECODE_HOST_ADDRESSES
-	ASN1_DECODE_IA5STRING
-	ASN1_DECODE_INT
-	ASN1_DECODE_INT32
-	ASN1_DECODE_INTEGER
-	ASN1_DECODE_KDC_OPTIONS
-	ASN1_DECODE_KDC_REP
-	ASN1_DECODE_KDC_REQ
-	ASN1_DECODE_KDC_REQ_BODY
-	ASN1_DECODE_KERBEROS_TIME
-	ASN1_DECODE_KEYTYPE
-	ASN1_DECODE_KRB5_FLAGS
-	ASN1_DECODE_KRB_CRED_INFO
-	ASN1_DECODE_KRB_SAFE_BODY
-	ASN1_DECODE_KVNO
-	ASN1_DECODE_LAST_REQ
-	ASN1_DECODE_LAST_REQ_ENTRY
-	ASN1_DECODE_MSGTYPE
-	ASN1_DECODE_NULL
-	ASN1_DECODE_OCTET
-	ASN1_DECODE_OCTETSTRING
-	ASN1_DECODE_PASSWDSEQUENCE
-	ASN1_DECODE_PA_DATA
-	ASN1_DECODE_PRINCIPAL_NAME
-	ASN1_DECODE_PRINTABLESTRING
-	ASN1_DECODE_REALM
-	ASN1_DECODE_SEQUENCE_OF_ENCTYPE
-	ASN1_DECODE_SEQUENCE_OF_KRB_CRED_INFO
-	ASN1_DECODE_SEQUENCE_OF_PASSWDSEQUENCE
-	ASN1_DECODE_SEQUENCE_OF_PA_DATA
-	ASN1_DECODE_SEQUENCE_OF_TICKET
-	ASN1_DECODE_TICKET
-	ASN1_DECODE_TICKET_FLAGS
-	ASN1_DECODE_TRANSITED_ENCODING
-	ASN1_DECODE_UI_2
-	ASN1_DECODE_UI_4
-	ASN1_DECODE_UNSIGNED_INTEGER
-	ASN1_ENCODE_AP_OPTIONS
-	ASN1_ENCODE_AUTHORIZATION_DATA
-	ASN1_ENCODE_CHARSTRING
-	ASN1_ENCODE_CHECKSUM
-	ASN1_ENCODE_ENCRYPTED_DATA
-	ASN1_ENCODE_ENCRYPTION_KEY
-	ASN1_ENCODE_ENC_KDC_REP_PART
-	ASN1_ENCODE_GENERALSTRING
-	ASN1_ENCODE_GENERALTIME
-	ASN1_ENCODE_HOST_ADDRESS
-	ASN1_ENCODE_HOST_ADDRESSES
-	ASN1_ENCODE_IA5STRING
-	ASN1_ENCODE_INTEGER
-	ASN1_ENCODE_KDC_OPTIONS
-	ASN1_ENCODE_KDC_REP
-	ASN1_ENCODE_KDC_REQ
-	ASN1_ENCODE_KDC_REQ_BODY
-	ASN1_ENCODE_KERBEROS_TIME
-	ASN1_ENCODE_KRB5_AUTHDATA_ELT
-	ASN1_ENCODE_KRB5_FLAGS
-	ASN1_ENCODE_KRB_CRED_INFO
-	ASN1_ENCODE_KRB_SAFE_BODY
-	ASN1_ENCODE_LAST_REQ
-	ASN1_ENCODE_LAST_REQ_ENTRY
-	ASN1_ENCODE_NULL
-	ASN1_ENCODE_OCTETSTRING
-	ASN1_ENCODE_PASSWDSEQUENCE
-	ASN1_ENCODE_PA_DATA
-	ASN1_ENCODE_PRINCIPAL_NAME
-	ASN1_ENCODE_PRINTABLESTRING
-	ASN1_ENCODE_REALM
-	ASN1_ENCODE_SEQUENCE_OF_ENCTYPE
-	ASN1_ENCODE_SEQUENCE_OF_KRB_CRED_INFO
-	ASN1_ENCODE_SEQUENCE_OF_PASSWDSEQUENCE
-	ASN1_ENCODE_SEQUENCE_OF_PA_DATA
-	ASN1_ENCODE_SEQUENCE_OF_TICKET
-	ASN1_ENCODE_TICKET
-	ASN1_ENCODE_TICKET_FLAGS
-	ASN1_ENCODE_TRANSITED_ENCODING
-	ASN1_ENCODE_UI_4
-	ASN1_ENCODE_UNSIGNED_INTEGER
-	ASN1_GET_ID
-	ASN1_GET_LENGTH
-	ASN1_GET_SEQUENCE
-	ASN1_GET_TAG
-	ASN1_KRB5_REALM_COPY
-	ASN1_MAKE_ETAG
-	ASN1_MAKE_ID
-	ASN1_MAKE_LENGTH
-	ASN1_MAKE_SEQUENCE
-	ASN1_MAKE_SET
-	ASN1_MAKE_STRING
-	ASN1_MAKE_TAG
-	DECODE_KRB5_AP_REP
-	DECODE_KRB5_AP_REP_ENC_PART
-	DECODE_KRB5_AP_REQ
-	DECODE_KRB5_AS_REP
-	DECODE_KRB5_AS_REQ
-	DECODE_KRB5_AUTHDATA
-	DECODE_KRB5_AUTHENTICATOR
-	DECODE_KRB5_CRED
-	DECODE_KRB5_ENCRYPTION_KEY
-	DECODE_KRB5_ENC_CRED_PART
-	DECODE_KRB5_ENC_KDC_REP_PART
-	DECODE_KRB5_ENC_PRIV_PART
-	DECODE_KRB5_ENC_TKT_PART
-	DECODE_KRB5_ERROR
-	DECODE_KRB5_KDC_REQ_BODY
-	DECODE_KRB5_PRIV
-	DECODE_KRB5_PWD_DATA
-	DECODE_KRB5_PWD_SEQUENCE
-	DECODE_KRB5_SAFE
-	DECODE_KRB5_TGS_REP
-	DECODE_KRB5_TGS_REQ
-	DECODE_KRB5_TICKET
-	ENCODE_KRB5_AP_REP
-	ENCODE_KRB5_AP_REP_ENC_PART
-	ENCODE_KRB5_AP_REQ
-	ENCODE_KRB5_AS_REP
-	ENCODE_KRB5_AS_REQ
-	ENCODE_KRB5_AUTHDATA
-	ENCODE_KRB5_AUTHENTICATOR
-	ENCODE_KRB5_CRED
-	ENCODE_KRB5_ENCRYPTION_KEY
-	ENCODE_KRB5_ENC_CRED_PART
-	ENCODE_KRB5_ENC_KDC_REP_PART
-	ENCODE_KRB5_ENC_PRIV_PART
-	ENCODE_KRB5_ENC_TKT_PART
-	ENCODE_KRB5_ERROR
-	ENCODE_KRB5_KDC_REQ_BODY
-	ENCODE_KRB5_PRIV
-	ENCODE_KRB5_PWD_DATA
-	ENCODE_KRB5_PWD_SEQUENCE
-	ENCODE_KRB5_SAFE
-	ENCODE_KRB5_TGS_REP
-	ENCODE_KRB5_TGS_REQ
-	ENCODE_KRB5_TICKET
-	GET_SECURID_PADATA
-	GET_UNIXTIME_PADATA
-	KEYTAB_KEYPROC
-	KRB5_425_CONV_PRINCIPAL
-	KRB5_524_CONV_PRINCIPAL
-	KRB5_ADDRESS_COMPARE
-	KRB5_ADDRESS_ORDER
-	KRB5_ADDRESS_SEARCH
-	KRB5_APPEND_ADDRESSES
-	KRB5_AUTH_TO_REP
-	KRB5_CHECK_TRANSITED_LIST
-	KRB5_COPY_ADDRESSES
-	KRB5_COPY_AUTHDATA
-	KRB5_COPY_AUTHENTICATOR
-	KRB5_COPY_CHECKSUM
-	KRB5_COPY_CREDS
-	KRB5_COPY_DATA
-	KRB5_COPY_KEYBLOCK
-	KRB5_COPY_KEYBLOCK_CONTENTS
-	KRB5_COPY_PRINCIPAL
-	KRB5_COPY_TICKET
-	KRB5_DECODE_KDC_REP
-	KRB5_DECRYPT_TKT_PART
-	KRB5_ENCODE_KDC_REP
-	KRB5_ENCRYPT_TKT_PART
-	KRB5_FREE_ADDRESS
+	_krb5_build_principal_ext
+	KRB5_CC_DEFAULT
 	KRB5_FREE_ADDRESSES
-	KRB5_FREE_AP_REP
 	KRB5_FREE_AP_REP_ENC_PART
-	KRB5_FREE_AP_REQ
-	KRB5_FREE_AUTHDATA
-	KRB5_FREE_AUTHENTICATOR
-	KRB5_FREE_AUTHENTICATOR_CONTENTS
-	KRB5_FREE_CHECKSUM
-	KRB5_FREE_CONTEXT
-	KRB5_FREE_CRED
-	KRB5_FREE_CREDS
 	KRB5_FREE_CRED_CONTENTS
-	KRB5_FREE_CRED_ENC_PART
-	KRB5_FREE_ENC_KDC_REP_PART
-	KRB5_FREE_ENC_TKT_PART
-	KRB5_FREE_ERROR
-	KRB5_FREE_KDC_REP
-	KRB5_FREE_KDC_REQ
-	KRB5_FREE_KEYBLOCK
-	KRB5_FREE_LAST_REQ
-	KRB5_FREE_PA_DATA
+	KRB5_FREE_CREDS
 	KRB5_FREE_PRINCIPAL
-	KRB5_FREE_PRIV
-	KRB5_FREE_PRIV_ENC_PART
-	KRB5_FREE_PWD_DATA
-	KRB5_FREE_PWD_SEQUENCES
-	KRB5_FREE_REALM_TREE
-	KRB5_FREE_SAFE
-	KRB5_FREE_TGT_CREDS
-	KRB5_FREE_TICKET
-	KRB5_FREE_TICKETS
-	KRB5_FREE_TKT_AUTHENT
-	KRB5_FULLADDR_ORDER
-	KRB5_GENERATE_SEQ_NUMBER
-	KRB5_GENERATE_SUBKEY
 	KRB5_GET_CREDENTIALS
-	KRB5_GET_CRED_FROM_KDC
-	KRB5_GET_CRED_VIA_2TGT
-	KRB5_GET_CRED_VIA_TGT
-	KRB5_GET_DEFAULT_IN_TKT_ETYPES
-	KRB5_GET_FOR_CREDS
-	KRB5_GET_IN_TKT
-	KRB5_GET_IN_TKT_WITH_KEYTAB
+	KRB5_GET_DEFAULT_REALM
 	KRB5_GET_IN_TKT_WITH_PASSWORD
-	KRB5_GET_IN_TKT_WITH_SKEY
-	KRB5_GET_SERVER_RCACHE
+	KRB5_GET_NOTIFICATION_MESSAGE
 	KRB5_INIT_CONTEXT
 	KRB5_INIT_ETS
-	KRB5_KDC_REP_DECRYPT_PROC
-	KRB5_KTFILEINT_CLOSE
-	KRB5_KTFILEINT_DELETE_ENTRY
-	KRB5_KTFILEINT_FIND_SLOT
-	KRB5_KTFILEINT_INTERNAL_READ_ENTRY
-	KRB5_KTFILEINT_OPENR
-	KRB5_KTFILEINT_OPENW
-	KRB5_KTFILEINT_READ_ENTRY
-	KRB5_KTFILEINT_SIZE_ENTRY
-	KRB5_KTFILEINT_WRITE_ENTRY
-	KRB5_KTFILE_ADD
-	KRB5_KTFILE_CLOSE
-	KRB5_KTFILE_END_GET
-	KRB5_KTFILE_GET_ENTRY
-	KRB5_KTFILE_GET_NAME
-	KRB5_KTFILE_GET_NEXT
-	KRB5_KTFILE_REMOVE
-	KRB5_KTFILE_RESOLVE
-	KRB5_KTFILE_START_SEQ_GET
-	KRB5_KTFILE_WRESOLVE
-	KRB5_KT_ADD_ENTRY
-	KRB5_KT_DEFAULT
-	KRB5_KT_FREE_ENTRY
-	KRB5_KT_READ_SERVICE_KEY
-	KRB5_KT_REGISTER
-	KRB5_KT_REMOVE_ENTRY
-	KRB5_KT_RESOLVE
-	KRB5_MK_CRED
-	KRB5_MK_ERROR
-	KRB5_MK_PRIV
-	KRB5_MK_REP
-	KRB5_MK_REQ
 	KRB5_MK_REQ_EXTENDED
-	KRB5_MK_SAFE
-	KRB5_OBTAIN_PADATA
+	KRB5_OS_LOCALADDR
 	KRB5_PARSE_NAME
-	KRB5_PRINCIPAL2SALT
-	KRB5_PRINCIPAL2SALT_INTERNAL
-	KRB5_PRINCIPAL2SALT_NOREALM
-	KRB5_PRINCIPAL_COMPARE
-	KRB5_RC_DEFAULT
-	KRB5_RC_DEFAULT_NAME
-	KRB5_RC_DEFAULT_TYPE
-	KRB5_RC_DFL_CLOSE
-	KRB5_RC_DFL_CLOSE_NO_FREE
-	KRB5_RC_DFL_DESTROY
-	KRB5_RC_DFL_EXPUNGE
-	KRB5_RC_DFL_GET_NAME
-	KRB5_RC_DFL_GET_SPAN
-	KRB5_RC_DFL_INIT
-	KRB5_RC_DFL_RECOVER
-	KRB5_RC_DFL_RESOLVE
-	KRB5_RC_DFL_STORE
-	KRB5_RC_FREE_ENTRY
-	KRB5_RC_GET_TYPE
-	KRB5_RC_IO_CLOSE
-	KRB5_RC_IO_CREAT
-	KRB5_RC_IO_DESTROY
-	KRB5_RC_IO_MARK
-	KRB5_RC_IO_MOVE
-	KRB5_RC_IO_OPEN
-	KRB5_RC_IO_READ
-	KRB5_RC_IO_SIZE
-	KRB5_RC_IO_SYNC
-	KRB5_RC_IO_UNMARK
-	KRB5_RC_IO_WRITE
-	KRB5_RC_REGISTER_TYPE
-	KRB5_RC_RESOLVE_FULL
-	KRB5_RC_RESOLVE_TYPE
-	KRB5_RD_CRED
-	KRB5_RD_ERROR
-	KRB5_RD_PRIV
 	KRB5_RD_REP
-	KRB5_RD_REQ
-	KRB5_RD_REQ_DECODED
-	KRB5_RD_REQ_SIMPLE
-	KRB5_RD_SAFE
-	KRB5_REALM_COMPARE
-	KRB5_RECVAUTH
-	KRB5_SENDAUTH
-	KRB5_SEND_TGS
-	KRB5_SET_DEFAULT_IN_TKT_ETYPES
-	KRB5_TGTNAME
+	KRB5_SNAME_TO_PRINCIPAL
+	KRB5_TIMEOFDAY
 	KRB5_UNPARSE_NAME
-	KRB5_UNPARSE_NAME_EXT
-	KRB5_VERIFY_PADATA
-	KRB5_WALK_REALM_TREE
-	PWD_KEYPROC
-	SKEY_KEYPROC
-	VERIFY_SECURID_PADATA
-	VERIFY_UNIXTIME_PADATA
-        KRB5_SNAME_TO_PRINCIPAL
-	KRB5_GET_DEFAULT_REALM
-	KRB5_GET_NOTIFiCATION_MESSAGE
-;Crypto routines
-	CRC32_SUM_FUNC
-	KRB5_RANDOM_CONFOUNDER
-	MAKE_KEY_SCHED
-	MD4_CRYPTO_SUM_FUNC
-	MD4_SUM_FUNC
-	MD4FINAL
-	MD4INIT
-	MD4UPDATE
-	MD5_CRYPTO_SUM_FUNC
-	MD5_SUM_FUNC
-	MD5FINAL
-	MD5INIT
-	MD5UPDATE
-	MIT_DES_CBC_CHECKSUM
-	MIT_DES_CBC_CKSUM
-	MIT_DES_CBC_ENCRYPT
-	MIT_DES_CHECK_KEY_PARITY
-	MIT_DES_CRC_DECRYPT_FUNC
-	MIT_DES_CRC_ENCRYPT_FUNC
-	MIT_DES_ECB_ENCRYPT
-	MIT_DES_FINISH_KEY
-	MIT_DES_FINISH_RANDOM_KEY
-	MIT_DES_FIXUP_KEY_PARITY
-	MIT_DES_GENERATE_RANDOM_BLOCK
-	MIT_DES_INIT_RANDOM_KEY
-	MIT_DES_INIT_RANDOM_NUMBER_GENERATOR
-	MIT_DES_IS_WEAK_KEY
-	MIT_DES_KEY_SCHED
-	MIT_DES_MD5_DECRYPT_FUNC
-	MIT_DES_MD5_ENCRYPT_FUNC
-	MIT_DES_NEW_RANDOM_KEY
-	MIT_DES_PROCESS_KEY
-	MIT_DES_RANDOM_KEY
-	MIT_DES_SET_RANDOM_GENERATOR_SEED
-	MIT_DES_SET_SEQUENCE_NUMBER
-	MIT_DES_STRING_TO_KEY
-	MIT_RAW_DES_DECRYPT_FUNC
-	MIT_RAW_DES_ENCRYPT_FUNC
 ;Com_err routines
-        ERROR_MESSAGE
         _com_err
+        ERROR_MESSAGE
 ;GSSAPI
 	GSS_ACCEPT_SEC_CONTEXT
 	GSS_ACQUIRE_CRED