diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2012-07-18 15:07:23 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2012-07-18 15:07:23 +0930 |
| commit | fe72740e8221575921c22030d6d4fcb19201b03b (patch) | |
| tree | 0b1bb254e23d6541eede8f2ff4494af477fd5566 /source3/utils/smbpasswd.c | |
| parent | c809eec53fb1d2a36909e4934dff349f91e3359e (diff) | |
| download | samba-fe72740e8221575921c22030d6d4fcb19201b03b.tar.gz samba-fe72740e8221575921c22030d6d4fcb19201b03b.tar.bz2 samba-fe72740e8221575921c22030d6d4fcb19201b03b.zip | |
loadparm: make the source3/ lp_ functions take an explicit TALLOC_CTX *.
They use talloc_tos() internally: hoist that up to the callers, some
of whom don't want to us talloc_tos().
A simple patch, but hits a lot of files.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'source3/utils/smbpasswd.c')
| -rw-r--r-- | source3/utils/smbpasswd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/utils/smbpasswd.c b/source3/utils/smbpasswd.c index 3689983444..43edab24ee 100644 --- a/source3/utils/smbpasswd.c +++ b/source3/utils/smbpasswd.c @@ -286,7 +286,7 @@ static bool store_ldap_admin_pw (char* pw) if (!secrets_init()) return False; - return secrets_store_ldap_pw(lp_ldap_admin_dn(), pw); + return secrets_store_ldap_pw(lp_ldap_admin_dn(talloc_tos()), pw); } @@ -301,7 +301,7 @@ static int process_root(int local_flags) char *old_passwd = NULL; if (local_flags & LOCAL_SET_LDAP_ADMIN_PW) { - char *ldap_admin_dn = lp_ldap_admin_dn(); + char *ldap_admin_dn = lp_ldap_admin_dn(talloc_tos()); if ( ! *ldap_admin_dn ) { DEBUG(0,("ERROR: 'ldap admin dn' not defined! Please check your smb.conf\n")); goto done; |