[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  5022b3d s4: Fix a -Wunused-value warning
      from  24fc5b4 s3-spoolss: Fix builtin forms order to match Windows again.

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


- Log -----------------------------------------------------------------
commit 5022b3d8c183181b922e3ccac49e5819eb453035
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Sep 26 10:07:32 2012 -0700

    s4: Fix a -Wunused-value warning
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Wed Sep 26 21:52:00 CEST 2012 on sn-devel-104

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

Summary of changes:
 source4/cldap_server/netlogon.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/cldap_server/netlogon.c b/source4/cldap_server/netlogon.c
index ce257e9..6d5efb5 100644
--- a/source4/cldap_server/netlogon.c
+++ b/source4/cldap_server/netlogon.c
@@ -241,7 +241,7 @@ NTSTATUS fill_netlogon_samlogon_response(struct ldb_context *sam_ctx,
 	}
 
 	if (str_list_check(services, "ntp_signd")) {
-		server_type | DS_SERVER_TIMESERV | DS_SERVER_GOOD_TIMESERV;
+		server_type |= DS_SERVER_TIMESERV | DS_SERVER_GOOD_TIMESERV;
 	}
 
 	if (samdb_rodc(sam_ctx, &am_rodc) == LDB_SUCCESS && !am_rodc) {


-- 
Samba Shared Repository