[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  226c59e libads: Fix CID 1272956 Fixing wrong if condition
       via  76ba7f9 rpc_server/srvsvc: Fix CID 241162 Logically dead code
      from  13b6199 s3: locking: Add a memcache based lock cache.

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


- Log -----------------------------------------------------------------
commit 226c59ea5bf2b8e27b8f0f9c36457a07df2d98ce
Author: Anoop C S <achiraya at redhat.com>
Date:   Wed Apr 15 16:34:35 2015 +0530

    libads: Fix CID 1272956 Fixing wrong if condition
    
    Signed-off-by: Anoop C S <achiraya at redhat.com>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Christof Schmitt <cs at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Sat Apr 18 01:33:04 CEST 2015 on sn-devel-104

commit 76ba7f93b4032a1033aa7c58393a9e15fe94de97
Author: Anoop C S <achiraya at redhat.com>
Date:   Wed Apr 15 15:56:42 2015 +0530

    rpc_server/srvsvc: Fix CID 241162 Logically dead code
    
    Signed-off-by: Anoop C S <achiraya at redhat.com>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Christof Schmitt <cs at samba.org>

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

Summary of changes:
 source3/libads/authdata.c                 | 2 +-
 source3/rpc_server/srvsvc/srv_srvsvc_nt.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libads/authdata.c b/source3/libads/authdata.c
index d3a0992..b4a1b84 100644
--- a/source3/libads/authdata.c
+++ b/source3/libads/authdata.c
@@ -239,7 +239,7 @@ NTSTATUS kerberos_return_pac(TALLOC_CTX *mem_ctx,
 	}
 
 	gensec_settings = lpcfg_gensec_settings(tmp_ctx, lp_ctx);
-	if (lp_ctx == NULL) {
+	if (gensec_settings == NULL) {
 		status = NT_STATUS_NO_MEMORY;
 		DEBUG(10, ("lpcfg_gensec_settings failed\n"));
 		goto out;
diff --git a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
index 7e42272..bbbdefe 100644
--- a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
@@ -1874,7 +1874,7 @@ WERROR _srvsvc_NetShareSetInfo(struct pipes_struct *p,
 				get_dyn_CONFIGFILE(),
 				share_name,
 				path,
-				comment ? comment : "",
+				comment,
 				max_connections,
 				csc_policy);
 		if (!command) {


-- 
Samba Shared Repository