← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source3/libsmb/libsmb_setget.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/libsmb/libsmb_setget.c
39
39
void
40
40
smbc_setNetbiosName(SMBCCTX *c, char * netbios_name)
41
41
{
42
 
        c->netbios_name = netbios_name;
 
42
        SAFE_FREE(c->netbios_name);
 
43
        if (netbios_name) {
 
44
                c->netbios_name = SMB_STRDUP(netbios_name);
 
45
        }
43
46
}
44
47
 
45
48
/** Get the workgroup used for making connections */
53
56
void
54
57
smbc_setWorkgroup(SMBCCTX *c, char * workgroup)
55
58
{
56
 
        c->workgroup = workgroup;
 
59
        SAFE_FREE(c->workgroup);
 
60
        if (workgroup) {
 
61
                c->workgroup = SMB_STRDUP(workgroup);
 
62
        }
57
63
}
58
64
 
59
65
/** Get the username used for making connections */
67
73
void
68
74
smbc_setUser(SMBCCTX *c, char * user)
69
75
{
70
 
        c->user = user;
 
76
        SAFE_FREE(c->user);
 
77
        if (user) {
 
78
                c->user = SMB_STRDUP(user);
 
79
        }
71
80
}
72
81
 
73
82
/** Get the debug level */