[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-1110-g3a1b4c0

Andrew Tridgell tridge at samba.org
Tue Feb 24 00:41:00 GMT 2009


The branch, master has been updated
       via  3a1b4c00eb96634229fb730e9b38e8df5180756a (commit)
       via  b9860043dc092df25d4a39074e106d7367ebbe8f (commit)
       via  0016b9cee8d9e640e0b4604a81a900708a944c0d (commit)
      from  faa1100d229aef56da5d48f5c19ec901e520f8ef (commit)

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


- Log -----------------------------------------------------------------
commit 3a1b4c00eb96634229fb730e9b38e8df5180756a
Merge: b9860043dc092df25d4a39074e106d7367ebbe8f faa1100d229aef56da5d48f5c19ec901e520f8ef
Author: Andrew Tridgell <tridge at samba.org>
Date:   Tue Feb 24 11:40:28 2009 +1100

    Merge branch 'master' of ssh://git.samba.org/data/git/samba

commit b9860043dc092df25d4a39074e106d7367ebbe8f
Author: Andrew Tridgell <tridge at samba.org>
Date:   Tue Feb 24 11:39:44 2009 +1100

    fixed the event context for net vampire

commit 0016b9cee8d9e640e0b4604a81a900708a944c0d
Author: Andrew Tridgell <tridge at samba.org>
Date:   Tue Feb 24 10:48:11 2009 +1100

    added a missing linefeed

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

Summary of changes:
 source4/utils/net/net.c      |    2 +-
 source4/utils/net/net_join.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index ba5296f..d934403 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -107,7 +107,7 @@ static const struct net_functable net_functable[] = {
 	{"vampire", "join and syncronise an AD domain onto the local server\n", net_vampire, net_vampire_usage},
 	{"samsync", "synchronise into the local ldb the sam of an NT4 domain\n", net_samsync_ldb, net_samsync_ldb_usage},
 	{"user", "manage user accounts\n", net_user, net_user_usage},
-	{"machinepw", "Get a machine password out of our SAM", net_machinepw,
+	{"machinepw", "Get a machine password out of our SAM\n", net_machinepw,
 	 net_machinepw_usage},
 	{NULL, NULL, NULL, NULL}
 };
diff --git a/source4/utils/net/net_join.c b/source4/utils/net/net_join.c
index ad63340..b0a25bb 100644
--- a/source4/utils/net/net_join.c
+++ b/source4/utils/net/net_join.c
@@ -126,7 +126,7 @@ int net_vampire(struct net_context *ctx, int argc, const char **argv)
 
 	domain_name = tmp;
 
-	libnetctx = libnet_context_init(NULL, ctx->lp_ctx);
+	libnetctx = libnet_context_init(ctx->event_ctx, ctx->lp_ctx);
 	if (!libnetctx) {
 		return -1;	
 	}


-- 
Samba Shared Repository


More information about the samba-cvs mailing list