summaryrefslogtreecommitdiff
path: root/lib/util
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-06-08 14:05:55 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-06-09 12:40:09 +0200
commit16b1c77644217796f70a3a0bf1d95c245f9ee2d9 (patch)
treeb08d316880e1a03d1a7fad4c5ced8d141878986c /lib/util
parentd01dbd6c3fd9ca2595d65991b56db4400a35ece0 (diff)
downloadsamba-16b1c77644217796f70a3a0bf1d95c245f9ee2d9.tar.gz
samba-16b1c77644217796f70a3a0bf1d95c245f9ee2d9.tar.bz2
samba-16b1c77644217796f70a3a0bf1d95c245f9ee2d9.zip
lib/util Bring procid_str() into lib/util as server_id_string()
This is needed for OpenChange, which prints Samba struct server_id values in debug messages. Andrew Bartlett
Diffstat (limited to 'lib/util')
-rw-r--r--lib/util/server_id.c36
-rw-r--r--lib/util/util.h2
-rwxr-xr-xlib/util/wscript_build3
3 files changed, 40 insertions, 1 deletions
diff --git a/lib/util/server_id.c b/lib/util/server_id.c
new file mode 100644
index 0000000000..a67c40eb19
--- /dev/null
+++ b/lib/util/server_id.c
@@ -0,0 +1,36 @@
+/*
+ Unix SMB/CIFS implementation.
+ Samba utility functions
+ Copyright (C) Andrew Bartlett 2011
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "includes.h"
+#include "librpc/gen_ndr/server_id.h"
+
+char *server_id_str(TALLOC_CTX *mem_ctx, const struct server_id *id)
+{
+ if (id->vnn == NONCLUSTER_VNN && id->task_id == 0) {
+ return talloc_asprintf(mem_ctx,
+ "%llu",
+ (unsigned long long)id->pid);
+ } else {
+ return talloc_asprintf(mem_ctx,
+ "%u:%llu:%u",
+ (unsigned)id->vnn,
+ (unsigned long long)id->pid,
+ (unsigned)id->task_id);
+ }
+}
diff --git a/lib/util/util.h b/lib/util/util.h
index e89c4ac997..e50cc38a2f 100644
--- a/lib/util/util.h
+++ b/lib/util/util.h
@@ -916,5 +916,7 @@ char *data_path(TALLOC_CTX *mem_ctx, const char *name);
**/
const char *shlib_ext(void);
+struct server_id;
+char *server_id_str(TALLOC_CTX *mem_ctx, const struct server_id *id);
#endif /* _SAMBA_UTIL_H_ */
diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index 8ce30eb689..6c4bb37884 100755
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -5,7 +5,8 @@ common_util_sources = '''talloc_stack.c smb_threads.c xfile.c data_blob.c
genrand.c fsusage.c blocking.c become_daemon.c
signal.c system.c params.c util.c util_id.c util_net.c
util_strlist.c util_paths.c idtree.c debug.c fault.c base64.c
- util_str.c util_str_common.c substitute.c ms_fnmatch.c'''
+ util_str.c util_str_common.c substitute.c ms_fnmatch.c
+ server_id.c'''
common_util_headers = 'debug.h'
common_util_public_deps = 'talloc pthread LIBCRYPTO CHARSET'