diff options
| author | Volker Lendecke <vl@samba.org> | 2010-06-27 15:36:38 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-08-28 12:28:53 +0200 |
| commit | 0f83aa865090bfaf06add6a9e8b7215ab1db7d95 (patch) | |
| tree | 2e3b2a96d2c73aca228b822a63415c829f4e89e3 /source3/utils | |
| parent | 520c5aae40ce882b8c5c020eb728d4198106d6b7 (diff) | |
| download | samba-0f83aa865090bfaf06add6a9e8b7215ab1db7d95.tar.gz samba-0f83aa865090bfaf06add6a9e8b7215ab1db7d95.tar.bz2 samba-0f83aa865090bfaf06add6a9e8b7215ab1db7d95.zip | |
s3: Remove the dependency of g_lock on procid_self
procid_self() references global vars, don't depend on them unnecessarily
Diffstat (limited to 'source3/utils')
| -rw-r--r-- | source3/utils/net_g_lock.c | 2 | ||||
| -rw-r--r-- | source3/utils/net_registry.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/utils/net_g_lock.c b/source3/utils/net_g_lock.c index a683b552de..937c11c0c4 100644 --- a/source3/utils/net_g_lock.c +++ b/source3/utils/net_g_lock.c @@ -90,7 +90,7 @@ static int net_g_lock_do(struct net_context *c, int argc, const char **argv) status = g_lock_do(name, G_LOCK_WRITE, timeval_set(timeout / 1000, timeout % 1000), - net_g_lock_do_fn, &state); + procid_self(), net_g_lock_do_fn, &state); if (!NT_STATUS_IS_OK(status)) { d_fprintf(stderr, "ERROR: g_lock_do failed: %s\n", nt_errstr(status)); diff --git a/source3/utils/net_registry.c b/source3/utils/net_registry.c index 4a6af959dc..f90d05454b 100644 --- a/source3/utils/net_registry.c +++ b/source3/utils/net_registry.c @@ -488,7 +488,7 @@ static int net_registry_increment(struct net_context *c, int argc, } status = g_lock_do("registry_increment_lock", G_LOCK_WRITE, - timeval_set(600, 0), + timeval_set(600, 0), procid_self(), net_registry_increment_fn, &state); if (!NT_STATUS_IS_OK(status)) { d_fprintf(stderr, _("g_lock_do failed: %s\n"), |