diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2012-09-24 09:20:46 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2012-09-24 23:06:07 +0200 |
| commit | fd8d4ec34785e71de3f8458222d196d454d0e723 (patch) | |
| tree | 4d2976bb833a3f7e46e43a26ba9841029ebfcbf2 /source4 | |
| parent | 6641d76562db10e6289c5e819b1296d8f6df37bf (diff) | |
| download | samba-fd8d4ec34785e71de3f8458222d196d454d0e723.tar.gz samba-fd8d4ec34785e71de3f8458222d196d454d0e723.tar.bz2 samba-fd8d4ec34785e71de3f8458222d196d454d0e723.zip | |
replace: Support setproctitle().
This uses the setproctitle() from libc, libsetproctitle or libbsd.
If none is available it provides a dummy implementation.
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/scripting/python/samba/netcmd/domain.py | 4 | ||||
| -rw-r--r-- | source4/smbd/process_onefork.c | 13 |
2 files changed, 2 insertions, 15 deletions
diff --git a/source4/scripting/python/samba/netcmd/domain.py b/source4/scripting/python/samba/netcmd/domain.py index 7d2421b246..2e8d7c965d 100644 --- a/source4/scripting/python/samba/netcmd/domain.py +++ b/source4/scripting/python/samba/netcmd/domain.py @@ -395,8 +395,8 @@ class cmd_domain_provision(Command): serverrole=server_role, dom_for_fun_level=dom_for_fun_level, backend_type=ldap_backend_type, ldapadminpass=ldapadminpass, ol_mmr_urls=ol_mmr_urls, - useeadb=eadb, next_rid=next_rid, lp=lp, use_ntvfs=(use_ntvfs), - use_rfc2307=(use_rfc2307)) + useeadb=eadb, next_rid=next_rid, lp=lp, use_ntvfs=use_ntvfs, + use_rfc2307=use_rfc2307) except ProvisioningError, e: raise CommandError("Provision failed", e) diff --git a/source4/smbd/process_onefork.c b/source4/smbd/process_onefork.c index 251e5074c8..b5e93d93be 100644 --- a/source4/smbd/process_onefork.c +++ b/source4/smbd/process_onefork.c @@ -32,19 +32,6 @@ #include "param/param.h" #include "ldb_wrap.h" -#ifdef HAVE_SETPROCTITLE -#ifdef HAVE_SETPROCTITLE_H -#include <setproctitle.h> -#endif -#else -#define setproctitle none_setproctitle -static int none_setproctitle(const char *fmt, ...) PRINTF_ATTRIBUTE(1, 2); -static int none_setproctitle(const char *fmt, ...) -{ - return 0; -} -#endif - NTSTATUS process_model_onefork_init(void); /* |