[SCM] Samba Shared Repository - branch master updated

[David Disseldorp]

The branch, master has been updated
       via  e66e06b fss: Fix CID 1293354 Wrong operator used
      from  5ee27b4 waf: Fix systemd detection

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


- Log -----------------------------------------------------------------
commit e66e06b60270239577fbf79c5f7b098dafc2458d
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Apr 8 16:46:44 2015 +0200

    fss: Fix CID 1293354 Wrong operator used
    
    Not used right now, but prevent future confusion.
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: David Disseldorp <ddiss at samba.org>
    
    Autobuild-User(master): David Disseldorp <ddiss at samba.org>
    Autobuild-Date(master): Wed Apr  8 19:36:36 CEST 2015 on sn-devel-104

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

Summary of changes:
 source3/rpc_server/fss/srv_fss_agent.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/source3/rpc_server/fss/srv_fss_agent.c b/source3/rpc_server/fss/srv_fss_agent.c
index 46d9a01..19578cc 100644
--- a/source3/rpc_server/fss/srv_fss_agent.c
+++ b/source3/rpc_server/fss/srv_fss_agent.c
@@ -1287,7 +1287,7 @@ uint32_t _fss_RecoveryCompleteShadowCopySet(struct pipes_struct *p,
 	/* stop msg sequence timer */
 	TALLOC_FREE(fss_global.seq_tmr);
 
-	if (sc_set->context | ATTR_NO_AUTO_RECOVERY) {
+	if (sc_set->context & ATTR_NO_AUTO_RECOVERY) {
 		/* TODO set read-only */
 	}
 


-- 
Samba Shared Repository