← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source3/smbd/reply.c

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2010-01-29 06:16:15 UTC
  • mfrom: (0.27.9 upstream) (0.34.4 squeeze)
  • Revision ID: james.westby@ubuntu.com-20100129061615-37hs6xqpsdhjq3ld
Tags: 2:3.4.5~dfsg-1ubuntu1
https://launchpad.net/bugs/462169
https://launchpad.net/bugs/493565
* Merge from debian testing.  Remaining changes:
  + debian/patches/VERSION.patch:
    - set 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 additon to authenticated ones.
    - add map to guest = Bad user, maps bad username to gues access.
  + debian/samba-common.conf:
    - 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 libswbclient0 replace/conflict with hardy's likewise-open.
    - Don't build against ctdb, since its not in main yet.
  + debian/rules:
    - Enable "native" PIE hardening.
    - Add BIND_NOW to maximize benefit of RELRO hardening.
  + Add ufw integration:
    - Created debian/samba.ufw.profile.
    - debian/rules, debian/samba.dirs, debian/samba.files: install
  + Add apoort hook:
    - Created debian/source_samba.py.
    - debian/rules, debian/samba.dirs, debian/samba-common-bin.files: install
  + debian/rules, debian/samba.if-up: allow "NetworkManager" as a recognized address
    family... it's obviously /not/ an address family, but it's what gets
    sent when using NM, so we'll cope for now.  (LP: #462169). Taken from karmic-proposed.
  + debian/control: Recommend keyutils for smbfs (LP: #493565)
  + Dropped patches:
    - debian/patches/security-CVE-2009-3297.patch: No longer needed
    - debian/patches/fix-too-many-open-files.patch: No longer needed

Show diffs side-by-side

added added

removed removed

Lines of Context:
source3/smbd/reply.c
46
46
{
47
47
        char *d = path;
48
48
        const char *s = path;
49
 
        NTSTATUS ret = NT_STATUS_OK;
50
49
        bool start_of_name_component = True;
51
50
        bool stream_started = false;
 
51
        bool check_quota = false;
52
52
 
53
53
        *p_last_component_contains_wcard = False;
54
54
 
66
66
                                        return NT_STATUS_OBJECT_NAME_INVALID;
67
67
                                }
68
68
                                if (StrCaseCmp(s, ":$DATA") != 0) {
69
 
                                        return NT_STATUS_INVALID_PARAMETER;
 
69
                                        check_quota = true;
70
70
                                }
71
71
                                break;
72
72
                        }
127
127
 
128
128
                                /* Are we at the start ? Can't go back further if so. */
129
129
                                if (d <= path) {
130
 
                                        ret = NT_STATUS_OBJECT_PATH_SYNTAX_BAD;
131
 
                                        break;
 
130
                                        return NT_STATUS_OBJECT_PATH_SYNTAX_BAD;
132
131
                                }
133
132
                                /* Go back one level... */
134
133
                                /* We know this is safe as '/' cannot be part of a mb sequence. */
201
200
 
202
201
        *d = '\0';
203
202
 
204
 
        return ret;
 
203
        if (check_quota) {
 
204
                if (StrCaseCmp(path, FAKE_FILE_NAME_QUOTA_UNIX) != 0) {
 
205
                        return NT_STATUS_INVALID_PARAMETER;
 
206
                }
 
207
        }
 
208
 
 
209
        return NT_STATUS_OK;
205
210
}
206
211
 
207
212
/****************************************************************************