← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Steve Langasek
  • Date: 2009-03-03 22:02:23 UTC
  • mfrom: (0.28.1 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090303220223-3bdlm2d9fwx1p1ye
Tags: 2:3.3.1-1ubuntu1
https://launchpad.net/bugs/337094
* Merge from Debian unstable (LP: #337094), 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/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.
  + debian/rules:
    - enable "native" PIE hardening.
  + Add ufw integration:
    - Created debian/samba.ufw.profile
    - debian/rules, debian/samba.dirs, debian/samba.files: install
      profile
    - debian/control: have samba suggest ufw
* Dropped changes, merged in Debian:
  + debian/libpam-smbpass.pam-config, debian/libpam-smbpass.postinst,
    debian/libpam-smbpass.prerm, debian/libpam-smbpass.files,
    debian/rules:
    - Make libpam-smbpasswd depend on libpam-runtime to allow 
      libpam-smbpasswd for auto-configuration.
  + debian/control:
    - Provide a config block for the new PAM framework to auto-configure
      itself
  + debian/samba.postinst:
    - When populating the new sambashare group, it is not an error
      if the user simply does not exist; test for this case and let
      the install continue instead of aborting.
  + debian/winbind.files:
    - include additional files

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/Makefile.in
126
126
LOGFILEBASE = @logfilebase@
127
127
CONFIGFILE = $(CONFIGDIR)/smb.conf
128
128
LMHOSTSFILE = $(CONFIGDIR)/lmhosts
129
 
CTDBDIR = @ctdbdir@
130
129
 
131
130
# This is where smbpasswd et al go
132
131
PRIVATEDIR = @privatedir@
192
191
        bin/nmblookup@EXEEXT@ bin/pdbedit@EXEEXT@ bin/tdbdump@EXEEXT@ \
193
192
        bin/tdbtool@EXEEXT@
194
193
BIN_PROGS3 = bin/smbpasswd@EXEEXT@ bin/rpcclient@EXEEXT@ bin/smbcacls@EXEEXT@ \
195
 
        bin/profiles@EXEEXT@ bin/ntlm_auth@EXEEXT@ \
 
194
        bin/profiles@EXEEXT@ bin/ntlm_auth@EXEEXT@ bin/sharesec@EXEEXT@ \
196
195
        bin/smbcquotas@EXEEXT@ bin/eventlogadm@EXEEXT@
197
196
BIN_PROGS4 = bin/ldbedit@EXEEXT@ bin/ldbsearch@EXEEXT@ bin/ldbadd@EXEEXT@ \
198
 
        bin/ldbdel@EXEEXT@ bin/ldbmodify@EXEEXT@
 
197
        bin/ldbdel@EXEEXT@ bin/ldbmodify@EXEEXT@ bin/ldbrename@EXEEXT@
199
198
 
200
199
TORTURE_PROGS = bin/smbtorture@EXEEXT@ bin/msgtest@EXEEXT@ \
201
200
        bin/masktest@EXEEXT@ bin/locktest@EXEEXT@ \
1081
1080
LDBADD_OBJ = $(LDB_CMDLINE_OBJ) lib/ldb/tools/ldbadd.o
1082
1081
LDBDEL_OBJ = $(LDB_CMDLINE_OBJ) lib/ldb/tools/ldbdel.o
1083
1082
LDBMODIFY_OBJ = $(LDB_CMDLINE_OBJ) lib/ldb/tools/ldbmodify.o
 
1083
LDBRENAME_OBJ = $(LDB_CMDLINE_OBJ) lib/ldb/tools/ldbrename.o
1084
1084
 
1085
1085
WINBIND_KRB5_LOCATOR_OBJ1 = nsswitch/winbind_krb5_locator.o
1086
1086
WINBIND_KRB5_LOCATOR_OBJ = $(WINBIND_KRB5_LOCATOR_OBJ1) $(LIBREPLACE_OBJ)
1202
1202
        dssetup.idl krb5pac.idl ntsvcs.idl libnetapi.idl drsuapi.idl drsblobs.idl \
1203
1203
        nbt.idl
1204
1204
 
 
1205
PIDL = "$(srcdir)/pidl/pidl"
 
1206
 
1205
1207
idl::
1206
 
        @IDL_FILES="$(IDL_FILES)" CPP="$(CPP)" PERL="$(PERL)" \
 
1208
        @IDL_FILES="$(IDL_FILES)" CPP="$(CPP)" PERL="$(PERL)" PIDL="$(PIDL)"\
1207
1209
         srcdir="$(srcdir)" $(srcdir)/script/build_idl.sh $(PIDL_ARGS)
1208
1210
 
1209
1211
 
1510
1512
bin/vfstest@EXEEXT@: $(BINARY_PREREQS) $(VFSTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
1511
1513
        @echo Linking $@
1512
1514
        @$(CC) $(FLAGS) -o $@ $(VFSTEST_OBJ) $(LDFLAGS) $(TERMLDFLAGS) \
1513
 
                $(TERMLIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) \
 
1515
                $(TERMLIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) $(DNSSD_LIBS) \
1514
1516
                $(ACL_LIBS) $(LIBS) $(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) \
1515
1517
                @SMBD_LIBS@ $(NSCD_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
1516
1518
                $(WINBIND_LIBS)
1578
1580
                $(LIBS) $(POPT_LIBS) $(LDAP_LIBS) \
1579
1581
                $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
1580
1582
 
 
1583
bin/ldbrename: $(BINARY_PREREQS) $(LDBRENAME_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
 
1584
        @echo Linking $@
 
1585
        @$(CC) $(FLAGS) -o $@ $(LDBRENAME_OBJ) $(DYNEXP) $(LDFLAGS) \
 
1586
                $(LIBS) $(POPT_LIBS) $(LDAP_LIBS) \
 
1587
                $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
 
1588
 
1581
1589
 
1582
1590
#####################################################################
1583
1591
#
1616
1624
 
1617
1625
$(LIBTALLOC_SHARED_TARGET): $(LIBTALLOC_SHARED_TARGET_SONAME)
1618
1626
        @rm -f $@
1619
 
        @ln -s -f `basename $(LIBTALLOC_SHARED_TARGET_SONAME)` $@
 
1627
        @ln -f -s `basename $(LIBTALLOC_SHARED_TARGET_SONAME)` $@
1620
1628
 
1621
1629
$(LIBTALLOC_STATIC_TARGET): $(BINARY_PREREQS) $(LIBTALLOC_OBJ0)
1622
1630
        @echo Linking non-shared library $@
1636
1644
        -$(INSTALLLIBCMD_SH) $(LIBTALLOC_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
1637
1645
        @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)`
1638
1646
        -if test -r $(LIBTALLOC_SHARED_TARGET_SONAME) ; then \
1639
 
                ln -s -f `basename $(LIBTALLOC_SHARED_TARGET_SONAME)` \
 
1647
                ln -f -s `basename $(LIBTALLOC_SHARED_TARGET_SONAME)` \
1640
1648
                        $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)` ; \
1641
1649
        fi
1642
1650
        -$(INSTALLLIBCMD_A) $(LIBTALLOC_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
1682
1690
 
1683
1691
$(LIBTDB_SHARED_TARGET): $(LIBTDB_SHARED_TARGET_SONAME)
1684
1692
        @rm -f $@
1685
 
        @ln -s -f `basename $(LIBTDB_SHARED_TARGET_SONAME)` $@
 
1693
        @ln -f -s `basename $(LIBTDB_SHARED_TARGET_SONAME)` $@
1686
1694
 
1687
1695
$(LIBTDB_STATIC_TARGET): $(BINARY_PREREQS) $(LIBTDB_OBJ0)
1688
1696
        @echo Linking non-shared library $@
1703
1711
        -$(INSTALLLIBCMD_SH) $(LIBTDB_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
1704
1712
        @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET)`
1705
1713
        -if test -r $(LIBTDB_SHARED_TARGET_SONAME) ; then \
1706
 
                ln -s -f `basename $(LIBTDB_SHARED_TARGET_SONAME)` \
 
1714
                ln -f -s `basename $(LIBTDB_SHARED_TARGET_SONAME)` \
1707
1715
                        $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET)` ; \
1708
1716
        fi
1709
1717
        -$(INSTALLLIBCMD_A) $(LIBTDB_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
1757
1765
 
1758
1766
$(LIBWBCLIENT_SHARED_TARGET): $(LIBWBCLIENT_SHARED_TARGET_SONAME)
1759
1767
        @rm -f $@
1760
 
        @ln -s -f `basename $(LIBWBCLIENT_SHARED_TARGET_SONAME)` $@
 
1768
        @ln -f -s `basename $(LIBWBCLIENT_SHARED_TARGET_SONAME)` $@
1761
1769
 
1762
1770
$(LIBWBCLIENT_STATIC_TARGET): $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ0) $(WBCOMMON_OBJ)
1763
1771
        @echo Linking non-shared library $@
1777
1785
        -$(INSTALLLIBCMD_SH) $(LIBWBCLIENT_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
1778
1786
        @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBWBCLIENT_SHARED_TARGET)`
1779
1787
        -if test -r $(LIBWBCLIENT_SHARED_TARGET_SONAME) ; then \
1780
 
                ln -s -f `basename $(LIBWBCLIENT_SHARED_TARGET_SONAME)` \
 
1788
                ln -f -s `basename $(LIBWBCLIENT_SHARED_TARGET_SONAME)` \
1781
1789
                        $(DESTDIR)$(LIBDIR)/`basename $(LIBWBCLIENT_SHARED_TARGET)` ; \
1782
1790
        fi
1783
1791
        @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include
1818
1826
 
1819
1827
$(LIBADDNS_SHARED_TARGET): $(LIBADDNS_SHARED_TARGET_SONAME)
1820
1828
        @rm -f $@
1821
 
        @ln -s -f `basename $(LIBADDNS_SHARED_TARGET_SONAME)` $@
 
1829
        @ln -f -s `basename $(LIBADDNS_SHARED_TARGET_SONAME)` $@
1822
1830
 
1823
1831
$(LIBADDNS_STATIC_TARGET): $(BINARY_PREREQS) $(LIBADDNS_OBJ0)
1824
1832
        @echo Linking non-shared library $@
1837
1845
        -$(INSTALLLIBCMD_SH) $(LIBADDNS_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
1838
1846
        @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBADDNS_SHARED_TARGET)`
1839
1847
        -if test -r $(LIBADDNS_SHARED_TARGET_SONAME) ; then \
1840
 
                ln -s -f `basename $(LIBADDNS_SHARED_TARGET_SONAME)` \
 
1848
                ln -f -s `basename $(LIBADDNS_SHARED_TARGET_SONAME)` \
1841
1849
                        $(DESTDIR)$(LIBDIR)/`basename $(LIBADDNS_SHARED_TARGET)` ; \
1842
1850
        fi
1843
1851
        -$(INSTALLLIBCMD_A) $(LIBADDNS_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
1904
1912
 
1905
1913
$(LIBNETAPI_SHARED_TARGET): $(LIBNETAPI_SHARED_TARGET_SONAME)
1906
1914
        @rm -f $@
1907
 
        @ln -s -f `basename $(LIBNETAPI_SHARED_TARGET_SONAME)` $@
 
1915
        @ln -f -s `basename $(LIBNETAPI_SHARED_TARGET_SONAME)` $@
1908
1916
 
1909
1917
$(LIBNETAPI_STATIC_TARGET): $(BINARY_PREREQS) $(LIBNETAPI_OBJ0)
1910
1918
        @echo Linking non-shared library $@
1924
1932
        -$(INSTALLLIBCMD_SH) $(LIBNETAPI_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
1925
1933
        @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBNETAPI_SHARED_TARGET)`
1926
1934
        -if test -r $(LIBNETAPI_SHARED_TARGET_SONAME) ; then \
1927
 
                ln -s -f `basename $(LIBNETAPI_SHARED_TARGET_SONAME)` \
 
1935
                ln -f -s `basename $(LIBNETAPI_SHARED_TARGET_SONAME)` \
1928
1936
                        $(DESTDIR)$(LIBDIR)/`basename $(LIBNETAPI_SHARED_TARGET)` ; \
1929
1937
        fi
1930
1938
        -$(INSTALLLIBCMD_A) $(LIBNETAPI_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
1988
1996
        -$(INSTALLLIBCMD_SH) $(LIBSMBCLIENT_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
1989
1997
        @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBCLIENT_SHARED_TARGET)`
1990
1998
        -if test -r $(LIBSMBCLIENT_SHARED_TARGET_SONAME) ; then \
1991
 
                ln -s -f `basename $(LIBSMBCLIENT_SHARED_TARGET_SONAME)` \
 
1999
                ln -f -s `basename $(LIBSMBCLIENT_SHARED_TARGET_SONAME)` \
1992
2000
                        $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBCLIENT_SHARED_TARGET)` ; \
1993
2001
        fi
1994
2002
        -$(INSTALLLIBCMD_A) $(LIBSMBCLIENT_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
2041
2049
 
2042
2050
$(LIBSMBSHAREMODES_SHARED_TARGET): $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME)
2043
2051
        @rm -f $@
2044
 
        @ln -s -f `basename $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME)` $@
 
2052
        @ln -f -s `basename $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME)` $@
2045
2053
 
2046
2054
$(LIBSMBSHAREMODES_STATIC_TARGET): $(BINARY_PREREQS) $(LIBSMBSHAREMODES_OBJ0)
2047
2055
        @echo Linking non-shared library $@
2060
2068
        -$(INSTALLLIBCMD_SH) $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
2061
2069
        @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBSHAREMODES_SHARED_TARGET)`
2062
2070
        -if test -r $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME) ; then \
2063
 
                ln -s -f `basename $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME)` \
 
2071
                ln -f -s `basename $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME)` \
2064
2072
                        $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBSHAREMODES_SHARED_TARGET)` ; \
2065
2073
        fi
2066
2074
        -$(INSTALLLIBCMD_A) $(LIBSMBSHAREMODES_STATIC_TARGET) $(DESTDIR)$(LIBDIR)