projects
/
srvx.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
a21e92c
)
remove manager entry from slfh's when a user gets added to the tlfh manager list
author
pk910
<philipp@zoelle1.de>
Mon, 7 Jan 2013 20:41:10 +0000
(21:41 +0100)
committer
pk910
<philipp@zoelle1.de>
Mon, 7 Jan 2013 20:41:10 +0000
(21:41 +0100)
src/mod-hostserv.c
patch
|
blob
|
history
diff --git
a/src/mod-hostserv.c
b/src/mod-hostserv.c
index 55ac89e928e5cd7bd957a4c42ea5c2b7236cabb0..db4feb53f3dd01b545aacbcf80f240a78633f73e 100644
(file)
--- a/
src/mod-hostserv.c
+++ b/
src/mod-hostserv.c
@@
-967,8
+967,20
@@
static MODCMD_FUNC(cmd_addmanager) {
}
if(fhinfo.slfh)
hs_add_manager_secondlevel(fhinfo.slfh, huser);
}
if(fhinfo.slfh)
hs_add_manager_secondlevel(fhinfo.slfh, huser);
- else
+ else
{
hs_add_manager_toplevel(fhinfo.tlfh, huser);
hs_add_manager_toplevel(fhinfo.tlfh, huser);
+ //remove from all slfh's
+ struct hs_manager *next_manager;
+ struct hs_secondlevel *slfh;
+ for(manager = huser->managements; manager; manager = next_manager) {
+ next_manager = manager->next;
+ if(manager->type == 2) {
+ slfh = manager->object;
+ if(slfh->toplevel == fhinfo.tlfh)
+ hs_del_manager(manager, 1);
+ }
+ }
+ }
reply("HSMSG_MANAGER_ADDED", hi->handle, fhinfo.slfh_name, fhinfo.tlfh_name);
return 1;
}
reply("HSMSG_MANAGER_ADDED", hi->handle, fhinfo.slfh_name, fhinfo.tlfh_name);
return 1;
}