Merged revisions 34627 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Sun, 18 Jun 2006 20:18:41 +0000 (20:18 +0000)
committerRussell Bryant <russell@russellbryant.com>
Sun, 18 Jun 2006 20:18:41 +0000 (20:18 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r34627 | russell | 2006-06-18 16:15:15 -0400 (Sun, 18 Jun 2006) | 5 lines

don't store multiple secrets delimited with semicolons for peers because this
is only valid for users. Instead, only keep the last specified secret for a
peer entry. Also, document how multiple secrets are handled in the sample
config. (Reported by PCadach on #asterisk-bugs)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@34628 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_iax2.c
configs/iax.conf.sample

index 82ddfbf..7442a06 100644 (file)
@@ -8351,11 +8351,7 @@ static struct iax2_peer *build_peer(const char *name, struct ast_variable *v, in
                peer->peercontext[0] = '\0';
                while(v) {
                        if (!strcasecmp(v->name, "secret")) {
-                               if (!ast_strlen_zero(peer->secret)) {
-                                       strncpy(peer->secret + strlen(peer->secret), ";", sizeof(peer->secret)-strlen(peer->secret) - 1);
-                                       strncpy(peer->secret + strlen(peer->secret), v->value, sizeof(peer->secret)-strlen(peer->secret) - 1);
-                               } else
-                                       ast_copy_string(peer->secret, v->value, sizeof(peer->secret));
+                               ast_copy_string(peer->secret, v->value, sizeof(peer->secret));
                        } else if (!strcasecmp(v->name, "mailbox")) {
                                ast_copy_string(peer->mailbox, v->value, sizeof(peer->mailbox));
                        } else if (!strcasecmp(v->name, "dbsecret")) {
index 62277b8..0d2f270 100644 (file)
@@ -377,7 +377,9 @@ host=216.207.245.47
 ;type=friend
 ;host=dynamic
 ;regexten=1234
-;secret=moofoo
+;secret=moofoo   ; Multiple secrets may be specified. For a "user", all
+;secret=foomoo   ; specified entries will be accepted as valid. For a "peer",
+;secret=shazbot  ; only the last specified secret will be used.
 ;context=default
 ;permit=0.0.0.0/0.0.0.0