mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-12-25 17:19:43 -05:00
"restrict" is a c99 keyword (ITS#3739)
This commit is contained in:
parent
e799b27eed
commit
58abc661f6
1 changed files with 6 additions and 6 deletions
|
|
@ -55,7 +55,7 @@ typedef struct pp_info {
|
|||
* used by all instances
|
||||
*/
|
||||
typedef struct pw_conn {
|
||||
int restrict; /* TRUE if connection is restricted */
|
||||
int restricted; /* TRUE if connection is restricted */
|
||||
} pw_conn;
|
||||
|
||||
static pw_conn *pwcons;
|
||||
|
|
@ -792,7 +792,7 @@ ppolicy_bind_resp( Operation *op, SlapReply *rs )
|
|||
* that we are disallowed from doing anything
|
||||
* other than change password.
|
||||
*/
|
||||
pwcons[op->o_conn->c_conn_idx].restrict = 1;
|
||||
pwcons[op->o_conn->c_conn_idx].restricted = 1;
|
||||
|
||||
ppb->pErr = PP_changeAfterReset;
|
||||
|
||||
|
|
@ -998,11 +998,11 @@ ppolicy_bind( Operation *op, SlapReply *rs )
|
|||
return SLAP_CB_CONTINUE;
|
||||
}
|
||||
|
||||
/* Reset the restrict flag for the next session on this connection */
|
||||
/* Reset the restricted flag for the next session on this connection */
|
||||
static int
|
||||
ppolicy_unbind( Operation *op, SlapReply *rs )
|
||||
{
|
||||
pwcons[op->o_conn->c_conn_idx].restrict = 0;
|
||||
pwcons[op->o_conn->c_conn_idx].restricted = 0;
|
||||
return SLAP_CB_CONTINUE;
|
||||
}
|
||||
|
||||
|
|
@ -1020,7 +1020,7 @@ ppolicy_restrict(
|
|||
send_ctrl = 1;
|
||||
}
|
||||
|
||||
if ( op->o_conn && pwcons[op->o_conn->c_conn_idx].restrict ) {
|
||||
if ( op->o_conn && pwcons[op->o_conn->c_conn_idx].restricted ) {
|
||||
Debug( LDAP_DEBUG_TRACE,
|
||||
"connection restricted to password changing only\n", 0, 0, 0);
|
||||
if ( send_ctrl ) {
|
||||
|
|
@ -1233,7 +1233,7 @@ ppolicy_modify( Operation *op, SlapReply *rs )
|
|||
}
|
||||
}
|
||||
|
||||
if (pwcons[op->o_conn->c_conn_idx].restrict && !mod_pw_only) {
|
||||
if (pwcons[op->o_conn->c_conn_idx].restricted && !mod_pw_only) {
|
||||
Debug( LDAP_DEBUG_TRACE,
|
||||
"connection restricted to password changing only\n", 0, 0, 0 );
|
||||
rs->sr_err = LDAP_INSUFFICIENT_ACCESS;
|
||||
|
|
|
|||
Loading…
Reference in a new issue