[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 5776222 s4:auth_sam: allow logons with an empty domain name via 2e49a97 tests/bind.py: Add a bind test with NTLMSSP with no domain via 5c625ea tests/py_creds: Add a SamLogonEx test with an empty string domain via e039e9b s3:cliconnect.c: remove useless ';' via 0786a65 s3:libsmb: allow -U"\administrator" to work from 6a59619 build: fix libceph-common detection https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 57762229da971e837b923f09ca01bad6151f9419 Author: Stefan MetzmacherDate: Tue Jan 9 08:54:11 2018 +0100 s4:auth_sam: allow logons with an empty domain name It turns out that an empty domain name maps to the local SAM. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13206 Signed-off-by: Stefan Metzmacher Reviewed-by: Andrew Bartlett Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Fri Feb 23 04:08:26 CET 2018 on sn-devel-144 commit 2e49a9ebf5bffbeadca03517b4a21bca24c0 Author: Garming Sam Date: Mon Jan 8 16:34:02 2018 +1300 tests/bind.py: Add a bind test with NTLMSSP with no domain Confirmed to pass against Windows 2012 R2. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13206 Signed-off-by: Garming Sam Reviewed-by: Andrew Bartlett Reviewed-by: Stefan Metzmacher commit 5c625eae3f54e8de434de26e9f6a0f2fde557c18 Author: Garming Sam Date: Mon Jan 8 13:36:59 2018 +1300 tests/py_creds: Add a SamLogonEx test with an empty string domain This test passes against 4.6, but failed against 4.7.5 and master. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13206 Signed-off-by: Garming Sam Reviewed-by: Andrew Bartlett Reviewed-by: Stefan Metzmacher commit e039e9b0d2a16b21ace019b028e5c8244486b8a3 Author: Stefan Metzmacher Date: Tue Jan 9 08:57:05 2018 +0100 s3:cliconnect.c: remove useless ';' BUG: https://bugzilla.samba.org/show_bug.cgi?id=13206 Signed-off-by: Stefan Metzmacher Reviewed-by: Andrew Bartlett commit 0786a65cabb92a812cf1c692d0d26914f74a6f87 Author: Stefan Metzmacher Date: Tue Jan 9 08:55:48 2018 +0100 s3:libsmb: allow -U"\\administrator" to work cli_credentials_get_principal() returns NULL in that case. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13206 Signed-off-by: Stefan Metzmacher Reviewed-by: Andrew Bartlett --- Summary of changes: auth/credentials/tests/bind.py | 26 +- python/samba/tests/py_credentials.py | 27 +++ source3/libsmb/cliconnect.c | 9 +++-- source4/auth/ntlm/auth_sam.c | 16 ++-- 4 files changed, 69 insertions(+), 9 deletions(-) Changeset truncated at 500 lines: diff --git a/auth/credentials/tests/bind.py b/auth/credentials/tests/bind.py index 91e493d..4aa4498 100755 --- a/auth/credentials/tests/bind.py +++ b/auth/credentials/tests/bind.py @@ -43,6 +43,7 @@ creds_machine = copy.deepcopy(creds) creds_user1 = copy.deepcopy(creds) creds_user2 = copy.deepcopy(creds) creds_user3 = copy.deepcopy(creds) +creds_user4 = copy.deepcopy(creds) class BindTests(samba.tests.TestCase): @@ -64,7 +65,7 @@ class BindTests(samba.tests.TestCase): self.config_dn = self.info_dc["configurationNamingContext"][0] self.computer_dn = "CN=centos53,CN=Computers,%s" % self.domain_dn self.password = "P@ssw0rd" -self.username = "BindTestUser_" + time.strftime("%s", time.gmtime()) +self.username = "BindTestUser" def tearDown(self): super(BindTests, self).tearDown() @@ -113,6 +114,7 @@ unicodePwd:: """ + base64.b64encode("\"P@ssw0rd\"".encode('utf-16-le')) + """ expression="(samAccountName=%s)" % self.username) self.assertEquals(len(ldb_res), 1) user_dn = ldb_res[0]["dn"] +self.addCleanup(delete_force, self.ldb, user_dn) # do a simple bind and search with the user account in format user@realm creds_user1.set_bind_dn(self.username + "@" + creds.get_realm()) @@ -138,5 +140,27 @@ unicodePwd:: """ + base64.b64encode("\"P@ssw0rd\"".encode('utf-16-le')) + """ lp=lp, ldap_only=True) res = ldb_user3.search(base="", expression="", scope=SCOPE_BASE, attrs=["*"]) +def
autobuild[sn-devel-144]: intermittent test failure detected
The autobuild test system (on sn-devel-144) 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.sn-devel-144/2018-02-23-0242/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey.sn-devel-144/2018-02-23-0242/samba.stderr http://git.samba.org/autobuild.flakey.sn-devel-144/2018-02-23-0242/samba.stdout The top commit at the time of the failure was: commit 6a59619844e0def505a6bfa778c17721c062e0ee Author: Günther DeschnerDate: Mon Jan 15 23:20:39 2018 +0100 build: fix libceph-common detection BUG: https://bugzilla.samba.org/show_bug.cgi?id=13277 Guenther Signed-off-by: Guenther Deschner Reviewed-by: David Disseldorp Autobuild-User(master): Günther Deschner Autobuild-Date(master): Thu Feb 22 19:30:12 CET 2018 on sn-devel-144
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 6a59619 build: fix libceph-common detection from 8c83347 util/rfc1738: update preamble https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 6a59619844e0def505a6bfa778c17721c062e0ee Author: Günther DeschnerDate: Mon Jan 15 23:20:39 2018 +0100 build: fix libceph-common detection BUG: https://bugzilla.samba.org/show_bug.cgi?id=13277 Guenther Signed-off-by: Guenther Deschner Reviewed-by: David Disseldorp Autobuild-User(master): Günther Deschner Autobuild-Date(master): Thu Feb 22 19:30:12 CET 2018 on sn-devel-144 --- Summary of changes: source3/wscript | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/wscript b/source3/wscript index 2deb7ff..e33ecaf 100644 --- a/source3/wscript +++ b/source3/wscript @@ -1526,11 +1526,13 @@ main() { conf.env['CPPPATH_CEPHFS'] = Options.options.libcephfs_dir + '/include' conf.env['LIBPATH_CEPHFS'] = Options.options.libcephfs_dir + '/lib' conf.env['LIBPATH_CEPH-COMMON'] = Options.options.libcephfs_dir + '/lib/ceph' +else: +conf.env['LIBPATH_CEPH-COMMON'] = Options.options.LIBDIR + '/ceph' if (Options.options.with_cephfs and conf.CHECK_HEADERS('cephfs/libcephfs.h', False, False, 'cephfs') and -conf.CHECK_LIB('cephfs', shlib=True) and -conf.CHECK_LIB('ceph-common', shlib=True)): +conf.CHECK_LIB('cephfs', shlib=True)): +conf.CHECK_LIB('ceph-common', shlib=True) if Options.options.with_acl_support: conf.DEFINE('HAVE_CEPH', '1') if conf.CHECK_FUNCS_IN('ceph_statx', 'cephfs ceph-common', -- Samba Shared Repository
[SCM] pam wrapper repository - annotated tag pam_wrapper-1.0.5 created
The annotated tag, pam_wrapper-1.0.5 has been created at 6081dbf88f54d124f210db1b8480a06fc3319067 (tag) tagging b7d0a21b538f05d81582d44e53a4c394e77905e8 (commit) replaces pam_wrapper-1.0.4 tagged by Andreas Schneider on Thu Feb 22 16:47:40 2018 +0100 - Log - pam_wrapper-1.0.5 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEjf9T4Y8qvI2PPJIjfuD8TcwBTj0FAlqO5iIACgkQfuD8TcwB Tj1fMg/+LUxPFbitJcqV0PTjw8JsPSbjOLj6+qdcxK1iM+lWijlksV4qXukOQrZH r6wbSTnUz5ZRWc197vQSx8+JjtHWJk4RVnNXoj29TRhRneBhlVjWliKtpRKZVCPi kHNCgwnGlj3cGVPnxrIYOQ3qQP3drsDOVQbRqNcnD/h2BatTpdMjEydGGQqH7NO3 eRfhQ2dnZwsdZoQqd96xMKj93wxsUsqtfGEv9lc4SX2MXuU0tyZrKAuxyT08Vq7T CsPzHT7/cnkH6mEqjKmK4mhTdaR5vEnibWU4Yl5isrnLn7s4R8ZRL0CeY/WtW+vp AMC7WkgiL55xLUkQWP5re9BkH+YKTFR1I+XwCKrTb6B5ccAjQggZRabPNknG7LRW U513zLAnQcUkIl+0Esn0n3hOZnt/Fds39C/kNZa4Ga5O4Rh01RAsNWv0kK73mJtt l6rnDU1DelvI2gHcRtcMULefoUxPcoY8vGsG6x4OWkV/rDW3ZVcLgAcjXJSNjJee tR2RHxUNIkMiz7e8Yir1wVeE/7EfnHZ2leOowEFmikZl1gxgRS8++dD7rexS9QW7 AUEfiLBo7Wr8A214iBrMXQrVdDi5H9ZbPzoGamC5I8iVCz16zWSQxE7YiEdYtiaC 0mjXw+gZt67naKpNyB8ZD2CwPfnKorrolFCkz6j9qzoFdkPsr94= =cr6W -END PGP SIGNATURE- Andreas Schneider (3): cmake: Improve PAM_WRAPPER_LOACATION cmake: Build python2 and python3 modules if possible Bump version to 1.0.5 Lumir Balhar (1): pypamtest: Fix Python 2.6 compatibility Nikos Mavrogiannopoulos (1): pwrap: Use a more unique name for pamdir Uri Simchoni (3): pam_wrapper: #ifdef-out unused functions pam_wrapper: use uintptr_t as base for const-discarding pam_wrapper: Use a constant string format specifier in test --- -- pam wrapper repository
[SCM] pam wrapper repository - branch master updated
The branch, master has been updated via b7d0a21 Bump version to 1.0.5 via 6bea1e1 pwrap: Use a more unique name for pamdir from 5c36d42 cmake: Build python2 and python3 modules if possible https://git.samba.org/?p=pam_wrapper.git;a=shortlog;h=master - Log - commit b7d0a21b538f05d81582d44e53a4c394e77905e8 Author: Andreas SchneiderDate: Thu Feb 22 15:46:12 2018 +0100 Bump version to 1.0.5 Signed-off-by: Andreas Schneider Reviewed-by: Ralph Boehme commit 6bea1e19edf520985776787c3ba3fcea3ca89faa Author: Nikos Mavrogiannopoulos Date: Mon Feb 19 21:23:23 2018 +0100 pwrap: Use a more unique name for pamdir Parallel builds fail quite predictable when using libpam_wrapper. It seems that the temporary directory used are created sequentially and that caused issues like: PWRAP_ERROR(8157) - pwrap_load_lib_handle: Failed to dlopen library: /tmp/pam.0/lib/libpam.so.0: cannot open shared object file: No such file or directory When a directory was cleaned up, incorrectly. I have not pin-pointed the race condition, but this patch starts from a random letter (using the PID of the process) in the temporary directory name, providing better assurances of uniqueness. Signed-off-by: Nikos Mavrogiannopoulos Reviewed-by: Andreas Schneider Reviewed-by: Ralph Boehme --- Summary of changes: CMakeLists.txt| 6 +++--- ChangeLog | 6 ++ src/pam_wrapper.c | 58 --- 3 files changed, 43 insertions(+), 27 deletions(-) Changeset truncated at 500 lines: diff --git a/CMakeLists.txt b/CMakeLists.txt index af00610..f63ca78 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ set(APPLICATION_NAME ${PROJECT_NAME}) set(APPLICATION_VERSION_MAJOR "1") set(APPLICATION_VERSION_MINOR "0") -set(APPLICATION_VERSION_PATCH "4") +set(APPLICATION_VERSION_PATCH "5") set(APPLICATION_VERSION "${APPLICATION_VERSION_MAJOR}.${APPLICATION_VERSION_MINOR}.${APPLICATION_VERSION_PATCH}") @@ -19,10 +19,10 @@ set(APPLICATION_VERSION "${APPLICATION_VERSION_MAJOR}.${APPLICATION_VERSION_MINO # Increment AGE. Set REVISION to 0 # If the source code was changed, but there were no interface changes: # Increment REVISION. -set(LIBRARY_VERSION "0.0.2") +set(LIBRARY_VERSION "0.0.3") set(LIBRARY_SOVERSION "0") -set(PAMTEST_LIBRARY_VERSION "0.0.2") +set(PAMTEST_LIBRARY_VERSION "0.0.3") set(PAMTEST_LIBRARY_SOVERSION "0") # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked diff --git a/ChangeLog b/ChangeLog index 8440261..7dac77c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ ChangeLog == +version 1.0.5 (released 2018-02-22) + * Added support to build python2 and python3 module at the same time + * Improved pam test directory creating + * Fixed python 2.6 compatibilty + * Fixed some build issues on FreeBSD + version 1.0.4 (released 2017-05-15) * Fix build on OpenBSD * Fix a resource leak diff --git a/src/pam_wrapper.c b/src/pam_wrapper.c index 473df4e..69bd9ca 100644 --- a/src/pam_wrapper.c +++ b/src/pam_wrapper.c @@ -34,6 +34,7 @@ #include #include #include +#include #include @@ -760,13 +761,15 @@ static void pwrap_init(void) char tmp_config_dir[] = "/tmp/pam.X"; size_t len = strlen(tmp_config_dir); const char *env; - uint32_t i; + struct stat sb; int rc; + unsigned i; char pam_library[128] = { 0 }; char libpam_path[1024] = { 0 }; ssize_t ret; FILE *pidfile; char pidfile_path[1024] = { 0 }; + char letter; if (!pam_wrapper_enabled()) { return; @@ -776,33 +779,36 @@ static void pwrap_init(void) return; } - PWRAP_LOG(PWRAP_LOG_DEBUG, "Initialize pam_wrapper"); - - for (i = 0; i < 36; i++) { - struct stat sb; - char c; - - if (i < 10) { - c = (char)(i + 48); - } else { - c = (char)(i + 87); + /* +* The name is selected to match/replace /etc/pam.d +* We start from a random alphanum trying letters until +* an available directory is found. +*/ + letter = 48 + (getpid() % 70); + for (i = 0; i < 127; i++) { + if (isalpha(letter) || isdigit(letter)) { + tmp_config_dir[len - 1] = letter; + + rc = lstat(tmp_config_dir, ); + if (rc == 0) { + PWRAP_LOG(PWRAP_LOG_TRACE, + "Check if
autobuild[sn-devel-144]: intermittent test failure detected
The autobuild test system (on sn-devel-144) 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.sn-devel-144/2018-02-22-1434/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey.sn-devel-144/2018-02-22-1434/samba.stderr http://git.samba.org/autobuild.flakey.sn-devel-144/2018-02-22-1434/samba.stdout The top commit at the time of the failure was: commit 8c833470fc52332c62220ec9cc38c8a4fd7721f1 Author: Douglas BagnallDate: Mon Feb 19 14:24:42 2018 +1300 util/rfc1738: update preamble Signed-off-by: Douglas Bagnall Reviewed-by: Andrew Bartlett Autobuild-User(master): Douglas Bagnall Autobuild-Date(master): Thu Feb 22 06:13:49 CET 2018 on sn-devel-144
[SCM] Socket Wrapper Repository - branch master updated
The branch, master has been updated via f7fc3f5 cmake: Fix checks for attributes from 986684f swrap: Avoid double semicolons in the code https://git.samba.org/?p=socket_wrapper.git;a=shortlog;h=master - Log - commit f7fc3f5294fc4bfc917fe5827594b774be730f4b Author: Andreas SchneiderDate: Thu Feb 22 09:37:40 2018 +0100 cmake: Fix checks for attributes Signed-off-by: Andreas Schneider Reviewed-by: Ralph Boehme --- Summary of changes: ConfigureChecks.cmake | 16 +++- 1 file changed, 11 insertions(+), 5 deletions(-) Changeset truncated at 500 lines: diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index cb2ea92..f06e780 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -42,7 +42,7 @@ if(CMAKE_COMPILER_IS_GNUCC AND NOT MINGW AND NOT OS2) "void __attribute__((visibility(\"default\"))) test() {} int main(void){ return 0; } " WITH_VISIBILITY_HIDDEN) -set(CMAKE_REQUIRED_FLAGS "") +unset(CMAKE_REQUIRED_FLAGS) endif (NOT GNUCC_VERSION EQUAL 34) endif(CMAKE_COMPILER_IS_GNUCC AND NOT MINGW AND NOT OS2) @@ -93,7 +93,7 @@ set(SWRAP_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} CACHE INTERNAL "socket_ check_struct_has_member("struct in_pktinfo" ipi_addr "sys/types.h;sys/socket.h;netinet/in.h" HAVE_STRUCT_IN_PKTINFO) set(CMAKE_REQUIRED_FLAGS -D_GNU_SOURCE) check_struct_has_member("struct in6_pktinfo" ipi6_addr "sys/types.h;sys/socket.h;netinet/in.h" HAVE_STRUCT_IN6_PKTINFO) -set(CMAKE_REQUIRED_FLAGS) +unset(CMAKE_REQUIRED_FLAGS) # STRUCT MEMBERS check_struct_has_member("struct sockaddr" sa_len "sys/types.h;sys/socket.h;netinet/in.h" HAVE_STRUCT_SOCKADDR_SA_LEN) @@ -173,6 +173,11 @@ int main(void) { return 0; }" HAVE_SOCKADDR_STORAGE) +### +# For detecting attributes we need to treat warnings as +# errors +set(CMAKE_REQUIRED_FLAGS "-Werror") + check_c_source_compiles(" void test_constructor_attribute(void) __attribute__ ((constructor)); @@ -238,8 +243,6 @@ int main(void) { return 0; }" HAVE_FUNCTION_ATTRIBUTE_FORMAT) -# If this produces a warning treat it as error! -set(CMAKE_REQUIRED_FLAGS "-Werror") check_c_source_compiles(" void test_address_sanitizer_attribute(void) __attribute__((no_sanitize_address)); @@ -251,7 +254,10 @@ void test_address_sanitizer_attribute(void) int main(void) { return 0; }" HAVE_ADDRESS_SANITIZER_ATTRIBUTE) -set(CMAKE_REQUIRED_FLAGS) + +# Stop treating wanrings as errors +unset(CMAKE_REQUIRED_FLAGS) +### check_library_exists(dl dlopen "" HAVE_LIBDL) if (HAVE_LIBDL) -- Socket Wrapper Repository