X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fmod-hostserv.c;h=84094d2b76f6ca47d7e9456047eb3f6ca877d176;hb=0c502b5846ba7efd6c4d08f3f92b682d51858c12;hp=29ef3e3f442c479b591b02376bc7ab60667c9036;hpb=ac567991f64b672b38bbcba48294bf6f6bff6228;p=srvx.git

diff --git a/src/mod-hostserv.c b/src/mod-hostserv.c
index 29ef3e3..84094d2 100644
--- a/src/mod-hostserv.c
+++ b/src/mod-hostserv.c
@@ -29,6 +29,8 @@
  *         "manager_can_del_toplevel" "0"; //managers of a toplevel group may delete the whole group
  *         "manager_can_rename_secondlevel" "0"; //managers of a secondlevel group may rename the whole group
  *         "manager_can_del_secondlevel" "0"; //managers of a secondlevel group may delete the whole group
+ *           "manager_toplevel_can_oset" "0"; //managers of a toplevel group can set other user's fakehosts
+ *         "manager_secondlevel_can_oset" "0"; //managers of a secondlevel group can set other user's fakehosts
  *     };
  *  };
  *
@@ -969,8 +971,20 @@ static MODCMD_FUNC(cmd_addmanager) {
     }
     if(fhinfo.slfh)
         hs_add_manager_secondlevel(fhinfo.slfh, huser);
-    else
+    else {
         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;
 }
@@ -1153,7 +1167,7 @@ static MODCMD_FUNC(cmd_unassign) {
 static MODCMD_FUNC(cmd_oset) {
     struct handle_info *hi;
     char *fakehost;
-	struct hs_assignment *assgn;
+    struct hs_assignment *assignment;
     if(!strchr(argv[1], '.')) {
         if (!(hi = modcmd_get_handle_info(user, argv[1])))
             return 0;
@@ -1167,15 +1181,16 @@ static MODCMD_FUNC(cmd_oset) {
         reply("NSMSG_MUST_AUTH");
         return 0;
     }
-	if(!strcmp(argv[1], "*")) {
-		if(!check_management_access(user->handle_info)) {
+    struct hs_user *hs_user = hs_get_user(hi, 1);
+    if(!strcmp(argv[1], "*")) {
+        if(!check_management_access(user->handle_info, NULL, NULL)) {
             reply("HSMSG_ACCESS_DENIED");
             return 0;
         }
         hs_activate_assignment(hs_user, NULL);
         return 1;
     } else {
-	    struct hs_fakehost_info fhinfo = parse_fakehost_info(fakehost, 1);
+        struct hs_fakehost_info fhinfo = parse_fakehost_info(fakehost, 1);
         if(fhinfo.parse_state == HS_FHPARSE_INVALID) {
             reply("HSMSG_TOPLEVEL_INVALID", fakehost);
             return 0;
@@ -1183,11 +1198,12 @@ static MODCMD_FUNC(cmd_oset) {
            reply("HSMSG_UNKNOWN_FAKEHOST", fhinfo.slfh_name, fhinfo.tlfh_name);
            return 0;
         }
-        struct hs_user *hs_user = hs_get_user(hi, 1);
         if(!check_management_access(user->handle_info, (hostserv_conf.manager_toplevel_can_oset ? fhinfo.tlfh : NULL), (hostserv_conf.manager_secondlevel_can_oset ? fhinfo.slfh : NULL))) {
             reply("HSMSG_ACCESS_DENIED");
             return 0;
         }
+        struct hs_toplevel *tlfh;
+        struct hs_secondlevel *slfh;
         for(assignment = hs_user->assignments; assignment; assignment = assignment->unext) {
             slfh = assignment->secondlevel;
             tlfh = slfh->toplevel;
@@ -1199,7 +1215,7 @@ static MODCMD_FUNC(cmd_oset) {
         }
         reply("HSMSG_UNKNOWN_FAKEHOST", fhinfo.slfh_name, fhinfo.tlfh_name);
         return 0;
-	}
+    }
 }
 
 static void hostserv_conf_read(void) {
@@ -1239,10 +1255,10 @@ static void hostserv_conf_read(void) {
     
     str = database_get_data(conf_node, "manager_can_rename_secondlevel", RECDB_QSTRING);
     hostserv_conf.manager_can_rename_secondlevel = (atoi(str) ? 1 : 0);
-	
-	str = database_get_data(conf_node, "manager_toplevel_can_oset", RECDB_QSTRING);
+    
+    str = database_get_data(conf_node, "manager_toplevel_can_oset", RECDB_QSTRING);
     hostserv_conf.manager_toplevel_can_oset = (atoi(str) ? 1 : 0);
-	
+    
     str = database_get_data(conf_node, "manager_secondlevel_can_oset", RECDB_QSTRING);
     hostserv_conf.manager_secondlevel_can_oset = (atoi(str) ? 1 : 0);
 }