The branch, master has been updated via a599319... libreplace: fixed declaration of dprintf() on FreeBSD via 83aaf48... s4-provision: FreeBSD uses 'staff' for users via de2b841... s4-provision: solaris uses the group "other" from 4c4d0a0... build: fixed nss_wrapper on solaris
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit a599319d0a389ff0c31dae8068cd7a78352aa9e7 Author: Andrew Tridgell <tri...@freebsd.home.tridgell.net> Date: Wed Mar 24 05:06:25 2010 +1100 libreplace: fixed declaration of dprintf() on FreeBSD commit 83aaf4829e2b9bece5c1b4181553d3025d6d2cb3 Author: Andrew Tridgell <tri...@samba.org> Date: Wed Mar 24 16:52:37 2010 +1100 s4-provision: FreeBSD uses 'staff' for users commit de2b8419358d3588f6d33a22686260de8efda1d2 Author: Andrew Tridgell <tri...@samba.org> Date: Tue Mar 23 11:02:32 2010 -0400 s4-provision: solaris uses the group "other" ----------------------------------------------------------------------- Summary of changes: lib/replace/replace.c | 4 ++-- lib/replace/replace.h | 10 ++++++++++ source4/scripting/python/samba/provision.py | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/replace/replace.c b/lib/replace/replace.c index f2dcb10..e4b97a8 100644 --- a/lib/replace/replace.c +++ b/lib/replace/replace.c @@ -705,7 +705,7 @@ void *rep_memmem(const void *haystack, size_t haystacklen, #endif #ifndef HAVE_VDPRINTF -int vdprintf(int fd, const char *format, va_list ap) +int rep_vdprintf(int fd, const char *format, va_list ap) { char *s = NULL; int ret; @@ -722,7 +722,7 @@ int vdprintf(int fd, const char *format, va_list ap) #endif #ifndef HAVE_DPRINTF -int dprintf(int fd, const char *format, ...) +int rep_dprintf(int fd, const char *format, ...) { int ret; va_list ap; diff --git a/lib/replace/replace.h b/lib/replace/replace.h index e7578cd..cd73e65 100644 --- a/lib/replace/replace.h +++ b/lib/replace/replace.h @@ -336,6 +336,16 @@ int rep_dlclose(void *handle); /* prototype is in system/network.h */ #endif +#ifndef HAVE_VDPRINTF +#define vdprintf rep_vdprintf +int rep_vdprintf(int fd, const char *format, va_list ap); +#endif + +#ifndef HAVE_DPRINTF +#define dprintf rep_dprintf +int rep_dprintf(int fd, const char *format, ...); +#endif + #ifndef PRINTF_ATTRIBUTE #if (__GNUC__ >= 3) && (__GNUC_MINOR__ >= 1 ) /** Use gcc attribute to check printf fns. a1 is the 1-based index of diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py index aa13711..1d5e61c 100644 --- a/source4/scripting/python/samba/provision.py +++ b/source4/scripting/python/samba/provision.py @@ -1140,7 +1140,7 @@ def provision(setup_dir, message, session_info, root_uid = findnss_uid([root or "root"]) nobody_uid = findnss_uid([nobody or "nobody"]) - users_gid = findnss_gid([users or "users"]) + users_gid = findnss_gid([users or "users", 'users', 'other', 'staff']) if wheel is None: wheel_gid = findnss_gid(["wheel", "adm"]) else: -- Samba Shared Repository