The branch, master has been updated via 213e726 build: Set LD_LIBRARY_PATH in install_with_python.sh via 5a1deec build: Make install_with_python.sh more portable via 8e84c33 build: In install_with_python.sh force using the python from the install we just made via 7acacdf build: Make install_with_python.sh executable via 489ad49 swat: move russian swat files alongside ja and tr via b9fbce2 passdb: Add discard_const_p() to pdb_samba_dsdb via 26bae89 vfs: Fix compilation of solaris ACL module via 9dfd0a0 build: Remove bashism from SAMBAMANPAGES rule from 313da9d smb.conf(5): update list of available protocols (bug #9552)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 213e7260a83d4349132e8c159798b476cec3f814 Author: Andrew Bartlett <abart...@samba.org> Date: Thu Jan 10 12:00:03 2013 +1100 build: Set LD_LIBRARY_PATH in install_with_python.sh This ensures that the python install finishes correctly. Andrew Bartlett Reviewed-by: Stefan Metzmacher <me...@samba.org> Autobuild-User(master): Stefan Metzmacher <me...@samba.org> Autobuild-Date(master): Thu Jan 10 14:00:13 CET 2013 on sn-devel-104 commit 5a1deec38a7ff7287b31a47ae61769c66e10de17 Author: Andrew Bartlett <abart...@samba.org> Date: Thu Jan 10 09:00:37 2013 +1100 build: Make install_with_python.sh more portable Reviewed-by: Stefan Metzmacher <me...@samba.org> commit 8e84c33a6094288ec2c8964588c679a71742e855 Author: Andrew Bartlett <abart...@samba.org> Date: Thu Jan 10 08:51:34 2013 +1100 build: In install_with_python.sh force using the python from the install we just made Reviewed-by: Stefan Metzmacher <me...@samba.org> commit 7acacdfc05d3162b2879b6ac80d0809b5af96f1e Author: Andrew Bartlett <abart...@samba.org> Date: Thu Jan 10 08:50:53 2013 +1100 build: Make install_with_python.sh executable Reviewed-by: Stefan Metzmacher <me...@samba.org> commit 489ad498ab14340eb99f35a8814418db9db788a5 Author: Andrew Bartlett <abart...@samba.org> Date: Thu Dec 20 18:36:40 2012 +1100 swat: move russian swat files alongside ja and tr Reviewed-by: Stefan Metzmacher <me...@samba.org> commit b9fbce20613952ead92dde3981a57f6d825c0584 Author: Andrew Bartlett <abart...@samba.org> Date: Thu Dec 13 10:33:04 2012 +1100 passdb: Add discard_const_p() to pdb_samba_dsdb Reviewed-by: Stefan Metzmacher <me...@samba.org> commit 26bae894f2ae898c51535dda14060ecf4786c6ec Author: Andrew Bartlett <abart...@samba.org> Date: Sat Jan 5 14:53:13 2013 +1100 vfs: Fix compilation of solaris ACL module Andrew Bartlett Reviewed-by: Stefan Metzmacher <me...@samba.org> commit 9dfd0a0dc980b521905399e0b409cb81fbbe6b37 Author: Andrew Bartlett <abart...@samba.org> Date: Wed Jan 9 09:39:59 2013 +1100 build: Remove bashism from SAMBAMANPAGES rule In sh, you must assign the variable, then export it. Andrew Bartlett Reviewed-by: Stefan Metzmacher <me...@samba.org> ----------------------------------------------------------------------- Summary of changes: buildtools/wafsamba/wafsamba.py | 3 ++- install_with_python.sh | 7 ++++++- source3/modules/vfs_solarisacl.c | 2 +- source3/passdb/pdb_samba_dsdb.c | 4 ++-- .../lang}/ru/help/welcome-no-samba-doc.html | 0 {source3/po => swat/lang}/ru/help/welcome.html | 0 {source3/po => swat/lang}/ru/images/globals.gif | Bin 2041 -> 2041 bytes {source3/po => swat/lang}/ru/images/home.gif | Bin 2190 -> 2190 bytes {source3/po => swat/lang}/ru/images/passwd.gif | Bin 1936 -> 1936 bytes {source3/po => swat/lang}/ru/images/printers.gif | Bin 2139 -> 2139 bytes {source3/po => swat/lang}/ru/images/shares.gif | Bin 2081 -> 2081 bytes {source3/po => swat/lang}/ru/images/status.gif | Bin 2305 -> 2305 bytes {source3/po => swat/lang}/ru/images/viewconfig.gif | Bin 2096 -> 2096 bytes {source3/po => swat/lang}/ru/images/wizard.gif | Bin 2605 -> 2605 bytes {source3/po => swat/lang}/ru/include/header.html | 0 15 files changed, 11 insertions(+), 5 deletions(-) mode change 100644 => 100755 install_with_python.sh rename {source3/po => swat/lang}/ru/help/welcome-no-samba-doc.html (100%) rename {source3/po => swat/lang}/ru/help/welcome.html (100%) rename {source3/po => swat/lang}/ru/images/globals.gif (100%) rename {source3/po => swat/lang}/ru/images/home.gif (100%) rename {source3/po => swat/lang}/ru/images/passwd.gif (100%) rename {source3/po => swat/lang}/ru/images/printers.gif (100%) rename {source3/po => swat/lang}/ru/images/shares.gif (100%) rename {source3/po => swat/lang}/ru/images/status.gif (100%) rename {source3/po => swat/lang}/ru/images/viewconfig.gif (100%) rename {source3/po => swat/lang}/ru/images/wizard.gif (100%) rename {source3/po => swat/lang}/ru/include/header.html (100%) Changeset truncated at 500 lines: diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index 9409669..6ef0b57 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -797,7 +797,8 @@ def SAMBAMANPAGES(bld, manpages): source=source, target=m, group='final', - rule='''export XML_CATALOG_FILES="${SAMBA_CATALOGS}" + rule='''XML_CATALOG_FILES="${SAMBA_CATALOGS}" + export XML_CATALOG_FILES ${XSLTPROC} --xinclude --stringparam noreference 0 -o ${TGT}.xml --nonet ${SAMBA_EXPAND_XSL} ${SRC} ${XSLTPROC} --nonet -o ${TGT} ${SAMBA_MAN_XSL} ${TGT}.xml''' ) diff --git a/install_with_python.sh b/install_with_python.sh old mode 100644 new mode 100755 index d7ae55d..7b51e5c --- a/install_with_python.sh +++ b/install_with_python.sh @@ -14,6 +14,8 @@ shift PATH=$PREFIX/python/bin:$PATH export PATH +LD_LIBRARY_PATH=$PREFIX/python/lib:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH VERSION="Python-2.6.5" @@ -31,11 +33,14 @@ do_install_python() { rm -rf python_install || exit 1 } -if ! test -d $PREFIX/python; then +if [ ! -d $PREFIX/python ]; then # needs to be installed do_install_python fi +PYTHON=$PREFIX/python/bin/python +export PYTHON + `dirname $0`/configure --prefix=$PREFIX $@ || exit 1 make -j || exit 1 make install || exit 1 diff --git a/source3/modules/vfs_solarisacl.c b/source3/modules/vfs_solarisacl.c index dd5fe82..9b3c4f6 100644 --- a/source3/modules/vfs_solarisacl.c +++ b/source3/modules/vfs_solarisacl.c @@ -300,7 +300,7 @@ int solarisacl_sys_acl_delete_def_file(vfs_handle_struct *handle, DEBUG(10, ("entering solarisacl_sys_acl_delete_def_file.\n")); smb_acl = solarisacl_sys_acl_get_file(handle, path, - SMB_ACL_TYPE_ACCESS); + SMB_ACL_TYPE_ACCESS, talloc_tos()); if (smb_acl == NULL) { DEBUG(10, ("getting file acl failed!\n")); goto done; diff --git a/source3/passdb/pdb_samba_dsdb.c b/source3/passdb/pdb_samba_dsdb.c index 2552fb9..0ff2e0a 100644 --- a/source3/passdb/pdb_samba_dsdb.c +++ b/source3/passdb/pdb_samba_dsdb.c @@ -384,7 +384,7 @@ static int pdb_samba_dsdb_replace_by_sam(struct pdb_samba_dsdb_state *state, bool changed_history = false; if (need_update(sam, PDB_LMPASSWD)) { struct ldb_val val; - val.data = pdb_get_lanman_passwd(sam); + val.data = discard_const_p(uint8_t, pdb_get_lanman_passwd(sam)); if (!val.data) { samdb_msg_add_delete(state->ldb, msg, msg, "dBCSPwd"); @@ -396,7 +396,7 @@ static int pdb_samba_dsdb_replace_by_sam(struct pdb_samba_dsdb_state *state, } if (need_update(sam, PDB_NTPASSWD)) { struct ldb_val val; - val.data = pdb_get_nt_passwd(sam); + val.data = discard_const_p(uint8_t, pdb_get_nt_passwd(sam)); if (!val.data) { samdb_msg_add_delete(state->ldb, msg, msg, "unicodePwd"); diff --git a/source3/po/ru/help/welcome-no-samba-doc.html b/swat/lang/ru/help/welcome-no-samba-doc.html similarity index 100% rename from source3/po/ru/help/welcome-no-samba-doc.html rename to swat/lang/ru/help/welcome-no-samba-doc.html diff --git a/source3/po/ru/help/welcome.html b/swat/lang/ru/help/welcome.html similarity index 100% rename from source3/po/ru/help/welcome.html rename to swat/lang/ru/help/welcome.html diff --git a/source3/po/ru/include/header.html b/swat/lang/ru/include/header.html similarity index 100% rename from source3/po/ru/include/header.html rename to swat/lang/ru/include/header.html -- Samba Shared Repository