diff options
| -rw-r--r-- | channels/chan_sip.c | 12 | ||||
| -rw-r--r-- | configs/res_ldap.conf.sample | 2 |
2 files changed, 14 insertions, 0 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 2774841a4..8fc808448 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -5263,6 +5263,18 @@ static struct sip_peer *realtime_peer(const char *newpeername, struct ast_sockad goto cleanup; } + /* Previous versions of Asterisk did not require the type field to be + * set for real time peers. This statement preserves that behavior. */ + if (peer->type == 0) { + if (which_objects == FINDUSERS) { + peer->type = SIP_TYPE_USER; + } else if (which_objects == FINDPEERS) { + peer->type = SIP_TYPE_PEER; + } else { + peer->type = SIP_TYPE_PEER | SIP_TYPE_USER; + } + } + ast_debug(3, "-REALTIME- loading peer from database to memory. Name: %s. Peer objects: %d\n", peer->name, rpeerobjs); if (ast_test_flag(&global_flags[1], SIP_PAGE2_RTCACHEFRIENDS) && !devstate_only) { diff --git a/configs/res_ldap.conf.sample b/configs/res_ldap.conf.sample index 4655841ec..9a2accb80 100644 --- a/configs/res_ldap.conf.sample +++ b/configs/res_ldap.conf.sample @@ -13,6 +13,8 @@ ; ; In the case of LDAP the last keyword in each line above specifies ; a section in this file. +; +; LDAP schema and ldif files can be located in contrib/scripts. ; TLS support ; ----------- |