sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-03 04:22:09 +03:00
Code Activity

get rid of the runtime test for broken getgroups() and add a compile

Browse Source 
time test instead. This also allows us to get rid of the igroups
element of a couple of structures.
This commit is contained in:
Andrew Tridgell
-
parent 19aa9a1c95
commit 8b25fe7341
12 changed files with 193 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/acconfig.h
View File

@ -47,3 +47,5 @@
#undef WITH_NISPLUS #undef WITH_NISPLUS
#undef WITH_AUTOMOUNT #undef WITH_AUTOMOUNT
#undef HAVE_PAM_AUTHENTICATE #undef HAVE_PAM_AUTHENTICATE
#undef HAVE_BROKEN_GETGROUPS

111
source/configure vendored
View File

@ -3692,17 +3692,42 @@ fi
fi fi
echo $ac_n "checking for broken getgroups ... $ac_c"
if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
#line 3701 "configure"
#include "confdefs.h"
#include "tests/getgroups.c"
EOF
if { (eval echo configure:3705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
echo yes;cat >> confdefs.h <<\EOF
#define HAVE_BROKEN_GETGROUPS 1
EOF
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -fr conftest*
echo no
fi
rm -fr conftest*
fi
echo $ac_n "checking for root ... $ac_c" echo $ac_n "checking for root ... $ac_c"
if test "$cross_compiling" = yes; then if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3702 "configure" #line 3727 "configure"
#include "confdefs.h" #include "confdefs.h"
main() { exit(getuid() != 0); } main() { exit(getuid() != 0); }
EOF EOF
if { (eval echo configure:3706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null if { (eval echo configure:3731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then then
echo yes;cat >> confdefs.h <<\EOF echo yes;cat >> confdefs.h <<\EOF
#define HAVE_ROOT 1 #define HAVE_ROOT 1
@ -3724,14 +3749,14 @@ if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3728 "configure" #line 3753 "configure"
#include "confdefs.h" #include "confdefs.h"
#define HAVE_NETMASK_IFCONF 1 #define HAVE_NETMASK_IFCONF 1
#define AUTOCONF 1 #define AUTOCONF 1
#include "netmask.c" #include "netmask.c"
EOF EOF
if { (eval echo configure:3735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null if { (eval echo configure:3760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then then
echo yes;netmask=yes;cat >> confdefs.h <<\EOF echo yes;netmask=yes;cat >> confdefs.h <<\EOF
#define HAVE_NETMASK_IFCONF 1 #define HAVE_NETMASK_IFCONF 1
@ -3753,14 +3778,14 @@ if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3757 "configure" #line 3782 "configure"
#include "confdefs.h" #include "confdefs.h"
#define HAVE_NETMASK_IFREQ 1 #define HAVE_NETMASK_IFREQ 1
#define AUTOCONF 1 #define AUTOCONF 1
#include "netmask.c" #include "netmask.c"
EOF EOF
if { (eval echo configure:3764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null if { (eval echo configure:3789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then then
echo yes;netmask=yes;cat >> confdefs.h <<\EOF echo yes;netmask=yes;cat >> confdefs.h <<\EOF
#define HAVE_NETMASK_IFREQ 1 #define HAVE_NETMASK_IFREQ 1
@ -3783,14 +3808,14 @@ if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3787 "configure" #line 3812 "configure"
#include "confdefs.h" #include "confdefs.h"
#define HAVE_NETMASK_AIX 1 #define HAVE_NETMASK_AIX 1
#define AUTOCONF 1 #define AUTOCONF 1
#include "netmask.c" #include "netmask.c"
EOF EOF
if { (eval echo configure:3794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null if { (eval echo configure:3819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then then
echo yes;netmask=yes;cat >> confdefs.h <<\EOF echo yes;netmask=yes;cat >> confdefs.h <<\EOF
#define HAVE_NETMASK_AIX 1 #define HAVE_NETMASK_AIX 1
@ -3812,11 +3837,11 @@ if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3816 "configure" #line 3841 "configure"
#include "confdefs.h" #include "confdefs.h"
#include "tests/trapdoor.c" #include "tests/trapdoor.c"
EOF EOF
if { (eval echo configure:3820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null if { (eval echo configure:3845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then then
echo no echo no
else else
@ -3837,11 +3862,11 @@ if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3841 "configure" #line 3866 "configure"
#include "confdefs.h" #include "confdefs.h"
#include "tests/shared_mmap.c" #include "tests/shared_mmap.c"
EOF EOF
if { (eval echo configure:3845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null if { (eval echo configure:3870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then then
echo yes;cat >> confdefs.h <<\EOF echo yes;cat >> confdefs.h <<\EOF
#define HAVE_SHARED_MMAP 1 #define HAVE_SHARED_MMAP 1
@ -3862,11 +3887,11 @@ if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3866 "configure" #line 3891 "configure"
#include "confdefs.h" #include "confdefs.h"
#include "tests/fcntl_lock.c" #include "tests/fcntl_lock.c"
EOF EOF
if { (eval echo configure:3870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null if { (eval echo configure:3895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then then
echo yes;cat >> confdefs.h <<\EOF echo yes;cat >> confdefs.h <<\EOF
#define HAVE_FCNTL_LOCK 1 #define HAVE_FCNTL_LOCK 1
@ -3887,11 +3912,11 @@ if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3891 "configure" #line 3916 "configure"
#include "confdefs.h" #include "confdefs.h"
#include "tests/sysv_ipc.c" #include "tests/sysv_ipc.c"
EOF EOF
if { (eval echo configure:3895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null if { (eval echo configure:3920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then then
echo yes;cat >> confdefs.h <<\EOF echo yes;cat >> confdefs.h <<\EOF
#define HAVE_SYSV_IPC 1 #define HAVE_SYSV_IPC 1
@ -3910,7 +3935,7 @@ fi
################################################# #################################################
# check for the AFS filesystem # check for the AFS filesystem
echo $ac_n "checking whether to use AFS""... $ac_c" 1>&6 echo $ac_n "checking whether to use AFS""... $ac_c" 1>&6
echo "configure:3914: checking whether to use AFS" >&5 echo "configure:3939: checking whether to use AFS" >&5
# Check whether --with-afs or --without-afs was given. # Check whether --with-afs or --without-afs was given.
if test "${with_afs+set}" = set; then if test "${with_afs+set}" = set; then
withval="$with_afs" withval="$with_afs"
@ -3936,7 +3961,7 @@ fi
################################################# #################################################
# check for the DFS auth system # check for the DFS auth system
echo $ac_n "checking whether to use DFS auth""... $ac_c" 1>&6 echo $ac_n "checking whether to use DFS auth""... $ac_c" 1>&6
echo "configure:3940: checking whether to use DFS auth" >&5 echo "configure:3965: checking whether to use DFS auth" >&5
# Check whether --with-dfs or --without-dfs was given. # Check whether --with-dfs or --without-dfs was given.
if test "${with_dfs+set}" = set; then if test "${with_dfs+set}" = set; then
withval="$with_dfs" withval="$with_dfs"
@ -3961,7 +3986,7 @@ fi
################################################# #################################################
# check for automount support # check for automount support
echo $ac_n "checking whether to use AUTOMOUNT""... $ac_c" 1>&6 echo $ac_n "checking whether to use AUTOMOUNT""... $ac_c" 1>&6
echo "configure:3965: checking whether to use AUTOMOUNT" >&5 echo "configure:3990: checking whether to use AUTOMOUNT" >&5
# Check whether --with-automount or --without-automount was given. # Check whether --with-automount or --without-automount was given.
if test "${with_automount+set}" = set; then if test "${with_automount+set}" = set; then
withval="$with_automount" withval="$with_automount"
@ -3986,7 +4011,7 @@ fi
################################################# #################################################
# check for a LDAP password database # check for a LDAP password database
echo $ac_n "checking whether to use LDAP password database""... $ac_c" 1>&6 echo $ac_n "checking whether to use LDAP password database""... $ac_c" 1>&6
echo "configure:3990: checking whether to use LDAP password database" >&5 echo "configure:4015: checking whether to use LDAP password database" >&5
# Check whether --with-ldap or --without-ldap was given. # Check whether --with-ldap or --without-ldap was given.
if test "${with_ldap+set}" = set; then if test "${with_ldap+set}" = set; then
withval="$with_ldap" withval="$with_ldap"
@ -4011,7 +4036,7 @@ fi
################################################# #################################################
# check for a NISPLUS password database # check for a NISPLUS password database
echo $ac_n "checking whether to use NISPLUS password database""... $ac_c" 1>&6 echo $ac_n "checking whether to use NISPLUS password database""... $ac_c" 1>&6
echo "configure:4015: checking whether to use NISPLUS password database" >&5 echo "configure:4040: checking whether to use NISPLUS password database" >&5
# Check whether --with-nisplus or --without-nisplus was given. # Check whether --with-nisplus or --without-nisplus was given.
if test "${with_nisplus+set}" = set; then if test "${with_nisplus+set}" = set; then
withval="$with_nisplus" withval="$with_nisplus"
@ -4036,7 +4061,7 @@ fi
################################################# #################################################
# check for the secure socket layer # check for the secure socket layer
echo $ac_n "checking whether to use SSL""... $ac_c" 1>&6 echo $ac_n "checking whether to use SSL""... $ac_c" 1>&6
echo "configure:4040: checking whether to use SSL" >&5 echo "configure:4065: checking whether to use SSL" >&5
# Check whether --with-ssl or --without-ssl was given. # Check whether --with-ssl or --without-ssl was given.
if test "${with_ssl+set}" = set; then if test "${with_ssl+set}" = set; then
withval="$with_ssl" withval="$with_ssl"
@ -4061,7 +4086,7 @@ fi
################################################# #################################################
# check for experimental mmap support # check for experimental mmap support
echo $ac_n "checking whether to use MMAP""... $ac_c" 1>&6 echo $ac_n "checking whether to use MMAP""... $ac_c" 1>&6
echo "configure:4065: checking whether to use MMAP" >&5 echo "configure:4090: checking whether to use MMAP" >&5
# Check whether --with-mmap or --without-mmap was given. # Check whether --with-mmap or --without-mmap was given.
if test "${with_mmap+set}" = set; then if test "${with_mmap+set}" = set; then
withval="$with_mmap" withval="$with_mmap"
@ -4086,7 +4111,7 @@ fi
################################################# #################################################
# check for syslog logging # check for syslog logging
echo $ac_n "checking whether to use syslog logging""... $ac_c" 1>&6 echo $ac_n "checking whether to use syslog logging""... $ac_c" 1>&6
echo "configure:4090: checking whether to use syslog logging" >&5 echo "configure:4115: checking whether to use syslog logging" >&5
# Check whether --with-syslog or --without-syslog was given. # Check whether --with-syslog or --without-syslog was given.
if test "${with_syslog+set}" = set; then if test "${with_syslog+set}" = set; then
withval="$with_syslog" withval="$with_syslog"
@ -4112,7 +4137,7 @@ fi
################################################# #################################################
# these tests are taken from the GNU fileutils package # these tests are taken from the GNU fileutils package
echo "checking how to get filesystem space usage" 1>&6 echo "checking how to get filesystem space usage" 1>&6
echo "configure:4116: checking how to get filesystem space usage" >&5 echo "configure:4141: checking how to get filesystem space usage" >&5
space=no space=no
# Perform only the link test since it seems there are no variants of the # Perform only the link test since it seems there are no variants of the
@ -4124,12 +4149,12 @@ space=no
if test $space = no; then if test $space = no; then
# SVR4 # SVR4
echo $ac_n "checking statvfs function (SVR4)""... $ac_c" 1>&6 echo $ac_n "checking statvfs function (SVR4)""... $ac_c" 1>&6
echo "configure:4128: checking statvfs function (SVR4)" >&5 echo "configure:4153: checking statvfs function (SVR4)" >&5
if eval "test \"`echo '$''{'fu_cv_sys_stat_statvfs'+set}'`\" = set"; then if eval "test \"`echo '$''{'fu_cv_sys_stat_statvfs'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 4133 "configure" #line 4158 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/statvfs.h> #include <sys/statvfs.h>
@ -4137,7 +4162,7 @@ int main() {
struct statvfs fsd; statvfs (0, &fsd); struct statvfs fsd; statvfs (0, &fsd);
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:4141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then if { (eval echo configure:4166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest* rm -rf conftest*
fu_cv_sys_stat_statvfs=yes fu_cv_sys_stat_statvfs=yes
else else
@ -4162,7 +4187,7 @@ fi
if test $space = no; then if test $space = no; then
# DEC Alpha running OSF/1 # DEC Alpha running OSF/1
echo $ac_n "checking for 3-argument statfs function (DEC OSF/1)""... $ac_c" 1>&6 echo $ac_n "checking for 3-argument statfs function (DEC OSF/1)""... $ac_c" 1>&6
echo "configure:4166: checking for 3-argument statfs function (DEC OSF/1)" >&5 echo "configure:4191: checking for 3-argument statfs function (DEC OSF/1)" >&5
if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs3_osf1'+set}'`\" = set"; then if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs3_osf1'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -4170,7 +4195,7 @@ else
fu_cv_sys_stat_statfs3_osf1=no fu_cv_sys_stat_statfs3_osf1=no
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 4174 "configure" #line 4199 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <sys/param.h> #include <sys/param.h>
@ -4183,7 +4208,7 @@ else
exit (statfs (".", &fsd, sizeof (struct statfs))); exit (statfs (".", &fsd, sizeof (struct statfs)));
} }
EOF EOF
if { (eval echo configure:4187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null if { (eval echo configure:4212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then then
fu_cv_sys_stat_statfs3_osf1=yes fu_cv_sys_stat_statfs3_osf1=yes
else else
@ -4210,7 +4235,7 @@ fi
if test $space = no; then if test $space = no; then
# AIX # AIX
echo $ac_n "checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)""... $ac_c" 1>&6 echo $ac_n "checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)""... $ac_c" 1>&6
echo "configure:4214: checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)" >&5 echo "configure:4239: checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)" >&5
if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs2_bsize'+set}'`\" = set"; then if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs2_bsize'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -4218,7 +4243,7 @@ else
fu_cv_sys_stat_statfs2_bsize=no fu_cv_sys_stat_statfs2_bsize=no
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 4222 "configure" #line 4247 "configure"
#include "confdefs.h" #include "confdefs.h"
#ifdef HAVE_SYS_PARAM_H #ifdef HAVE_SYS_PARAM_H
@ -4237,7 +4262,7 @@ else
exit (statfs (".", &fsd)); exit (statfs (".", &fsd));
} }
EOF EOF
if { (eval echo configure:4241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null if { (eval echo configure:4266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then then
fu_cv_sys_stat_statfs2_bsize=yes fu_cv_sys_stat_statfs2_bsize=yes
else else
@ -4264,7 +4289,7 @@ fi
if test $space = no; then if test $space = no; then
# SVR3 # SVR3
echo $ac_n "checking for four-argument statfs (AIX-3.2.5, SVR3)""... $ac_c" 1>&6 echo $ac_n "checking for four-argument statfs (AIX-3.2.5, SVR3)""... $ac_c" 1>&6
echo "configure:4268: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5 echo "configure:4293: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5
if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs4'+set}'`\" = set"; then if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs4'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -4272,7 +4297,7 @@ else
fu_cv_sys_stat_statfs4=no fu_cv_sys_stat_statfs4=no
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 4276 "configure" #line 4301 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/statfs.h> #include <sys/statfs.h>
@ -4282,7 +4307,7 @@ else
exit (statfs (".", &fsd, sizeof fsd, 0)); exit (statfs (".", &fsd, sizeof fsd, 0));
} }
EOF EOF
if { (eval echo configure:4286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null if { (eval echo configure:4311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then then
fu_cv_sys_stat_statfs4=yes fu_cv_sys_stat_statfs4=yes
else else
@ -4309,7 +4334,7 @@ fi
if test $space = no; then if test $space = no; then
# 4.4BSD and NetBSD # 4.4BSD and NetBSD
echo $ac_n "checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)""... $ac_c" 1>&6 echo $ac_n "checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)""... $ac_c" 1>&6
echo "configure:4313: checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)" >&5 echo "configure:4338: checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)" >&5
if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs2_fsize'+set}'`\" = set"; then if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs2_fsize'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -4317,7 +4342,7 @@ else
fu_cv_sys_stat_statfs2_fsize=no fu_cv_sys_stat_statfs2_fsize=no
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 4321 "configure" #line 4346 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <sys/types.h> #include <sys/types.h>
#ifdef HAVE_SYS_PARAM_H #ifdef HAVE_SYS_PARAM_H
@ -4333,7 +4358,7 @@ else
exit (statfs (".", &fsd)); exit (statfs (".", &fsd));
} }
EOF EOF
if { (eval echo configure:4337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null if { (eval echo configure:4362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then then
fu_cv_sys_stat_statfs2_fsize=yes fu_cv_sys_stat_statfs2_fsize=yes
else else
@ -4360,7 +4385,7 @@ fi
if test $space = no; then if test $space = no; then
# Ultrix # Ultrix
echo $ac_n "checking for two-argument statfs with struct fs_data (Ultrix)""... $ac_c" 1>&6 echo $ac_n "checking for two-argument statfs with struct fs_data (Ultrix)""... $ac_c" 1>&6
echo "configure:4364: checking for two-argument statfs with struct fs_data (Ultrix)" >&5 echo "configure:4389: checking for two-argument statfs with struct fs_data (Ultrix)" >&5
if eval "test \"`echo '$''{'fu_cv_sys_stat_fs_data'+set}'`\" = set"; then if eval "test \"`echo '$''{'fu_cv_sys_stat_fs_data'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -4368,7 +4393,7 @@ else
fu_cv_sys_stat_fs_data=no fu_cv_sys_stat_fs_data=no
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 4372 "configure" #line 4397 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <sys/types.h> #include <sys/types.h>
#ifdef HAVE_SYS_PARAM_H #ifdef HAVE_SYS_PARAM_H
@ -4388,7 +4413,7 @@ else
exit (statfs (".", &fsd) != 1); exit (statfs (".", &fsd) != 1);
} }
EOF EOF
if { (eval echo configure:4392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null if { (eval echo configure:4417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then then
fu_cv_sys_stat_fs_data=yes fu_cv_sys_stat_fs_data=yes
else else

5
source/configure.in
View File

@ -211,6 +211,11 @@ if test "$ac_cv_lib_socket_connect" = "yes" ||
AC_DEFINE(HAVE_CONNECT) AC_DEFINE(HAVE_CONNECT)
fi]) fi])
echo $ac_n "checking for broken getgroups ... $ac_c"
AC_TRY_RUN([#include "tests/getgroups.c"],
echo yes;AC_DEFINE(HAVE_BROKEN_GETGROUPS),
echo no)
echo $ac_n "checking for root ... $ac_c" echo $ac_n "checking for root ... $ac_c"
AC_TRY_RUN([main() { exit(getuid() != 0); }], AC_TRY_RUN([main() { exit(getuid() != 0); }],

1
source/include/config.h.in
View File

@ -104,6 +104,7 @@
#undef WITH_NISPLUS #undef WITH_NISPLUS
#undef WITH_AUTOMOUNT #undef WITH_AUTOMOUNT
#undef HAVE_PAM_AUTHENTICATE #undef HAVE_PAM_AUTHENTICATE
#undef HAVE_BROKEN_GETGROUPS
/* The number of bytes in a int. */ /* The number of bytes in a int. */
#undef SIZEOF_INT #undef SIZEOF_INT

6
source/include/includes.h
View File

@ -287,6 +287,12 @@ extern char *sys_errlist[];
extern int errno; extern int errno;
#endif #endif
#ifdef HAVE_BROKEN_GETGROUPS
#define GID_T int
#else
#define GID_T gid_t
#endif
/* Lists, trees, caching, datbase... */ /* Lists, trees, caching, datbase... */
#include "ubi_sLinkList.h" #include "ubi_sLinkList.h"

5
source/include/proto.h
View File

@ -1661,8 +1661,7 @@ BOOL last_challenge(unsigned char *challenge);
user_struct *get_valid_user_struct(uint16 vuid); user_struct *get_valid_user_struct(uint16 vuid);
void invalidate_vuid(uint16 vuid); void invalidate_vuid(uint16 vuid);
char *validated_username(uint16 vuid); char *validated_username(uint16 vuid);
int setup_groups(char *user, int uid, int gid, int *p_ngroups, int setup_groups(char *user, int uid, int gid, int *p_ngroups, GID_T **p_groups);
int **p_igroups, gid_t **p_groups);
uint16 register_vuid(int uid,int gid, char *unix_name, char *requested_name, BOOL guest); uint16 register_vuid(int uid,int gid, char *unix_name, char *requested_name, BOOL guest);
void add_session_user(char *user); void add_session_user(char *user);
BOOL update_smbpassword_file( char *user, fstring password); BOOL update_smbpassword_file( char *user, fstring password);
@ -1984,7 +1983,7 @@ void *mem_dup( void *from, int size );
void array_promote(char *array,int elsize,int element); void array_promote(char *array,int elsize,int element);
void set_socket_options(int fd, char *options); void set_socket_options(int fd, char *options);
void close_sockets(void ); void close_sockets(void );
BOOL in_group(gid_t group, int current_gid, int ngroups, int *groups); BOOL in_group(gid_t group, int current_gid, int ngroups, GID_T *groups);
char *StrCpy(char *dest,char *src); char *StrCpy(char *dest,char *src);
char *StrnCpy(char *dest,char *src,int n); char *StrnCpy(char *dest,char *src,int n);
void putip(void *dest,void *src); void putip(void *dest,void *src);

15
source/include/smb.h
View File

@ -386,11 +386,10 @@ struct cli_state {
struct current_user struct current_user
{ {
int cnum, vuid; int cnum, vuid;
int uid, gid; int uid, gid;
int ngroups; int ngroups;
gid_t *groups; GID_T *groups;
int *igroups;
}; };
typedef struct typedef struct
@ -500,8 +499,7 @@ typedef struct
/* This groups info is valid for the user that *opened* the connection */ /* This groups info is valid for the user that *opened* the connection */
int ngroups; int ngroups;
gid_t *groups; GID_T *groups;
int *igroups; /* an integer version - some OSes are broken :-( */
time_t lastused; time_t lastused;
BOOL used; BOOL used;
@ -537,8 +535,7 @@ typedef struct
/* following groups stuff added by ih */ /* following groups stuff added by ih */
/* This groups info is needed for when we become_user() for this uid */ /* This groups info is needed for when we become_user() for this uid */
int n_groups; int n_groups;
gid_t *groups; GID_T *groups;
int *igroups; /* an integer version - some OSes are broken :-( */
int n_sids; int n_sids;
int *sids; int *sids;

14
source/lib/util.c
View File

@ -635,17 +635,17 @@ void close_sockets(void )
/**************************************************************************** /****************************************************************************
determine whether we are in the specified group determine whether we are in the specified group
****************************************************************************/ ****************************************************************************/
BOOL in_group(gid_t group, int current_gid, int ngroups, int *groups) BOOL in_group(gid_t group, int current_gid, int ngroups, GID_T *groups)
{ {
int i; int i;
if (group == current_gid) return(True); if (group == current_gid) return(True);
for (i=0;i<ngroups;i++) for (i=0;i<ngroups;i++)
if (group == groups[i]) if (group == groups[i])
return(True); return(True);
return(False); return(False);
} }
/**************************************************************************** /****************************************************************************

102
source/smbd/password.c
View File

@ -137,14 +137,11 @@ void invalidate_vuid(uint16 vuid)
/* same number of igroups as groups */ /* same number of igroups as groups */
vuser->n_groups = 0; vuser->n_groups = 0;
if (vuser->groups && (vuser->groups != (gid_t *)vuser->igroups)) if (vuser->groups) free(vuser->groups);
free(vuser->groups);
if (vuser->igroups) free(vuser->igroups); if (vuser->sids) free(vuser->sids);
if (vuser->sids ) free(vuser->sids);
vuser->sids = NULL; vuser->sids = NULL;
vuser->igroups = NULL;
vuser->groups = NULL; vuser->groups = NULL;
} }
@ -164,78 +161,41 @@ char *validated_username(uint16 vuid)
/**************************************************************************** /****************************************************************************
Setup the groups a user belongs to. Setup the groups a user belongs to.
****************************************************************************/ ****************************************************************************/
int setup_groups(char *user, int uid, int gid, int *p_ngroups, int setup_groups(char *user, int uid, int gid, int *p_ngroups, GID_T **p_groups)
int **p_igroups, gid_t **p_groups)
{ {
if (-1 == initgroups(user,gid)) int i,ngroups;
{ GID_T *groups;
if (getuid() == 0) GID_T grp = 0;
{
DEBUG(0,("Unable to initgroups!\n")); if (-1 == initgroups(user,gid)) {
if (gid < 0 || gid > 16000 || uid < 0 || uid > 16000) if (getuid() == 0) {
DEBUG(0,("This is probably a problem with the account %s\n",user)); DEBUG(0,("Unable to initgroups!\n"));
if (gid < 0 || gid > 16000 || uid < 0 || uid > 16000) {
DEBUG(0,("This is probably a problem with the account %s\n",
user));
}
}
return -1;
} }
}
else
{
int i,ngroups;
int *igroups;
gid_t grp = 0;
ngroups = getgroups(0,&grp);
if (ngroups <= 0)
ngroups = 32;
igroups = (int *)malloc(sizeof(int)*ngroups);
for (i=0;i<ngroups;i++)
igroups[i] = 0x42424242;
ngroups = getgroups(ngroups,(gid_t *)igroups);
if (igroups[0] == 0x42424242) ngroups = getgroups(0,&grp);
ngroups = 0; if (ngroups <= 0) ngroups = 32;
*p_ngroups = ngroups; groups = (GID_T *)malloc(sizeof(groups[0])*ngroups);
/* The following bit of code is very strange. It is due to the ngroups = getgroups(ngroups,(gid_t *)groups);
fact that some OSes use int* and some use gid_t* for
getgroups, and some (like SunOS) use both, one in prototypes,
and one in man pages and the actual code. Thus we detect it
dynamically using some very ugly code */
if (ngroups > 0)
{
/* does getgroups return ints or gid_t ?? */
static BOOL groups_use_ints = True;
if (groups_use_ints && (*p_ngroups) = ngroups;
ngroups == 1 &&
SVAL(igroups,2) == 0x4242) (*p_groups) = groups;
groups_use_ints = False;
DEBUG(3,("%s is in %d groups\n",user,ngroups));
for (i=0;groups_use_ints && i<ngroups;i++) for (i=0;i<ngroups;i++) {
if (igroups[i] == 0x42424242) DEBUG(3,("%d ",(int)groups[i]));
groups_use_ints = False;
if (groups_use_ints)
{
*p_igroups = igroups;
*p_groups = (gid_t *)igroups;
}
else
{
gid_t *groups = (gid_t *)igroups;
igroups = (int *)malloc(sizeof(int)*ngroups);
for (i=0;i<ngroups;i++)
{
igroups[i] = groups[i];
}
*p_igroups = igroups;
*p_groups = (gid_t *)groups;
}
} }
DEBUG(3,("%s is in %d groups\n",user,ngroups)); DEBUG(3,("\n"));
for (i=0;i<ngroups;i++)
DEBUG(3,("%d ",igroups[i])); return 0;
DEBUG(3,("\n"));
}
return 0;
} }
@ -299,13 +259,11 @@ uint16 register_vuid(int uid,int gid, char *unix_name, char *requested_name, BOO
vuser->n_groups = 0; vuser->n_groups = 0;
vuser->groups = NULL; vuser->groups = NULL;
vuser->igroups = NULL;
/* Find all the groups this uid is in and store them. /* Find all the groups this uid is in and store them.
Used by become_user() */ Used by become_user() */
setup_groups(unix_name,uid,gid, setup_groups(unix_name,uid,gid,
&vuser->n_groups, &vuser->n_groups,
&vuser->igroups,
&vuser->groups); &vuser->groups);
DEBUG(3,("uid %d registered to name %s\n",uid,unix_name)); DEBUG(3,("uid %d registered to name %s\n",uid,unix_name));

12
source/smbd/server.c
View File

@ -206,7 +206,7 @@ int dos_mode(int cnum,char *path,struct stat *sbuf)
((sbuf->st_mode & S_IWUSR) && current_user.uid==sbuf->st_uid) || ((sbuf->st_mode & S_IWUSR) && current_user.uid==sbuf->st_uid) ||
((sbuf->st_mode & S_IWGRP) && ((sbuf->st_mode & S_IWGRP) &&
in_group(sbuf->st_gid,current_user.gid, in_group(sbuf->st_gid,current_user.gid,
current_user.ngroups,current_user.igroups)))) current_user.ngroups,current_user.groups))))
result |= aRONLY; result |= aRONLY;
} else { } else {
if ((sbuf->st_mode & S_IWUSR) == 0) if ((sbuf->st_mode & S_IWUSR) == 0)
@ -356,7 +356,7 @@ int file_utime(int cnum, char *fname, struct utimbuf *times)
((sb.st_mode & S_IWUSR) && current_user.uid==sb.st_uid) || ((sb.st_mode & S_IWUSR) && current_user.uid==sb.st_uid) ||
((sb.st_mode & S_IWGRP) && ((sb.st_mode & S_IWGRP) &&
in_group(sb.st_gid,current_user.gid, in_group(sb.st_gid,current_user.gid,
current_user.ngroups,current_user.igroups)))) { current_user.ngroups,current_user.groups)))) {
/* We are allowed to become root and change the filetime. */ /* We are allowed to become root and change the filetime. */
become_root(False); become_root(False);
ret = sys_utime(fname, times); ret = sys_utime(fname, times);
@ -3567,14 +3567,13 @@ int make_connection(char *service,char *user,char *password, int pwlen, char *de
/* groups stuff added by ih */ /* groups stuff added by ih */
pcon->ngroups = 0; pcon->ngroups = 0;
pcon->igroups = NULL;
pcon->groups = NULL; pcon->groups = NULL;
if (!IS_IPC(cnum)) if (!IS_IPC(cnum))
{ {
/* Find all the groups this uid is in and store them. Used by become_user() */ /* Find all the groups this uid is in and store them. Used by become_user() */
setup_groups(pcon->user,pcon->uid,pcon->gid, setup_groups(pcon->user,pcon->uid,pcon->gid,
&pcon->ngroups,&pcon->igroups,&pcon->groups); &pcon->ngroups,&pcon->groups);
/* check number of connections */ /* check number of connections */
if (!claim_connection(cnum, if (!claim_connection(cnum,
@ -4267,11 +4266,8 @@ void close_cnum(int cnum, uint16 vuid)
num_connections_open--; num_connections_open--;
if (Connections[cnum].ngroups && Connections[cnum].groups) if (Connections[cnum].ngroups && Connections[cnum].groups)
{ {
if (Connections[cnum].igroups != (int *)Connections[cnum].groups) free(Connections[cnum].groups);
free(Connections[cnum].groups);
free(Connections[cnum].igroups);
Connections[cnum].groups = NULL; Connections[cnum].groups = NULL;
Connections[cnum].igroups = NULL;
Connections[cnum].ngroups = 0; Connections[cnum].ngroups = 0;
} }

2
source/smbd/uid.c
View File

@ -242,7 +242,6 @@ BOOL become_user(connection_struct *conn, int cnum, uint16 vuid)
uid = conn->uid; uid = conn->uid;
gid = conn->gid; gid = conn->gid;
current_user.groups = conn->groups; current_user.groups = conn->groups;
current_user.igroups = conn->igroups;
current_user.ngroups = conn->ngroups; current_user.ngroups = conn->ngroups;
} }
else else
@ -258,7 +257,6 @@ BOOL become_user(connection_struct *conn, int cnum, uint16 vuid)
gid = conn->gid; gid = conn->gid;
current_user.ngroups = vuser->n_groups; current_user.ngroups = vuser->n_groups;
current_user.groups = vuser->groups; current_user.groups = vuser->groups;
current_user.igroups = vuser->igroups;
} }
if (initial_uid == 0) if (initial_uid == 0)

62
source/tests/getgroups.c Normal file
View File

@ -0,0 +1,62 @@
/* this tests whether getgroups actually returns lists of integers
rather than gid_t. The test only works if the user running
the test is in at least 1 group
The test is designed to check for those broken OSes that define
getgroups() as returning an array of gid_t but actually return a
array of ints! Ultrix is one culprit
*/
#include <sys/types.h>
#include <stdio.h>
#include <unistd.h>
#include <grp.h>
main()
{
int i;
int *igroups;
char *cgroups;
int grp = 0;
int ngroups = getgroups(0,&grp);
if (sizeof(gid_t) == sizeof(int)) {
fprintf(stderr,"gid_t and int are the same size\n");
exit(1);
}
if (ngroups <= 0)
ngroups = 32;
igroups = (int *)malloc(sizeof(int)*ngroups);
for (i=0;i<ngroups;i++)
igroups[i] = 0x42424242;
ngroups = getgroups(ngroups,(gid_t *)igroups);
if (igroups[0] == 0x42424242)
ngroups = 0;
if (ngroups == 0) {
printf("WARNING: can't determine getgroups return type\n");
exit(1);
}
cgroups = (char *)igroups;
if (ngroups == 1 &&
cgroups[2] == 0x42 && cgroups[3] == 0x42) {
fprintf(stderr,"getgroups returns gid_t\n");
exit(1);
}
for (i=0;i<ngroups;i++) {
if (igroups[i] == 0x42424242) {
fprintf(stderr,"getgroups returns gid_t\n");
exit(1);
}
}
exit(0);
}