README-MIT
==========

This media contains two files and a directory of the code diffs for the MIT
contribution from Sun Microsystems, Inc.

Files
=====

README-MIT
----------

This one.

LICENSE
-------

Contains the license agreement of this contribution and instructions
on how to implement said license.


Directory
=========

Contains the various code differences that are a part of the contribution.

diffs
-----

The files are in HTML format for readability in order to aid merging
code bases.  The header of the diffs can be found at:

./diffs/index.html

This file contains links to various contextual differences that should
ease code merging.  For example, the following entry is for one module
that has changed:

-----------begin paste---------------
Cdiffs Udiffs Sdiffs Coderev usr/src/cmd/krb5/kadmin/cli/kadmin.c

Kerberos Database Incremental Propagation (MIT contribution)

9 lines changed : 6/0/3/1731 (inserted/deleted/modified/unchanged) 
-----------end paste---------------

where the Cdiffs link is the old contextual diffs followed by the new
contextual diffs of the code changes.

where the Udiffs link is the contextual diffs with five additional lines from
Solaris' code base.

where the Sdiffs link is the larger contextual diffs that show the old
revision on the left and the newer revision on the right.

where the Coderev link gives a larger contextual diff with color coding
that provides changes within a line of changes if any.

in this example "Kerberos Database Incremental Propagation (MIT contribution)"
is just the comments included in the delta of this file.

the last line listed in this example gives the number of lines changed
by this delta and the particular type of line changes that the file
incurred.


Solaris - MIT mappings
======================

The following files are either updated or new as marked.  Files that
contain the same functions, but use different files names have been
marked as well:

Updated:
** usr/src/uts/common/gssapi/gen_oids.c
** usr/src/uts/common/gssapi/include/mechglueP.h (mglueP.h in MIT release)

** usr/src/lib/libgss/g_accept_sec_context.c
** usr/src/lib/libgss/g_acquire_cred.c
* usr/src/lib/libgss/g_compare_name.c
* usr/src/lib/libgss/g_context_time.c
* usr/src/lib/libgss/g_delete_sec_context.c
* usr/src/lib/libgss/g_dsp_name.c
* usr/src/lib/libgss/g_dsp_status.c
* usr/src/lib/libgss/g_exp_sec_context.c
* usr/src/lib/libgss/g_glue.c		(combines function in util_token.c
					 in MIT release)
* usr/src/lib/libgss/g_imp_name.c
* usr/src/lib/libgss/g_imp_sec_context.c
* usr/src/lib/libgss/g_init_sec_context.c
* usr/src/lib/libgss/g_initialize.c 	(combines functions in g_oid_ops.c,
					g_indicate_mechs.c,
					and g_glue.c
					in MIT release)
* usr/src/lib/libgss/g_inquire_context.c	(g_inq_context.c in MIT release)
* usr/src/lib/libgss/g_inquire_cred.c		(g_inq_cred.c in MIT release)
* usr/src/lib/libgss/g_inquire_names.c		(g_inq_names.c in MIT release)
* usr/src/lib/libgss/g_oid_ops.c
* usr/src/lib/libgss/g_process_context.c
* usr/src/lib/libgss/g_rel_cred.c
* usr/src/lib/libgss/g_rel_name.c
* usr/src/lib/libgss/g_rel_oid_set.c
* usr/src/lib/libgss/g_seal.c
* usr/src/lib/libgss/g_sign.c
* usr/src/lib/libgss/g_unseal.c
* usr/src/lib/libgss/g_verify.c
* usr/src/lib/libgss/gssd_pname_to_uid.c
* usr/src/lib/libgss/oid_ops.c

** usr/src/cmd/krb5/kadmin/cli/kadmin.c
** usr/src/cmd/krb5/kadmin/dbutil/dump.c
** usr/src/cmd/krb5/kadmin/dbutil/kdb5_create.c
** usr/src/cmd/krb5/kadmin/dbutil/kdb5_destroy.c
** usr/src/cmd/krb5/kadmin/dbutil/kdb5_util.c
** usr/src/cmd/krb5/kadmin/dbutil/kdb5_util.h
** usr/src/cmd/krb5/kadmin/server/ovsec_kadmd.c
** usr/src/cmd/krb5/slave/kpropd.c
** usr/src/lib/gss_mechs/mech_krb5/et/kdb5_err.c
** usr/src/lib/krb5/kadm5/admin.h
** usr/src/lib/krb5/kadm5/alt_prof.c
** usr/src/lib/krb5/kadm5/clnt/client_init.c
** usr/src/lib/krb5/kadm5/kadm_host_srv_names.c
** usr/src/lib/krb5/kadm5/srv/server_acl.c
** usr/src/lib/krb5/kadm5/srv/server_acl.h
** usr/src/lib/krb5/kadm5/srv/server_init.c
** usr/src/lib/krb5/kdb/kdb_db2.c
** usr/src/lib/krb5/kdb/kdb_hdr.h
** usr/src/uts/common/gssapi/mechs/krb5/include/k5-int.h
** usr/src/uts/common/gssapi/mechs/krb5/include/krb5.h

New:
* usr/src/lib/gss_mechs/mech_spnego/mech/gssapiP_spnego.h
* usr/src/lib/gss_mechs/mech_spnego/mech/spnego_mech.c

* usr/src/uts/common/gssapi/include/gssapi_err_generic.h

* usr/src/lib/libgss/g_canon_name.c
* usr/src/lib/libgss/g_dup_name.c
* usr/src/lib/libgss/g_export_name.c
* usr/src/lib/libgss/g_utils.c
* usr/src/lib/libgss/g_store_cred.c
* usr/src/lib/libgss/g_userok.c

* usr/src/cmd/krb5/iprop/iprop.x
* usr/src/cmd/krb5/iprop/iprop_hdr.h
* usr/src/cmd/krb5/kadmin/server/ipropd_svc.c
* usr/src/cmd/krb5/kproplog/kproplog.c
* usr/src/cmd/krb5/slave/kpropd_rpc.c
* usr/src/lib/krb5/kdb/kdb_convert.c
* usr/src/lib/krb5/kdb/kdb_log.c
* usr/src/lib/krb5/kdb/kdb_log.h
