[SCM] Samba Shared Repository - branch master updated - 54b90cd1da7368b4c51dce1ae80714d72dd8bf7f

[Stefan Metzmacher]

The branch, master has been updated
       via  54b90cd1da7368b4c51dce1ae80714d72dd8bf7f (commit)
       via  a2700f37310880a67a5371fda3d14072ca2a51a6 (commit)
      from  e9215c97133bc059339af31946ebbcea08d13098 (commit)

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


- Log -----------------------------------------------------------------
commit 54b90cd1da7368b4c51dce1ae80714d72dd8bf7f
Author: Stefan Metzmacher <metze at samba.org>
Date:   Sat Dec 6 15:48:10 2008 +0100

    s4:winbind: fill in the correct variable...
    
    metze

commit a2700f37310880a67a5371fda3d14072ca2a51a6
Author: Stefan Metzmacher <metze at samba.org>
Date:   Sat Dec 6 15:38:49 2008 +0100

    s4:secrets: remove unused structure
    
    metze

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

Summary of changes:
 source4/param/secrets.h          |    7 -------
 source4/winbind/wb_init_domain.c |    2 +-
 2 files changed, 1 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/param/secrets.h b/source4/param/secrets.h
index 83b6dc7..558a796 100644
--- a/source4/param/secrets.h
+++ b/source4/param/secrets.h
@@ -20,13 +20,6 @@
 #ifndef _SECRETS_H
 #define _SECRETS_H
 
-/* structure for storing machine account password
-   (ie. when samba server is member of a domain */
-struct machine_acct_pass {
-	uint8_t hash[16];
-	time_t mod_time;
-};
-
 #define SECRETS_PRIMARY_DOMAIN_DN "cn=Primary Domains"
 #define SECRETS_PRINCIPALS_DN "cn=Principals"
 #define SECRETS_PRIMARY_DOMAIN_FILTER "(&(flatname=%s)(objectclass=primaryDomain))"
diff --git a/source4/winbind/wb_init_domain.c b/source4/winbind/wb_init_domain.c
index 531647d..8011cba 100644
--- a/source4/winbind/wb_init_domain.c
+++ b/source4/winbind/wb_init_domain.c
@@ -396,7 +396,7 @@ static void init_domain_recv_samr(struct composite_context *ctx)
 	state->ctx->status = wb_connect_samr_recv(
 		ctx, state->domain,
 		&state->domain->libnet_ctx->samr.pipe,
-		&state->domain->libnet_ctx->samr.handle, 
+		&state->domain->libnet_ctx->samr.connect_handle,
 		&state->domain->libnet_ctx->samr.handle);
 	if (!composite_is_ok(state->ctx)) return;
 


-- 
Samba Shared Repository