[SCM] Samba Shared Repository - branch v3-2-test updated -
release-3-2-0pre2-934-g020b1e6
Günther Deschner
gd at samba.org
Wed Apr 16 00:20:10 GMT 2008
The branch, v3-2-test has been updated
via 020b1e6431601fadf44dbfe8393908c096ecfa4c (commit)
from 143e2b573043dd04a6404fc91d781e8a727bd092 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 020b1e6431601fadf44dbfe8393908c096ecfa4c
Author: Günther Deschner <gd at samba.org>
Date: Wed Apr 16 02:16:08 2008 +0200
net/libnetapi: Include netapi headers early and free on exit.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source/utils/net.c | 7 +++++++
source/utils/net.h | 2 ++
source/utils/net_dom.c | 3 ---
3 files changed, 9 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/utils/net.c b/source/utils/net.c
index 5706e33..f6851f6 100644
--- a/source/utils/net.c
+++ b/source/utils/net.c
@@ -1169,6 +1169,13 @@ static struct functable net_func[] = {
rc = net_run_function(argc_new-1, argv_new+1, net_func, net_help);
DEBUG(2,("return code = %d\n", rc));
+
+ {
+ struct libnetapi_ctx *ctx = NULL;
+ libnetapi_getctx(&ctx);
+ libnetapi_free(ctx);
+ }
+
TALLOC_FREE(frame);
return rc;
}
diff --git a/source/utils/net.h b/source/utils/net.h
index 3a4b1da..00a818a 100644
--- a/source/utils/net.h
+++ b/source/utils/net.h
@@ -22,6 +22,8 @@
* include
*/
+#include "lib/netapi/netapi.h"
+
typedef NTSTATUS (*rpc_command_fn)(const DOM_SID *,
const char *,
struct cli_state *cli,
diff --git a/source/utils/net_dom.c b/source/utils/net_dom.c
index e88bbdb..6e4bf14 100644
--- a/source/utils/net_dom.c
+++ b/source/utils/net_dom.c
@@ -19,7 +19,6 @@
#include "includes.h"
#include "utils/net.h"
-#include "lib/netapi/netapi.h"
static int net_dom_usage(int argc, const char **argv)
{
@@ -130,7 +129,6 @@ static int net_dom_unjoin(int argc, const char **argv)
cli_shutdown(cli);
}
- /* libnetapi_free(ctx); */
return ret;
}
@@ -244,7 +242,6 @@ static int net_dom_join(int argc, const char **argv)
cli_shutdown(cli);
}
- /* libnetapi_free(ctx); */
return ret;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list