Commit c70cab00 authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#6257

parent 45d87c22
...@@ -3,6 +3,7 @@ OpenLDAP 2.4 Change Log ...@@ -3,6 +3,7 @@ OpenLDAP 2.4 Change Log
OpenLDAP 2.4.18 Engineering OpenLDAP 2.4.18 Engineering
Fixed client tools common options (ITS#6049) Fixed client tools common options (ITS#6049)
Fixed liblber speed and other problems (ITS#6215) Fixed liblber speed and other problems (ITS#6215)
Added libldap option for SASL_USERNAME (ITS#6257)
Fixed libldap error parsing (ITS#6197) Fixed libldap error parsing (ITS#6197)
Fixed libldap native getpass usage (ITS#4643) Fixed libldap native getpass usage (ITS#4643)
Fixed libldap tls_check_hostname for OpenSSL and MozNSS (ITS#6239) Fixed libldap tls_check_hostname for OpenSSL and MozNSS (ITS#6239)
......
...@@ -186,6 +186,7 @@ LDAP_BEGIN_DECL ...@@ -186,6 +186,7 @@ LDAP_BEGIN_DECL
#define LDAP_OPT_X_SASL_MAXBUFSIZE 0x6109 #define LDAP_OPT_X_SASL_MAXBUFSIZE 0x6109
#define LDAP_OPT_X_SASL_MECHLIST 0x610a /* read-only */ #define LDAP_OPT_X_SASL_MECHLIST 0x610a /* read-only */
#define LDAP_OPT_X_SASL_NOCANON 0x610b #define LDAP_OPT_X_SASL_NOCANON 0x610b
#define LDAP_OPT_X_SASL_USERNAME 0x610c /* read-only */
/* OpenLDAP GSSAPI options */ /* OpenLDAP GSSAPI options */
#define LDAP_OPT_X_GSSAPI_DO_NOT_FREE_CONTEXT 0x6200 #define LDAP_OPT_X_GSSAPI_DO_NOT_FREE_CONTEXT 0x6200
......
...@@ -1013,6 +1013,31 @@ ldap_int_sasl_get_option( LDAP *ld, int option, void *arg ) ...@@ -1013,6 +1013,31 @@ ldap_int_sasl_get_option( LDAP *ld, int option, void *arg )
*(int *)arg = (int) LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_SASL_NOCANON ); *(int *)arg = (int) LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_SASL_NOCANON );
break; break;
case LDAP_OPT_X_SASL_USERNAME: {
int sc;
char *username;
sasl_conn_t *ctx;
if( ld->ld_defconn == NULL ) {
return -1;
}
ctx = ld->ld_defconn->lconn_sasl_authctx;
if ( ctx == NULL ) {
return -1;
}
sc = sasl_getprop( ctx, SASL_USERNAME,
(SASL_CONST void **)(char **) &username );
if ( sc != SASL_OK ) {
return -1;
}
*(char **)arg = username;
} break;
case LDAP_OPT_X_SASL_SECPROPS: case LDAP_OPT_X_SASL_SECPROPS:
/* this option is write only */ /* this option is write only */
return -1; return -1;
...@@ -1034,6 +1059,7 @@ ldap_int_sasl_set_option( LDAP *ld, int option, void *arg ) ...@@ -1034,6 +1059,7 @@ ldap_int_sasl_set_option( LDAP *ld, int option, void *arg )
switch ( option ) { switch ( option ) {
case LDAP_OPT_X_SASL_SSF: case LDAP_OPT_X_SASL_SSF:
case LDAP_OPT_X_SASL_USERNAME:
/* This option is read-only */ /* This option is read-only */
return -1; return -1;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment