The branch, master has been updated via 39e58d6 s3fs-utils: Free the popt context in smbcacls and smbquotas. via aca807c s3fs-net: Use talloc for memory allocation. from a88e3be s3:docs document shadow:snapdirseverywhere option of vfs_shadow_copy2
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 39e58d6845ee4dab0e9ae1537fccaed837ead728 Author: Andreas Schneider <a...@samba.org> Date: Mon Oct 29 21:12:14 2012 +0100 s3fs-utils: Free the popt context in smbcacls and smbquotas. Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed by: Jeremy Allison <j...@samba.org> Autobuild-User(master): Jeremy Allison <j...@samba.org> Autobuild-Date(master): Tue Oct 30 20:22:46 CET 2012 on sn-devel-104 commit aca807c94cdb44cc846562400495ee3a7114f8e0 Author: Andreas Schneider <a...@samba.org> Date: Mon Oct 29 21:12:13 2012 +0100 s3fs-net: Use talloc for memory allocation. Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed by: Jeremy Allison <j...@samba.org> ----------------------------------------------------------------------- Summary of changes: source3/utils/net.c | 2 +- source3/utils/smbcacls.c | 2 ++ source3/utils/smbcquotas.c | 2 ++ 3 files changed, 5 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/utils/net.c b/source3/utils/net.c index eccb522..85fe2f6 100644 --- a/source3/utils/net.c +++ b/source3/utils/net.c @@ -868,7 +868,7 @@ static struct functable net_func[] = { break; case 'U': c->opt_user_specified = true; - c->opt_user_name = SMB_STRDUP(c->opt_user_name); + c->opt_user_name = talloc_strdup(c, c->opt_user_name); p = strchr(c->opt_user_name,'%'); if (p) { *p = 0; diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c index 3d18bee..7df4e48 100644 --- a/source3/utils/smbcacls.c +++ b/source3/utils/smbcacls.c @@ -1435,6 +1435,8 @@ static struct cli_state *connect_one(struct user_auth_info *auth_info, return -1; } + poptFreeContext(pc); + string_replace(path,'/','\\'); server = talloc_strdup(frame, path+2); diff --git a/source3/utils/smbcquotas.c b/source3/utils/smbcquotas.c index be82e34..b962103 100644 --- a/source3/utils/smbcquotas.c +++ b/source3/utils/smbcquotas.c @@ -688,6 +688,8 @@ FSQFLAGS:QUOTA_ENABLED/DENY_DISK/LOG_SOFTLIMIT/LOG_HARD_LIMIT", "SETSTRING" }, exit(EXIT_PARSE_ERROR); } + poptFreeContext(pc); + string_replace(path, '/', '\\'); server = SMB_STRDUP(path+2); -- Samba Shared Repository