diff options
| author | Volker Lendecke <vlendec@samba.org> | 2007-05-07 09:35:35 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:21:52 -0500 |
| commit | e6383f47629368d9dd4e803f17566a24e9d7359e (patch) | |
| tree | cebde89910087c3220786f209da2c4e32a71bc46 /source3/web | |
| parent | d1153fc79076741571b203b1d70f1536bde208f0 (diff) | |
| download | samba-e6383f47629368d9dd4e803f17566a24e9d7359e.tar.gz | |
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/web')
| -rw-r--r-- | source3/web/startstop.c | 2 | ||||
| -rw-r--r-- | source3/web/statuspage.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source3/web/startstop.c b/source3/web/startstop.c index 44945cd5362..1485516474c 100644 --- a/source3/web/startstop.c +++ b/source3/web/startstop.c @@ -121,7 +121,7 @@ void stop_winbindd(void) } #endif /* kill a specified process */ -void kill_pid(struct process_id pid) +void kill_pid(struct server_id pid) { if (geteuid() != 0) return; diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c index e4d726c4fd2..7b5c528a7de 100644 --- a/source3/web/statuspage.c +++ b/source3/web/statuspage.c @@ -28,14 +28,14 @@ PIDMAP { PIDMAP *next, *prev; - struct process_id pid; + struct server_id pid; char *machine; }; static PIDMAP *pidmap; static int PID_or_Machine; /* 0 = show PID, else show Machine name */ -static struct process_id smbd_pid; +static struct server_id smbd_pid; /* from 2nd call on, remove old list */ static void initPid2Machine (void) @@ -55,7 +55,7 @@ static void initPid2Machine (void) } /* add new PID <-> Machine name mapping */ -static void addPid2Machine (struct process_id pid, char *machine) +static void addPid2Machine (struct server_id pid, char *machine) { /* show machine name rather PID on table "Open Files"? */ if (PID_or_Machine) { @@ -75,7 +75,7 @@ static void addPid2Machine (struct process_id pid, char *machine) } /* lookup PID <-> Machine name mapping */ -static char *mapPid2Machine (struct process_id pid) +static char *mapPid2Machine (struct server_id pid) { static char pidbuf [64]; PIDMAP *map; |