[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-803-gd40537c
Andrew Tridgell
tridge at samba.org
Tue Aug 4 21:32:51 MDT 2009
The branch, master has been updated
via d40537c92a9ad7535b90218f289c35f039d03b0c (commit)
from cd1d7f4be7d31388ab79c797acaf6d7730113112 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit d40537c92a9ad7535b90218f289c35f039d03b0c
Author: Andrew Tridgell <tridge at samba.org>
Date: Wed Aug 5 13:31:06 2009 +1000
fixed a uid_wrapper bug that caused a segv in the RAW-ACLS test
-----------------------------------------------------------------------
Summary of changes:
lib/uid_wrapper/uid_wrapper.c | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/uid_wrapper/uid_wrapper.c b/lib/uid_wrapper/uid_wrapper.c
index 948ff65..f7f0431 100644
--- a/lib/uid_wrapper/uid_wrapper.c
+++ b/lib/uid_wrapper/uid_wrapper.c
@@ -42,6 +42,10 @@ static void uwrap_init(void)
uwrap.initialised = true;
if (getenv("UID_WRAPPER")) {
uwrap.enabled = true;
+ /* put us in one group */
+ uwrap.ngroups = 1;
+ uwrap.groups = talloc_array(talloc_autofree_context(), gid_t, 1);
+ uwrap.groups[0] = 0;
}
}
@@ -101,14 +105,17 @@ _PUBLIC_ int uwrap_setgroups(size_t size, const gid_t *list)
talloc_free(uwrap.groups);
uwrap.ngroups = 0;
-
- uwrap.groups = talloc_array(talloc_autofree_context(), gid_t, size);
- if (uwrap.groups == NULL) {
- errno = ENOMEM;
- return -1;
+ uwrap.groups = NULL;
+
+ if (size != 0) {
+ uwrap.groups = talloc_array(talloc_autofree_context(), gid_t, size);
+ if (uwrap.groups == NULL) {
+ errno = ENOMEM;
+ return -1;
+ }
+ memcpy(uwrap.groups, list, size*sizeof(gid_t));
+ uwrap.ngroups = size;
}
- memcpy(uwrap.groups, list, size*sizeof(gid_t));
- uwrap.ngroups = size;
return 0;
}
@@ -130,7 +137,7 @@ _PUBLIC_ int uwrap_getgroups(int size, gid_t *list)
return -1;
}
memcpy(list, uwrap.groups, size*sizeof(gid_t));
- return 0;
+ return uwrap.ngroups;
}
_PUBLIC_ uid_t uwrap_getuid(void)
--
Samba Shared Repository
More information about the samba-cvs
mailing list