summaryrefslogtreecommitdiff
path: root/source4/utils
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-11-09 09:26:47 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:05:41 -0500
commit4815480bb6ed44081076bac5471267609f7668cf (patch)
tree66546c6401d73d8248c7ec51762cfe60711f4571 /source4/utils
parent3351f1aa8d0f96358d4550a154a63c7a1e542109 (diff)
downloadsamba-4815480bb6ed44081076bac5471267609f7668cf.tar.gz
samba-4815480bb6ed44081076bac5471267609f7668cf.tar.bz2
samba-4815480bb6ed44081076bac5471267609f7668cf.zip
r3633: - moved module init functions to after smb.conf and command line
parsing, so that module init can take account of lp_ parms (thats why gensec:krb5=no wasn't working) - added a BASE-DISCONNECT torture test that tests server response to clients disconnecting with open lock and open requests pending (This used to be commit 5205f598b8c0be6985e61cc842cc5da109ba5b7e)
Diffstat (limited to 'source4/utils')
-rw-r--r--source4/utils/net/net.c3
-rw-r--r--source4/utils/ntlm_auth.c5
2 files changed, 5 insertions, 3 deletions
diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index dcd663d3fd..ac427c4935 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -207,6 +207,8 @@ static int binary_net(int argc, const char **argv)
return 1;
}
+ net_init_subsystems;
+
mem_ctx = talloc_init("net_context");
ctx = talloc_p(mem_ctx, struct net_context);
if (!ctx) {
@@ -232,6 +234,5 @@ static int binary_net(int argc, const char **argv)
int main(int argc, const char **argv)
{
- net_init_subsystems;
return binary_net(argc, argv);
}
diff --git a/source4/utils/ntlm_auth.c b/source4/utils/ntlm_auth.c
index 5cc02ffbb2..23586b1db5 100644
--- a/source4/utils/ntlm_auth.c
+++ b/source4/utils/ntlm_auth.c
@@ -861,8 +861,6 @@ enum {
POPT_TABLEEND
};
- ntlm_auth_init_subsystems;
-
/* Samba client initialisation */
setup_logging("ntlm_auth", DEBUG_STDERR);
@@ -899,6 +897,9 @@ enum {
return 1;
}
+ ntlm_auth_init_subsystems;
+
+
if (opt_domain == NULL) {
opt_domain = lp_workgroup();
}