← Back to branch summary

~ubuntu-branches/ubuntu/maverick/samba/maverick-security

« back to all changes in this revision

Viewing changes to source/smbd/server.c

  • Committer: Bazaar Package Importer
  • Author(s): Andrew Mitchell
  • Date: 2009-05-18 13:26:04 UTC
  • mfrom: (0.28.5 sid)
  • Revision ID: james.westby@ubuntu.com-20090518132604-ebyuqimgymtr3h0k
Tags: 2:3.3.4-2ubuntu1
https://launchpad.net/bugs/312449
https://launchpad.net/bugs/300221
* Merge from debian unstable, remaining changes:
  + debian/patches/VERSION.patch:
    - setup SAMBA_VERSION_SUFFIX to Ubuntu.
  + debian/smb.conf:
    - add "(Samba, Ubuntu)" to server string.
    - comment out the default [homes] share, and add a comment about
      "valid users = %S" to show users how to restrict access to
      \\server\username to only username.
    - Set 'usershare allow guests', so that usershare admins are
      allowed to create public shares in addition to authenticated
      ones.
    - add map to guest = Bad user, maps bad username to guest access.
  + debian/samba-common.config:
    - Do not change priority to high if dhclient3 is installed.
    - Use priority medium instead of high for the workgroup question.
  + debian/samba-common.postinst: Add more informative error message for
    the case where smb.conf was manually deleted (LP: #312449)
  + debian/mksambapasswd.awk:
    - Do not add user with UID less than 1000 to smbpasswd.
  + debian/control:
    - Make libwbclient0 replace/conflict with hardy's likewise-open.
    - Don't build against ctdb.
    - Add suggests keyutils for smbfs. (LP: #300221)
  + debian/rules:
    - enable "native" PIE hardening.
    - remove --with-ctdb and --with-cluster-support=yes
  + Add ufw integration:
    - Created debian/samba.ufw profile.
    - debian/rules, debian/samba.dirs, debian/samba.files: install 
      profile
    - debian/control: have samba sugguest ufw.
* Dropped patches:
  + debian/patches/fix-upstream-bug-6186.patch: Merged upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/smbd/server.c
588
588
                           MSG_SMB_INJECT_FAULT, msg_inject_fault);
589
589
#endif
590
590
 
 
591
        /* Kick off our mDNS registration. */
 
592
        if (dns_port != 0) {
 
593
#ifdef WITH_DNSSD_SUPPORT
 
594
                dns_register_smbd(&dns_reg, dns_port, &maxfd,
 
595
                                  &r_fds, &idle_timeout);
 
596
#endif
 
597
#ifdef WITH_AVAHI_SUPPORT
 
598
                void *avahi_conn;
 
599
                avahi_conn = avahi_start_register(
 
600
                        smbd_event_context(), smbd_event_context(),
 
601
                        dns_port);
 
602
                if (avahi_conn == NULL) {
 
603
                        DEBUG(10, ("avahi_start_register failed\n"));
 
604
                }
 
605
#endif
 
606
        }
 
607
 
591
608
        /* now accept incoming connections - forking a new process
592
609
           for each incoming connection */
593
610
        DEBUG(2,("waiting for a connection\n"));
632
649
                FD_ZERO(&w_fds);
633
650
                GetTimeOfDay(&now);
634
651
 
635
 
                /* Kick off our mDNS registration. */
636
 
                if (dns_port != 0) {
637
 
                        dns_register_smbd(&dns_reg, dns_port, &maxfd,
638
 
                                        &r_fds, &idle_timeout);
639
 
                }
640
 
 
641
652
                event_add_to_select_args(smbd_event_context(), &now,
642
653
                                         &r_fds, &w_fds, &idle_timeout,
643
654
                                         &maxfd);