[SCM] Samba Shared Repository - branch v3-5-test updated
Bo Yang
boyang at samba.org
Mon Nov 30 10:01:06 MST 2009
The branch, v3-5-test has been updated
via f9651fc... Revert "s3: Fix commit 9b5f8eb59ed7f65d4c017cd6a9dc668ebf3115b6."
via cdbf770... Revert "s3: Fix crash in free_file_list()."
from 54e2e0a... s3:docs: Fix typo in man mount.cifs.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -----------------------------------------------------------------
commit f9651fcd867293fb0364729e220ee81c3f7a72af
Author: Bo Yang <boyang at samba.org>
Date: Tue Dec 1 01:05:35 2009 +0800
Revert "s3: Fix commit 9b5f8eb59ed7f65d4c017cd6a9dc668ebf3115b6."
This reverts commit 509b42486e5f98343d95100c12969703398a248d.
commit cdbf7708c219f12432c8cac237dd9c1144b8ee22
Author: Bo Yang <boyang at samba.org>
Date: Tue Dec 1 01:05:10 2009 +0800
Revert "s3: Fix crash in free_file_list()."
This reverts commit 9b5f8eb59ed7f65d4c017cd6a9dc668ebf3115b6.
-----------------------------------------------------------------------
Summary of changes:
source3/param/loadparm.c | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 641f7ad..9da853f 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -7016,7 +7016,6 @@ static void add_to_file_list(const char *fname, const char *subfname)
}
f->subfname = SMB_STRDUP(subfname);
if (!f->subfname) {
- SAFE_FREE(f->name);
SAFE_FREE(f);
return;
}
@@ -7027,7 +7026,6 @@ static void add_to_file_list(const char *fname, const char *subfname)
if (t)
f->modtime = t;
}
- return;
}
/**
@@ -7093,7 +7091,7 @@ bool lp_file_list_changed(void)
return true;
}
} else {
- n2 = talloc_sub_basic(get_current_username(),
+ n2 = alloc_sub_basic(get_current_username(),
current_user_info.domain,
f->name);
if (!n2) {
@@ -7114,11 +7112,12 @@ bool lp_file_list_changed(void)
ctime(&mod_time)));
f->modtime = mod_time;
SAFE_FREE(f->subfname);
- f->subfname = SMB_STRDUP(n2);
- TALLOC_FREE(n2);
+ f->subfname = n2; /* Passing ownership of
+ return from alloc_sub_basic
+ above. */
return true;
}
- TALLOC_FREE(n2);
+ SAFE_FREE(n2);
}
f = f->next;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list