summaryrefslogtreecommitdiff
path: root/source3/smbd/server.c
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2012-02-15 11:22:45 +0100
committerJeremy Allison <jra@samba.org>2012-02-15 21:10:22 +0100
commitdd5868d41eeaa304a471822d7783526d9f4c37f5 (patch)
tree244604395cecaf711417fa641e654f126c225564 /source3/smbd/server.c
parenta6bd7f3d574998419cac01b1f7b4fa2e1067bb7c (diff)
downloadsamba-dd5868d41eeaa304a471822d7783526d9f4c37f5.tar.gz
samba-dd5868d41eeaa304a471822d7783526d9f4c37f5.tar.bz2
samba-dd5868d41eeaa304a471822d7783526d9f4c37f5.zip
s3: Add SERVERID_UNIQUE_ID_NOT_TO_VERIFY, bug 8760
Autobuild-User: Jeremy Allison <jra@samba.org> Autobuild-Date: Wed Feb 15 21:10:22 CET 2012 on sn-devel-104
Diffstat (limited to 'source3/smbd/server.c')
-rw-r--r--source3/smbd/server.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 10d59adbc6..182b346197 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -481,7 +481,7 @@ static void smbd_accept_connection(struct tevent_context *ev,
* Generate a unique id in the parent process so that we use
* the global random state in the parent.
*/
- generate_random_buffer((uint8_t *)&unique_id, sizeof(unique_id));
+ unique_id = serverid_get_random_unique_id();
pid = sys_fork();
if (pid == 0) {
@@ -973,7 +973,6 @@ extern void build_options(bool screen);
struct smbd_parent_context *parent = NULL;
TALLOC_CTX *frame;
NTSTATUS status;
- uint64_t unique_id;
struct tevent_context *ev_ctx;
struct messaging_context *msg_ctx;
struct tevent_signal *se;
@@ -1191,8 +1190,7 @@ extern void build_options(bool screen);
become_daemon(Fork, no_process_group, log_stdout);
}
- generate_random_buffer((uint8_t *)&unique_id, sizeof(unique_id));
- set_my_unique_id(unique_id);
+ set_my_unique_id(serverid_get_random_unique_id());
#if HAVE_SETPGID
/*