[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 12cb6cd s3-build: Remove unused hooks to set smbtorture4 and test
args
from 356f798 auth/credentials Remove debug that prints in normal
operation
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 12cb6cd44a3f2cee73974b9d845178d63b3dbc4b
Author: Andrew Bartlett
Date: Mon Jan 9 13:59:48 2012 +1100
s3-build: Remove unused hooks to set smbtorture4 and test args
These were left around after the selftest.pl script was introduced.
Andrew Bartlett
Autobuild-User: Andrew Bartlett
Autobuild-Date: Mon Jan 9 06:13:21 CET 2012 on sn-devel-104
---
Summary of changes:
source3/Makefile.in |5
source3/configure.in |7 -
source3/m4/check_path.m4 | 58 --
3 files changed, 0 insertions(+), 70 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 2dcb71b..532cd79 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -53,9 +53,6 @@ LMHOSTSFILE=@LMHOSTSFILE@
SMB_PASSWD_FILE=@SMB_PASSWD_FILE@
selftest_prefix=@selftest_prefix@
-selftest_shrdir=@selftest_shrdir@
-smbtorture4_option=@smbtorture4_option@
-selftest_custom_conf=@selftest_custom_conf@
LIBS=@LIBS@
CC=@CC@
@@ -3503,8 +3500,6 @@ test_pam_modules:: pam_modules
## Targets for 'make test'
##
-TEST_EXTRA_ARGS = ${smbtorture4_option} ${selftest_shrdir}
${selftest_custom_conf}
-
valgrindtest:: all torture timelimit
@echo Running Test suite with valgrind
@$(MAKE) test \
diff --git a/source3/configure.in b/source3/configure.in
index e39d439..32561fa 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -7069,13 +7069,6 @@ fi
m4_include(../lib/zlib/zlib.m4)
if test x$smbtorture4_possible = xyes; then
- saved_USESHARED="$USESHARED"
- USESHARED="false"
- smbtorture4_path="bin/smbtorture4"
- smbtorture4_option="-t bin/smbtorture4"
- AC_SUBST(smbtorture4_path)
- AC_SUBST(smbtorture4_option)
- USESHARED="$saved_USESHARED"
SMBTORTURE4="bin/smbtorture4"
AC_SUBST(SMBTORTURE4)
fi
diff --git a/source3/m4/check_path.m4 b/source3/m4/check_path.m4
index be31782..f0b98c9 100644
--- a/source3/m4/check_path.m4
+++ b/source3/m4/check_path.m4
@@ -27,64 +27,6 @@ AC_ARG_WITH(selftest-prefix,
esac
])
-#
-# set shrdir for 'make test'
-selftest_shrdir=""
-AC_SUBST(selftest_shrdir)
-AC_ARG_WITH(selftest-shrdir,
-[AS_HELP_STRING([--with-selftest-shrdir=DIR], [The share directory that make
test will be run against ($selftest_shrdir)])],
-[ case "$withval" in
- yes|no)
-AC_MSG_WARN([--with-selftest-shrdir called without argument - will use
default])
- ;;
- * )
-selftest_shrdir="-s $withval"
-;;
- esac
-])
-
-#
-# set path of samba4's smbtorture
-smbtorture4_path=""
-AC_SUBST(smbtorture4_path)
-smbtorture4_option=""
-AC_SUBST(smbtorture4_option)
-AC_ARG_WITH(smbtorture4_path,
-[AS_HELP_STRING([--with-smbtorture4-path=PATH], [The path to a samba4
smbtorture for make test (none)])],
-[ case "$withval" in
- yes|no)
-AC_MSG_ERROR([--with-smbtorture4-path should take a path])
- ;;
- * )
-smbtorture4_path="$withval"
-if test -z "$smbtorture4_path" -a ! -f $smbtorture4_path; then
- AC_MSG_ERROR(['$smbtorture_path' does not exist!])
-fi
-smbtorture4_option="-t $withval"
- ;;
- esac
-])
-
-#
-# set custom conf for make test
-selftest_custom_conf=""
-AC_SUBST(selftest_custom_conf)
-AC_ARG_WITH(selftest_custom_conf,
-[AS_HELP_STRING([--with-selftest-custom-conf=PATH], [An optional custom
smb.conf that is included in the server smb.conf during make test(none)])],
-[ case "$withval" in
- yes|no)
-AC_MSG_ERROR([--with-selftest-custom-conf should take a path])
- ;;
- * )
-selftest_custom_conf="$withval"
-if test -z "$selftest_custom_conf" -a ! -f $selftest_custom_conf; then
- AC_MSG_ERROR(['$selftest_custom_conf' does not exist!])
-fi
-selftest_custom_conf="-c $withval"
- ;;
- esac
-])
-
## check for --enable-debug first before checking CFLAGS before
## so that we don't mix -O and -g
debug=no
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 356f798 auth/credentials Remove debug that prints in normal operation via 13f5414 s3-libsmb: Do not look up FQDN or use host/ for krb5 encrypted CIFS via c243bd2 s3-sefltest Make krb5 tests contain the word krb5 via 1a41f72 s3-selftst Add encrypted CIFS testing with kerberos via 4b9d52d s3-libsmb: match the rest of Samba3 in kerberos name selection in smb sealing via c017c3e s3-selftest: Add test for smbclient kerberos support via 3192095 s3-build SMBTORTRUE4 variable is unused in make test via bd9309b s3-build SAMBA4SHAREDIR is unused in make test via fbe0275 s3-build: smbtorture4 can be built regardless of use_ads via 1a588df s3-selftest: remove smb4torture_possible and add have_ads_support via cb00b58 s3-selftest Hide smb4torture_possible inside plansmbtorturetestsuite() from eff69aa Add "repack" command to tdbtool. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 356f7989eb7114a5149d777882cf741322f34dfc Author: Andrew Bartlett Date: Mon Jan 9 11:52:54 2012 +1100 auth/credentials Remove debug that prints in normal operation The fact that this function is unimplemented is unimportant to the callers as credential caches are not handled via the auth/credentials code in s3. Andrew Bartlett Autobuild-User: Andrew Bartlett Autobuild-Date: Mon Jan 9 03:24:36 CET 2012 on sn-devel-104 commit 13f5414f93e54b2fad7d2966cd3ddd2e4abb0dc6 Author: Andrew Bartlett Date: Mon Jan 9 11:19:33 2012 +1100 s3-libsmb: Do not look up FQDN or use host/ for krb5 encrypted CIFS This is important, as we want to use exactly the same name and ticket that the libsmb session setup code used, so we do not hit the KDC twice. For the session setup to have succeded using the default 'client use spnego principal = no', the cifs/ principal must exist anyway, so looking for host/ is pointless. The case of 'client use spnego principal = yes' was never supported here. Andrew Bartlett commit c243bd2578026d28abfbb4e8a76fe7f008291466 Author: Andrew Bartlett Date: Mon Jan 9 10:50:14 2012 +1100 s3-sefltest Make krb5 tests contain the word krb5 commit 1a41f728611c283386b41fca5dfadad0aff3c8f5 Author: Andrew Bartlett Date: Mon Jan 9 10:49:49 2012 +1100 s3-selftst Add encrypted CIFS testing with kerberos commit 4b9d52d735ae6bb2be4573441bd15b4291c83c42 Author: Andrew Bartlett Date: Mon Jan 9 10:30:47 2012 +1100 s3-libsmb: match the rest of Samba3 in kerberos name selection in smb sealing This mirrors 860ad734ba77238d187520f72afcbdc1c73d94ef which in turn mirrors the behaviour of the libsmb client code at session setup time. Andrew Bartlett commit c017c3ec8e75106d893fe3b68fca34c75b513830 Author: Andrew Bartlett Date: Mon Jan 9 10:18:37 2012 +1100 s3-selftest: Add test for smbclient kerberos support commit 319209592d25872bc6b05b5fad5666ccc32cdc2a Author: Andrew Bartlett Date: Fri Jan 6 19:16:32 2012 +1100 s3-build SMBTORTRUE4 variable is unused in make test commit bd9309b91c2dd19fbbc8be73732780ee0aaf8095 Author: Andrew Bartlett Date: Fri Jan 6 19:14:33 2012 +1100 s3-build SAMBA4SHAREDIR is unused in make test commit fbe027508464d876602f9e4b12defbe4def63995 Author: Andrew Bartlett Date: Fri Jan 6 19:12:08 2012 +1100 s3-build: smbtorture4 can be built regardless of use_ads commit 1a588dfd1940ae54923d5f7a66276dca2fa08aee Author: Andrew Bartlett Date: Mon Jan 9 09:47:47 2012 +1100 s3-selftest: remove smb4torture_possible and add have_ads_support The smb4torture_possible check has already been hidden in plansmbtorturetestsuite to reduce extra complexity and indentation. The have_ads_support check will allow ADS tests to be run when we do not have the ability to run smbtorture4 Andrew Bartlett commit cb00b58349fbd8c72d1c51e6cacc204c76a70a13 Author: Andrew Bartlett Date: Mon Jan 9 09:26:57 2012 +1100 s3-selftest Hide smb4torture_possible inside plansmbtorturetestsuite() --- Summary of changes: auth/credentials/credentials_samba3.c |1 - source3/Makefile.in |2 - source3/configure.in|4 - source3/libsmb/clifsinfo.c | 46 -- source3/script/tests/test_smbclient_krb5.sh | 21 + source3/selftest/tests.py | 127 +-- 6 files changed, 117 insertions(+), 84 deletions(-) create mode 100755 source3/script/tests/test_smbclient_krb5.sh Changeset truncated at 500 lines: diff --git a/auth/credentials/credentials_samba3.c b/auth/credentials/credentials_samba3.c index 2310825..d742a0a 100644 --- a/auth/credent
autobuild: intermittent test failure detected
The autobuild test system has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey/2012-01-09-0025/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2012-01-09-0025/samba3.stderr http://git.samba.org/autobuild.flakey/2012-01-09-0025/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2012-01-09-0025/samba4.stderr http://git.samba.org/autobuild.flakey/2012-01-09-0025/samba4.stdout The top commit at the time of the failure was: commit eff69aa0f908f5cb44b3cb846c8a4ada874240fa Author: Ira Cooper Date: Fri Jan 6 15:45:06 2012 -0800 Add "repack" command to tdbtool. Autobuild-User: Jeremy Allison Autobuild-Date: Sat Jan 7 02:18:41 CET 2012 on sn-devel-104
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated
via 4e6955a Fix bug #8687 - net memberships usage info is wrong
from 70bbd7a s3-libsmb: Don't duplicate kerberos service tickets.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -
commit 4e6955a05a1813c7a452ad83652ff96b43e21f06
Author: Jeremy Allison
Date: Thu Jan 5 13:54:29 2012 -0800
Fix bug #8687 - net memberships usage info is wrong
Typo in usage.
Autobuild-User: Jeremy Allison
Autobuild-Date: Fri Jan 6 00:30:20 CET 2012 on sn-devel-104
(cherry picked from commit 0453544900ef2ebff7a3c677d4048ef530713b64)
---
Summary of changes:
source3/utils/net_groupmap.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/utils/net_groupmap.c b/source3/utils/net_groupmap.c
index 0d4cddd..44b024e 100644
--- a/source3/utils/net_groupmap.c
+++ b/source3/utils/net_groupmap.c
@@ -823,7 +823,7 @@ static int net_groupmap_memberships(struct net_context *c,
int argc, const char
!string_to_sid(&member, argv[0]) ) {
d_printf("%s\n%s",
_("Usage:"),
-_("net groupmap memberof sid\n"));
+_("net groupmap memberships sid\n"));
return -1;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via 0453544 Fix bug #8687 - net memberships usage info is wrong
from 60cb113 s3-libsmb: Don't duplicate kerberos service tickets.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit 0453544900ef2ebff7a3c677d4048ef530713b64
Author: Jeremy Allison
Date: Thu Jan 5 13:54:29 2012 -0800
Fix bug #8687 - net memberships usage info is wrong
Typo in usage.
Autobuild-User: Jeremy Allison
Autobuild-Date: Fri Jan 6 00:30:20 CET 2012 on sn-devel-104
---
Summary of changes:
source3/utils/net_groupmap.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/utils/net_groupmap.c b/source3/utils/net_groupmap.c
index 943a996..1328874 100644
--- a/source3/utils/net_groupmap.c
+++ b/source3/utils/net_groupmap.c
@@ -823,7 +823,7 @@ static int net_groupmap_memberships(struct net_context *c,
int argc, const char
!string_to_sid(&member, argv[0]) ) {
d_printf("%s\n%s",
_("Usage:"),
-_("net groupmap memberof sid\n"));
+_("net groupmap memberships sid\n"));
return -1;
}
--
Samba Shared Repository
