s4/test: fix DC password in selftest-vars.sh

Andrew Bartlett abartlet at samba.org
Mon Jun 21 20:21:07 MDT 2010


On Mon, 2010-06-21 at 20:51 -0500, Kamen Mazdrashki wrote:
> The branch, master has been updated
>        via  efe65cd... s4/dsdb-test: fix usage comment
>        via  acebfcb... s4/test: fix DC password in selftest-vars.sh
>       from  c668b21... s4 torture: RAW-SFILEINFO display warning instead of error on unsupported info level
> 
> http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
> 
> 
> - Log -----------------------------------------------------------------
> commit efe65cd7b707c3ba5b321016829da431d6905415
> Author: Kamen Mazdrashki <kamenim at samba.org>
> Date:   Tue Jun 22 04:42:15 2010 +0300
> 
>     s4/dsdb-test: fix usage comment
> 
> commit acebfcb93897657a28f0a4588a19abcf5356ebcf
> Author: Kamen Mazdrashki <kamenim at samba.org>
> Date:   Tue Jun 22 04:41:49 2010 +0300
> 
>     s4/test: fix DC password in selftest-vars.sh
> 
> -----------------------------------------------------------------------
> 
> Summary of changes:
>  source4/lib/ldb/tests/python/dsdb_schema_info.py |    4 ++--
>  source4/scripting/devel/selftest-vars.sh         |    4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> 
> Changeset truncated at 500 lines:
> 
> diff --git a/source4/lib/ldb/tests/python/dsdb_schema_info.py b/source4/lib/ldb/tests/python/dsdb_schema_info.py
> index 56d9b11..4d136aa 100755
> --- a/source4/lib/ldb/tests/python/dsdb_schema_info.py
> +++ b/source4/lib/ldb/tests/python/dsdb_schema_info.py
> @@ -20,9 +20,9 @@
>  
>  #
>  # Usage:
> -#  export TARGET_DC=target_dc_or_local_samdb_url
> +#  export DC_SERVER=target_dc_or_local_samdb_url
>  #  export SUBUNITRUN=$samba4srcdir/scripting/bin/subunitrun
> -#  PYTHONPATH="$samba4srcdir/torture/libnet/python" $SUBUNITRUN dsdb_schema_info -Ukma-exch.devel/Administrator%333
> +#  PYTHONPATH="$PYTHONPATH:$samba4srcdir/lib/ldb/tests/python" $SUBUNITRUN dsdb_schema_info -U"$DOMAIN/$DC_USERNAME"%"$DC_PASSWORD"
>  #
>  
>  import sys
> diff --git a/source4/scripting/devel/selftest-vars.sh b/source4/scripting/devel/selftest-vars.sh
> index 0932b62..ca99ced 100644
> --- a/source4/scripting/devel/selftest-vars.sh
> +++ b/source4/scripting/devel/selftest-vars.sh
> @@ -39,9 +39,9 @@ export TLS_ENABLED=yes
>  export DC_NETBIOSALIAS=localdc
>  export DC_NETBIOSNAME=localdc1
>  export DC_SERVER=localdc1
> -export DC_PASSWORD=locDCpass0
> +export DC_PASSWORD=locDCpass1
>  export PYTHONPATH=$PWD/bin/python
> -export PASSWORD=locDCpass0
> +export PASSWORD=locDCpass1
>  export LDB_MODULES_PATH=$PWD/bin/modules/ldb
>  export NETBIOSALIAS=localdc
>  export SMB_CONF_PATH=$PWD/st/dc/etc/smb.conf

We really need to stop having this separate copy of the selftest code.
If we rework the environment generation code, we should try and have it
generate this file dynamically, if we have to keep it at all (I still
think that testenv is a safer way to create the matching environment). 

Andrew Bartlett



More information about the samba-technical mailing list