← Back to branch summary

~ubuntu-branches/ubuntu/vivid/samba/vivid

« back to all changes in this revision

Viewing changes to source3/winbindd/winbindd_domain.c

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2011-12-21 13:18:04 UTC
  • mfrom: (0.39.21 sid)
  • Revision ID: package-import@ubuntu.com-20111221131804-xtlr39wx6njehxxr
Tags: 2:3.6.1-3ubuntu1
* Merge from Debian testing.  Remaining changes:
  + debian/patches/VERSION.patch:
    - set SAMBA_VERSION_SUFFIX to Ubuntu.
  + debian/patches/error-trans.fix-276472:
    - Add the translation of Unix Error code -ENOTSUP to NT Error Code
    - NT_STATUS_NOT_SUPPORTED to prevent the Permission denied error.
  + 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/control:
    - Don't build against or suggest ctdb.
    - Add dependency on samba-common-bin to samba.
  + Add ufw integration:
    - Created debian/samba.ufw.profile
    - debian/rules, debian/samba.dirs, debian/samba.files: install
      profile
    - debian/control: have samba suggest ufw
  + Add apport hook:
    - Created debian/source_samba.py.
    - debian/rules, debian/samba.dirs, debian/samba-common-bin.files: install
  + Switch to upstart:
    - Add debian/samba.{nmbd,smbd}.upstart.
  + debian/samba.logrotate, debian/samba-common.dhcp, debian/samba.if-up:
    - Make them upstart compatible
  + debian/samba.postinst: 
    - Avoid scary pdbedit warnings on first import.
  + debian/samba-common.postinst: Add more informative error message for
    the case where smb.conf was manually deleted
  + debian/patches/fix-debuglevel-name-conflict.patch: don't use 'debug_level'
    as a global variable name in an NSS module 
  + Dropped:
    - debian/patches/error-trans.fix-276472
    - debian/patches/fix-debuglevel-name-conflict.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
source3/winbindd/winbindd_domain.c
39
39
                .struct_cmd     = WINBINDD_INIT_CONNECTION,
40
40
                .struct_fn      = winbindd_dual_init_connection,
41
41
        },{
42
 
                .name           = "SHOW_SEQUENCE",
43
 
                .struct_cmd     = WINBINDD_SHOW_SEQUENCE,
44
 
                .struct_fn      = winbindd_dual_show_sequence,
45
 
        },{
46
42
                .name           = "PAM_AUTH",
47
43
                .struct_cmd     = WINBINDD_PAM_AUTH,
48
44
                .struct_fn      = winbindd_dual_pam_auth,
63
59
                .struct_cmd     = WINBINDD_PAM_CHAUTHTOK,
64
60
                .struct_fn      = winbindd_dual_pam_chauthtok,
65
61
        },{
66
 
                .name           = "CCACHE_NTLM_AUTH",
67
 
                .struct_cmd     = WINBINDD_CCACHE_NTLMAUTH,
68
 
                .struct_fn      = winbindd_dual_ccache_ntlm_auth,
69
 
        },{
70
 
                .name           = "CCACHE_SAVE",
71
 
                .struct_cmd     = WINBINDD_CCACHE_SAVE,
72
 
                .struct_fn      = winbindd_dual_ccache_save,
73
 
        },{
74
62
                .name           = "NDRCMD",
75
63
                .struct_cmd     = WINBINDD_DUAL_NDRCMD,
76
64
                .struct_fn      = winbindd_dual_ndrcmd,
79
67
        }
80
68
};
81
69
 
82
 
void setup_domain_child(struct winbindd_domain *domain,
83
 
                        struct winbindd_child *child)
 
70
void setup_domain_child(struct winbindd_domain *domain)
84
71
{
85
 
        setup_child(domain, child, domain_dispatch_table,
86
 
                    "log.wb", domain->name);
 
72
        int i;
 
73
 
 
74
        for (i=0; i<lp_winbind_max_domain_connections(); i++) {
 
75
                setup_child(domain, &domain->children[i],
 
76
                            domain_dispatch_table,
 
77
                            "log.wb", domain->name);
 
78
                domain->children[i].domain = domain;
 
79
        }
87
80
}