← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source/registry/reg_dispatcher.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_dispatcher.c
80
80
 High level wrapper function for storing registry subkeys
81
81
 ***********************************************************************/
82
82
 
83
 
bool store_reg_keys( REGISTRY_KEY *key, REGSUBKEY_CTR *subkeys )
 
83
bool store_reg_keys( REGISTRY_KEY *key, struct regsubkey_ctr *subkeys )
84
84
{
85
85
        if (key->ops && key->ops->store_subkeys)
86
86
                return key->ops->store_subkeys(key->name, subkeys);
100
100
        return false;
101
101
}
102
102
 
 
103
WERROR create_reg_subkey(REGISTRY_KEY *key, const char *subkey)
 
104
{
 
105
        if (key->ops && key->ops->create_subkey) {
 
106
                return key->ops->create_subkey(key->name, subkey);
 
107
        }
 
108
 
 
109
        return WERR_NOT_SUPPORTED;
 
110
}
 
111
 
 
112
WERROR delete_reg_subkey(REGISTRY_KEY *key, const char *subkey)
 
113
{
 
114
        if (key->ops && key->ops->delete_subkey) {
 
115
                return key->ops->delete_subkey(key->name, subkey);
 
116
        }
 
117
 
 
118
        return WERR_NOT_SUPPORTED;
 
119
}
 
120
 
103
121
/***********************************************************************
104
122
 High level wrapper function for enumerating registry subkeys
105
123
 Initialize the TALLOC_CTX if necessary
106
124
 ***********************************************************************/
107
125
 
108
 
int fetch_reg_keys( REGISTRY_KEY *key, REGSUBKEY_CTR *subkey_ctr )
 
126
int fetch_reg_keys( REGISTRY_KEY *key, struct regsubkey_ctr *subkey_ctr )
109
127
{
110
128
        int result = -1;
111
129
 
216
234
 * Check whether the in-memory version of the subkyes of a
217
235
 * registry key needs update from disk.
218
236
 */
219
 
bool reg_subkeys_need_update(REGISTRY_KEY *key, REGSUBKEY_CTR *subkeys)
 
237
bool reg_subkeys_need_update(REGISTRY_KEY *key, struct regsubkey_ctr *subkeys)
220
238
{
221
239
        if (key->ops && key->ops->subkeys_need_update)
222
240
        {