Changeset 832
- Timestamp:
- Nov 14, 2013, 4:49:48 PM (12 years ago)
- Location:
- branches/samba-3.5.x
- Files:
-
- 14 edited
-
WHATSNEW.txt (modified) (2 diffs)
-
lib/tdb/common/tdb_private.h (modified) (1 diff)
-
lib/tdb/tools/tdbdump.c (modified) (1 diff)
-
packaging/RHEL-CTDB/samba.spec (modified) (1 diff)
-
packaging/RHEL/makerpms.sh (modified) (1 diff)
-
packaging/RHEL/samba.spec (modified) (1 diff)
-
source3/VERSION (modified) (1 diff)
-
source3/build.cmd (modified) (1 diff)
-
source3/configure (modified) (66 diffs)
-
source3/include/config.h.in (modified) (1 diff)
-
source3/lib/util_tdb.c (modified) (2 diffs)
-
source3/nmbd/nmbd.c (modified) (1 diff)
-
source3/smbd/nttrans.c (modified) (1 diff)
-
source3/torture/torture.c (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/samba-3.5.x/WHATSNEW.txt
r774 r832 1 ============================== 2 Release Notes for Samba 3.5.22 3 August 05, 2013 4 ============================== 5 6 7 This is a security release in order to address 8 CVE-2013-4124 (Missing integer wrap protection in EA list reading can cause 9 server to loop with DOS). 10 11 o CVE-2013-4124: 12 All current released versions of Samba are vulnerable to a denial of 13 service on an authenticated or guest connection. A malformed packet 14 can cause the smbd server to loop the CPU performing memory 15 allocations and preventing any further service. 16 17 A connection to a file share, or a local account is needed to exploit 18 this problem, either authenticated or unauthenticated if guest 19 connections are allowed. 20 21 This flaw is not exploitable beyond causing the code to loop 22 allocating memory, which may cause the machine to exceed memory 23 limits. 24 25 26 Changes since 3.5.21: 27 --------------------- 28 29 o Jeremy Allison <jra@samba.org> 30 * BUG 10010: CVE-2013-4124: Missing integer wrap protection in EA list 31 reading can cause server to loop with DOS. 32 33 34 ###################################################################### 35 Reporting bugs & Development Discussion 36 ####################################### 37 38 Please discuss this release on the samba-technical mailing list or by 39 joining the #samba-technical IRC channel on irc.freenode.net. 40 41 If you do report problems then please try to send high quality 42 feedback. If you don't provide vital information to help us track down 43 the problem then you will probably be ignored. All bug reports should 44 be filed under the Samba 3.5 product in the project's Bugzilla 45 database (https://bugzilla.samba.org/). 46 47 48 ====================================================================== 49 == Our Code, Our Bugs, Our Responsibility. 50 == The Samba Team 51 ====================================================================== 52 53 54 Release notes for older releases follow: 55 ---------------------------------------- 56 1 57 ============================== 2 58 Release Notes for Samba 3.5.21 … … 62 118 63 119 64 Release notes for older releases follow: 65 ---------------------------------------- 120 ---------------------------------------------------------------------- 121 66 122 67 123 ============================== -
branches/samba-3.5.x/lib/tdb/common/tdb_private.h
r657 r832 38 38 #include "tdb.h" 39 39 40 /* #define TDB_TRACE 1 */ 40 #define TDB_TRACE 0 41 41 #ifndef HAVE_GETPAGESIZE 42 42 #define getpagesize() 0x2000 -
branches/samba-3.5.x/lib/tdb/tools/tdbdump.c
r414 r832 56 56 TDB_CONTEXT *tdb; 57 57 TDB_DATA key, value; 58 59 58 tdb = tdb_open(fname, 0, 0, O_RDONLY, 0); 60 59 if (!tdb) { -
branches/samba-3.5.x/packaging/RHEL-CTDB/samba.spec
r774 r832 6 6 Packager: Samba Team <samba@samba.org> 7 7 Name: samba 8 Version: 3.5.2 18 Version: 3.5.22 9 9 Release: 1GITHASH 10 10 Epoch: 0 -
branches/samba-3.5.x/packaging/RHEL/makerpms.sh
r774 r832 21 21 USERID=`id -u` 22 22 GRPID=`id -g` 23 VERSION='3.5.2 1'23 VERSION='3.5.22' 24 24 REVISION='' 25 25 SPECFILE="samba.spec" -
branches/samba-3.5.x/packaging/RHEL/samba.spec
r774 r832 12 12 Packager: Samba Team <samba@samba.org> 13 13 Name: samba 14 Version: 3.5.2 114 Version: 3.5.22 15 15 Release: 1 16 16 Epoch: 0 -
branches/samba-3.5.x/source3/VERSION
r774 r832 26 26 SAMBA_VERSION_MAJOR=3 27 27 SAMBA_VERSION_MINOR=5 28 SAMBA_VERSION_RELEASE=2 128 SAMBA_VERSION_RELEASE=22 29 29 30 30 ######################################################## -
branches/samba-3.5.x/source3/build.cmd
r824 r832 347 347 SetCLFlags: procedure expose cacheFile 348 348 349 call lineout cacheFile, "CFLAGS='-D__EMX__ -DOS2 -D__OS2__ -D__ST_MT_ERRNO__ -O 2-march=pentium -mtune=pentium4'";350 call lineout cacheFile, "CXXFLAGS='-D__EMX__ -DOS2 -D__OS2__ -D__ST_MT_ERRNO__ -O 2-march=pentium -mtune=pentium4'";349 call lineout cacheFile, "CFLAGS='-D__EMX__ -DOS2 -D__OS2__ -D__ST_MT_ERRNO__ -O1 -march=pentium -mtune=pentium4'"; 350 call lineout cacheFile, "CXXFLAGS='-D__EMX__ -DOS2 -D__OS2__ -D__ST_MT_ERRNO__ -O1 -march=pentium -mtune=pentium4'"; 351 351 call lineout cacheFile, "LDFLAGS='-Zmap -Zargs-wild -Zbin-files -Zhigh-mem -D__ST_MT_ERRNO__ -s'"; 352 352 /* address cmd 'SET AR=emxomfar' -
branches/samba-3.5.x/source3/configure
r824 r832 1 1 #! /bin/sh 2 2 # Guess values for system-dependent variables and create Makefiles. 3 # Generated by GNU Autoconf 2.6 8for Samba 3.3 # Generated by GNU Autoconf 2.69 for Samba 3. 4 4 # 5 5 # Report bugs to <samba-technical@samba.org>. 6 6 # 7 7 # 8 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 9 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software 10 # Foundation, Inc. 8 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. 11 9 # 12 10 # … … 137 135 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH 138 136 137 # Use a proper internal environment variable to ensure we don't fall 138 # into an infinite loop, continuously re-executing ourselves. 139 if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then 140 _as_can_reexec=no; export _as_can_reexec; 141 # We cannot yet assume a decent shell, so we have to provide a 142 # neutralization value for shells without unset; and this also 143 # works around shells that cannot unset nonexistent variables. 144 # Preserve -v and -x to the replacement shell. 145 BASH_ENV=/dev/null 146 ENV=/dev/null 147 (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV 148 case $- in # (((( 149 *v*x* | *x*v* ) as_opts=-vx ;; 150 *v* ) as_opts=-v ;; 151 *x* ) as_opts=-x ;; 152 * ) as_opts= ;; 153 esac 154 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} 155 # Admittedly, this is quite paranoid, since all the known shells bail 156 # out after a failed `exec'. 157 $as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 158 as_fn_exit 255 159 fi 160 # We don't want this to propagate to other subprocesses. 161 { _as_can_reexec=; unset _as_can_reexec;} 139 162 if test "x$CONFIG_SHELL" = x; then 140 163 as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : … … 170 193 exitcode=1; echo positional parameters were not saved. 171 194 fi 172 test x\$exitcode = x0 || exit 1" 195 test x\$exitcode = x0 || exit 1 196 test -x / || exit 1" 173 197 as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO 174 198 as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO … … 215 239 216 240 if test "x$CONFIG_SHELL" != x; then : 217 # We cannot yet assume a decent shell, so we have to provide a 218 # neutralization value for shells without unset; and this also 219 # works around shells that cannot unset nonexistent variables. 220 # Preserve -v and -x to the replacement shell. 221 BASH_ENV=/dev/null 222 ENV=/dev/null 223 (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV 224 export CONFIG_SHELL 225 case $- in # (((( 226 *v*x* | *x*v* ) as_opts=-vx ;; 227 *v* ) as_opts=-v ;; 228 *x* ) as_opts=-x ;; 229 * ) as_opts= ;; 230 esac 231 exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} 241 export CONFIG_SHELL 242 # We cannot yet assume a decent shell, so we have to provide a 243 # neutralization value for shells without unset; and this also 244 # works around shells that cannot unset nonexistent variables. 245 # Preserve -v and -x to the replacement shell. 246 BASH_ENV=/dev/null 247 ENV=/dev/null 248 (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV 249 case $- in # (((( 250 *v*x* | *x*v* ) as_opts=-vx ;; 251 *v* ) as_opts=-v ;; 252 *x* ) as_opts=-x ;; 253 * ) as_opts= ;; 254 esac 255 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} 256 # Admittedly, this is quite paranoid, since all the known shells bail 257 # out after a failed `exec'. 258 $as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 259 exit 255 232 260 fi 233 261 … … 332 360 333 361 } # as_fn_mkdir_p 362 363 # as_fn_executable_p FILE 364 # ----------------------- 365 # Test if FILE is an executable regular file. 366 as_fn_executable_p () 367 { 368 test -f "$1" && test -x "$1" 369 } # as_fn_executable_p 334 370 # as_fn_append VAR VALUE 335 371 # ---------------------- … … 453 489 { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } 454 490 491 # If we had to re-execute with $CONFIG_SHELL, we're ensured to have 492 # already done that, so ensure we don't try to do so again and fall 493 # in an infinite loop. This has already happened in practice. 494 _as_can_reexec=no; export _as_can_reexec 455 495 # Don't try to exec as it changes $[0], causing all sort of problems 456 496 # (the dirname of $[0] is not the place where we might find the … … 487 527 # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. 488 528 # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. 489 # In both cases, we have to default to `cp -p '.529 # In both cases, we have to default to `cp -pR'. 490 530 ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || 491 as_ln_s='cp -p '531 as_ln_s='cp -pR' 492 532 elif ln conf$$.file conf$$ 2>/dev/null; then 493 533 as_ln_s=ln 494 534 else 495 as_ln_s='cp -p '535 as_ln_s='cp -pR' 496 536 fi 497 537 else 498 as_ln_s='cp -p '538 as_ln_s='cp -pR' 499 539 fi 500 540 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file … … 508 548 fi 509 549 510 if test -x / >/dev/null 2>&1; then 511 as_test_x='test -x' 512 else 513 if ls -dL / >/dev/null 2>&1; then 514 as_ls_L_option=L 515 else 516 as_ls_L_option= 517 fi 518 as_test_x=' 519 eval sh -c '\'' 520 if test -d "$1"; then 521 test -d "$1/."; 522 else 523 case $1 in #( 524 -*)set "./$1";; 525 esac; 526 case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( 527 ???[sx]*):;;*)false;;esac;fi 528 '\'' sh 529 ' 530 fi 531 as_executable_p=$as_test_x 550 as_test_x='test -x' 551 as_executable_p=as_fn_executable_p 532 552 533 553 # Sed expression to map a string onto a valid CPP name. … … 1498 1518 if test "x$build_alias" = x; then 1499 1519 cross_compiling=maybe 1500 $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.1501 If a cross compiler is detected then cross compile mode will be used" >&21502 1520 elif test "x$build_alias" != "x$host_alias"; then 1503 1521 cross_compiling=yes … … 1896 1914 cat <<\_ACEOF 1897 1915 Samba configure 3 1898 generated by GNU Autoconf 2.6 81899 1900 Copyright (C) 201 0Free Software Foundation, Inc.1916 generated by GNU Autoconf 2.69 1917 1918 Copyright (C) 2012 Free Software Foundation, Inc. 1901 1919 This configure script is free software; the Free Software Foundation 1902 1920 gives unlimited permission to copy, distribute and modify it. … … 2175 2193 } && test -s conftest$ac_exeext && { 2176 2194 test "$cross_compiling" = yes || 2177 $as_test_x conftest$ac_exeext2195 test -x conftest$ac_exeext 2178 2196 }; then : 2179 2197 ac_retval=0 … … 2265 2283 { 2266 2284 static int test_array [1 - 2 * !(($2) >= 0)]; 2267 test_array [0] = 0 2285 test_array [0] = 0; 2286 return test_array [0]; 2268 2287 2269 2288 ; … … 2281 2300 { 2282 2301 static int test_array [1 - 2 * !(($2) <= $ac_mid)]; 2283 test_array [0] = 0 2302 test_array [0] = 0; 2303 return test_array [0]; 2284 2304 2285 2305 ; … … 2307 2327 { 2308 2328 static int test_array [1 - 2 * !(($2) < 0)]; 2309 test_array [0] = 0 2329 test_array [0] = 0; 2330 return test_array [0]; 2310 2331 2311 2332 ; … … 2323 2344 { 2324 2345 static int test_array [1 - 2 * !(($2) >= $ac_mid)]; 2325 test_array [0] = 0 2346 test_array [0] = 0; 2347 return test_array [0]; 2326 2348 2327 2349 ; … … 2357 2379 { 2358 2380 static int test_array [1 - 2 * !(($2) <= $ac_mid)]; 2359 test_array [0] = 0 2381 test_array [0] = 0; 2382 return test_array [0]; 2360 2383 2361 2384 ; … … 2600 2623 2601 2624 It was created by Samba $as_me 3, which was 2602 generated by GNU Autoconf 2.6 8. Invocation command line was2625 generated by GNU Autoconf 2.69. Invocation command line was 2603 2626 2604 2627 $ $0 $@ … … 3764 3787 test -z "$as_dir" && as_dir=. 3765 3788 for ac_exec_ext in '' $ac_executable_extensions; do 3766 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then3789 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 3767 3790 ac_cv_prog_CC="${ac_tool_prefix}gcc" 3768 3791 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 3804 3827 test -z "$as_dir" && as_dir=. 3805 3828 for ac_exec_ext in '' $ac_executable_extensions; do 3806 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then3829 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 3807 3830 ac_cv_prog_ac_ct_CC="gcc" 3808 3831 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 3857 3880 test -z "$as_dir" && as_dir=. 3858 3881 for ac_exec_ext in '' $ac_executable_extensions; do 3859 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then3882 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 3860 3883 ac_cv_prog_CC="${ac_tool_prefix}cc" 3861 3884 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 3898 3921 test -z "$as_dir" && as_dir=. 3899 3922 for ac_exec_ext in '' $ac_executable_extensions; do 3900 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then3923 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 3901 3924 if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then 3902 3925 ac_prog_rejected=yes … … 3956 3979 test -z "$as_dir" && as_dir=. 3957 3980 for ac_exec_ext in '' $ac_executable_extensions; do 3958 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then3981 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 3959 3982 ac_cv_prog_CC="$ac_tool_prefix$ac_prog" 3960 3983 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 4000 4023 test -z "$as_dir" && as_dir=. 4001 4024 for ac_exec_ext in '' $ac_executable_extensions; do 4002 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then4025 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 4003 4026 ac_cv_prog_ac_ct_CC="$ac_prog" 4004 4027 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 4446 4469 #include <stdarg.h> 4447 4470 #include <stdio.h> 4448 #include <sys/types.h> 4449 #include <sys/stat.h> 4471 struct stat; 4450 4472 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ 4451 4473 struct buf { int x; }; … … 4681 4703 } 4682 4704 _ACEOF 4683 for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 - xc99=all-qlanglvl=extc994705 for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99 4684 4706 do 4685 4707 CC="$ac_save_CC $ac_arg" … … 4876 4898 for ac_exec_ext in '' $ac_executable_extensions; do 4877 4899 ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" 4878 { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; }|| continue4900 as_fn_executable_p "$ac_path_GREP" || continue 4879 4901 # Check for GNU ac_path_GREP and select it if it is found. 4880 4902 # Check for GNU $ac_path_GREP … … 4942 4964 for ac_exec_ext in '' $ac_executable_extensions; do 4943 4965 ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" 4944 { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; }|| continue4966 as_fn_executable_p "$ac_path_EGREP" || continue 4945 4967 # Check for GNU ac_path_EGREP and select it if it is found. 4946 4968 # Check for GNU $ac_path_EGREP … … 5149 5171 /* end confdefs.h. */ 5150 5172 5151 # 5152 5173 # define __EXTENSIONS__ 1 5174 $ac_includes_default 5153 5175 int 5154 5176 main () … … 5637 5659 for ac_prog in ginstall scoinst install; do 5638 5660 for ac_exec_ext in '' $ac_executable_extensions; do 5639 if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then5661 if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then 5640 5662 if test $ac_prog = install && 5641 5663 grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then … … 5956 5978 rm -rf conftest* 5957 5979 fi 5980 5981 5958 5982 fi 5959 5983 … … 6987 7011 test -z "$as_dir" && as_dir=. 6988 7012 for ac_exec_ext in '' $ac_executable_extensions; do 6989 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then7013 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6990 7014 ac_cv_prog_AWK="$ac_prog" 6991 7015 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 7038 7062 test -z "$as_dir" && as_dir=. 7039 7063 for ac_exec_ext in '' $ac_executable_extensions; do 7040 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then7064 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 7041 7065 ac_cv_path_MAKE="$as_dir/$ac_word$ac_exec_ext" 7042 7066 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 7116 7140 test -z "$as_dir" && as_dir=. 7117 7141 for ac_exec_ext in '' $ac_executable_extensions; do 7118 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then7142 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 7119 7143 ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" 7120 7144 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 7159 7183 test -z "$as_dir" && as_dir=. 7160 7184 for ac_exec_ext in '' $ac_executable_extensions; do 7161 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then7185 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 7162 7186 ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" 7163 7187 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 7214 7238 test -z "$as_dir" && as_dir=. 7215 7239 for ac_exec_ext in '' $ac_executable_extensions; do 7216 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then7240 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 7217 7241 ac_cv_prog_AR="${ac_tool_prefix}ar" 7218 7242 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 7254 7278 test -z "$as_dir" && as_dir=. 7255 7279 for ac_exec_ext in '' $ac_executable_extensions; do 7256 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then7280 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 7257 7281 ac_cv_prog_ac_ct_AR="ar" 7258 7282 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 13335 13359 main () 13336 13360 { 13337 /* FIXME: Include the comments suggested by Paul. */ 13361 13338 13362 #ifndef __cplusplus 13339 /* Ultrix mips cc rejects this . */13363 /* Ultrix mips cc rejects this sort of thing. */ 13340 13364 typedef int charset[2]; 13341 const charset cs ;13365 const charset cs = { 0, 0 }; 13342 13366 /* SunOS 4.1.1 cc rejects this. */ 13343 13367 char const *const *pcpcc; … … 13356 13380 ppc = (char**) pcpcc; 13357 13381 pcpcc = (char const *const *) ppc; 13358 { /* SCO 3.2v4 cc rejects this. */ 13359 char *t; 13382 { /* SCO 3.2v4 cc rejects this sort of thing. */ 13383 char tx; 13384 char *t = &tx; 13360 13385 char const *s = 0 ? (char *) 0 : (char const *) 0; 13361 13386 … … 13373 13398 ++p; 13374 13399 } 13375 { /* AIX XL C 1.02.0.0 rejects this s aying13400 { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying 13376 13401 "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ 13377 struct s { int j; const int *ap[3]; } ;13378 struct s *b ; b->j = 5;13402 struct s { int j; const int *ap[3]; } bx; 13403 struct s *b = &bx; b->j = 5; 13379 13404 } 13380 13405 { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ … … 13682 13707 { 13683 13708 static int test_array [1 - 2 * !(((char) -1) < 0)]; 13684 test_array [0] = 0 13709 test_array [0] = 0; 13710 return test_array [0]; 13685 13711 13686 13712 ; … … 13908 13934 test -z "$as_dir" && as_dir=. 13909 13935 for ac_exec_ext in '' $ac_executable_extensions; do 13910 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then13936 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 13911 13937 ac_cv_path_CUPS_CONFIG="$as_dir/$ac_word$ac_exec_ext" 13912 13938 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 18214 18240 test -z "$as_dir" && as_dir=. 18215 18241 for ac_exec_ext in '' $ac_executable_extensions; do 18216 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then18242 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 18217 18243 ac_cv_prog_ROFF="groff -etpsR -Tascii -man" 18218 18244 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 18710 18736 test -z "$as_dir" && as_dir=. 18711 18737 for ac_exec_ext in '' $ac_executable_extensions; do 18712 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then18738 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 18713 18739 ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" 18714 18740 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 18753 18779 test -z "$as_dir" && as_dir=. 18754 18780 for ac_exec_ext in '' $ac_executable_extensions; do 18755 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then18781 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 18756 18782 ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" 18757 18783 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 24851 24877 test -z "$as_dir" && as_dir=. 24852 24878 for ac_exec_ext in '' $ac_executable_extensions; do 24853 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then24879 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 24854 24880 ac_cv_path_KRB5CONFIG="$as_dir/$ac_word$ac_exec_ext" 24855 24881 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 39129 39155 test -z "$as_dir" && as_dir=. 39130 39156 for ac_exec_ext in '' $ac_executable_extensions; do 39131 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then39157 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 39132 39158 ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" 39133 39159 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 39173 39199 test -z "$as_dir" && as_dir=. 39174 39200 for ac_exec_ext in '' $ac_executable_extensions; do 39175 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then39201 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 39176 39202 ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" 39177 39203 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 39225 39251 test -z "$as_dir" && as_dir=. 39226 39252 for ac_exec_ext in '' $ac_executable_extensions; do 39227 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then39253 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 39228 39254 ac_cv_path_PYTHON_CONFIG="$as_dir/$ac_word$ac_exec_ext" 39229 39255 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 39269 39295 test -z "$as_dir" && as_dir=. 39270 39296 for ac_exec_ext in '' $ac_executable_extensions; do 39271 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then39297 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 39272 39298 ac_cv_path_PYTHON_CONFIG="$as_dir/$ac_word$ac_exec_ext" 39273 39299 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 39592 39618 test -z "$as_dir" && as_dir=. 39593 39619 for ac_exec_ext in '' $ac_executable_extensions; do 39594 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then39620 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 39595 39621 ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" 39596 39622 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 39636 39662 test -z "$as_dir" && as_dir=. 39637 39663 for ac_exec_ext in '' $ac_executable_extensions; do 39638 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then39664 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 39639 39665 ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" 39640 39666 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 39688 39714 test -z "$as_dir" && as_dir=. 39689 39715 for ac_exec_ext in '' $ac_executable_extensions; do 39690 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then39716 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 39691 39717 ac_cv_path_PYTHON_CONFIG="$as_dir/$ac_word$ac_exec_ext" 39692 39718 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 39732 39758 test -z "$as_dir" && as_dir=. 39733 39759 for ac_exec_ext in '' $ac_executable_extensions; do 39734 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then39760 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 39735 39761 ac_cv_path_PYTHON_CONFIG="$as_dir/$ac_word$ac_exec_ext" 39736 39762 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 42058 42084 test -z "$as_dir" && as_dir=. 42059 42085 for ac_exec_ext in '' $ac_executable_extensions; do 42060 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then42086 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 42061 42087 ac_cv_prog_LEX="$ac_prog" 42062 42088 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 42090 42116 c { yymore (); } 42091 42117 d { yyless (1); } 42092 e { yyless (input () != 0); } 42118 e { /* IRIX 6.5 flex 2.5.4 underquotes its yyless argument. */ 42119 yyless ((input () != 0)); } 42093 42120 f { unput (yytext[0]); } 42094 42121 . { BEGIN INITIAL; } … … 42231 42258 test -z "$as_dir" && as_dir=. 42232 42259 for ac_exec_ext in '' $ac_executable_extensions; do 42233 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then42260 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 42234 42261 ac_cv_prog_YACC="$ac_prog" 42235 42262 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 44128 44155 test -z "$as_dir" && as_dir=. 44129 44156 for ac_exec_ext in '' $ac_executable_extensions; do 44130 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then44157 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 44131 44158 ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" 44132 44159 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 44310 44337 test -z "$as_dir" && as_dir=. 44311 44338 for ac_exec_ext in '' $ac_executable_extensions; do 44312 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then44339 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 44313 44340 ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" 44314 44341 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 44615 44642 test -z "$as_dir" && as_dir=. 44616 44643 for ac_exec_ext in '' $ac_executable_extensions; do 44617 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then44644 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 44618 44645 ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" 44619 44646 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 44892 44919 test -z "$as_dir" && as_dir=. 44893 44920 for ac_exec_ext in '' $ac_executable_extensions; do 44894 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then44921 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 44895 44922 ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" 44896 44923 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 45310 45337 test -z "$as_dir" && as_dir=. 45311 45338 for ac_exec_ext in '' $ac_executable_extensions; do 45312 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then45339 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 45313 45340 ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" 45314 45341 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 48175 48202 # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. 48176 48203 # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. 48177 # In both cases, we have to default to `cp -p '.48204 # In both cases, we have to default to `cp -pR'. 48178 48205 ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || 48179 as_ln_s='cp -p '48206 as_ln_s='cp -pR' 48180 48207 elif ln conf$$.file conf$$ 2>/dev/null; then 48181 48208 as_ln_s=ln 48182 48209 else 48183 as_ln_s='cp -p '48210 as_ln_s='cp -pR' 48184 48211 fi 48185 48212 else 48186 as_ln_s='cp -p '48213 as_ln_s='cp -pR' 48187 48214 fi 48188 48215 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file … … 48244 48271 fi 48245 48272 48246 if test -x / >/dev/null 2>&1; then 48247 as_test_x='test -x' 48248 else 48249 if ls -dL / >/dev/null 2>&1; then 48250 as_ls_L_option=L 48251 else 48252 as_ls_L_option= 48253 fi 48254 as_test_x=' 48255 eval sh -c '\'' 48256 if test -d "$1"; then 48257 test -d "$1/."; 48258 else 48259 case $1 in #( 48260 -*)set "./$1";; 48261 esac; 48262 case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( 48263 ???[sx]*):;;*)false;;esac;fi 48264 '\'' sh 48265 ' 48266 fi 48267 as_executable_p=$as_test_x 48273 48274 # as_fn_executable_p FILE 48275 # ----------------------- 48276 # Test if FILE is an executable regular file. 48277 as_fn_executable_p () 48278 { 48279 test -f "$1" && test -x "$1" 48280 } # as_fn_executable_p 48281 as_test_x='test -x' 48282 as_executable_p=as_fn_executable_p 48268 48283 48269 48284 # Sed expression to map a string onto a valid CPP name. … … 48287 48302 ac_log=" 48288 48303 This file was extended by Samba $as_me 3, which was 48289 generated by GNU Autoconf 2.6 8. Invocation command line was48304 generated by GNU Autoconf 2.69. Invocation command line was 48290 48305 48291 48306 CONFIG_FILES = $CONFIG_FILES … … 48353 48368 ac_cs_version="\\ 48354 48369 Samba config.status 3 48355 configured by $0, generated by GNU Autoconf 2.6 8,48370 configured by $0, generated by GNU Autoconf 2.69, 48356 48371 with options \\"\$ac_cs_config\\" 48357 48372 48358 Copyright (C) 201 0Free Software Foundation, Inc.48373 Copyright (C) 2012 Free Software Foundation, Inc. 48359 48374 This config.status script is free software; the Free Software Foundation 48360 48375 gives unlimited permission to copy, distribute and modify it." … … 48446 48461 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 48447 48462 if \$ac_cs_recheck; then 48448 set X '$SHELL''$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion48463 set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion 48449 48464 shift 48450 48465 \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 -
branches/samba-3.5.x/source3/include/config.h.in
r773 r832 3356 3356 #undef YYTEXT_POINTER 3357 3357 3358 /* Enable large inode numbers on Mac OS X 10.5. */ 3359 #ifndef _DARWIN_USE_64_BIT_INODE 3360 # define _DARWIN_USE_64_BIT_INODE 1 3361 #endif 3362 3358 3363 /* File offset bits */ 3359 3364 #undef _FILE_OFFSET_BITS -
branches/samba-3.5.x/source3/lib/util_tdb.c
r414 r832 223 223 va_list ap; 224 224 size_t len1, len2; 225 225 226 226 va_start(ap, fmt); 227 227 len1 = tdb_pack_va(NULL, 0, fmt, ap); … … 635 635 { 636 636 int ret; 637 637 638 if (t1.dptr == NULL && t2.dptr != NULL) { 638 639 return -1; -
branches/samba-3.5.x/source3/nmbd/nmbd.c
r778 r832 792 792 793 793 #ifdef __OS2__ 794 794 global_Sem32Add = 1; 795 795 #endif 796 796 -
branches/samba-3.5.x/source3/smbd/nttrans.c
r736 r832 935 935 break; 936 936 } 937 938 /* Integer wrap protection for the increment. */ 939 if (offset + next_offset < offset) { 940 break; 941 } 942 937 943 offset += next_offset; 944 945 /* Integer wrap protection for while loop. */ 946 if (offset + 4 < offset) { 947 break; 948 } 949 938 950 } 939 951 -
branches/samba-3.5.x/source3/torture/torture.c
r795 r832 2272 2272 { 2273 2273 struct cli_state *cli1; 2274 const char *fname = " \\lockt9.lck";2274 const char *fname = "//lockt9.lck"; 2275 2275 uint16_t fnum; 2276 2276 bool correct = False; … … 2327 2327 if (!NT_STATUS_IS_OK(status)) { 2328 2328 d_fprintf(stderr, "cli_open returned %s\n", cli_errstr(cli1)); 2329 d_fprintf(stderr, "cli_open returned %s file: %s\n", cli_errstr(cli1), fname); 2329 2330 return false; 2330 2331 }
Note:
See TracChangeset
for help on using the changeset viewer.
