[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  be8e90f s3/rpc_server: move rpc_modules.c to its own subsystem
       via  9a55940 libgpo: Fix error check in gp_inifile_init_context_direct()
      from  ca5d36d s3/winbindd: fix invalid free

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


- Log -----------------------------------------------------------------
commit be8e90f27a70f3ba8d708e984cf7b2a34e8c2628
Author: Ralph Boehme <slow at samba.org>
Date:   Mon Jan 16 12:24:54 2017 +0100

    s3/rpc_server: move rpc_modules.c to its own subsystem
    
    The source file rpc_modules.c was used in two places which lead to the
    following build error when configuring with '--nonshared-binary=smbd/smbd':
    
      ERROR: source source3/rpc_server/rpc_modules.c is in more than one
      subsystem of target 'smbd/smbd': ['RPC_SERVICE', 'MDSSD']
    
    Bug: https://bugzilla.samba.org/show_bug.cgi?id=12524
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Noel Power <nopower at suse.com>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Fri Jan 20 15:00:45 CET 2017 on sn-devel-144

commit 9a55940e95909900b72726b2e216b36cbbd305ab
Author: Günther Deschner <gd at samba.org>
Date:   Thu Jan 19 16:49:38 2017 +0100

    libgpo: Fix error check in gp_inifile_init_context_direct()
    
    Guenther
    
    Signed-off-by: Guenther Deschner <gd at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

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

Summary of changes:
 libgpo/gpo_ini.c                 |  4 ++--
 source3/rpc_server/wscript_build | 11 ++++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libgpo/gpo_ini.c b/libgpo/gpo_ini.c
index 198e8af..c1b1698 100644
--- a/libgpo/gpo_ini.c
+++ b/libgpo/gpo_ini.c
@@ -359,7 +359,7 @@ NTSTATUS gp_inifile_init_context_direct(TALLOC_CTX *mem_ctx,
 {
 	struct gp_inifile_context *gp_ctx = NULL;
 	NTSTATUS status;
-	int rv;
+	bool rv;
 	char *tmp_filename = NULL;
 
 	if (unix_path == NULL || pgp_ctx == NULL) {
@@ -382,7 +382,7 @@ NTSTATUS gp_inifile_init_context_direct(TALLOC_CTX *mem_ctx,
 				   change_section,
 				   store_keyval_pair,
 				   gp_ctx);
-	if (rv != 0) {
+	if (!rv) {
 		return NT_STATUS_NO_SUCH_FILE;
 	}
 
diff --git a/source3/rpc_server/wscript_build b/source3/rpc_server/wscript_build
index 55373e7..ad3a141 100644
--- a/source3/rpc_server/wscript_build
+++ b/source3/rpc_server/wscript_build
@@ -39,6 +39,10 @@ bld.SAMBA3_SUBSYSTEM('RPC_SERVER',
                     NDR_NAMED_PIPE_AUTH
                     ''')
 
+bld.SAMBA3_SUBSYSTEM('RPC_MODULES',
+                    source='rpc_modules.c',
+                    deps='samba-util')
+
 ### RPC_SERVICES
 bld.SAMBA3_SUBSYSTEM('RPC_DSSETUP',
                     source='''dssetup/srv_dssetup_nt.c
@@ -156,11 +160,12 @@ bld.SAMBA3_SUBSYSTEM('RPC_SERVER_REGISTER',
                     deps='samba-util')
 
 bld.SAMBA3_SUBSYSTEM('RPC_SERVICE',
-                    source='rpc_service_setup.c rpc_modules.c',
+                    source='rpc_service_setup.c',
                     deps='''
                     rpc
                     RPC_SERVER
                     RPC_SERVER_REGISTER
+		    RPC_MODULES
                     RPC_SAMR
                     RPC_LSARPC
                     RPC_WINREG
@@ -199,6 +204,6 @@ bld.SAMBA3_SUBSYSTEM('FSSD',
                     deps='samba-util')
 
 bld.SAMBA3_SUBSYSTEM('MDSSD',
-                    source='mdssd.c rpc_modules.c',
-                    deps='RPC_SOCK_HELPER samba-util',
+                    source='mdssd.c',
+                    deps='RPC_SOCK_HELPER RPC_MODULES samba-util',
                     enabled=bld.env.with_spotlight)


-- 
Samba Shared Repository