Merge branch 'master' into lukeh/moonshot

Conflicts:
	lib/gssapi/krb5/external.c
	lib/libedit/src/vi.c

diff --cc lib/gssapi/krb5/external.c
index dbbd8edb0df0a0f07fe6f858116d7c6f126137bf,c0b92c915df43f908613c7a3eaa85bff58d9e294..8bf9229663a998642dee890f2e8c0d15cefc5747
--- 1/lib/gssapi/krb5/external.c
--- 2/lib/gssapi/krb5/external.c
+++ b/lib/gssapi/krb5/external.c
@@@ -324,9 -324,12 +324,17 @@@ static gssapi_mech_interface_desc krb5_
      NULL,
      krb5_mo,
      sizeof(krb5_mo) / sizeof(krb5_mo[0]),
-     NULL,
 +    _gsskrb5_authorize_localname,
 +    _gsskrb5_pname_to_uid
++    NULL,
++    NULL,
++    NULL,
+     NULL,
+     NULL,
+     NULL,
+     NULL,
+     NULL,
+     NULL,
  };
  
  gssapi_mech_interface

diff --cc lib/gssapi/mech/gss_mo.c
Simple merge