← Back to branch summary

~ubuntu-branches/ubuntu/vivid/virtualbox-ose/vivid

« back to all changes in this revision

Viewing changes to src/VBox/Devices/Network/slirp/bootp.c

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2009-10-13 23:06:00 UTC
  • mfrom: (0.3.2 upstream) (0.1.12 sid)
  • Revision ID: james.westby@ubuntu.com-20091013230600-xhu2pwizq0wo63l9
Tags: 3.0.8-dfsg-1ubuntu1
https://launchpad.net/bugs/444812
https://launchpad.net/bugs/267097
https://launchpad.net/bugs/288590
https://launchpad.net/bugs/434503
* Merge from debian unstable (LP: #444812), remaining changes:
  - Enable DKMS support on virtualbox host and guest modules (LP: #267097)
    - Drop virtualbox-ose{-guest,}-modules-* package templates
    - Recommend *-source instead of *-modules packages
    - Replace error messages related to missing/mismatched
      kernel module accordingly
  - Autoload kernel module
    - LOAD_VBOXDRV_MODULE=1 in virtualbox-ose.default
  - Disable update action
    - patches/u01-disable-update-action.dpatch
  - Virtualbox should go in Accessories, not in System tools (LP: #288590)
    - virtualbox-ose-qt.files/virtualbox-ose.desktop
  - Add apport hook
    - virtualbox-ose.files/source_virtualbox-ose.py
    - virtualbox-ose.install
  - Add launchpad integration
    - control
    - lpi-bug.xpm
    - patches/u02-lp-integration.dpatch
* Try to remove existing dkms modules before adding the new modules
  (LP: #434503)
  - debian/virtualbox-ose-source.postinst
  - debian/virtualbox-ose-guest-source.postinst
* Don't fail if dkms modules have already been removed
  - debian/virtualbox-ose-source.prerm
  - debian/virtualbox-ose-guest-source.prerm

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Devices/Network/slirp/bootp.c
322
322
            goto skip_dns_servers;
323
323
        }
324
324
 
325
 
        if (!TAILQ_EMPTY(&pData->dns_list_head)) 
 
325
        if (!TAILQ_EMPTY(&pData->dns_list_head))
326
326
        {
327
327
            de = TAILQ_LAST(&pData->dns_list_head, dns_list_head);
328
328
            q_dns_header = q;
341
341
        {
342
342
                /* Microsoft dhcp client doen't like domain-less dhcp and trimmed packets*/
343
343
                /* dhcpcd client very sad if no domain name is passed */
344
 
                FILL_BOOTP_EXT(q, RFC1533_DOMAINNAME, 1, " "); 
 
344
                FILL_BOOTP_EXT(q, RFC1533_DOMAINNAME, 1, " ");
345
345
        }
346
346
        if (pData->fPassDomain)
347
347
        {
348
348
            LIST_FOREACH(dd, &pData->dns_domain_list_head, dd_list)
349
349
            {
350
 
                
 
350
 
351
351
                if (dd->dd_pszDomain == NULL)
352
352
                    continue;
353
353
                /* never meet valid separator here in RFC1533*/
354
 
                if (added != 0) 
355
 
                    FILL_BOOTP_EXT(q, RFC1533_DOMAINNAME, 1, ","); 
 
354
                if (added != 0)
 
355
                    FILL_BOOTP_EXT(q, RFC1533_DOMAINNAME, 1, ",");
356
356
                else
357
357
                    added = 1;
358
358
                val = (int)strlen(dd->dd_pszDomain);