rework controls API

[openldap] / libraries / libldap / stctrl.c

diff --git a/libraries/libldap/stctrl.c b/libraries/libldap/stctrl.c
index 84284e11dbd8f1994cb0a8ad91ddbaa5592add8b..4dc197cb6c2a4f02dc5d607e429803fc759ab9b5 100644 (file)
--- a/libraries/libldap/stctrl.c
+++ b/libraries/libldap/stctrl.c
@@ -128,7 +128,7 @@ done:;
  * NOTE: this API is bad; it could be much more efficient...
  */
 int
-ldap_create_session_tracking(
+ldap_create_session_tracking_control(
        LDAP            *ld,
        char            *sessionSourceIp,
        char            *sessionSourceName,
@@ -137,7 +137,6 @@ ldap_create_session_tracking(
        LDAPControl     **ctrlp )
 {
        struct berval   value;
-       BerElement      *ber;
 
        if ( ctrlp == NULL ) {
                ld->ld_errno = LDAP_PARAM_ERROR;
@@ -148,21 +147,11 @@ ldap_create_session_tracking(
                sessionSourceIp, sessionSourceName, formatOID,
                sessionTrackingIdentifier, &value );
        if ( ld->ld_errno == LDAP_SUCCESS ) {
-               ber = ldap_alloc_ber_with_options( ld );
-               if ( ber == NULL ) {
-                       ld->ld_errno = LDAP_NO_MEMORY;
-                       return LDAP_NO_MEMORY;
-               }
-
-               ld->ld_errno = ldap_create_control( LDAP_CONTROL_X_SESSION_TRACKING,
-                       ber, 0, ctrlp );
-               if ( ld->ld_errno == LDAP_SUCCESS ) {
-                       (*ctrlp)->ldctl_value = value;
-
-               } else {
+               ld->ld_errno = ldap_control_create( LDAP_CONTROL_X_SESSION_TRACKING,
+                       0, &value, 0, ctrlp );
+               if ( ld->ld_errno != LDAP_SUCCESS ) {
                        LDAP_FREE( value.bv_val );
                }
-               ber_free( ber, 1 );
        }
 
        return ld->ld_errno;
@@ -198,14 +187,10 @@ ldap_parse_session_tracking_control(
                return LDAP_PARAM_ERROR;
        }
 
-       ip->bv_val = NULL;
-       ip->bv_len = 0;
-       name->bv_val = NULL;
-       name->bv_len = 0;
-       oid->bv_val = NULL;
-       oid->bv_len = 0;
-       id->bv_val = NULL;
-       id->bv_len = 0;
+       BER_BVZERO( ip );
+       BER_BVZERO( name );
+       BER_BVZERO( oid );
+       BER_BVZERO( id );
 
        ber = ber_init( &ctrl->ldctl_value );