[SCM] NSS Wrapper Repository - branch master updated
The branch, master has been updated
via e7e1cf3 Update README.
via b711455 cmake: Add cmake config mode file.
via 3f4070e cmake: Add pkgconfig file.
from 6cf4553 nwrap: Fix fd checks.
http://gitweb.samba.org/?p=nss_wrapper.git;a=shortlog;h=master
- Log -
commit e7e1cf368958d20b8174e035e9faca8be291341e
Author: Andreas Schneider a...@samba.org
Date: Wed Jan 22 10:33:06 2014 +0100
Update README.
commit b711455f25980f0e8bc6049c9f800d3fdbeac20a
Author: Andreas Schneider a...@samba.org
Date: Wed Jan 22 10:29:07 2014 +0100
cmake: Add cmake config mode file.
commit 3f4070e7d15528e785fe11de8ca62ba56613f059
Author: Andreas Schneider a...@samba.org
Date: Wed Jan 22 10:28:11 2014 +0100
cmake: Add pkgconfig file.
---
Summary of changes:
CMakeLists.txt | 22
README | 47 +--
nss_wrapper-config-version.cmake.in | 11
nss_wrapper.pc.cmake|3 ++
4 files changed, 75 insertions(+), 8 deletions(-)
create mode 100644 nss_wrapper-config-version.cmake.in
create mode 100644 nss_wrapper.pc.cmake
Changeset truncated at 500 lines:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e8b0ad0..8359849 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,6 +56,28 @@ install(
DESTINATION
${BIN_INSTALL_DIR})
+# pkg-config file
+configure_file(nss_wrapper.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/nss_wrapper.pc
@ONLY)
+install(
+ FILES
+${CMAKE_CURRENT_BINARY_DIR}/nss_wrapper.pc
+ DESTINATION
+${LIB_INSTALL_DIR}/pkgconfig
+ COMPONENT
+pkgconfig
+)
+
+# cmake config files
+configure_file(nss_wrapper-config-version.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/nss_wrapper-config-version.cmake @ONLY)
+install(
+FILES
+${CMAKE_CURRENT_BINARY_DIR}/nss_wrapper-config-version.cmake
+DESTINATION
+${CMAKE_INSTALL_DIR}
+COMPONENT
+devel
+)
+
if (UNIT_TESTING)
find_package(CMocka REQUIRED)
include(AddCMockaTest)
diff --git a/README b/README
index 53646c7..3edef91 100644
--- a/README
+++ b/README
@@ -1,19 +1,50 @@
NSS wrapper library
-This is a wrapper for the user, group and hosts NSS API allowing the use of
-other data sources.
+There are projects which provide daemons needing to be able to create, modify
+and delete unix users. Or just switch user ids to interact with the system e.g.
+a user space file server. To be able to test that you need the privilege to
+modify the passwd and groups file. With nss_wrapper it is possible to define
+your own passwd and groups file which will be used by software to act correctly
+while under test.
-To be able to use it you need to set the following environment variables:
+If you have a client and server under test they normally use functions to
+resolve network names to addresses (dns) or vice versa. The nss_wrappers allow
+you to create a hosts file to setup name resolution for the addresses you use
+with socket_wrapper.
+
+The first environment variable you need to set is:
LD_PRELOAD=libnss_wrapper.so
-NSS_WRAPPER_PASSWD=/path/to/your/passwd
-NSS_WRAPPER_GROUP=/path/to/your/group
+
+For user and group accounts you need to create two files: 'passwd' and 'group'.
+The format of the passwd file is described in 'man 5 passwd' and the group file
+in 'man 5 group'. So you can fill these files with made up accounts. You point
+nss_wrapper to them using the two variables:
+
+NSS_WRAPPER_PASSWD=/path/to/your/passwd and
+NSS_WRAPPER_GROUP=/path/to/your/group.
+
+If you also need to emulate network name resolution in your enviornment,
+especially with socket_wrapper, you can write a hosts file. The format is
+described in 'man 5 hosts'. Then you can point nss_wrapper to your hosts
+file using:
NSS_WRAPPER_HOSTS=/path/to/your/hosts
+If you need to return a hostname which is different from the one of your
+machine is using you can use:
+
NSS_WRAPPER_HOSTNAME=test.example.org
-You can either enable user and group resolving or only hosts. If you don't know
-how the passwd file should look like, please read 'man 5 passwd', for the
-groups file 'man 5 group' and for hosts 'man 5 hosts'.
+If you have a project which also provides user and group information out of a
+database, you normally write your own nss modules. nss_wrapper is able to load
+nss modules and ask them first before looking into the faked passwd and group
+file. To point nss_wrapper to the module you can do that using
+
+NSS_WRAPPER_MODULE_SO_PATH=/path/to/libnss_yourmodule.so
+
+As each nss module has a special prefix like _nss_winbind_getpwnam() you need
+to set the prefix too so nss_wrapper can load the functions with:
+
+NSS_WRAPPER_MODULE_FN_NAME=prefix
diff --git a/nss_wrapper-config-version.cmake.in
[SCM] NSS Wrapper Repository - branch master updated
The branch, master has been updated
via 3f164d2 cmake: Update DefineInstallationPaths.cmake.
from e7e1cf3 Update README.
http://gitweb.samba.org/?p=nss_wrapper.git;a=shortlog;h=master
- Log -
commit 3f164d209a727508b259037328b85060e6f4843e
Author: Andreas Schneider a...@samba.org
Date: Wed Jan 22 10:33:40 2014 +0100
cmake: Update DefineInstallationPaths.cmake.
---
Summary of changes:
cmake/Modules/DefineInstallationPaths.cmake | 29 +++---
1 files changed, 17 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/cmake/Modules/DefineInstallationPaths.cmake
b/cmake/Modules/DefineInstallationPaths.cmake
index d857871..88e08ca 100644
--- a/cmake/Modules/DefineInstallationPaths.cmake
+++ b/cmake/Modules/DefineInstallationPaths.cmake
@@ -1,15 +1,4 @@
-if (WIN32)
- # Same same
- set(BIN_INSTALL_DIR bin CACHE PATH -)
- set(SBIN_INSTALL_DIR . CACHE PATH -)
- set(LIB_INSTALL_DIR lib CACHE PATH -)
- set(INCLUDE_INSTALL_DIR include CACHE PATH -)
- set(PLUGIN_INSTALL_DIR plugins CACHE PATH -)
- set(HTML_INSTALL_DIR doc/HTML CACHE PATH -)
- set(ICON_INSTALL_DIR . CACHE PATH -)
- set(SOUND_INSTALL_DIR . CACHE PATH -)
- set(LOCALE_INSTALL_DIR lang CACHE PATH -)
-elseif (UNIX OR OS2)
+if (UNIX OR OS2)
IF (NOT APPLICATION_NAME)
MESSAGE(STATUS ${PROJECT_NAME} is used as APPLICATION_NAME)
SET(APPLICATION_NAME ${PROJECT_NAME})
@@ -58,6 +47,10 @@ elseif (UNIX OR OS2)
CACHE PATH The subdirectory to the header prefix (default prefix/include)
)
+ set(CMAKE_INSTALL_DIR
+${LIB_INSTALL_DIR}/cmake
+CACHE PATH The subdirectory to install cmake config files)
+
SET(DATA_INSTALL_DIR
${DATA_INSTALL_PREFIX}
CACHE PATH The parent directory where applications can install their data
(default prefix/share/${APPLICATION_NAME})
@@ -101,4 +94,16 @@ elseif (UNIX OR OS2)
${SHARE_INSTALL_PREFIX}/info
CACHE PATH The ${APPLICATION_NAME} info install dir (default prefix/info)
)
+else()
+ # Same same
+ set(BIN_INSTALL_DIR bin CACHE PATH -)
+ set(SBIN_INSTALL_DIR sbin CACHE PATH -)
+ set(LIB_INSTALL_DIR lib${LIB_SUFFIX} CACHE PATH -)
+ set(INCLUDE_INSTALL_DIR include CACHE PATH -)
+ set(CMAKE_INSTALL_DIR CMake CACHE PATH -)
+ set(PLUGIN_INSTALL_DIR plugins CACHE PATH -)
+ set(HTML_INSTALL_DIR doc/HTML CACHE PATH -)
+ set(ICON_INSTALL_DIR icons CACHE PATH -)
+ set(SOUND_INSTALL_DIR soudns CACHE PATH -)
+ set(LOCALE_INSTALL_DIR lang CACHE PATH -)
endif ()
--
NSS Wrapper Repository
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/2014-01-22-1545/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2014-01-22-1545/samba3.stderr http://git.samba.org/autobuild.flakey/2014-01-22-1545/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2014-01-22-1545/samba.stderr http://git.samba.org/autobuild.flakey/2014-01-22-1545/samba.stdout The top commit at the time of the failure was: commit c427b29be915483eb23791b80b8df265715798d1 Author: Volker Lendecke v...@samba.org Date: Mon Jan 20 10:56:16 2014 +0100 messaging3: Remove unused messaging_tdb_event Signed-off-by: Volker Lendecke v...@samba.org Reviewed-by: Jeremy Allison j...@samba.org Autobuild-User(master): Volker Lendecke v...@samba.org Autobuild-Date(master): Tue Jan 21 10:07:21 CET 2014 on sn-devel-104
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 38f8788 s4:torture/rpc: add invalidAuthenticate2
via 25fb73f s4:rpc_server/netlogon: return a zero return_authenticator
and rid on error
via dcc2c83 s3:rpc_server/netlogon: return a zero return_authenticator
on error
via b8fdeb8 libcli/auth: reject computer_name longer than 15 chars
via 387ed2e libcli/auth: don't alter the computer_name in cluster mode.
via 8cf4eff s3:rpc_client: use db_open() to open
netlogon_creds_cli.tdb
via ece3ba1 libcli/auth: add netlogon_creds_cli_set_global_db()
from c427b29 messaging3: Remove unused messaging_tdb_event
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 38f8788d6bf7fac509dcf492214a66a8bb3ac3fc
Author: Stefan Metzmacher me...@samba.org
Date: Fri Jan 10 12:19:08 2014 +0100
s4:torture/rpc: add invalidAuthenticate2
This add 'rpc.netlogon.netlogon.invalidAuthenticate2' as new test
it demonstrates the STATUS_BUFFER_OVERFLOW on computer names
larger than 15 characters.
Signed-off-by: Stefan Metzmacher me...@samba.org
Reviewed-by: Andrew Bartlett abart...@samba.org
Autobuild-User(master): Stefan Metzmacher me...@samba.org
Autobuild-Date(master): Wed Jan 22 19:07:12 CET 2014 on sn-devel-104
commit 25fb73f2821821630dde4cc263794e754ca03d68
Author: Stefan Metzmacher me...@samba.org
Date: Sat Jan 11 17:13:04 2014 +0100
s4:rpc_server/netlogon: return a zero return_authenticator and rid on error
Signed-off-by: Stefan Metzmacher me...@samba.org
Reviewed-by: Andrew Bartlett abart...@samba.org
commit dcc2c8362df9af088613722ebd8a6261fb098a5c
Author: Stefan Metzmacher me...@samba.org
Date: Sat Jan 11 17:13:04 2014 +0100
s3:rpc_server/netlogon: return a zero return_authenticator on error
Signed-off-by: Stefan Metzmacher me...@samba.org
Reviewed-by: Andrew Bartlett abart...@samba.org
commit b8fdeb8ca7ce362058bb86a4e58b34fb6340867e
Author: Stefan Metzmacher me...@samba.org
Date: Fri Jan 10 13:13:40 2014 +0100
libcli/auth: reject computer_name longer than 15 chars
This matches Windows, it seems they use a fixed size field to store
netlogon_creds_CredentialState.
Signed-off-by: Stefan Metzmacher me...@samba.org
Reviewed-by: Andrew Bartlett abart...@samba.org
commit 387ed2e15df085274f72cebda341040a1e767a4b
Author: Stefan Metzmacher me...@samba.org
Date: Fri Jan 17 14:08:59 2014 +0100
libcli/auth: don't alter the computer_name in cluster mode.
This breaks NTLMv2 authentication.
Signed-off-by: Stefan Metzmacher me...@samba.org
Reviewed-by: Andrew Bartlett abart...@samba.org
commit 8cf4eff201aa9e1ba8127311bcfc2a357fb4ef03
Author: Stefan Metzmacher me...@samba.org
Date: Fri Jan 17 14:07:37 2014 +0100
s3:rpc_client: use db_open() to open netlogon_creds_cli.tdb
This uses dbwrap_ctdb if running in a cluster.
Signed-off-by: Stefan Metzmacher me...@samba.org
Reviewed-by: Andrew Bartlett abart...@samba.org
commit ece3ba10a16138a75b207a0cf9fe299759253d99
Author: Stefan Metzmacher me...@samba.org
Date: Fri Jan 17 14:00:27 2014 +0100
libcli/auth: add netlogon_creds_cli_set_global_db()
This can be used to inject a db_context from dbwrap_ctdb.
Signed-off-by: Stefan Metzmacher me...@samba.org
Reviewed-by: Andrew Bartlett abart...@samba.org
---
Summary of changes:
libcli/auth/netlogon_creds_cli.c | 32 -
libcli/auth/netlogon_creds_cli.h |2 +
libcli/auth/schannel_state_tdb.c |8 ++
source3/rpc_client/cli_netlogon.c | 38 ++-
source3/rpc_server/netlogon/srv_netlog_nt.c |1 +
source4/rpc_server/netlogon/dcerpc_netlogon.c | 12 ++-
source4/torture/rpc/netlogon.c| 88 +
7 files changed, 142 insertions(+), 39 deletions(-)
Changeset truncated at 500 lines:
diff --git a/libcli/auth/netlogon_creds_cli.c b/libcli/auth/netlogon_creds_cli.c
index 51b30a1..88893ad 100644
--- a/libcli/auth/netlogon_creds_cli.c
+++ b/libcli/auth/netlogon_creds_cli.c
@@ -199,6 +199,16 @@ static NTSTATUS netlogon_creds_cli_context_common(
static struct db_context *netlogon_creds_cli_global_db;
+NTSTATUS netlogon_creds_cli_set_global_db(struct db_context **db)
+{
+ if (netlogon_creds_cli_global_db != NULL) {
+ return NT_STATUS_INVALID_PARAMETER_MIX;
+ }
+
+ netlogon_creds_cli_global_db = talloc_move(talloc_autofree_context(),
db);
+ return NT_STATUS_OK;
+}
+
NTSTATUS netlogon_creds_cli_open_global_db(struct loadparm_context *lp_ctx)
{
char *fname;
@@ -251,28 +261,12 @@ NTSTATUS netlogon_creds_cli_context_global(struct
loadparm_context *lp_ctx,
bool seal_secure_channel = true;
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 0f347e4 log winbind version (when requested) in winbindd log
from 38f8788 s4:torture/rpc: add invalidAuthenticate2
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 0f347e44e2447e9c03a694198adad6be1fa9dd6c
Author: Noel Power noel.po...@suse.com
Date: Wed Jan 22 12:49:44 2014 +
log winbind version (when requested) in winbindd log
winbindd currently only logs the INTERFACE version request,
it would be useful to additionally have the version returned
in the log also.
Signed-off-by: Noel Power noel.po...@suse.com
Reviewed-by: Jim McDonough j...@samba.org
Reviewed-by: David Disseldorp dd...@samba.org
Autobuild-User(master): David Disseldorp dd...@samba.org
Autobuild-Date(master): Wed Jan 22 21:57:04 CET 2014 on sn-devel-104
---
Summary of changes:
source3/winbindd/winbindd_misc.c |4 ++--
source4/winbind/wb_samba3_cmd.c |2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/winbindd_misc.c b/source3/winbindd/winbindd_misc.c
index 29d6a26..fa4907c 100644
--- a/source3/winbindd/winbindd_misc.c
+++ b/source3/winbindd/winbindd_misc.c
@@ -391,8 +391,8 @@ void winbindd_info(struct winbindd_cli_state *state)
void winbindd_interface_version(struct winbindd_cli_state *state)
{
- DEBUG(3, ([%5lu]: request interface version\n,
- (unsigned long)state-pid));
+ DEBUG(3, ([%5lu]: request interface version (version = %d)\n,
+ (unsigned long)state-pid, WINBIND_INTERFACE_VERSION));
state-response-data.interface_version = WINBIND_INTERFACE_VERSION;
request_ok(state);
diff --git a/source4/winbind/wb_samba3_cmd.c b/source4/winbind/wb_samba3_cmd.c
index 091e93e..9ec3c4b 100644
--- a/source4/winbind/wb_samba3_cmd.c
+++ b/source4/winbind/wb_samba3_cmd.c
@@ -182,6 +182,8 @@ static void wbsrv_samba3_async_epilogue(NTSTATUS status,
NTSTATUS wbsrv_samba3_interface_version(struct wbsrv_samba3_call *s3call)
{
+ DEBUG(3, (request interface version (version = %d)\n,
WINBIND_INTERFACE_VERSION));
+
s3call-response-result= WINBINDD_OK;
s3call-response-data.interface_version=
WINBIND_INTERFACE_VERSION;
return NT_STATUS_OK;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via b04e8b7 s3: ldap client can return NT_STATUS_OK when an error
occurs in a paged search.
from 0f347e4 log winbind version (when requested) in winbindd log
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit b04e8b7557b82a4b96cf74db04742fb017edb3ba
Author: Daniel Liberman dliber...@lenovoemc.com
Date: Tue Jan 21 16:25:41 2014 -0800
s3: ldap client can return NT_STATUS_OK when an error occurs in a paged
search.
Inside ads_do_search_all_args(), if the first call to
ads_do_paged_search_args()
fails, the proper error status is returned.
But, if the execution is already inside the loop to get all the accounts
doing
several calls to ads_do_paged_search_args(), and one of these calls times
out,
the status returned is from the *first* call, so success. This causes
net_ads_search() to interpret the return from ads_do_search_retry() as
success and print all the accounts returned, but it’s only a subset.
Also ensure we free previously returned results on error
in subsequent fetches.
https://bugzilla.samba.org/show_bug.cgi?id=10387
Reviewed-by: Jeremy Allison j...@samba.org
Reviewed-by: Richard Sharpe realrichardsha...@gmail.com
Autobuild-User(master): Jeremy Allison j...@samba.org
Autobuild-Date(master): Thu Jan 23 01:40:54 CET 2014 on sn-devel-104
---
Summary of changes:
source3/libads/ldap.c | 11 +++
1 files changed, 7 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index 12aacd4..10ac8fc 100644
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -1140,13 +1140,16 @@ static ADS_STATUS ads_do_paged_search(ADS_STRUCT *ads,
const char *bind_path,
#ifdef HAVE_LDAP_ADD_RESULT_ENTRY
while (cookie) {
LDAPMessage *res2 = NULL;
- ADS_STATUS status2;
LDAPMessage *msg, *next;
- status2 = ads_do_paged_search_args(ads, bind_path, scope, expr,
+ status = ads_do_paged_search_args(ads, bind_path, scope, expr,
attrs, args, res2, count,
cookie);
-
- if (!ADS_ERR_OK(status2)) break;
+ if (!ADS_ERR_OK(status)) {
+ /* Ensure we free all collected results */
+ ads_msgfree(ads, *res);
+ *res = NULL;
+ break;
+ }
/* this relies on the way that ldap_add_result_entry() works
internally. I hope
that this works on all ldap libs, but I have only tested
with openldap */
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 7638f52 s3: Don't open the dir for stat/attr/acl related mask
from b04e8b7 s3: ldap client can return NT_STATUS_OK when an error
occurs in a paged search.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 7638f521456f1c7e615591dff4c403902cd4ddac
Author: Abhidnya Joshi achir...@in.ibm.com
Date: Wed Jan 22 17:02:15 2014 -0800
s3: Don't open the dir for stat/attr/acl related mask
Signed-off-by: Abhidnya Joshi achir...@in.ibm.com
Reviewed-by: Jeremy Allison j...@samba.org
Reviewed-by: Christof Schmitt c...@samba.org
Autobuild-User(master): Jeremy Allison j...@samba.org
Autobuild-Date(master): Thu Jan 23 03:56:35 CET 2014 on sn-devel-104
---
Summary of changes:
source3/smbd/open.c | 31 +--
1 files changed, 21 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 200c1ce..cce8be2 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -3211,19 +3211,30 @@ static NTSTATUS open_directory(connection_struct *conn,
*/
ZERO_STRUCT(mtimespec);
+ if (access_mask (FILE_LIST_DIRECTORY|
+ FILE_ADD_FILE|
+ FILE_ADD_SUBDIRECTORY|
+ FILE_TRAVERSE|
+ DELETE_ACCESS|
+ FILE_DELETE_CHILD)) {
#ifdef O_DIRECTORY
- status = fd_open(conn, fsp, O_RDONLY|O_DIRECTORY, 0);
+ status = fd_open(conn, fsp, O_RDONLY|O_DIRECTORY, 0);
#else
- /* POSIX allows us to open a directory with O_RDONLY. */
- status = fd_open(conn, fsp, O_RDONLY, 0);
+ /* POSIX allows us to open a directory with O_RDONLY. */
+ status = fd_open(conn, fsp, O_RDONLY, 0);
#endif
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG(5, (open_directory: Could not open fd for
- %s (%s)\n,
- smb_fname_str_dbg(smb_dname),
- nt_errstr(status)));
- file_free(req, fsp);
- return status;
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(5, (open_directory: Could not open fd for
+ %s (%s)\n,
+ smb_fname_str_dbg(smb_dname),
+ nt_errstr(status)));
+ file_free(req, fsp);
+ return status;
+ }
+ } else {
+ fsp-fh-fd = -1;
+ DEBUG(10, (Not opening Directory %s\n,
+ smb_fname_str_dbg(smb_dname)));
}
status = vfs_stat_fsp(fsp);
--
Samba Shared Repository
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 9c3d6e3 Revert Add --without-gettext to restore Samba build on hpisgr8 via 5cdf707 Revert Add --without-gettext to restore Samba build on SerNET-Tru64 via 454aa72 Revert Add --without-gettext to restore Samba build on SerNet-IRIX from adce933 sernet-imini: remove gettext hack again http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 9c3d6e37243297ff0d54a83f33a5a406cb942e8d Author: Christian Ambach a...@samba.org Date: Fri Jan 3 06:50:13 2014 +0100 Revert Add --without-gettext to restore Samba build on hpisgr8 This reverts commit 43b5c253e71bb83362c89942017b46ec53af. commit 5cdf70784fd8bff43e3bc2bf236219adb9b29272 Author: Christian Ambach a...@samba.org Date: Fri Jan 3 06:47:58 2014 +0100 Revert Add --without-gettext to restore Samba build on SerNET-Tru64 This reverts commit c90aa48f0112f4c40f00357c1dc96e463004c5e7. commit 454aa729d7a1a5b2f06b345a1dafde34763df7e9 Author: Christian Ambach a...@samba.org Date: Fri Jan 3 06:44:22 2014 +0100 Revert Add --without-gettext to restore Samba build on SerNet-IRIX This reverts commit e037a38d69bf7dd6e6d23600438ec2cf2a501f33. --- Summary of changes: SerNet-IRIX.fns |4 SerNet-Tru64.fns |2 +- hpisgr8.fns |2 +- 3 files changed, 2 insertions(+), 6 deletions(-) Changeset truncated at 500 lines: diff --git a/SerNet-IRIX.fns b/SerNet-IRIX.fns index c845470..cdcb6cb 100644 --- a/SerNet-IRIX.fns +++ b/SerNet-IRIX.fns @@ -15,11 +15,7 @@ for compiler in $compilers; do #export config=--with-included-popt . common.fns - config=--without-gettext - export config test_tree samba_4_0_test . $compiler - config= - export config test_tree samba_3_current source3 $compiler test_tree samba_3_next source3 $compiler diff --git a/SerNet-Tru64.fns b/SerNet-Tru64.fns index b2a995f..3571b60 100644 --- a/SerNet-Tru64.fns +++ b/SerNet-Tru64.fns @@ -16,7 +16,7 @@ for compiler in $compilers; do . common.fns - config=--without-gettext --without-acl-support + config=--without-acl-support export config test_tree samba_4_0_test . $compiler config= diff --git a/hpisgr8.fns b/hpisgr8.fns index c2fcab4..2ba4864 100644 --- a/hpisgr8.fns +++ b/hpisgr8.fns @@ -15,7 +15,7 @@ for compiler in $compilers; do . common.fns - config=--without-gettext --without-acl-support + config=--without-acl-support export config test_tree samba_4_0_test . $compiler config= -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via 90b2a36 mark tdb2 as an old tree to delete
via 605038a Replace tdb2 build with ntdb
from 9c3d6e3 Revert Add --without-gettext to restore Samba build on
hpisgr8
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit 90b2a36f8fbe95203d7793e072a4d0115b920481
Author: Andrew Bartlett abart...@samba.org
Date: Thu Jan 23 20:46:20 2014 +1300
mark tdb2 as an old tree to delete
Signed-off-by: Andrew Bartlett abart...@samba.org
commit 605038a8d28f69273677ca05b2f4bfafab616581
Author: Amitay Isaacs ami...@gmail.com
Date: Thu Jan 23 17:32:09 2014 +1100
Replace tdb2 build with ntdb
Signed-off-by: Amitay Isaacs ami...@gmail.com
---
Summary of changes:
build_test.fns | 10 +-
common.fns |2 +-
web/trees.conf |4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/build_test.fns b/build_test.fns
index de2023e..1f00620 100644
--- a/build_test.fns
+++ b/build_test.fns
@@ -164,7 +164,7 @@ choose_scm() {
tree=$1
case $tree in
- samba* | rsync | libreplace | talloc | tdb* | ldb |
pidl | ccache* | waf*)
+ samba* | rsync | libreplace | talloc | tdb | ntdb | ldb
| pidl | ccache* | waf*)
echo git
return 0
;;
@@ -255,7 +255,7 @@ do_make() {
MMTIME=$MAXTIME
# some trees don't need as much time
case $tree in
- rsync | tdb* | talloc | libreplace | ccache* | waf*)
+ rsync | tdb | ntdb | talloc | libreplace | ccache* | waf*)
if [ $compiler != checker ]; then
MMTIME=`expr $MMTIME / 5`
fi
@@ -320,7 +320,7 @@ action_lcovreport() {
lorikeet-heimdal*)
lcov --directory $builddir --capture --output-file
$builddir/$tree.lcov.info
;;
- samba_4*|tdb*|talloc|ldb|libreplace)
+ samba_4*|tdb|ntdb|talloc|ldb|libreplace)
lcov --base-directory $builddir/bin --directory
$builddir/bin --capture --output-file $builddir/$tree.lcov.info
;;
waf)
@@ -343,7 +343,7 @@ action_lcovreport() {
action_callcatcherreport() {
if [ $CALLCATCHER_REPORT = yes ]; then
case $tree in
- tdb*|talloc|ldb)
+ tdb|ntdb|talloc|ldb)
callanalyse `find $builddir/bin -name \*.so*`
$builddir/bin/* $builddir/coverage/unused-fns.txt
;;
samba_4*)
@@ -1046,7 +1046,7 @@ per_run_hook() {
old_trees=web popt distcc samba-gtk smb-build lorikeet-heimdal
samba_3_2
old_trees=$old_tree samba_3_2_test samba4 samba_4_0_waf
samba_4_0_waf.metze
- old_trees=$old_tree samba_3_X_test samba_3_X_devel samba_3_X_devel
samba_3_waf samba_3_master
+ old_trees=$old_tree samba_3_X_test samba_3_X_devel samba_3_X_devel
samba_3_waf samba_3_master tdb2
for d in $old_trees; do
delete_old_tree $d
done
diff --git a/common.fns b/common.fns
index c25abf2..e983b39 100644
--- a/common.fns
+++ b/common.fns
@@ -10,6 +10,6 @@ test_tree ccache . $compiler
test_tree ccache-maint . $compiler
test_tree talloc . $compiler
test_tree tdb . $compiler
-test_tree tdb2 . $compiler
+test_tree ntdb . $compiler
test_tree ldb . $compiler
test_tree waf demos $compiler
diff --git a/web/trees.conf b/web/trees.conf
index 5be6cb8..184fcb6 100644
--- a/web/trees.conf
+++ b/web/trees.conf
@@ -54,11 +54,11 @@ repo = samba.git
branch = master
subdir = lib/tdb/
-[tdb2]
+[ntdb]
scm = git
repo = samba.git
branch = master
-subdir = lib/tdb2/
+subdir = lib/ntdb/
[ldb]
scm = git
--
build.samba.org
