[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  b6f58e2... s3-selftest: fix return code for modprinter.pl -a.
      from  c42d9c4... tsocket/bsd: fix comment in tdgram_bsd_recvfrom_handler()

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit b6f58e25b5bbce25d4e8825e680afe3986f10e8c
Author: Günther Deschner <gd at samba.org>
Date:   Thu Feb 18 11:20:49 2010 +0100

    s3-selftest: fix return code for modprinter.pl -a.
    
    Background is: the SetPrinter level 2 calls "addprinter command" an fails if a
    share already existed (and the addprinter command returned a non-0 return code).
    Removing the non-0 return code is fine, as in AddPrinter{Ex}, we have checks to
    see if a share already exists before calling out the addprinter command.
    
    Maybe one day, we need to have a "changeprinter command"...
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source3/script/tests/printing/modprinter.pl |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/script/tests/printing/modprinter.pl b/source3/script/tests/printing/modprinter.pl
index 4064841..9e5e329 100755
--- a/source3/script/tests/printing/modprinter.pl
+++ b/source3/script/tests/printing/modprinter.pl
@@ -95,7 +95,8 @@ while (<CONFIGFILE>) {
 		if ($section eq $share_name) {
 			$found_section = 1;
 			if ($opt_add) {
-				die("share $share_name already exists\n");
+				exit 0;
+#				die("share $share_name already exists\n");
 			}
 			if ($opt_delete) {
 				$within_section = 1;


-- 
Samba Shared Repository