← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source/registry/reg_backend_smbconf.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/registry/reg_backend_smbconf.c
25
25
 
26
26
extern REGISTRY_OPS regdb_ops;          /* these are the default */
27
27
 
28
 
static int smbconf_fetch_keys( const char *key, REGSUBKEY_CTR *subkey_ctr )
 
28
static int smbconf_fetch_keys( const char *key, struct regsubkey_ctr *subkey_ctr )
29
29
{
30
30
        return regdb_ops.fetch_subkeys(key, subkey_ctr);
31
31
}
32
32
 
33
 
static bool smbconf_store_keys( const char *key, REGSUBKEY_CTR *subkeys )
 
33
static bool smbconf_store_keys( const char *key, struct regsubkey_ctr *subkeys )
34
34
{
35
35
        return regdb_ops.store_subkeys(key, subkeys);
36
36
}
37
37
 
 
38
static WERROR smbconf_create_subkey(const char *key, const char *subkey)
 
39
{
 
40
        return regdb_ops.create_subkey(key, subkey);
 
41
}
 
42
 
 
43
static WERROR smbconf_delete_subkey(const char *key, const char *subkey)
 
44
{
 
45
        return regdb_ops.delete_subkey(key, subkey);
 
46
}
 
47
 
38
48
static int smbconf_fetch_values( const char *key, REGVAL_CTR *val )
39
49
{
40
50
        return regdb_ops.fetch_values(key, val);
79
89
        .fetch_values = smbconf_fetch_values,
80
90
        .store_subkeys = smbconf_store_keys,
81
91
        .store_values = smbconf_store_values,
 
92
        .create_subkey = smbconf_create_subkey,
 
93
        .delete_subkey = smbconf_delete_subkey,
82
94
        .reg_access_check = smbconf_reg_access_check,
83
95
        .get_secdesc = smbconf_get_secdesc,
84
96
        .set_secdesc = smbconf_set_secdesc,