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

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index ba5296fd97d9ed46a9dc0b5c60a952fea5d6adf1..d934403ade2105e23ca5c82030f52c87f5203e15 100644 (file)
--- 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 ad63340089907b550122218fdd5bb8e2ef440113..b0a25bb7c067ae6d28e4ce0b45890fce069d7f6d 100644 (file)
--- 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;      
        }