← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source3/m4/aclocal.m4

  • 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/m4/aclocal.m4
433
433
    jm_cv_giconv=no
434
434
    jm_save_LIBS="$LIBS"
435
435
 
436
 
    dnl Check for include in funny place but no lib needed
437
 
    if test "$jm_cv_func_iconv" != yes; then 
 
436
  dnl Check for include in giconv.h but no lib needed
 
437
  if test "$jm_cv_func_iconv" != yes; then
 
438
    AC_TRY_LINK([#include <stdlib.h>
 
439
#include <giconv.h>],
 
440
      [iconv_t cd = iconv_open("","");
 
441
       iconv(cd,NULL,NULL,NULL,NULL);
 
442
       iconv_close(cd);],
 
443
       jm_cv_func_iconv=yes
 
444
       jm_cv_include="giconv.h"
 
445
       jm_cv_giconv="yes"
 
446
       jm_cv_lib_iconv="")
 
447
 
 
448
    dnl Standard iconv.h include, lib in glibc or libc ...
 
449
    if test "$jm_cv_func_iconv" != yes; then
438
450
      AC_TRY_LINK([#include <stdlib.h>
439
 
#include <giconv.h>],
 
451
#include <iconv.h>],
440
452
        [iconv_t cd = iconv_open("","");
441
453
         iconv(cd,NULL,NULL,NULL,NULL);
442
454
         iconv_close(cd);],
 
455
         jm_cv_include="iconv.h"
443
456
         jm_cv_func_iconv=yes
444
 
         jm_cv_include="giconv.h"
445
 
         jm_cv_giconv="yes"
446
457
         jm_cv_lib_iconv="")
447
458
 
448
 
      dnl Standard iconv.h include, lib in glibc or libc ...
 
459
      dnl Include in giconv.h, libgiconv needed to link
449
460
      if test "$jm_cv_func_iconv" != yes; then
 
461
        jm_save_LIBS="$LIBS"
 
462
        LIBS="$LIBS -lgiconv"
450
463
        AC_TRY_LINK([#include <stdlib.h>
451
 
#include <iconv.h>],
 
464
#include <giconv.h>],
452
465
          [iconv_t cd = iconv_open("","");
453
466
           iconv(cd,NULL,NULL,NULL,NULL);
454
467
           iconv_close(cd);],
455
 
           jm_cv_include="iconv.h"
456
 
           jm_cv_func_iconv=yes
457
 
           jm_cv_lib_iconv="")
458
 
 
459
 
          if test "$jm_cv_lib_iconv" != yes; then
460
 
            jm_save_LIBS="$LIBS"
461
 
            LIBS="$LIBS -lgiconv"
462
 
            AC_TRY_LINK([#include <stdlib.h>
463
 
#include <giconv.h>],
464
 
              [iconv_t cd = iconv_open("","");
465
 
               iconv(cd,NULL,NULL,NULL,NULL);
466
 
               iconv_close(cd);],
467
 
              jm_cv_lib_iconv=yes
468
 
              jm_cv_func_iconv=yes
469
 
              jm_cv_include="giconv.h"
470
 
              jm_cv_giconv=yes
471
 
              jm_cv_lib_iconv="giconv")
472
 
 
473
 
           LIBS="$jm_save_LIBS"
474
 
 
 
468
          jm_cv_lib_iconv=yes
 
469
          jm_cv_func_iconv=yes
 
470
          jm_cv_include="giconv.h"
 
471
          jm_cv_giconv=yes
 
472
          jm_cv_lib_iconv="giconv")
 
473
 
 
474
        LIBS="$jm_save_LIBS"
 
475
 
 
476
        dnl Include in iconv.h, libiconv needed to link
475
477
        if test "$jm_cv_func_iconv" != yes; then
476
478
          jm_save_LIBS="$LIBS"
477
479
          LIBS="$LIBS -liconv"
485
487
            jm_cv_lib_iconv="iconv")
486
488
          LIBS="$jm_save_LIBS"
487
489
 
488
 
          if test "$jm_cv_lib_iconv" != yes; then
 
490
          dnl Include in biconv.h, libbiconv needed to link
 
491
          if test "$jm_cv_func_iconv" != yes; then
489
492
            jm_save_LIBS="$LIBS"
490
493
            LIBS="$LIBS -lbiconv"
491
494
            AC_TRY_LINK([#include <stdlib.h>
500
503
              jm_cv_lib_iconv="biconv")
501
504
 
502
505
            LIBS="$jm_save_LIBS"
503
 
          fi
 
506
          fi
504
507
        fi
505
508
      fi
506
509
    fi