← Back to branch summary

~ubuntu-branches/ubuntu/precise/freerdp/precise

« back to all changes in this revision

Viewing changes to libfreerdp-utils/args.c

  • Committer: Package Import Robot
  • Author(s): Otavio Salvador, Jeremy Bicha
  • Date: 2012-02-11 10:34:05 UTC
  • mfrom: (1.1.7) (9.1.3 sid)
  • Revision ID: package-import@ubuntu.com-20120211103405-mk0gjhjn70eeyxul
Tags: 1.0.1-1
http://bugs.debian.org/659332
[ Jeremy Bicha ]
* New upstream release. Closes: #659332.
* Updated symbols

Show diffs side-by-side

added added

removed removed

Lines of Context:
libfreerdp-utils/args.c
101
101
                                "  --ntlm: force NTLM authentication protocol version (1 or 2)\n"
102
102
                                "  --ignore-certificate: ignore verification of logon certificate\n"
103
103
                                "  --sec: force protocol security (rdp, tls or nla)\n"
 
104
                                "  --secure-checksum: use salted checksums with Standard RDP encryption\n"
104
105
                                "  --version: print version information\n"
105
106
                                "\n", argv[0]);
106
107
                        return FREERDP_ARGS_PARSE_HELP; //TODO: What is the correct return
305
306
                {
306
307
                        settings->ignore_certificate = true;
307
308
                }
 
309
                else if (strcmp("--certificate-name", argv[index]) == 0)
 
310
                {
 
311
                        index++;
 
312
                        if (index == argc)
 
313
                        {
 
314
                                printf("missing certificate name\n");
 
315
                                return FREERDP_ARGS_PARSE_FAILURE;
 
316
                        }
 
317
 
 
318
                        settings->certificate_name = xstrdup(argv[index]);
 
319
                }
308
320
                else if (strcmp("--no-fastpath", argv[index]) == 0)
309
321
                {
310
322
                        settings->fastpath_input = false;
536
548
                                i = 0;
537
549
                                while (index < argc && strcmp("--", argv[index]) != 0)
538
550
                                {
539
 
                                        plugin_data = (RDP_PLUGIN_DATA*)xrealloc(plugin_data, sizeof(RDP_PLUGIN_DATA) * (i + 2));
 
551
                                        if (plugin_data == NULL)
 
552
                                                plugin_data = (RDP_PLUGIN_DATA*) xmalloc(sizeof(RDP_PLUGIN_DATA) * (i + 2));
 
553
                                        else
 
554
                                                plugin_data = (RDP_PLUGIN_DATA*) xrealloc(plugin_data, sizeof(RDP_PLUGIN_DATA) * (i + 2));
 
555
 
540
556
                                        plugin_data[i].size = sizeof(RDP_PLUGIN_DATA);
541
557
                                        plugin_data[i].data[0] = NULL;
542
558
                                        plugin_data[i].data[1] = NULL;
543
559
                                        plugin_data[i].data[2] = NULL;
544
560
                                        plugin_data[i].data[3] = NULL;
545
561
                                        plugin_data[i + 1].size = 0;
 
562
 
546
563
                                        for (j = 0, p = argv[index]; j < 4 && p != NULL; j++)
547
564
                                        {
548
565
                                                if (*p == '\'')
600
617
                        }
601
618
                        num_extensions++;
602
619
                }
 
620
                else if (strcmp("--secure-checksum", argv[index]) == 0)
 
621
                {
 
622
                        settings->secure_checksum = true;
 
623
                }
603
624
                else if (strcmp("--version", argv[index]) == 0)
604
625
                {
605
626
                        printf("This is FreeRDP version %s\n", FREERDP_VERSION_FULL);