Merged revisions 256019 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r256019 | russell | 2010-04-02 18:55:57 -0500 (Fri, 02 Apr 2010) | 10 lines
  
  Export MEETMEBOOKID and fix pin-less conferences with realtime conferences
  
  (closes issue #16866)
  Reported by: DEA
  Patches:
        rt-meetme-options.txt uploaded by DEA (license 3)
  Tested by: DEA
  
  Review: https://reviewboard.asterisk.org/r/582/
........


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

apps/app_meetme.c

@@ -3362,6 +3362,11 @@ bailoutandtrynormal:
 		/* Return the number of seconds the user was in the conf */
 		snprintf(meetmesecs, sizeof(meetmesecs), "%d", (int) (time(NULL) - user->jointime));
 		pbx_builtin_setvar_helper(chan, "MEETMESECS", meetmesecs);
+
+		/* Return the RealTime bookid for CDR linking */
+		if (rt_schedule) {
+			pbx_builtin_setvar_helper(chan, "MEETMEBOOKID", conf->bookid);
+		}
 	}
 	ast_free(user);
 	AST_LIST_UNLOCK(&confs);
@@ -3934,6 +3939,14 @@ static int conf_exec(struct ast_channel *chan, void *data)
 					/* No pin required */
 					allowretry = 0;
 
+					/* For RealTime conferences without a pin 
+					 * should still support loading options
+					 */
+					if (!ast_strlen_zero(cnf->useropts)) {
+						char *opts = ast_strdupa(cnf->useropts);
+						ast_app_parse_options(meetme_opts, &confflags, optargs, opts);
+					}
+
 					/* Run the conference */
 					res = conf_run(chan, cnf, confflags.flags, optargs);
 				}