upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-29 02:59:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup gssapi_flags -> ldo_gssapi_flags

Browse source
This commit is contained in:
Howard Chu 2012-01-24 15:28:47 -08:00
parent 7ff18967d7
commit ce2c041671
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libraries/libldap/gssapi.c
View file

@ -700,7 +700,7 @@ ldap_int_gss_spnego_bind_s( LDAP *ld )
req_mech = &spnego_oid;
}
req_flags = ld->ld_options.gssapi_flags;
req_flags = ld->ld_options.ldo_gssapi_flags;
req_flags |= GSS_C_MUTUAL_FLAG | GSS_C_REPLAY_FLAG;
/*
@ -865,11 +865,11 @@ ldap_int_gssapi_get_option( LDAP *ld, int option, void *arg )
switch ( option ) {
case LDAP_OPT_SSPI_FLAGS:
* (unsigned *) arg = (unsigned) ld->ld_options.gssapi_flags;
* (unsigned *) arg = (unsigned) ld->ld_options.ldo_gssapi_flags;
break;
case LDAP_OPT_SIGN:
if ( ld->ld_options.gssapi_flags & GSS_C_INTEG_FLAG ) {
if ( ld->ld_options.ldo_gssapi_flags & GSS_C_INTEG_FLAG ) {
* (int *) arg = (int)-1;
} else {
* (int *) arg = (int)0;
@ -877,7 +877,7 @@ ldap_int_gssapi_get_option( LDAP *ld, int option, void *arg )
break;
case LDAP_OPT_ENCRYPT:
if ( ld->ld_options.gssapi_flags & GSS_C_CONF_FLAG ) {
if ( ld->ld_options.ldo_gssapi_flags & GSS_C_CONF_FLAG ) {
* (int *) arg = (int)-1;
} else {
* (int *) arg = (int)0;
@ -928,19 +928,19 @@ ldap_int_gssapi_set_option( LDAP *ld, int option, void *arg )
switch ( option ) {
case LDAP_OPT_SSPI_FLAGS:
if ( arg != LDAP_OPT_OFF ) {
ld->ld_options.gssapi_flags = * (unsigned *)arg;
ld->ld_options.ldo_gssapi_flags = * (unsigned *)arg;
}
break;
case LDAP_OPT_SIGN:
if ( arg != LDAP_OPT_OFF ) {
ld->ld_options.gssapi_flags |= GSS_C_INTEG_FLAG;
ld->ld_options.ldo_gssapi_flags |= GSS_C_INTEG_FLAG;
}
break;
case LDAP_OPT_ENCRYPT:
if ( arg != LDAP_OPT_OFF ) {
ld->ld_options.gssapi_flags |= GSS_C_INTEG_FLAG | GSS_C_CONF_FLAG;
ld->ld_options.ldo_gssapi_flags |= GSS_C_INTEG_FLAG | GSS_C_CONF_FLAG;
}
break;

2
libraries/libldap/ldap-int.h
View file

@ -276,8 +276,6 @@ struct ldapoptions {
#endif
#ifdef HAVE_GSSAPI
unsigned gssapi_flags;
unsigned ldo_gssapi_flags;
#define LDAP_GSSAPI_OPT_DO_NOT_FREE_GSS_CONTEXT 0x0001
#define LDAP_GSSAPI_OPT_ALLOW_REMOTE_PRINCIPAL 0x0002