Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

compile fixes for !HAVE_GSS_USEROK and !HAVE_GSS_INDICATE_MECHS_BY_ATTRS #1

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -3650,6 +3650,7 @@ AC_ARG_WITH(kerberos5,
AC_SEARCH_LIBS(k_hasafs, kafs, AC_DEFINE(USE_AFS, 1,
[Define this if you want to use libkafs' AFS support]))
AC_CHECK_FUNCS( gss_localname gss_userok)
AC_CHECK_FUNCS([gss_indicate_mechs_by_attrs])
fi
]
)
Expand Down
7 changes: 5 additions & 2 deletions gss-serv.c
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ static int ssh_gssapi_generic_userok(
}
#endif

#ifdef HAVE_GSS_USEROK
static int
ssh_gssapi_generic_localname(ssh_gssapi_client *client,
char **localname) {
Expand Down Expand Up @@ -100,7 +101,6 @@ ssh_gssapi_generic_localname(ssh_gssapi_client *client,
#endif
}

#ifdef HAVE_GSS_USEROK
static ssh_gssapi_mech ssh_gssapi_generic_mech = {
NULL, NULL,
{0, NULL},
Expand All @@ -111,7 +111,7 @@ static ssh_gssapi_mech ssh_gssapi_generic_mech = {
NULL};
static const ssh_gssapi_mech *ssh_gssapi_generic_mech_ptr = &ssh_gssapi_generic_mech;
#else /*HAVE_GSS_USEROK*/
static const ssh_gssapi_mech ssh_gssapi_generic_mech_ptr = NULL;
static const ssh_gssapi_mech *ssh_gssapi_generic_mech_ptr = NULL;
#endif

#ifdef KRB5
Expand Down Expand Up @@ -211,6 +211,8 @@ ssh_gssapi_supported_oids(gss_OID_set *oidset)
OM_uint32 min_status;
int present;
gss_OID_set supported;

#ifdef HAVE_GSS_INDICATE_MECHS_BY_ATTRS
/* If we have a generic mechanism all OIDs supported */
if (ssh_gssapi_generic_mech_ptr) {
gss_OID_desc except_oids[3];
Expand All @@ -229,6 +231,7 @@ ssh_gssapi_supported_oids(gss_OID_set *oidset)
oidset)))
return;
}
#endif

gss_create_empty_oid_set(&min_status, oidset);

Expand Down