summaryrefslogtreecommitdiff
path: root/source3/nsswitch
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2007-05-07 09:35:35 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:21:52 -0500
commite6383f47629368d9dd4e803f17566a24e9d7359e (patch)
treecebde89910087c3220786f209da2c4e32a71bc46 /source3/nsswitch
parentd1153fc79076741571b203b1d70f1536bde208f0 (diff)
downloadsamba-e6383f47629368d9dd4e803f17566a24e9d7359e.tar.gz
samba-e6383f47629368d9dd4e803f17566a24e9d7359e.tar.bz2
samba-e6383f47629368d9dd4e803f17566a24e9d7359e.zip
r22736: Start to merge the low-hanging fruit from the now 7000-line cluster patch.
This changes "struct process_id" to "struct server_id", keeping both is just too much hassle. No functional change (I hope ;-)) Volker (This used to be commit 0ad4b1226c9d91b72136310d3bbb640d2c5d67b8)
Diffstat (limited to 'source3/nsswitch')
-rw-r--r--source3/nsswitch/winbindd.c4
-rw-r--r--source3/nsswitch/winbindd_cm.c4
-rw-r--r--source3/nsswitch/winbindd_dual.c16
3 files changed, 12 insertions, 12 deletions
diff --git a/source3/nsswitch/winbindd.c b/source3/nsswitch/winbindd.c
index 9c5cd3b0e3..57591fb6c2 100644
--- a/source3/nsswitch/winbindd.c
+++ b/source3/nsswitch/winbindd.c
@@ -171,7 +171,7 @@ static void sigchld_handler(int signum)
}
/* React on 'smbcontrol winbindd reload-config' in the same way as on SIGHUP*/
-static void msg_reload_services(int msg_type, struct process_id src,
+static void msg_reload_services(int msg_type, struct server_id src,
void *buf, size_t len, void *private_data)
{
/* Flush various caches */
@@ -180,7 +180,7 @@ static void msg_reload_services(int msg_type, struct process_id src,
}
/* React on 'smbcontrol winbindd shutdown' in the same way as on SIGTERM*/
-static void msg_shutdown(int msg_type, struct process_id src,
+static void msg_shutdown(int msg_type, struct server_id src,
void *buf, size_t len, void *private_data)
{
do_sigterm = True;
diff --git a/source3/nsswitch/winbindd_cm.c b/source3/nsswitch/winbindd_cm.c
index 82c85d6246..a0d12ee62c 100644
--- a/source3/nsswitch/winbindd_cm.c
+++ b/source3/nsswitch/winbindd_cm.c
@@ -82,7 +82,7 @@ static BOOL get_dcs(TALLOC_CTX *mem_ctx, const struct winbindd_domain *domain,
Child failed to find DC's. Reschedule check.
****************************************************************/
-static void msg_failed_to_go_online(int msg_type, struct process_id src,
+static void msg_failed_to_go_online(int msg_type, struct server_id src,
void *buf, size_t len, void *private_data)
{
struct winbindd_domain *domain;
@@ -118,7 +118,7 @@ static void msg_failed_to_go_online(int msg_type, struct process_id src,
Actually cause a reconnect from a message.
****************************************************************/
-static void msg_try_to_go_online(int msg_type, struct process_id src,
+static void msg_try_to_go_online(int msg_type, struct server_id src,
void *buf, size_t len, void *private_data)
{
struct winbindd_domain *domain;
diff --git a/source3/nsswitch/winbindd_dual.c b/source3/nsswitch/winbindd_dual.c
index 58ed19be32..fb335b56a5 100644
--- a/source3/nsswitch/winbindd_dual.c
+++ b/source3/nsswitch/winbindd_dual.c
@@ -478,7 +478,7 @@ void winbindd_flush_negative_conn_cache(struct winbindd_domain *domain)
/* Set our domains as offline and forward the offline message to our children. */
-void winbind_msg_offline(int msg_type, struct process_id src,
+void winbind_msg_offline(int msg_type, struct server_id src,
void *buf, size_t len, void *private_data)
{
struct winbindd_child *child;
@@ -531,7 +531,7 @@ void winbind_msg_offline(int msg_type, struct process_id src,
/* Set our domains as online and forward the online message to our children. */
-void winbind_msg_online(int msg_type, struct process_id src,
+void winbind_msg_online(int msg_type, struct server_id src,
void *buf, size_t len, void *private_data)
{
struct winbindd_child *child;
@@ -600,7 +600,7 @@ void winbind_msg_online(int msg_type, struct process_id src,
}
/* Forward the online/offline messages to our children. */
-void winbind_msg_onlinestatus(int msg_type, struct process_id src,
+void winbind_msg_onlinestatus(int msg_type, struct server_id src,
void *buf, size_t len, void *private_data)
{
struct winbindd_child *child;
@@ -671,7 +671,7 @@ static void account_lockout_policy_handler(struct event_context *ctx,
/* Deal with a request to go offline. */
-static void child_msg_offline(int msg_type, struct process_id src,
+static void child_msg_offline(int msg_type, struct server_id src,
void *buf, size_t len, void *private_data)
{
struct winbindd_domain *domain;
@@ -703,7 +703,7 @@ static void child_msg_offline(int msg_type, struct process_id src,
/* Deal with a request to go online. */
-static void child_msg_online(int msg_type, struct process_id src,
+static void child_msg_online(int msg_type, struct server_id src,
void *buf, size_t len, void *private_data)
{
struct winbindd_domain *domain;
@@ -765,12 +765,12 @@ static const char *collect_onlinestatus(TALLOC_CTX *mem_ctx)
return buf;
}
-static void child_msg_onlinestatus(int msg_type, struct process_id src,
+static void child_msg_onlinestatus(int msg_type, struct server_id src,
void *buf, size_t len, void *private_data)
{
TALLOC_CTX *mem_ctx;
const char *message;
- struct process_id *sender;
+ struct server_id *sender;
DEBUG(5,("winbind_msg_onlinestatus received.\n"));
@@ -778,7 +778,7 @@ static void child_msg_onlinestatus(int msg_type, struct process_id src,
return;
}
- sender = (struct process_id *)buf;
+ sender = (struct server_id *)buf;
mem_ctx = talloc_init("winbind_msg_onlinestatus");
if (mem_ctx == NULL) {