diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-04-01 15:26:00 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-04-01 15:26:00 +0200 |
| commit | 39b2fc37f2f8d914a6e5945b5b503ee4e7b9f5f3 (patch) | |
| tree | f0b4923151c3ca722e4001331f97d7833a7e7537 /source4/smbd | |
| parent | 7fd96c5b04177a412d9ef12b2f4620b587fe8ed6 (diff) | |
| download | samba-39b2fc37f2f8d914a6e5945b5b503ee4e7b9f5f3.tar.gz samba-39b2fc37f2f8d914a6e5945b5b503ee4e7b9f5f3.tar.bz2 samba-39b2fc37f2f8d914a6e5945b5b503ee4e7b9f5f3.zip | |
Add context pointer to secrets functions.
(This used to be commit 873941d8a8dca8e7ace83f9af9939e4264f78c96)
Diffstat (limited to 'source4/smbd')
| -rw-r--r-- | source4/smbd/process_standard.c | 3 | ||||
| -rw-r--r-- | source4/smbd/server.c | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/source4/smbd/process_standard.c b/source4/smbd/process_standard.c index deb44c0a68..820859400e 100644 --- a/source4/smbd/process_standard.c +++ b/source4/smbd/process_standard.c @@ -204,9 +204,6 @@ _NORETURN_ static void standard_terminate(struct event_context *ev, const char * which makes leak checking easier */ reload_charcnv(global_loadparm); - /* the secrets db should really hang off the connection structure */ - secrets_shutdown(); - talloc_free(ev); /* terminate this process */ diff --git a/source4/smbd/server.c b/source4/smbd/server.c index fe38a4e5ab..d6e2fb19e4 100644 --- a/source4/smbd/server.c +++ b/source4/smbd/server.c @@ -278,7 +278,7 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[ /* Do *not* remove this, until you have removed * passdb/secrets.c, and proved that Samba still builds... */ /* Setup the SECRETS subsystem */ - if (!secrets_init(cmdline_lp_ctx)) { + if (secrets_init(talloc_autofree_context(), cmdline_lp_ctx) == NULL) { exit(1); } |