Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 191735 | Differences between
and this patch

Collapse All | Expand All

(-)./configure.in.orig (-30 / +54 lines)
Lines 1055-1060 Link Here
1055
   AC_DEFINE(HAVE_SIG_ATOMIC_T_TYPE,1,[Whether we have the atomic_t variable type])
1055
   AC_DEFINE(HAVE_SIG_ATOMIC_T_TYPE,1,[Whether we have the atomic_t variable type])
1056
fi
1056
fi
1057
1057
1058
AC_CACHE_CHECK([for struct sigevent type],samba_cv_struct_sigevent, [
1059
    AC_TRY_COMPILE([
1060
#include <sys/types.h>
1061
#if STDC_HEADERS
1062
#include <stdlib.h>
1063
#include <stddef.h>
1064
#endif
1065
#include <signal.h>],[struct sigevent s;],
1066
	samba_cv_struct_sigevent=yes,samba_cv_struct_sigevent=no)])
1067
if test x"$samba_cv_struct_sigevent" = x"yes"; then
1068
   AC_DEFINE(HAVE_STRUCT_SIGEVENT,1,[Whether we have the struct sigevent])
1069
   AC_CHECK_MEMBERS([struct sigevent.sigev_value.sival_ptr,struct sigevent.sigev_value.sigval_ptr], , ,
1070
	[#include <signal.h>])
1071
fi
1072
1058
AC_CACHE_CHECK([for struct timespec type],samba_cv_struct_timespec, [
1073
AC_CACHE_CHECK([for struct timespec type],samba_cv_struct_timespec, [
1059
    AC_TRY_COMPILE([
1074
    AC_TRY_COMPILE([
1060
#include <sys/types.h>
1075
#include <sys/types.h>
Lines 1258-1263 Link Here
1258
1273
1259
# Find a method of generating a stack trace
1274
# Find a method of generating a stack trace
1260
AC_CHECK_HEADERS(execinfo.h libexc.h libunwind.h)
1275
AC_CHECK_HEADERS(execinfo.h libexc.h libunwind.h)
1276
AC_SEARCH_LIBS(backtrace_symbols, [execinfo])
1261
AC_CHECK_FUNCS(backtrace_symbols)
1277
AC_CHECK_FUNCS(backtrace_symbols)
1262
AC_CHECK_LIB(exc, trace_back_stack)
1278
AC_CHECK_LIB(exc, trace_back_stack)
1263
1279
Lines 4098-4107 Link Here
4098
4114
4099
  ################################################################
4115
  ################################################################
4100
  # first test for Active Directory support being enabled
4116
  # first test for Active Directory support being enabled
4101
  #if test x"$with_ads_support" = x"no"; then
4117
  if test x"$with_ads_support" = x"no"; then
4102
  #		AC_MSG_ERROR(Active Directory support is required to enable DNS Update support)
4118
  		AC_MSG_ERROR(Active Directory support is required to enable DNS Update support)
4103
  #		with_dnsupdate_support=no
4119
  		with_dnsupdate_support=no
4104
  #fi	  	
4120
  fi	  	
4105
  ##################################################################
4121
  ##################################################################
4106
  # then test for uuid.h (necessary to generate unique DNS keynames
4122
  # then test for uuid.h (necessary to generate unique DNS keynames
4107
  # (uuid.h is required for this test)
4123
  # (uuid.h is required for this test)
Lines 5226-5232 Link Here
5226
#################################################
5242
#################################################
5227
# check for ACL support
5243
# check for ACL support
5228
5244
5229
AC_MSG_CHECKING(whether to support ACLs)
5245
AC_MSG_NOTICE(checking whether to support ACLs...)
5230
AC_ARG_WITH(acl-support,
5246
AC_ARG_WITH(acl-support,
5231
[  --with-acl-support      Include ACL support (default=no)],
5247
[  --with-acl-support      Include ACL support (default=no)],
5232
[ case "$withval" in
5248
[ case "$withval" in
Lines 5234-5276 Link Here
5234
5250
5235
	case "$host_os" in
5251
	case "$host_os" in
5236
	*sysv5*)
5252
	*sysv5*)
5237
		AC_MSG_RESULT(Using UnixWare ACLs)
5253
		AC_MSG_NOTICE(Using UnixWare ACLs)
5238
		AC_DEFINE(HAVE_UNIXWARE_ACLS,1,[Whether UnixWare ACLs are available])
5254
		AC_DEFINE(HAVE_UNIXWARE_ACLS,1,[Whether UnixWare ACLs are available])
5239
		default_static_modules="$default_static_modules vfs_solarisacl"
5255
		default_static_modules="$default_static_modules vfs_solarisacl"
5240
		;;
5256
		;;
5241
	*solaris*)
5257
	*solaris*)
5242
		AC_MSG_RESULT(Using solaris ACLs)
5258
		AC_MSG_NOTICE(Using Solaris ACLs)
5243
		AC_DEFINE(HAVE_SOLARIS_ACLS,1,[Whether solaris ACLs are available])
5259
		AC_DEFINE(HAVE_SOLARIS_ACLS,1,[Whether Solaris ACLs are available])
5244
		ACL_LIBS="$ACL_LIBS -lsec"
5260
		ACL_LIBS="$ACL_LIBS -lsec"
5245
		default_static_modules="$default_static_modules vfs_solarisacl"
5261
		default_static_modules="$default_static_modules vfs_solarisacl"
5246
		;;
5262
		;;
5247
	*hpux*)
5263
	*hpux*)
5248
		AC_MSG_RESULT(Using HPUX ACLs)
5264
		AC_MSG_NOTICE(Using HPUX ACLs)
5249
		AC_DEFINE(HAVE_HPUX_ACLS,1,[Whether HPUX ACLs are available])
5265
		AC_DEFINE(HAVE_HPUX_ACLS,1,[Whether HPUX ACLs are available])
5250
		default_static_modules="$default_static_modules vfs_hpuxacl"
5266
		default_static_modules="$default_static_modules vfs_hpuxacl"
5251
		;;
5267
		;;
5252
	*irix*)
5268
	*irix*)
5253
		AC_MSG_RESULT(Using IRIX ACLs)
5269
		AC_MSG_NOTICE(Using IRIX ACLs)
5254
		AC_DEFINE(HAVE_IRIX_ACLS,1,[Whether IRIX ACLs are available])
5270
		AC_DEFINE(HAVE_IRIX_ACLS,1,[Whether IRIX ACLs are available])
5255
		default_static_modules="$default_static_modules vfs_irixacl"
5271
		default_static_modules="$default_static_modules vfs_irixacl"
5256
		;;
5272
		;;
5257
	*aix*)
5273
	*aix*)
5258
		AC_MSG_RESULT(Using AIX ACLs)
5274
		AC_MSG_NOTICE(Using AIX ACLs)
5259
		AC_DEFINE(HAVE_AIX_ACLS,1,[Whether AIX ACLs are available])
5275
		AC_DEFINE(HAVE_AIX_ACLS,1,[Whether AIX ACLs are available])
5260
		default_static_modules="$default_static_modules vfs_aixacl"
5276
		default_static_modules="$default_static_modules vfs_aixacl"
5261
		;;
5277
		;;
5262
	*osf*)
5278
	*osf*)
5263
		AC_MSG_RESULT(Using Tru64 ACLs)
5279
		AC_MSG_NOTICE(Using Tru64 ACLs)
5264
		AC_DEFINE(HAVE_TRU64_ACLS,1,[Whether Tru64 ACLs are available])
5280
		AC_DEFINE(HAVE_TRU64_ACLS,1,[Whether Tru64 ACLs are available])
5265
		ACL_LIBS="$ACL_LIBS -lpacl"
5281
		ACL_LIBS="$ACL_LIBS -lpacl"
5266
		default_static_modules="$default_static_modules vfs_tru64acl"
5282
		default_static_modules="$default_static_modules vfs_tru64acl"
5267
		;;
5283
		;;
5268
	*freebsd[[5-9]]*)
5269
		AC_MSG_RESULT(Using FreeBSD posix ACLs)
5270
		AC_DEFINE(HAVE_POSIX_ACLS,1,[Whether FreeBSD POSIX ACLs are available])
5271
		AC_DEFINE(HAVE_ACL_GET_PERM_NP,1,[Whether acl_get_perm_np() is available])
5272
		default_static_modules="$default_static_modules vfs_posixacl"
5273
		;;
5274
	*linux*)
5284
	*linux*)
5275
		AC_CHECK_LIB(attr,getxattr,[ACL_LIBS="$ACL_LIBS -lattr"])
5285
		AC_CHECK_LIB(attr,getxattr,[ACL_LIBS="$ACL_LIBS -lattr"])
5276
       		AC_CHECK_LIB(acl,acl_get_file,[ACL_LIBS="$ACL_LIBS -lacl"])
5286
       		AC_CHECK_LIB(acl,acl_get_file,[ACL_LIBS="$ACL_LIBS -lacl"])
Lines 5291-5297 Link Here
5291
			LIBS=$acl_LIBS
5301
			LIBS=$acl_LIBS
5292
		])
5302
		])
5293
		if test x"$samba_cv_HAVE_POSIX_ACLS" = x"yes"; then
5303
		if test x"$samba_cv_HAVE_POSIX_ACLS" = x"yes"; then
5294
			AC_MSG_RESULT(Using posix ACLs)
5304
			AC_MSG_NOTICE(Using posix ACLs)
5295
			AC_DEFINE(HAVE_POSIX_ACLS,1,[Whether POSIX ACLs are available])
5305
			AC_DEFINE(HAVE_POSIX_ACLS,1,[Whether POSIX ACLs are available])
5296
			AC_CACHE_CHECK([for acl_get_perm_np],samba_cv_HAVE_ACL_GET_PERM_NP,[
5306
			AC_CACHE_CHECK([for acl_get_perm_np],samba_cv_HAVE_ACL_GET_PERM_NP,[
5297
				acl_LIBS=$LIBS
5307
				acl_LIBS=$LIBS
Lines 5312-5323 Link Here
5312
				AC_DEFINE(HAVE_ACL_GET_PERM_NP,1,[Whether acl_get_perm_np() is available])
5322
				AC_DEFINE(HAVE_ACL_GET_PERM_NP,1,[Whether acl_get_perm_np() is available])
5313
			fi
5323
			fi
5314
		fi
5324
		fi
5315
            ;;
5325
		;;
5316
         *)
5326
         *)
5317
		AC_CHECK_LIB(acl,acl_get_file,[ACL_LIBS="$ACL_LIBS -lacl"])
5327
		AC_CHECK_LIB(acl,acl_get_file,[
5318
		AC_CACHE_CHECK([for ACL support],samba_cv_HAVE_POSIX_ACLS,[
5328
		    ACL_LIBS="$ACL_LIBS -lacl"
5329
		    samba_cv_acl_get_file=yes
5330
		],[
5331
		    AC_CHECK_FUNC(acl_get_file,[samba_cv_acl_get_file=yes])
5332
		])
5333
		if test x"$samba_cv_acl_get_file" = x"yes"; then
5334
		    AC_CACHE_CHECK([for POSIX ACL support],samba_cv_HAVE_POSIX_ACLS,[
5319
			acl_LIBS=$LIBS
5335
			acl_LIBS=$LIBS
5320
			LIBS="$LIBS -lacl"
5336
			LIBS="$LIBS $ACL_LIBS"
5321
			AC_TRY_LINK([
5337
			AC_TRY_LINK([
5322
				#include <sys/types.h>
5338
				#include <sys/types.h>
5323
				#include <sys/acl.h>
5339
				#include <sys/acl.h>
Lines 5330-5349 Link Here
5330
			[samba_cv_HAVE_POSIX_ACLS=yes],
5346
			[samba_cv_HAVE_POSIX_ACLS=yes],
5331
			[samba_cv_HAVE_POSIX_ACLS=no])
5347
			[samba_cv_HAVE_POSIX_ACLS=no])
5332
			LIBS=$acl_LIBS
5348
			LIBS=$acl_LIBS
5333
		])
5349
		    ])
5334
		if test x"$samba_cv_HAVE_POSIX_ACLS" = x"yes"; then
5350
		    if test x"$samba_cv_HAVE_POSIX_ACLS" = x"yes"; then
5335
			AC_MSG_RESULT(Using posix ACLs)
5351
			AC_MSG_NOTICE(Using POSIX ACLs)
5336
			AC_DEFINE(HAVE_POSIX_ACLS,1,[Whether POSIX ACLs are available])
5352
			AC_DEFINE(HAVE_POSIX_ACLS,1,[Whether POSIX ACLs are available])
5337
			AC_CACHE_CHECK([for acl_get_perm_np],samba_cv_HAVE_ACL_GET_PERM_NP,[
5353
			AC_CACHE_CHECK([for acl_get_perm_np],samba_cv_HAVE_ACL_GET_PERM_NP,[
5338
				acl_LIBS=$LIBS
5354
				acl_LIBS=$LIBS
5339
				LIBS="$LIBS -lacl"
5355
				LIBS="$LIBS $ACL_LIBS"
5340
				AC_TRY_LINK([
5356
				AC_TRY_LINK([
5341
					#include <sys/types.h>
5357
					#include <sys/types.h>
5342
					#include <sys/acl.h>
5358
					#include <sys/acl.h>
5343
				],[
5359
				],[
5344
					acl_permset_t permset_d;
5360
					acl_permset_t permset_d;
5345
					acl_perm_t perm;
5361
					acl_perm_t perm;
5346
					return acl_get_perm_np( permset_d, perm);
5362
					return acl_get_perm_np(permset_d, perm);
5347
				],
5363
				],
5348
				[samba_cv_HAVE_ACL_GET_PERM_NP=yes],
5364
				[samba_cv_HAVE_ACL_GET_PERM_NP=yes],
5349
				[samba_cv_HAVE_ACL_GET_PERM_NP=no])
5365
				[samba_cv_HAVE_ACL_GET_PERM_NP=no])
Lines 5352-5368 Link Here
5352
			if test x"$samba_cv_HAVE_ACL_GET_PERM_NP" = x"yes"; then
5368
			if test x"$samba_cv_HAVE_ACL_GET_PERM_NP" = x"yes"; then
5353
				AC_DEFINE(HAVE_ACL_GET_PERM_NP,1,[Whether acl_get_perm_np() is available])
5369
				AC_DEFINE(HAVE_ACL_GET_PERM_NP,1,[Whether acl_get_perm_np() is available])
5354
			fi
5370
			fi
5371
		    fi
5372
		fi
5373
		if test x"$samba_cv_HAVE_POSIX_ACLS" != x"yes"; then
5374
		    AC_MSG_NOTICE(No POSIX ACLs support is availble)
5375
		    AC_DEFINE(HAVE_NO_ACLS,1,[Whether no ACLs support is available])
5355
		fi
5376
		fi
5356
            ;;
5377
            ;;
5357
        esac
5378
        esac
5358
        ;;
5379
        ;;
5359
  *)
5380
  *)
5360
    AC_MSG_RESULT(no)
5381
    AC_MSG_NOTICE(No ACLs support is availble)
5361
    AC_DEFINE(HAVE_NO_ACLS,1,[Whether no ACLs support is available])
5382
    AC_DEFINE(HAVE_NO_ACLS,1,[Whether no ACLs support is available])
5362
    ;;
5383
    ;;
5363
  esac ],
5384
  esac ],
5385
  AC_MSG_NOTICE(No ACLs support is built in)
5364
  AC_DEFINE(HAVE_NO_ACLS,1,[Whether no ACLs support should be built in])
5386
  AC_DEFINE(HAVE_NO_ACLS,1,[Whether no ACLs support should be built in])
5365
  AC_MSG_RESULT(no)
5366
)
5387
)
5367
5388
5368
if test x"$samba_cv_HAVE_POSIX_ACLS" = x"yes"; then
5389
if test x"$samba_cv_HAVE_POSIX_ACLS" = x"yes"; then
Lines 5836-5841 Link Here
5836
		NSSSONAMEVERSIONSUFFIX=".1"
5857
		NSSSONAMEVERSIONSUFFIX=".1"
5837
		WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_freebsd.o \
5858
		WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_freebsd.o \
5838
		    nsswitch/winbind_nss_linux.o"
5859
		    nsswitch/winbind_nss_linux.o"
5860
		WINBIND_WINS_NSS_EXTRA_OBJS="nsswitch/wins_freebsd.o nsswitch/wins.o"
5839
		WINBIND_NSS="nsswitch/nss_winbind.$SHLIBEXT"
5861
		WINBIND_NSS="nsswitch/nss_winbind.$SHLIBEXT"
5840
		WINBIND_WINS_NSS="nsswitch/nss_wins.$SHLIBEXT"
5862
		WINBIND_WINS_NSS="nsswitch/nss_wins.$SHLIBEXT"
5841
		;;
5863
		;;
Lines 5893-5898 Link Here
5893
AC_SUBST(WINBIND_NSS_LDSHFLAGS)
5915
AC_SUBST(WINBIND_NSS_LDSHFLAGS)
5894
AC_SUBST(WINBIND_NSS_EXTRA_OBJS)
5916
AC_SUBST(WINBIND_NSS_EXTRA_OBJS)
5895
AC_SUBST(WINBIND_NSS_EXTRA_LIBS)
5917
AC_SUBST(WINBIND_NSS_EXTRA_LIBS)
5918
AC_SUBST(WINBIND_WINS_NSS_EXTRA_OBJS)
5919
AC_SUBST(WINBIND_WINS_NSS_EXTRA_LIBS)
5896
AC_SUBST(NSSSONAMEVERSIONSUFFIX)
5920
AC_SUBST(NSSSONAMEVERSIONSUFFIX)
5897
AC_SUBST(PAM_WINBIND_EXTRA_LIBS)
5921
AC_SUBST(PAM_WINBIND_EXTRA_LIBS)
5898
5922
(-)./smbd/aio.c.orig (-1 / +16 lines)
Lines 25-31 Link Here
25
25
26
/* The signal we'll use to signify aio done. */
26
/* The signal we'll use to signify aio done. */
27
#ifndef RT_SIGNAL_AIO
27
#ifndef RT_SIGNAL_AIO
28
#define RT_SIGNAL_AIO (SIGRTMIN+3)
28
#ifndef SIGRTMIN
29
#define SIGRTMIN	NSIG
30
#endif
31
#define RT_SIGNAL_AIO	(SIGRTMIN+3)
32
#endif
33
34
#ifndef HAVE_STRUCT_SIGEVENT_SIGEV_VALUE_SIVAL_PTR
35
#ifdef HAVE_STRUCT_SIGEVENT_SIGEV_VALUE_SIGVAL_PTR
36
#define sival_int	sigval_int
37
#define sival_ptr	sigval_ptr
38
#endif
29
#endif
39
#endif
30
40
31
/****************************************************************************
41
/****************************************************************************
Lines 531-536 Link Here
531
static BOOL handle_aio_completed(struct aio_extra *aio_ex, int *perr)
541
static BOOL handle_aio_completed(struct aio_extra *aio_ex, int *perr)
532
{
542
{
533
	int err;
543
	int err;
544
	
545
	if(!aio_ex) {
546
	        DEBUG(3, ("handle_aio_completed: Non-existing aio_ex passed\n"));
547
		return False;
548
	}
534
549
535
	/* Ensure the operation has really completed. */
550
	/* Ensure the operation has really completed. */
536
	if (SMB_VFS_AIO_ERROR(aio_ex->fsp, &aio_ex->acb) == EINPROGRESS) {
551
	if (SMB_VFS_AIO_ERROR(aio_ex->fsp, &aio_ex->acb) == EINPROGRESS) {

Return to bug 191735