[SCM] Samba Shared Repository - branch master updated

Andreas Schneider asn at samba.org
Mon Oct 18 06:44:02 MDT 2010


The branch, master has been updated
       via  b615b70 s3-winbind: Fixed init order.
       via  abeef47 librpc: Fixed memory context of dcerpc_binding_from_tower.
       via  d42ddd7 s4-gensec: Add dependency on com_err to GENSEC_KRB5.
      from  034832c s4-ldb Add LDB_REQ_SET_LOCATION to help track handler use

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


- Log -----------------------------------------------------------------
commit b615b7060188bbc33a8e8b38b2b2b14b239dc735
Author: Andreas Schneider <asn at samba.org>
Date:   Fri Oct 15 17:58:39 2010 +0200

    s3-winbind: Fixed init order.
    
    We need the system server info in the rpc services.
    
    Autobuild-User: Andreas Schneider <asn at samba.org>
    Autobuild-Date: Mon Oct 18 12:43:16 UTC 2010 on sn-devel-104

commit abeef470c4f233762950d0bf8d60760a7f8578a9
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Oct 18 12:20:56 2010 +0200

    librpc: Fixed memory context of dcerpc_binding_from_tower.

commit d42ddd7b603524fb9a95be2317104d2f0e456ee2
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Oct 18 11:50:04 2010 +0200

    s4-gensec: Add dependency on com_err to GENSEC_KRB5.

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

Summary of changes:
 librpc/rpc/binding.c              |    4 ++--
 source3/winbindd/winbindd.c       |    6 +++---
 source4/auth/gensec/wscript_build |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/rpc/binding.c b/librpc/rpc/binding.c
index 1b716d0..7489073 100644
--- a/librpc/rpc/binding.c
+++ b/librpc/rpc/binding.c
@@ -685,14 +685,14 @@ _PUBLIC_ NTSTATUS dcerpc_binding_from_tower(TALLOC_CTX *mem_ctx,
 
 	/* Set endpoint */
 	if (tower->num_floors >= 4) {
-		binding->endpoint = dcerpc_floor_get_rhs_data(mem_ctx, &tower->floors[3]);
+		binding->endpoint = dcerpc_floor_get_rhs_data(binding, &tower->floors[3]);
 	} else {
 		binding->endpoint = NULL;
 	}
 
 	/* Set network address */
 	if (tower->num_floors >= 5) {
-		binding->host = dcerpc_floor_get_rhs_data(mem_ctx, &tower->floors[4]);
+		binding->host = dcerpc_floor_get_rhs_data(binding, &tower->floors[4]);
 		NT_STATUS_HAVE_NO_MEMORY(binding->host);
 		binding->target_hostname = binding->host;
 	}
diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index d2344fd..b8a9e16 100644
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -1298,14 +1298,14 @@ int main(int argc, char **argv, char **envp)
 
 	winbindd_register_handlers();
 
-	rpc_lsarpc_init(NULL);
-	rpc_samr_init(NULL);
-
 	if (!init_system_info()) {
 		DEBUG(0,("ERROR: failed to setup system user info.\n"));
 		exit(1);
 	}
 
+	rpc_lsarpc_init(NULL);
+	rpc_samr_init(NULL);
+
 	/* setup listen sockets */
 
 	if (!winbindd_setup_listeners()) {
diff --git a/source4/auth/gensec/wscript_build b/source4/auth/gensec/wscript_build
index dff85d6..4c8ced6 100644
--- a/source4/auth/gensec/wscript_build
+++ b/source4/auth/gensec/wscript_build
@@ -14,7 +14,7 @@ bld.SAMBA_MODULE('gensec_krb5',
 	source='gensec_krb5.c',
 	subsystem='gensec',
 	init_function='gensec_krb5_init',
-	deps='CREDENTIALS KERBEROS auth_session',
+	deps='CREDENTIALS KERBEROS auth_session com_err',
 	internal_module=False,
 	)
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list