← Back to branch summary

~ubuntu-branches/ubuntu/lucid/samba/lucid-proposed

« back to all changes in this revision

Viewing changes to debian/patches/usershare.patch

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2009-12-28 05:02:32 UTC
  • mfrom: (0.34.3 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091228050232-jdd4xy3otxp71kdt
Tags: 2:3.4.3-2ubuntu1
* 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/conflickt with hardy's likewise-open.
    - Don't build against ctdb.
    - Build-depend on libreadline-dev instead of libreadline5-dev.
  + 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

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/usershare.patch
7
7
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/samba/+bug/128548
8
8
Forwarded: not-needed
9
9
 
10
 
Index: samba-3.3.0/docs/manpages/net.8
 
10
Index: b/docs/manpages/net.8
11
11
===================================================================
12
 
--- samba-3.3.0.orig/docs/manpages/net.8
13
 
+++ samba-3.3.0/docs/manpages/net.8
14
 
@@ -903,9 +903,9 @@
 
12
--- a/docs/manpages/net.8       2009-11-08 15:54:27.000000000 +0100
 
13
+++ b/docs/manpages/net.8       2009-11-08 15:55:35.000000000 +0100
 
14
@@ -917,9 +917,9 @@
15
15
 Store a secret for the specified domain, used primarily for domains that use idmap_ldap as a backend\&. In this case the secret is used as the password for the user DN used to bind to the ldap server\&.
16
16
 .SS "USERSHARE"
17
17
 .PP
23
23
 .PP
24
24
 The usershare commands are:
25
25
 .RS 4
26
 
Index: samba-3.3.0/source3/param/loadparm.c
 
26
Index: b/source3/param/loadparm.c
27
27
===================================================================
28
 
--- samba-3.3.0.orig/source3/param/loadparm.c
29
 
+++ samba-3.3.0/source3/param/loadparm.c
30
 
@@ -4906,7 +4906,7 @@
 
28
--- a/source3/param/loadparm.c  2009-11-08 15:54:27.000000000 +0100
 
29
+++ b/source3/param/loadparm.c  2009-11-08 15:55:35.000000000 +0100
 
30
@@ -5098,7 +5098,7 @@
31
31
        string_set(&Globals.szUsersharePath, s);
32
32
        SAFE_FREE(s);
33
33
        string_set(&Globals.szUsershareTemplateShare, "");