The branch, master has been updated
via 9f5dbde s3:winbindd:idmap_autorid remove a stray comment
via 006d58f waf: Improve log errors for MIT build
from ae8f349 lib: FreeBSD needs sys/wait.h for WIFEXITED
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 9f5dbdec757860ea42f1ccc740d09a25ac107f94
Author: Christian Ambach <[email protected]>
Date: Wed Mar 22 09:54:13 2017 +0100
s3:winbindd:idmap_autorid remove a stray comment
Signed-off-by: Christian Ambach <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
Autobuild-User(master): Andreas Schneider <[email protected]>
Autobuild-Date(master): Wed May 3 03:35:34 CEST 2017 on sn-devel-144
commit 006d58f5baabec474f4e4fc7b406a55cf74d8f26
Author: Christian Ambach <[email protected]>
Date: Tue May 2 18:09:04 2017 +0200
waf: Improve log errors for MIT build
Signed-off-by: Christian Ambach <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
source3/winbindd/idmap_autorid.c | 3 ---
wscript_configure_system_mitkrb5 | 6 +++---
2 files changed, 3 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/idmap_autorid.c b/source3/winbindd/idmap_autorid.c
index 5748c80..39027d1 100644
--- a/source3/winbindd/idmap_autorid.c
+++ b/source3/winbindd/idmap_autorid.c
@@ -913,9 +913,6 @@ done:
return status;
}
-/*
- Close the idmap tdb instance
-*/
static struct idmap_methods autorid_methods = {
.init = idmap_autorid_initialize,
.unixids_to_sids = idmap_autorid_unixids_to_sids,
diff --git a/wscript_configure_system_mitkrb5 b/wscript_configure_system_mitkrb5
index 8695dc6..9c35113 100644
--- a/wscript_configure_system_mitkrb5
+++ b/wscript_configure_system_mitkrb5
@@ -67,9 +67,9 @@ if conf.env.KRB5_CONFIG:
krb5_version = krb5_version.split("-")[0]
if parse_version(krb5_version) < parse_version(krb5_required_version):
- Logs.error('ERROR: MIT KRB5 build with Samba AD requires at least
%s. %s has been found and cannot be used' % (krb5_required_version,
krb5_version))
- Logs.error('ERROR: If you want to just build Samba FS use the
option --without-ad-dc which requires version %s' % (krb5_min_required_version))
- Logs.error('ERROR: You may try to build with embedded Heimdal
Kerebros by not specifying --with-system-mitkrb5')
+ Logs.error('ERROR: The MIT KRB5 build with Samba AD requires at
least %s. %s has been found and cannot be used' % (krb5_required_version,
krb5_version))
+ Logs.error('ERROR: If you want to just build Samba FS (File
Server) use the option --without-ad-dc which requires version %s' %
(krb5_min_required_version))
+ Logs.error('ERROR: You may try to build with embedded Heimdal
Kerberos by not specifying --with-system-mitkrb5')
sys.exit(1)
else:
Logs.info('MIT Kerberos %s detected, MIT krb5 build can proceed' %
(krb5_version))
--
Samba Shared Repository
