improve previous commit

diff --git a/clients/tools/common.c b/clients/tools/common.c
index 84f73e91443731dfd0ec52101faa4b8eff39bb44..ac9c300afb03776e3d7de291e09a9d4a36b966ea 100644 (file)
--- a/clients/tools/common.c
+++ b/clients/tools/common.c
@@ -996,19 +996,28 @@ tool_conn_setup( int dont, void (*private_setup)( LDAP * ) )
 void
 tool_bind( LDAP *ld )
 {
+       LDAPControl     **sctrlsp = NULL;
+       LDAPControl     *sctrls[2];
+       int             nsctrls = 0;
+
 #ifdef LDAP_CONTROL_PASSWORDPOLICYREQUEST
-       LDAPControl *sctrls[2] = { NULL };
        if ( ppolicy ) {
                LDAPControl c;
                c.ldctl_oid = LDAP_CONTROL_PASSWORDPOLICYREQUEST;
                c.ldctl_value.bv_val = NULL;
                c.ldctl_value.bv_len = 0;
                c.ldctl_iscritical = 0;
-               sctrls[0] = &c;
-               sctrls[1] = NULL;
+               sctrls[nsctrls] = &c;
+               sctrls[++nsctrls] = NULL;
        }
 #endif
 
+       if ( nsctrls ) {
+               sctrlsp = sctrls;
+       }
+
+       assert( nsctrls < sizeof(sctrls)/sizeof(sctrls[0]) );
+
        if ( authmethod == LDAP_AUTH_SASL ) {
 #ifdef HAVE_CYRUS_SASL
                void *defaults;
@@ -1034,11 +1043,7 @@ tool_bind( LDAP *ld )
                        sasl_authz_id );
 
                rc = ldap_sasl_interactive_bind_s( ld, binddn, sasl_mech,
-#ifdef LDAP_CONTROL_PASSWORDPOLICYREQUEST
-                       sctrls,
-#else
-                       NULL,
-#endif
+                       sctrlsp,
                        NULL, sasl_flags, lutil_sasl_interact, defaults );
 
                lutil_sasl_freedefs( defaults );
@@ -1074,11 +1079,7 @@ tool_bind( LDAP *ld )
                {
                        /* simple bind */
                        rc = ldap_sasl_bind( ld, binddn, LDAP_SASL_SIMPLE, &passwd,
-#ifdef LDAP_CONTROL_PASSWORDPOLICYREQUEST
-                               sctrls,
-#else
-                               NULL,
-#endif
+                               sctrlsp,
                                NULL, &msgid );
                        if ( msgid == -1 ) {
                                tool_perror( "ldap_sasl_bind(SIMPLE)", rc,