Hello community, here is the log from the commit of package yast2-samba-server checked in at Wed Nov 8 14:04:29 CET 2006. -------- --- yast2-samba-server/yast2-samba-server.changes 2006-10-30 18:39:25.000000000 +0100 +++ /mounts/work_src_done/NOARCH/yast2-samba-server/yast2-samba-server.changes 2006-11-08 13:00:13.000000000 +0100 @@ -1,0 +2,10 @@ +Wed Nov 8 11:14:42 CET 2006 - locilka@suse.cz + +- Fixed handling of "net rpc trustdom establish" when password + contains quotes or apostrophes (#219001). +- Fixed evaluation of SambaTrustDom::Establish() function's return + to show up that the command has failed (#219001). +- Added new testsuite for SambaTrustDom module. +- 2.14.2 + +------------------------------------------------------------------- Old: ---- yast2-samba-server-2.14.1.tar.bz2 New: ---- yast2-samba-server-2.14.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-samba-server.spec ++++++ --- /var/tmp/diff_new_pack.EQsG9l/_old 2006-11-08 14:04:18.000000000 +0100 +++ /var/tmp/diff_new_pack.EQsG9l/_new 2006-11-08 14:04:18.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-samba-server (Version 2.14.1) +# spec file for package yast2-samba-server (Version 2.14.2) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-samba-server -Version: 2.14.1 -Release: 2 +Version: 2.14.2 +Release: 1 License: GNU General Public License (GPL) - all versions Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-samba-server-2.14.1.tar.bz2 +Source0: yast2-samba-server-2.14.2.tar.bz2 prefix: /usr BuildRequires: libsmbclient libsmbclient-devel perl-Crypt-SmbHash perl-X500-DN perl-XML-Writer samba-client update-desktop-files yast2 yast2-devtools yast2-ldap-client yast2-network yast2-perl-bindings yast2-printer yast2-samba-client yast2-testsuite Requires: yast2-perl-bindings yast2 yast2-ldap-client yast2-samba-client yast2-pam yast2-printer perl-Crypt-SmbHash yast2-ldap yast2-network @@ -36,7 +36,7 @@ Lukas Ocilka <locilka@suse.cz> %prep -%setup -n yast2-samba-server-2.14.1 +%setup -n yast2-samba-server-2.14.2 %build %{prefix}/bin/y2tool y2autoconf @@ -71,6 +71,13 @@ %doc %{prefix}/share/doc/packages/yast2-samba-server %changelog -n yast2-samba-server +* Wed Nov 08 2006 - locilka@suse.cz +- Fixed handling of "net rpc trustdom establish" when password + contains quotes or apostrophes (#219001). +- Fixed evaluation of SambaTrustDom::Establish() function's return + to show up that the command has failed (#219001). +- Added new testsuite for SambaTrustDom module. +- 2.14.2 * Fri Oct 27 2006 - locilka@suse.cz - Adding samba-server.rnc for AutoYaST profile validation (#215248) - 2.14.1 ++++++ yast2-samba-server-2.14.1.tar.bz2 -> yast2-samba-server-2.14.2.tar.bz2 ++++++ ++++ 6969 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-samba-server-2.14.1/Makefile.am new/yast2-samba-server-2.14.2/Makefile.am --- old/yast2-samba-server-2.14.1/Makefile.am 2006-10-30 18:43:17.000000000 +0100 +++ new/yast2-samba-server-2.14.2/Makefile.am 2006-11-08 12:47:24.000000000 +0100 @@ -7,7 +7,8 @@ # #where devtools are -Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool +PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) +Y2TOOL = $(PREFIX)/bin/y2tool VERSION = $(shell cat $(srcdir)/VERSION) RPMNAME = $(shell cat $(srcdir)/RPMNAME) @@ -19,7 +20,7 @@ # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools) ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) @@ -33,7 +34,7 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 # where devtools instal m4 snippets # argh, executed literally -#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal +#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-samba-server-2.14.1/Makefile.am.common new/yast2-samba-server-2.14.2/Makefile.am.common --- old/yast2-samba-server-2.14.1/Makefile.am.common 2006-10-30 18:43:17.000000000 +0100 +++ new/yast2-samba-server-2.14.2/Makefile.am.common 2006-11-08 12:47:24.000000000 +0100 @@ -29,19 +29,7 @@ dist-hook: check-syntax -CHECK_SYNTAX = true check-syntax: $(client_DATA) $(ycpchook) - @if test "$(client_DATA)"; then \ - if $(CHECK_SYNTAX); then \ - TO_CHECK="$(filter %.ycp,$^)"; \ - echo "Checking syntax of $${TO_CHECK}"; \ - if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \ - echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ - exit 1; \ - fi; \ - else \ - echo "Syntax check disabled"; \ - fi; \ - fi + if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi -include .dep diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-samba-server-2.14.1/VERSION new/yast2-samba-server-2.14.2/VERSION --- old/yast2-samba-server-2.14.1/VERSION 2006-10-30 18:39:25.000000000 +0100 +++ new/yast2-samba-server-2.14.2/VERSION 2006-11-08 11:17:59.000000000 +0100 @@ -1 +1 @@ -2.14.1 +2.14.2 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-samba-server-2.14.1/configure.in new/yast2-samba-server-2.14.2/configure.in --- old/yast2-samba-server-2.14.1/configure.in 2006-10-30 18:43:17.000000000 +0100 +++ new/yast2-samba-server-2.14.2/configure.in 2006-11-08 12:47:24.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-samba-server dnl -dnl -- This file is generated by y2autoconf 2.13.29 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-samba-server, 2.14.1, http://bugs.opensuse.org/, yast2-samba-server) +AC_INIT(yast2-samba-server, 2.14.2, http://bugs.opensuse.org/, yast2-samba-server) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.14.1" +VERSION="2.14.2" RPMNAME="yast2-samba-server" MAINTAINER="Lukas Ocilka <locilka@suse.cz>" @@ -110,8 +110,6 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-devel.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` -AC_SUBST(Y2DEVTOOLS_PREFIX) devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` @@ -144,9 +142,6 @@ if test "$YCPC" = "false"; then AC_MSG_ERROR([ycpc is not installed]) fi -AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [ - AC_MSG_WARN([yast2-testsuite.rpm is not installed]) -]) AC_CONFIG_FILES(Makefile doc/autodocs/Makefile diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-samba-server-2.14.1/src/SambaPrinters.pm new/yast2-samba-server-2.14.2/src/SambaPrinters.pm --- old/yast2-samba-server-2.14.1/src/SambaPrinters.pm 2005-01-24 14:51:44.000000000 +0100 +++ new/yast2-samba-server-2.14.2/src/SambaPrinters.pm 2006-10-09 15:51:00.000000000 +0200 @@ -3,7 +3,7 @@ # Authors: Stanislav Visnovsky <visnov@suse.cz> # Martin Lazar <mlazar@suse.cz> # -# $Id: SambaPrinters.pm 20366 2004-11-19 13:51:55Z mlazar $ +# $Id: SambaPrinters.pm 21643 2005-02-16 16:35:08Z mlazar $ # # Representation of the configuration of samba-server. # Input and output routines. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-samba-server-2.14.1/src/SambaTrustDom.pm new/yast2-samba-server-2.14.2/src/SambaTrustDom.pm --- old/yast2-samba-server-2.14.1/src/SambaTrustDom.pm 2005-06-29 14:53:01.000000000 +0200 +++ new/yast2-samba-server-2.14.2/src/SambaTrustDom.pm 2006-11-08 11:18:08.000000000 +0100 @@ -3,7 +3,7 @@ # Authors: Stanislav Visnovsky <visnov@suse.cz> # Martin Lazar <mlazar@suse.cz> # -# $Id: SambaTrustDom.pm 23798 2005-06-27 11:51:59Z mlazar $ +# $Id: SambaTrustDom.pm 34151 2006-11-08 10:18:06Z locilka $ # # Representation of the configuration of samba-server. # Input and output routines. @@ -87,9 +87,12 @@ sub Establish { my ($self, $domain, $passwd) = @_; return undef unless defined $domain; + + # escape all quote-strings + $passwd =~ s/\"/\\\"/g; - my $cmd = "net rpc trustdom establish '$domain' -U 'root%$passwd'"; - y2debug("net rpc trustdom establish '$domain' -U root%".("*"x length($passwd))); + my $cmd = 'net rpc trustdom establish "'.$domain.'" -U "root%'.$passwd.'"'; + y2milestone('Running command >net rpc trustdom establish "'.$domain.'" -U "root%$password"<'); if (SCR->Execute(".target.bash", $cmd)) { y2error("Cannot establish trusted domain relationship for '$domain'"); return undef; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-samba-server-2.14.1/src/dialogs.ycp new/yast2-samba-server-2.14.2/src/dialogs.ycp --- old/yast2-samba-server-2.14.1/src/dialogs.ycp 2006-10-30 18:39:25.000000000 +0100 +++ new/yast2-samba-server-2.14.2/src/dialogs.ycp 2006-11-08 11:18:08.000000000 +0100 @@ -5,7 +5,7 @@ * Authors: Stanislav Visnovsky <stanislav.visnovsky@suse.cz> * Lukas Ocilka <locilka@suse.cz> * - * $Id: dialogs.ycp 33319 2006-10-10 13:29:05Z locilka $ + * $Id: dialogs.ycp 34151 2006-11-08 10:18:06Z locilka $ */ { @@ -412,7 +412,8 @@ Report::Error (_("Domain name cannot be empty.") ); ret = nil; } - if (SambaTrustDom::Establish(domain, passwd)) { + boolean success = SambaTrustDom::Establish(domain, passwd); + if (success != true) { import "Report"; Report::Error (_("Cannot establish trusted domain relationship.")); ret = nil; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-samba-server-2.14.1/testsuite/Modules/tests/SambaTrustDom.out new/yast2-samba-server-2.14.2/testsuite/Modules/tests/SambaTrustDom.out --- old/yast2-samba-server-2.14.1/testsuite/Modules/tests/SambaTrustDom.out 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-samba-server-2.14.2/testsuite/Modules/tests/SambaTrustDom.out 2006-11-08 12:57:27.000000000 +0100 @@ -0,0 +1,16 @@ +Dump ------------------------------------------------------------ +Execute .target.bash "net rpc trustdom establish \"domain\" -U \"root%password\"" 0 +Return true +Execute .target.bash "net rpc trustdom establish \"domain\" -U \"root%password\"" 1 +Return nil +Dump ------------------------------------------------------------ +Execute .target.bash "net rpc trustdom establish \"domain\" -U \"root%password\\\"\\\"abc\"" 0 +Return true +Execute .target.bash "net rpc trustdom establish \"domain\" -U \"root%password\\\"\\\"abc\"" 1 +Return nil +Dump ------------------------------------------------------------ +Execute .target.bash "net rpc trustdom establish \"domain\" -U \"root%pas''sword\\\"\\\"'\\\"abc\"" 0 +Return true +Execute .target.bash "net rpc trustdom establish \"domain\" -U \"root%pas''sword\\\"\\\"'\\\"abc\"" 1 +Return nil +Dump ------------------------------------------------------------ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-samba-server-2.14.1/testsuite/Modules/tests/SambaTrustDom.ycp new/yast2-samba-server-2.14.2/testsuite/Modules/tests/SambaTrustDom.ycp --- old/yast2-samba-server-2.14.1/testsuite/Modules/tests/SambaTrustDom.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-samba-server-2.14.2/testsuite/Modules/tests/SambaTrustDom.ycp 2006-11-08 12:58:08.000000000 +0100 @@ -0,0 +1,32 @@ +{ + //testedfiles: SambaTrustDom.ycp + + include "testsuite.ycp"; + + map READ = $[]; + map WRITE = $[]; + map EXEC = $[]; + + map EXEC1 = $[ + "target" : $["bash" : 0], + ]; + + map EXEC2 = $[ + "target" : $["bash" : 1], + ]; + + TESTSUITE_INIT ([READ, WRITE, EXEC], nil); + + import "SambaTrustDom"; + + DUMP ("------------------------------------------------------------"); + TEST (``(SambaTrustDom::Establish("domain", "password")), [READ, WRITE, EXEC1], nil); + TEST (``(SambaTrustDom::Establish("domain", "password")), [READ, WRITE, EXEC2], nil); + DUMP ("------------------------------------------------------------"); + TEST (``(SambaTrustDom::Establish("domain", "password\"\"abc")), [READ, WRITE, EXEC1], nil); + TEST (``(SambaTrustDom::Establish("domain", "password\"\"abc")), [READ, WRITE, EXEC2], nil); + DUMP ("------------------------------------------------------------"); + TEST (``(SambaTrustDom::Establish("domain", "pas''sword\"\"'\"abc")), [READ, WRITE, EXEC1], nil); + TEST (``(SambaTrustDom::Establish("domain", "pas''sword\"\"'\"abc")), [READ, WRITE, EXEC2], nil); + DUMP ("------------------------------------------------------------"); +} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org