The branch, master has been updated via a7f067c BUG 9699: Fix adding case sensitive spn. via 5dad084 ccan: fix HAVE_BSWAP_64 for autoconf. from b5d5b9a libsmbclient: Fix cli_session_setup_guest_send
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit a7f067c244401d37057a7ed7c00ba4ffc76f2b5a Author: Andreas Schneider <a...@samba.org> Date: Wed Apr 3 15:46:00 2013 +0200 BUG 9699: Fix adding case sensitive spn. We should be able to define the case of the spn cause it is important for some services like nfs. 'net ads keytab add "nfs"' should not result in an uppercase spn. Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> Autobuild-User(master): Jeremy Allison <j...@samba.org> Autobuild-Date(master): Wed Apr 3 23:57:32 CEST 2013 on sn-devel-104 commit 5dad084ab176820af8d661f681e0659596d067cb Author: Rusty Russell <ru...@rustcorp.com.au> Date: Tue Apr 2 17:00:01 2013 +1030 ccan: fix HAVE_BSWAP_64 for autoconf. Autoconf defines HAVE_BSWAP_64_DECL, we want HAVE_BSWAP_64. Signed-off-by: Rusty Russell <ru...@rustcorp.com.au> Reviewed-by: Jeremy Allison <j...@samba.org> ----------------------------------------------------------------------- Summary of changes: lib/ccan/libccan.m4 | 16 +++++++++++++++- source3/libads/ldap.c | 14 ++------------ 2 files changed, 17 insertions(+), 13 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/ccan/libccan.m4 b/lib/ccan/libccan.m4 index 7b27c69..cda1353 100644 --- a/lib/ccan/libccan.m4 +++ b/lib/ccan/libccan.m4 @@ -346,4 +346,18 @@ if test x"$samba_cv_warn_unused_result" = xyes ; then AC_DEFINE(HAVE_WARN_UNUSED_RESULT, 1, [whether we have __attribute__((warn_unused_result))]) fi -AC_HAVE_DECL(bswap_64, [#include <byteswap.h>]) + +AC_CACHE_CHECK([whether we have bswap_64], + samba_cv_have_bswap_64, + [ + AC_LINK_IFELSE([AC_LANG_SOURCE( + [#include <byteswap.h> + int main(void) { return bswap_64(1) ? 0 : 1; } + ])], + samba_cv_have_bswap_64=yes) + ]) + +if test x"$samba_cv_have_bswap_64" = xyes ; then + AC_DEFINE(HAVE_BSWAP_64, 1, + [whether we have bswap_64]) +fi diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c index ca5962c..2a4a83b 100644 --- a/source3/libads/ldap.c +++ b/source3/libads/ldap.c @@ -1949,12 +1949,7 @@ ADS_STATUS ads_add_service_principal_name(ADS_STRUCT *ads, const char *machine_n ads_msgfree(ads, res); return ADS_ERROR(LDAP_NO_MEMORY); } - if (!strupper_m(psp1)) { - ret = ADS_ERROR(LDAP_NO_MEMORY); - goto out; - } - - if (!strlower_m(&psp1[strlen(spn)])) { + if (!strlower_m(&psp1[strlen(spn) + 1])) { ret = ADS_ERROR(LDAP_NO_MEMORY); goto out; } @@ -1970,12 +1965,7 @@ ADS_STATUS ads_add_service_principal_name(ADS_STRUCT *ads, const char *machine_n ret = ADS_ERROR(LDAP_NO_MEMORY); goto out; } - if (!strupper_m(psp2)) { - ret = ADS_ERROR(LDAP_NO_MEMORY); - goto out; - } - - if (!strlower_m(&psp2[strlen(spn)])) { + if (!strlower_m(&psp2[strlen(spn) + 1])) { ret = ADS_ERROR(LDAP_NO_MEMORY); goto out; } -- Samba Shared Repository