← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source/configure.in

  • Committer: Bazaar Package Importer
  • Author(s): Andrew Mitchell
  • Date: 2009-05-18 13:26:04 UTC
  • mfrom: (0.28.5 sid)
  • Revision ID: james.westby@ubuntu.com-20090518132604-ebyuqimgymtr3h0k
Tags: 2:3.3.4-2ubuntu1
https://launchpad.net/bugs/312449
https://launchpad.net/bugs/300221
* Merge from debian unstable, 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/samba-common.postinst: Add more informative error message for
    the case where smb.conf was manually deleted (LP: #312449)
  + 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.
    - Add suggests keyutils for smbfs. (LP: #300221)
  + debian/rules:
    - enable "native" PIE hardening.
    - remove --with-ctdb and --with-cluster-support=yes
  + Add ufw integration:
    - Created debian/samba.ufw profile.
    - debian/rules, debian/samba.dirs, debian/samba.files: install 
      profile
    - debian/control: have samba sugguest ufw.
* Dropped patches:
  + debian/patches/fix-upstream-bug-6186.patch: Merged upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/configure.in
250
250
        else
251
251
           AC_MSG_CHECKING(GNU ld release version)
252
252
           changequote(,)dnl
253
 
           ac_cv_gnu_ld_vernr=`echo $ac_cv_gnu_ld_version | sed -n 's,^.*\([1-9][0-9]*\.[0-9][0-9]*\).*$,\1,p'`
 
253
           ac_cv_gnu_ld_vernr=`echo $ac_cv_gnu_ld_version | sed -n 's,^[^0-9]*\([1-9][0-9]*\.[0-9][0-9]*\).*$,\1,p'`
254
254
           ac_cv_gnu_ld_vernr_major=`echo $ac_cv_gnu_ld_vernr | cut -d '.' -f 1`
255
255
           ac_cv_gnu_ld_vernr_minor=`echo $ac_cv_gnu_ld_vernr | cut -d '.' -f 2`
256
256
           changequote([,])dnl
262
262
           if test "$ac_cv_gnu_ld_vernr_major" -lt 2 || test "$ac_cv_gnu_ld_vernr_minor" -lt 14; then
263
263
             ac_cv_gnu_ld_no_default_allow_shlib_undefined=yes
264
264
           fi
265
 
           if test "$ac_cv_gnu_ld_vernr_major" -gt 2 || test "$ac_cv_gnu_ld_vernr_major"=2 && test "$ac_cv_gnu_ld_vernr_minor" -ge 12; then
 
265
           if test "$ac_cv_gnu_ld_vernr_major" -gt 2 || test "$ac_cv_gnu_ld_vernr_major" = 2 && test "$ac_cv_gnu_ld_vernr_minor" -ge 12; then
266
266
             ac_cv_gnu_ld_version_script=yes
267
267
           fi
268
268
        fi
862
862
 
863
863
AC_CHECK_FUNCS(dirfd)
864
864
if test x"$ac_cv_func_dirfd" = x"yes"; then
865
 
        default_shared_modules="$default_shared_modules vfs_syncops"
 
865
        default_shared_modules="$default_shared_modules vfs_syncops vfs_dirsort"
866
866
fi
867
867
 
868
868
AC_CACHE_CHECK([for sig_atomic_t type],samba_cv_sig_atomic_t, [
6168
6168
# Check if user wants DNS service discovery support
6169
6169
 
6170
6170
AC_ARG_ENABLE(dnssd,
6171
 
[AS_HELP_STRING([--enable-dnssd], [Enable DNS service discovery support (default=auto)])])
 
6171
[AS_HELP_STRING([--enable-dnssd], [Enable DNS service discovery support (default=no)])])
6172
6172
 
6173
6173
AC_SUBST(DNSSD_LIBS)
6174
 
if test x"$enable_dnssd" != x"no"; then
 
6174
if test x"$enable_dnssd" == x"yes"; then
6175
6175
    have_dnssd_support=yes
6176
6176
 
6177
6177
    AC_CHECK_HEADERS(dns_sd.h)
6200
6200
fi
6201
6201
 
6202
6202
#################################################
 
6203
# Check if user wants avahi support
 
6204
 
 
6205
AC_ARG_ENABLE(avahi,
 
6206
[AS_HELP_STRING([--enable-avahi], [Enable Avahi support (default=auto)])])
 
6207
 
 
6208
AC_SUBST(AVAHI_LIBS)
 
6209
if test x"$enable_avahi" != x"no"; then
 
6210
    have_avahi_support=yes
 
6211
 
 
6212
    AC_CHECK_HEADERS(avahi-common/watch.h)
 
6213
    if test x"$ac_cv_header_avahi_common_watch_h" != x"yes"; then
 
6214
        have_avahi_support=no
 
6215
    fi
 
6216
 
 
6217
    AC_CHECK_HEADERS(avahi-client/client.h)
 
6218
    if test x"$ac_cv_header_avahi_common_watch_h" != x"yes"; then
 
6219
        have_avahi_support=no
 
6220
    fi
 
6221
 
 
6222
    AC_CHECK_LIB_EXT(avahi-client, AVAHI_LIBS, avahi_client_new)
 
6223
    if test x"$ac_cv_lib_ext_avahi_client_avahi_client_new" != x"yes"; then
 
6224
        have_avahi_support=no
 
6225
    fi
 
6226
 
 
6227
    if test x"$have_avahi_support" = x"yes"; then
 
6228
        AC_DEFINE(WITH_AVAHI_SUPPORT, 1,
 
6229
                [Whether to enable avahi support])
 
6230
        AC_SUBST(AVAHI_OBJ, "lib/avahi.o smbd/avahi_register.o")
 
6231
    else
 
6232
        if test x"$enable_avahi" = x"yes"; then
 
6233
            AC_MSG_ERROR(avahi support not available)
 
6234
        fi
 
6235
    fi
 
6236
fi
 
6237
 
 
6238
#################################################
6203
6239
# Check to see if we should use the included iniparser
6204
6240
 
6205
6241
AC_ARG_WITH(included-iniparser,
6401
6437
SMB_MODULE(vfs_acl_xattr, \$(VFS_ACL_XATTR_OBJ), "bin/acl_xattr.$SHLIBEXT", VFS)
6402
6438
SMB_MODULE(vfs_acl_tdb, \$(VFS_ACL_TDB_OBJ), "bin/acl_tdb.$SHLIBEXT", VFS)
6403
6439
SMB_MODULE(vfs_smb_traffic_analyzer, \$(VFS_SMB_TRAFFIC_ANALYZER_OBJ), "bin/smb_traffic_analyzer.$SHLIBEXT", VFS)
 
6440
SMB_MODULE(vfs_dirsort, \$(VFS_DIRSORT_OBJ), "bin/dirsort.$SHLIBEXT", VFS)
6404
6441
 
6405
6442
 
6406
6443
SMB_SUBSYSTEM(VFS,smbd/vfs.o)