[SCM] Samba Shared Repository - branch v3-4-stable updated - release-3-4-0rc1-11-gd96b0c5

[Karolin Seeger]

The branch, v3-4-stable has been updated
       via  d96b0c5f9e4e53c7dc53532c28e4ec42c70232a4 (commit)
       via  a5061b118743430e5c1adae9dbd74d87370c8b7e (commit)
       via  21f78dba36388a9ee9ea3a369c1bcd9bb8ce56ba (commit)
      from  3eac232fdcae51843110ba84cd1698c1ac4be8af (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-stable


- Log -----------------------------------------------------------------
commit d96b0c5f9e4e53c7dc53532c28e4ec42c70232a4
Author: Karolin Seeger <kseeger at samba.org>
Date:   Mon Jun 29 15:28:23 2009 +0200

    WHATSNEW: Update changes.
    
    Karolin
    (cherry picked from commit e742e2b3968801f15f0127f02dff27c78371b5f7)

commit a5061b118743430e5c1adae9dbd74d87370c8b7e
Author: Günther Deschner <gd at samba.org>
Date:   Mon Jun 29 15:06:40 2009 +0200

    s3-selftest: add RPC-SAMR-MACHINE-AUTH to list of test to run against s3.
    
    Guenther
    (cherry picked from commit d5c73127b7e6a9ab917c35811fcfdcfe11681086)

commit 21f78dba36388a9ee9ea3a369c1bcd9bb8ce56ba
Author: David Markey <admin at dmarkey.com>
Date:   Mon Jun 29 08:12:03 2009 +0200

    Fix bug 6514: net gives unhelpful "lp_load failed" when it's missing smb.conf
    (cherry picked from commit 55ed0be65f07b46d51a647e556644039d68a002d)
    (cherry picked from commit 36791e2d05f05282ac4eaab17541aa857e48d830)

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

Summary of changes:
 WHATSNEW.txt                          |    4 ++++
 source3/lib/netapi/netapi.c           |    2 +-
 source3/script/tests/test_posix_s3.sh |    5 +++--
 3 files changed, 8 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 06177ca..011f457 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -218,6 +218,10 @@ o    Volker Lendecke <vl at samba.org>
      * BUG 6498: Add workaround for MS KB932762.
 
 
+o    David Markey <admin at dmarkey.com>
+     * BUG 6514: Improve error message in 'net' when smb.conf is not available.
+
+
 o    Bo Yang <boyang at samba.org>
      * BUG 6499: Fix building of pam_smbpass.
 
diff --git a/source3/lib/netapi/netapi.c b/source3/lib/netapi/netapi.c
index 8893881..2f8474b 100644
--- a/source3/lib/netapi/netapi.c
+++ b/source3/lib/netapi/netapi.c
@@ -89,7 +89,7 @@ NET_API_STATUS libnetapi_init(struct libnetapi_ctx **context)
 
 	if (!lp_load(get_dyn_CONFIGFILE(), true, false, false, false)) {
 		TALLOC_FREE(frame);
-		fprintf(stderr, "lp_load failed\n");
+		fprintf(stderr, "error loading %s\n", get_dyn_CONFIGFILE() );
 		return W_ERROR_V(WERR_GENERAL_FAILURE);
 	}
 
diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index 0bcf369..04d0eeb 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -42,8 +42,9 @@ rpc="$rpc RPC-SAMBA3-SPOOLSS RPC-SAMBA3-WKSSVC"
 rpc="$rpc RPC-NETLOGSAMBA3 RPC-SAMBA3SESSIONKEY RPC-SAMBA3-GETUSERNAME"
 rpc="$rpc RPC-SVCCTL RPC-SPOOLSS RPC-SPOOLSS-WIN RPC-NTSVCS"
 rpc="$rpc RPC-LSA-GETUSER RPC-LSA-LOOKUPSIDS RPC-LSA-LOOKUPNAMES"
-rpc="$rpc RPC-SAMR-USERS RPC-SAMR-USERS-PRIVILEGES RPC-SAMR-PASSWORDS RPC-SAMR-PASSWORDS-PWDLASTSET RPC-SAMR-LARGE-DC RPC-JOIN"
-rpc="$rpc RPC-SCHANNEL RPC-SCHANNEL2 RPC-BENCH-SCHANNEL1"
+rpc="$rpc RPC-SAMR-USERS RPC-SAMR-USERS-PRIVILEGES RPC-SAMR-PASSWORDS"
+rpc="$rpc RPC-SAMR-PASSWORDS-PWDLASTSET RPC-SAMR-LARGE-DC RPC-SAMR-MACHINE-AUTH"
+rpc="$rpc RPC-SCHANNEL RPC-SCHANNEL2 RPC-BENCH-SCHANNEL1 RPC-JOIN"
 
 # NOTE: to enable the UNIX-WHOAMI test, we need to change the default share
 # config to allow guest access. I'm not sure whether this would break other


-- 
Samba Shared Repository