Attachment #318058 for bug #426398

Lines 565-574 int get_call_id(int sock, pid_t gre, pid Link Here

(-)pptp-1.7.2/pptp.c.const (-3 / +6 lines)
565	void launch_pppd(char ttydev, int argc, char *argv)	565	void launch_pppd(char ttydev, int argc, char *argv)
566	{	566	{
567	char new_argv[argc + 4];/ XXX if not using GCC, hard code a limit here. */	567	char new_argv[argc + 4];/ XXX if not using GCC, hard code a limit here. */
		568	char str_pppd[] = PPPD_BINARY;
		569	char str_direct[] = "-direct";
		570	char str_38400[] = "38400";
568	int i = 0, j;	571	int i = 0, j;
569	new_argv[i++] = PPPD_BINARY;	572	new_argv[i++] = str_pppd;
570	#ifdef USER_PPP	573	#ifdef USER_PPP
571	new_argv[i++] = "-direct";	574	new_argv[i++] = str_direct;
572	/* ppp expects to have stdin connected to ttydev */	575	/* ppp expects to have stdin connected to ttydev */
573	if ((j = open(ttydev, O_RDWR)) == -1)	576	if ((j = open(ttydev, O_RDWR)) == -1)
574	fatal("Cannot open %s: %s", ttydev, strerror(errno));	577	fatal("Cannot open %s: %s", ttydev, strerror(errno));
Lines 577-583 void launch_pppd(char *ttydev, int argc, Link Here
577	close(j);	580	close(j);
578	#else	581	#else
579	new_argv[i++] = ttydev;	582	new_argv[i++] = ttydev;
580	new_argv[i++] = "38400";	583	new_argv[i++] = str_38400;
581	#endif	584	#endif
582	for (j = 0; j < argc; j++)	585	for (j = 0; j < argc; j++)
583	new_argv[i++] = argv[j];	586	new_argv[i++] = argv[j];

Lines 16-22 Link Here

(-)pptp-1.7.2/util.c.const (-1 / +1 lines)
16	#endif	16	#endif
17		17
18	/* implementation of log_string, defined as extern in util.h */	18	/* implementation of log_string, defined as extern in util.h */
19	char *log_string = "anon";	19	const char *log_string = "anon";
20		20
21	static void open_log(void) __attribute__ ((constructor));	21	static void open_log(void) __attribute__ ((constructor));
22	static void close_log(void) __attribute__ ((destructor));	22	static void close_log(void) __attribute__ ((destructor));

Lines 10-16 Link Here

(-)pptp-1.7.2/util.h.const (-1 / +1 lines)
10	/* log_string is an identifier for this pptp process, passed from	10	/* log_string is an identifier for this pptp process, passed from
11	command line using --log-string=X, and included with every log message.	11	command line using --log-string=X, and included with every log message.
12	Useful for people with multiple pptp sessions open at a time */	12	Useful for people with multiple pptp sessions open at a time */
13	extern char * log_string;	13	extern const char * log_string;
14		14
15	/* log_level sets the logging verbosity. Values range from 0 (errors only)	15	/* log_level sets the logging verbosity. Values range from 0 (errors only)
16	to 1 (errors and warnings) to 2 (high verbosity, for debugging) */	16	to 1 (errors and warnings) to 2 (high verbosity, for debugging) */

Return to bug 426398