← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source/smbd/uid.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/uid.c
166
166
 
167
167
                if (ent->vuid == vuid) {
168
168
                        ent->vuid = UID_FIELD_INVALID;
 
169
                        /* Ensure we're not freeing an active pointer. */
 
170
                        if (conn->server_info == ent->server_info) {
 
171
                                conn->server_info = NULL;
 
172
                        }
169
173
                        TALLOC_FREE(ent->server_info);
170
174
                        ent->read_only = False;
171
175
                        ent->admin_user = False;
218
222
 
219
223
        server_info = vuser ? vuser->server_info : conn->server_info;
220
224
 
 
225
        if (!server_info) {
 
226
                /* Invalid vuid sent - even with security = share. */
 
227
                DEBUG(2,("change_to_user: Invalid vuid %d used on "
 
228
                         "share %s.\n",vuid, lp_servicename(snum) ));
 
229
                return false;
 
230
        }
 
231
 
221
232
        if (!check_user_ok(conn, vuid, server_info, snum)) {
222
233
                DEBUG(2,("change_to_user: SMB user %s (unix user %s, vuid %d) "
223
234
                         "not permitted access to share %s.\n",