diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-05-21 18:04:47 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-05-21 18:04:47 +0200 |
| commit | 20796bcf57a7f5e1921dc12e0568221f985fe4f2 (patch) | |
| tree | 8f0540a602a9ea0031d656bc31c0b8bc1e91eb70 /source3/lib/util.c | |
| parent | 323be4a6907e4915bb76aa103bf5b868f0b459b1 (diff) | |
| parent | 1a416ff13ca7786f2e8d24c66addf00883e9cb12 (diff) | |
| download | samba-20796bcf57a7f5e1921dc12e0568221f985fe4f2.tar.gz samba-20796bcf57a7f5e1921dc12e0568221f985fe4f2.tar.bz2 samba-20796bcf57a7f5e1921dc12e0568221f985fe4f2.zip | |
Merge branch 'v3-3-test' of ssh://git.samba.org/data/git/samba into docbook
Conflicts:
source/Makefile.in
(This used to be commit 01987778a123f853fccdcb7fe9566143e2d7c490)
Diffstat (limited to 'source3/lib/util.c')
| -rw-r--r-- | source3/lib/util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/lib/util.c b/source3/lib/util.c index a6b436cc6a..68524a21ce 100644 --- a/source3/lib/util.c +++ b/source3/lib/util.c @@ -3074,7 +3074,7 @@ struct server_id interpret_pid(const char *pid_string) result.pid = pid; } else if (sscanf(pid_string, "%u", &pid) == 1) { - result.vnn = NONCLUSTER_VNN; + result.vnn = get_my_vnn(); result.pid = pid; } else { |