mirror of
https://github.com/samba-team/samba.git
synced 2025-03-24 10:50:22 +03:00
Merge from HEAD:
- heimdal updates to configure - make DEBUG() const - add testsuite for: - preexec - preexec close - valid users - fix testsuite for 'invalid users' Andrew Bartlett (This used to be commit aa41fb8703db4a4ecd3b353874c99a994e8ed630)
This commit is contained in:
Andrew Bartlett
parent
ed3d7fd7b5
commit
4b117b8917
6
source3/configure
vendored
6
source3/configure
vendored
@ -6229,7 +6229,7 @@ _ACEOF
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
|
||||
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
egrep -v '^ *\+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
@ -20516,8 +20516,8 @@ if test x$FOUND_KRB5 = x"no"; then
|
||||
echo "$as_me:$LINENO: checking for /usr/include/heimdal" >&5
|
||||
echo $ECHO_N "checking for /usr/include/heimdal... $ECHO_C" >&6
|
||||
if test -d /usr/include/heimdal; then
|
||||
CFLAGS="$CFLAGS -I/usr/heimdal/include"
|
||||
CPPFLAGS="$CPPFLAGS -I/usr/heimdal/include"
|
||||
CFLAGS="$CFLAGS -I/usr/include/heimdal"
|
||||
CPPFLAGS="$CPPFLAGS -I/usr/include/heimdal"
|
||||
echo "$as_me:$LINENO: result: yes" >&5
|
||||
echo "${ECHO_T}yes" >&6
|
||||
else
|
||||
|
||||
@ -1993,8 +1993,8 @@ if test x$FOUND_KRB5 = x"no"; then
|
||||
# see if this box has the SuSE location for the heimdal kerberos implementation
|
||||
AC_MSG_CHECKING(for /usr/include/heimdal)
|
||||
if test -d /usr/include/heimdal; then
|
||||
CFLAGS="$CFLAGS -I/usr/heimdal/include"
|
||||
CPPFLAGS="$CPPFLAGS -I/usr/heimdal/include"
|
||||
CFLAGS="$CFLAGS -I/usr/include/heimdal"
|
||||
CPPFLAGS="$CPPFLAGS -I/usr/include/heimdal"
|
||||
AC_MSG_RESULT(yes)
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
|
||||
@ -36,9 +36,9 @@
|
||||
arguemnts to DEBUG() right. We have got them wrong too often in the
|
||||
past.
|
||||
*/
|
||||
int Debug1( char *, ... ) PRINTF_ATTRIBUTE(1,2);
|
||||
BOOL dbgtext( char *, ... ) PRINTF_ATTRIBUTE(1,2);
|
||||
BOOL dbghdr( int level, char *file, char *func, int line );
|
||||
int Debug1( const char *, ... ) PRINTF_ATTRIBUTE(1,2);
|
||||
BOOL dbgtext( const char *, ... ) PRINTF_ATTRIBUTE(1,2);
|
||||
BOOL dbghdr( int level, const char *file, const char *func, int line );
|
||||
|
||||
extern XFILE *dbf;
|
||||
extern pstring debugf;
|
||||
|
||||
@ -702,7 +702,7 @@ void check_log_size( void )
|
||||
* This is called by dbghdr() and format_debug_text().
|
||||
* ************************************************************************** **
|
||||
*/
|
||||
int Debug1( char *format_str, ... )
|
||||
int Debug1( const char *format_str, ... )
|
||||
{
|
||||
va_list ap;
|
||||
int old_errno = errno;
|
||||
@ -897,7 +897,7 @@ void dbgflush( void )
|
||||
* ************************************************************************** **
|
||||
*/
|
||||
|
||||
BOOL dbghdr( int level, char *file, char *func, int line )
|
||||
BOOL dbghdr( int level, const char *file, const char *func, int line )
|
||||
{
|
||||
/* Ensure we don't lose any real errno value. */
|
||||
int old_errno = errno;
|
||||
@ -967,7 +967,7 @@ BOOL dbghdr( int level, char *file, char *func, int line )
|
||||
*
|
||||
* ************************************************************************** **
|
||||
*/
|
||||
BOOL dbgtext( char *format_str, ... )
|
||||
BOOL dbgtext( const char *format_str, ... )
|
||||
{
|
||||
va_list ap;
|
||||
pstring msgbuf;
|
||||
|
||||
@ -6,3 +6,5 @@ security="invalidusers"
|
||||
|
||||
(test_listfilesauth_should_deny $security) || exit 1
|
||||
|
||||
security="validusers"
|
||||
(test_listfilesauth $security) || exit 1
|
||||
|
||||
@ -21,14 +21,18 @@
|
||||
# directory when testing. Some of them take a -c parameter, but tpot
|
||||
# says it's not done consistently.
|
||||
|
||||
template_smb_conf_setup() {
|
||||
cat basicsmb.smb.conf$1.template | \
|
||||
template_setup() {
|
||||
cat $1.template | \
|
||||
sed "s|PREFIX|$prefix|g" | \
|
||||
sed "s|BUILD_FARM|$test_root|g" | \
|
||||
sed "s|WHOAMI|$whoami|g" | \
|
||||
sed "s|LOGLEVEL|$loglevel|g" \
|
||||
> $prefix/lib/smb.conf$1
|
||||
echo "template_smb_conf_setup: Created $prefix/lib/smb.conf$1"
|
||||
> $prefix/$2
|
||||
echo "template_setup: Created $prefix/$2"
|
||||
}
|
||||
|
||||
template_smb_conf_setup() {
|
||||
template_setup "basicsmb.smb.conf$1" "lib/smb.conf$1"
|
||||
}
|
||||
|
||||
test_smb_conf_setup() {
|
||||
@ -50,7 +54,13 @@ test_smb_conf_setup() {
|
||||
|
||||
template_smb_conf_setup
|
||||
template_smb_conf_setup .hostsequiv
|
||||
template_smb_conf_setup .validusers
|
||||
template_smb_conf_setup .invalidusers
|
||||
template_smb_conf_setup .preexec
|
||||
template_smb_conf_setup .preexec_close
|
||||
template_smb_conf_setup .preexec_cl_fail
|
||||
|
||||
template_setup preexec lib/preexec
|
||||
|
||||
echo "127.0.0.1 localhost">$prefix/lib/lmhosts
|
||||
echo "127.0.0.2 BUILDFARM">>$prefix/lib/lmhosts
|
||||
@ -59,6 +69,12 @@ test_smb_conf_setup() {
|
||||
echo "127.0.0.5 SERVER">>$prefix/lib/lmhosts
|
||||
echo "127.0.0.6 DOMAIN">>$prefix/lib/lmhosts
|
||||
echo "127.0.0.7 HOSTSEQUIV">>$prefix/lib/lmhosts
|
||||
echo "127.0.0.7 VALIDUSERS">>$prefix/lib/lmhosts
|
||||
echo "127.0.0.7 INVALIDUSERS">>$prefix/lib/lmhosts
|
||||
echo "127.0.0.7 PREEXEC">>$prefix/lib/lmhosts
|
||||
echo "127.0.0.7 PREEXEC_CLOSE">>$prefix/lib/lmhosts
|
||||
echo "127.0.0.7 PREEXEC_CL_FAIL">>$prefix/lib/lmhosts
|
||||
|
||||
|
||||
echo "127.0.0.1" > $prefix/lib/hosts.equiv
|
||||
|
||||
|
||||
@ -3,6 +3,7 @@ basicsmb-sharesec basicsmb-usersec \
|
||||
basicsmb-serversec basicsmb-domainsec basicsmb-domainsec-nt4 \
|
||||
basicsmb-shareguest basicsmb-hostsequiv basicsmb-invalidusers \
|
||||
basicsmb-hostsdeny basicsmb-remote-pass-change \
|
||||
basicsmb-preexec \
|
||||
torture-FDPASS torture-LOCK1 torture-LOCK2 \
|
||||
torture-LOCK3 torture-LOCK4 torture-LOCK5 \
|
||||
torture-UNLINK torture-BROWSE torture-ATTR \
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user