From: Volker Lendecke Date: Sat, 25 Sep 2010 23:28:21 +0000 (-0700) Subject: s3: Remove talloc_autofree_context() from smbpasswd X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=bf6ca13346e67107d821cec9edf4f767defa490e;p=mat%2Fsamba.git s3: Remove talloc_autofree_context() from smbpasswd In both cases, pwd is freed immediately --- diff --git a/source3/utils/smbpasswd.c b/source3/utils/smbpasswd.c index 1b68136c68..2ae7e4dcdf 100644 --- a/source3/utils/smbpasswd.c +++ b/source3/utils/smbpasswd.c @@ -342,7 +342,7 @@ static int process_root(int local_flags) load_interfaces(); } - if (!user_name[0] && (pwd = getpwuid_alloc(talloc_autofree_context(), geteuid()))) { + if (!user_name[0] && (pwd = getpwuid_alloc(talloc_tos(), geteuid()))) { fstrcpy(user_name, pwd->pw_name); TALLOC_FREE(pwd); } @@ -507,7 +507,7 @@ static int process_nonroot(int local_flags) } if (!user_name[0]) { - pwd = getpwuid_alloc(talloc_autofree_context(), getuid()); + pwd = getpwuid_alloc(talloc_tos(), getuid()); if (pwd) { fstrcpy(user_name,pwd->pw_name); TALLOC_FREE(pwd);