mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Distinguish between AUTHTYPE and AUTHMETHOD (latter is static storage)

Browse Source 
for Sun ONE harmonisation
This commit is contained in:
Luke Howard 2003-01-21 09:39:56 +00:00
parent 30d946959e
commit 4a9213f752
2 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
servers/slapd/slapi/slapi_pblock.c
View File

@ -367,12 +367,6 @@ slapi_pblock_destroy( Slapi_PBlock* pb )
str = NULL; str = NULL;
} }
get( pb, SLAPI_CONN_AUTHTYPE, (void **)&str );
if ( str != NULL ) {
ch_free( str );
str = NULL;
}
get( pb, SLAPI_CONN_AUTHMETHOD, (void **)&str ); get( pb, SLAPI_CONN_AUTHMETHOD, (void **)&str );
if ( str != NULL ) { if ( str != NULL ) {
ch_free( str ); ch_free( str );

40
servers/slapd/slapi/slapi_utils.c
View File

@ -1151,29 +1151,43 @@ int slapi_x_backend_set_pb( Slapi_PBlock *pb, Backend *be )
} }
#if defined(LDAP_SLAPI) #if defined(LDAP_SLAPI)
static char *Authorization2AuthType( AuthorizationInformation *authz, int is_tls ) /*
* If oldStyle is TRUE, then a value suitable for setting to
* the deprecated SLAPI_CONN_AUTHTYPE value is returned
* (pointer to static storage).
*
* If oldStyle is FALSE, then a value suitable for setting to
* the new SLAPI_CONN_AUTHMETHOD will be returned, which is
* a pointer to allocated memory and will include the SASL
* mechanism (if any).
*/
static char *Authorization2AuthType( AuthorizationInformation *authz, int is_tls, int oldStyle )
{ {
size_t len; size_t len;
char *authType; char *authType;
switch ( authz->sai_method ) { switch ( authz->sai_method ) {
case LDAP_AUTH_SASL: case LDAP_AUTH_SASL:
len = sizeof(SLAPD_AUTH_SASL) + authz->sai_mech.bv_len; if ( oldStyle ) {
authType = slapi_ch_malloc( len ); authType = SLAPD_AUTH_SASL;
snprintf( authType, len, "%s%s", SLAPD_AUTH_SASL, authz->sai_mech.bv_val ); } else {
len = sizeof(SLAPD_AUTH_SASL) + authz->sai_mech.bv_len;
authType = slapi_ch_malloc( len );
snprintf( authType, len, "%s%s", SLAPD_AUTH_SASL, authz->sai_mech.bv_val );
}
break; break;
case LDAP_AUTH_SIMPLE: case LDAP_AUTH_SIMPLE:
authType = slapi_ch_strdup( SLAPD_AUTH_SIMPLE ); authType = oldStyle ? SLAPD_AUTH_SIMPLE : slapi_ch_strdup( SLAPD_AUTH_SIMPLE );
break; break;
case LDAP_AUTH_NONE: case LDAP_AUTH_NONE:
authType = slapi_ch_strdup( SLAPD_AUTH_NONE ); authType = oldStyle ? SLAPD_AUTH_NONE : slapi_ch_strdup( SLAPD_AUTH_NONE );
break; break;
default: default:
authType = NULL; authType = NULL;
break; break;
} }
if ( is_tls && authType == NULL ) { if ( is_tls && authType == NULL ) {
authType = slapi_ch_strdup( SLAPD_AUTH_SSL ); authType = oldStyle ? SLAPD_AUTH_SSL : slapi_ch_strdup( SLAPD_AUTH_SSL );
} }
return authType; return authType;
@ -1209,16 +1223,22 @@ int slapi_x_connection_set_pb( Slapi_PBlock *pb, Connection *conn )
if ( rc != LDAP_SUCCESS ) if ( rc != LDAP_SUCCESS )
return rc; return rc;
connAuthType = Authorization2AuthType( &conn->c_authz, conn->c_is_tls ); /* Returns pointer to static string */
connAuthType = Authorization2AuthType( &conn->c_authz, conn->c_is_tls, 1 );
if ( connAuthType != NULL ) { if ( connAuthType != NULL ) {
rc = slapi_pblock_set(pb, SLAPI_CONN_AUTHTYPE, (void *)connAuthType); rc = slapi_pblock_set(pb, SLAPI_CONN_AUTHTYPE, (void *)connAuthType);
if ( rc != LDAP_SUCCESS ) if ( rc != LDAP_SUCCESS )
return rc; return rc;
}
/* Returns pointer to allocated string */
connAuthType = Authorization2AuthType( &conn->c_authz, conn->c_is_tls, 0 );
if ( connAuthType != NULL ) {
rc = slapi_pblock_set(pb, SLAPI_CONN_AUTHMETHOD, (void *)connAuthType); rc = slapi_pblock_set(pb, SLAPI_CONN_AUTHMETHOD, (void *)connAuthType);
if ( rc != LDAP_SUCCESS ) if ( rc != LDAP_SUCCESS )
return rc; return rc;
} }
if ( conn->c_authz.sai_dn.bv_val != NULL ) { if ( conn->c_authz.sai_dn.bv_val != NULL ) {
char *connDn = slapi_ch_strdup(conn->c_authz.sai_dn.bv_val); char *connDn = slapi_ch_strdup(conn->c_authz.sai_dn.bv_val);
rc = slapi_pblock_set(pb, SLAPI_CONN_DN, (void *)connDn); rc = slapi_pblock_set(pb, SLAPI_CONN_DN, (void *)connDn);
@ -1282,7 +1302,7 @@ int slapi_x_operation_set_pb( Slapi_PBlock *pb, Operation *op )
if ( rc != LDAP_SUCCESS ) if ( rc != LDAP_SUCCESS )
return rc; return rc;
opAuthType = Authorization2AuthType( &op->o_authz, op->o_conn->c_is_tls ); opAuthType = Authorization2AuthType( &op->o_authz, op->o_conn->c_is_tls, 1 );
if (opAuthType != NULL) { if (opAuthType != NULL) {
rc = slapi_pblock_set( pb, SLAPI_OPERATION_AUTHTYPE, (void *)opAuthType ); rc = slapi_pblock_set( pb, SLAPI_OPERATION_AUTHTYPE, (void *)opAuthType );
if ( rc != LDAP_SUCCESS ) if ( rc != LDAP_SUCCESS )