← Back to branch summary

~ubuntu-branches/ubuntu/vivid/samba/vivid

« back to all changes in this revision

Viewing changes to lib/util/config.mk

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2011-12-21 13:18:04 UTC
  • mfrom: (0.39.21 sid)
  • Revision ID: package-import@ubuntu.com-20111221131804-xtlr39wx6njehxxr
Tags: 2:3.6.1-3ubuntu1
* Merge from Debian testing.  Remaining changes:
  + debian/patches/VERSION.patch:
    - set SAMBA_VERSION_SUFFIX to Ubuntu.
  + debian/patches/error-trans.fix-276472:
    - Add the translation of Unix Error code -ENOTSUP to NT Error Code
    - NT_STATUS_NOT_SUPPORTED to prevent the Permission denied error.
  + 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/control:
    - Don't build against or suggest ctdb.
    - Add dependency on samba-common-bin to samba.
  + Add ufw integration:
    - Created debian/samba.ufw.profile
    - debian/rules, debian/samba.dirs, debian/samba.files: install
      profile
    - debian/control: have samba suggest ufw
  + Add apport hook:
    - Created debian/source_samba.py.
    - debian/rules, debian/samba.dirs, debian/samba-common-bin.files: install
  + Switch to upstart:
    - Add debian/samba.{nmbd,smbd}.upstart.
  + debian/samba.logrotate, debian/samba-common.dhcp, debian/samba.if-up:
    - Make them upstart compatible
  + debian/samba.postinst: 
    - Avoid scary pdbedit warnings on first import.
  + debian/samba-common.postinst: Add more informative error message for
    the case where smb.conf was manually deleted
  + debian/patches/fix-debuglevel-name-conflict.patch: don't use 'debug_level'
    as a global variable name in an NSS module 
  + Dropped:
    - debian/patches/error-trans.fix-276472
    - debian/patches/fix-debuglevel-name-conflict.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/util/config.mk
1
 
[LIBRARY::LIBSAMBA-UTIL]
2
 
PUBLIC_DEPENDENCIES = \
3
 
                LIBTALLOC LIBCRYPTO \
4
 
                SOCKET_WRAPPER LIBREPLACE_NETWORK \
5
 
                CHARSET EXECINFO UID_WRAPPER
6
 
 
7
 
LIBSAMBA-UTIL_VERSION = 0.0.1
8
 
LIBSAMBA-UTIL_SOVERSION = 0
9
 
 
10
 
LIBSAMBA-UTIL_OBJ_FILES = $(addprefix $(libutilsrcdir)/, \
11
 
                xfile.o \
12
 
                debug.o \
13
 
                fault.o \
14
 
                signal.o \
15
 
                system.o \
16
 
                time.o \
17
 
                genrand.o \
18
 
                dprintf.o \
19
 
                util_str.o \
20
 
                rfc1738.o \
21
 
                substitute.o \
22
 
                util_strlist.o \
23
 
                util_file.o \
24
 
                data_blob.o \
25
 
                util.o \
26
 
                blocking.o \
27
 
                util_net.o \
28
 
                fsusage.o \
29
 
                ms_fnmatch.o \
30
 
                mutex.o \
31
 
                idtree.o \
32
 
                become_daemon.o \
33
 
                rbtree.o \
34
 
                talloc_stack.o \
35
 
                smb_threads.o \
36
 
                params.o \
37
 
                parmlist.o \
38
 
                util_id.o)
39
 
 
40
 
PUBLIC_HEADERS += $(addprefix $(libutilsrcdir)/, util.h \
41
 
                                 dlinklist.h \
42
 
                                 attr.h \
43
 
                                 byteorder.h \
44
 
                                 data_blob.h \
45
 
                                 debug.h \
46
 
                                 memory.h \
47
 
                                 mutex.h \
48
 
                                 safe_string.h \
49
 
                                 time.h \
50
 
                                 util_ldb.h \
51
 
                                 talloc_stack.h \
52
 
                                 xfile.h)
53
 
 
54
 
[SUBSYSTEM::ASN1_UTIL]
55
 
 
56
 
ASN1_UTIL_OBJ_FILES = $(libutilsrcdir)/asn1.o
57
 
 
58
 
[SUBSYSTEM::UNIX_PRIVS]
59
 
PRIVATE_DEPENDENCIES = UID_WRAPPER
60
 
 
61
 
UNIX_PRIVS_OBJ_FILES = $(libutilsrcdir)/unix_privs.o
62
 
 
63
 
$(eval $(call proto_header_template,$(libutilsrcdir)/unix_privs.h,$(UNIX_PRIVS_OBJ_FILES:.o=.c)))
64
 
 
65
 
################################################
66
 
# Start SUBSYSTEM WRAP_XATTR
67
 
[SUBSYSTEM::WRAP_XATTR]
68
 
PUBLIC_DEPENDENCIES = XATTR
69
 
#
70
 
# End SUBSYSTEM WRAP_XATTR
71
 
################################################
72
 
 
73
 
WRAP_XATTR_OBJ_FILES = $(libutilsrcdir)/wrap_xattr.o
74
 
 
75
 
[SUBSYSTEM::UTIL_TDB]
76
 
PUBLIC_DEPENDENCIES = LIBTDB
77
 
 
78
 
UTIL_TDB_OBJ_FILES = $(libutilsrcdir)/util_tdb.o
79
 
 
80
 
[SUBSYSTEM::UTIL_TEVENT]
81
 
PUBLIC_DEPENDENCIES = LIBTEVENT
82
 
 
83
 
UTIL_TEVENT_OBJ_FILES = $(addprefix $(libutilsrcdir)/, \
84
 
                        tevent_unix.o \
85
 
                        tevent_ntstatus.o)
86
 
 
87
 
[SUBSYSTEM::UTIL_LDB]
88
 
PUBLIC_DEPENDENCIES = LIBLDB
89
 
 
90
 
UTIL_LDB_OBJ_FILES = $(libutilsrcdir)/util_ldb.o