← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source/param/loadparm.c

  • Committer: Bazaar Package Importer
  • Author(s): Steve Langasek
  • Date: 2009-03-03 22:02:23 UTC
  • mfrom: (0.28.1 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090303220223-3bdlm2d9fwx1p1ye
Tags: 2:3.3.1-1ubuntu1
https://launchpad.net/bugs/337094
* Merge from Debian unstable (LP: #337094), 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/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.
  + debian/rules:
    - enable "native" PIE hardening.
  + Add ufw integration:
    - Created debian/samba.ufw.profile
    - debian/rules, debian/samba.dirs, debian/samba.files: install
      profile
    - debian/control: have samba suggest ufw
* Dropped changes, merged in Debian:
  + debian/libpam-smbpass.pam-config, debian/libpam-smbpass.postinst,
    debian/libpam-smbpass.prerm, debian/libpam-smbpass.files,
    debian/rules:
    - Make libpam-smbpasswd depend on libpam-runtime to allow 
      libpam-smbpasswd for auto-configuration.
  + debian/control:
    - Provide a config block for the new PAM framework to auto-configure
      itself
  + debian/samba.postinst:
    - When populating the new sambashare group, it is not an error
      if the user simply does not exist; test for this case and let
      the install continue instead of aborting.
  + debian/winbind.files:
    - include additional files

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/param/loadparm.c
250
250
        char *szLdapIdmapSuffix;
251
251
        char *szLdapGroupSuffix;
252
252
        int ldap_ssl;
 
253
        bool ldap_ssl_ads;
253
254
        char *szLdapSuffix;
254
255
        char *szLdapAdminDn;
255
256
        int ldap_debug_level;
3576
3577
                .flags          = FLAG_ADVANCED,
3577
3578
        },
3578
3579
        {
 
3580
                .label          = "ldap ssl ads",
 
3581
                .type           = P_BOOL,
 
3582
                .p_class        = P_GLOBAL,
 
3583
                .ptr            = &Globals.ldap_ssl_ads,
 
3584
                .special        = NULL,
 
3585
                .enum_list      = NULL,
 
3586
                .flags          = FLAG_ADVANCED,
 
3587
        },
 
3588
        {
3579
3589
                .label          = "ldap timeout",
3580
3590
                .type           = P_INTEGER,
3581
3591
                .p_class        = P_GLOBAL,
4784
4794
 
4785
4795
        string_set(&Globals.szLdapAdminDn, "");
4786
4796
        Globals.ldap_ssl = LDAP_SSL_START_TLS;
 
4797
        Globals.ldap_ssl_ads = False;
4787
4798
        Globals.ldap_passwd_sync = LDAP_PASSWD_SYNC_OFF;
4788
4799
        Globals.ldap_delete_dn = False;
4789
4800
        Globals.ldap_replication_sleep = 1000; /* wait 1 sec for replication */
5107
5118
FN_GLOBAL_STRING(lp_ldap_suffix, &Globals.szLdapSuffix)
5108
5119
FN_GLOBAL_STRING(lp_ldap_admin_dn, &Globals.szLdapAdminDn)
5109
5120
FN_GLOBAL_INTEGER(lp_ldap_ssl, &Globals.ldap_ssl)
 
5121
FN_GLOBAL_BOOL(lp_ldap_ssl_ads, &Globals.ldap_ssl_ads)
5110
5122
FN_GLOBAL_INTEGER(lp_ldap_passwd_sync, &Globals.ldap_passwd_sync)
5111
5123
FN_GLOBAL_BOOL(lp_ldap_delete_dn, &Globals.ldap_delete_dn)
5112
5124
FN_GLOBAL_INTEGER(lp_ldap_replication_sleep, &Globals.ldap_replication_sleep)