X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=common-src%2Famxml.c;h=6f1e7a6369ab73f72cdcad05c7899120f9191928;hb=949b8910a5e23c4285d0b1aedacfc82a14dc97a5;hp=3402ae8b0406c2764f2a0f7a281040e3e92f39bf;hpb=fd48f3e498442f0cbff5f3606c7c403d0566150e;p=debian%2Famanda

diff --git a/common-src/amxml.c b/common-src/amxml.c
index 3402ae8..6f1e7a6 100644
--- a/common-src/amxml.c
+++ b/common-src/amxml.c
@@ -60,7 +60,7 @@ typedef struct amgxml_s {
     property_t *property_data;
     proplist_t  property;
     script_t   *script;
-    level_t    *alevel;
+    am_level_t    *alevel;
     char       *encoding;
     char       *raw;
 } amgxml_t;
@@ -76,6 +76,52 @@ alloc_dle(void)
     return dle;
 }
 
+void
+free_dle(
+    dle_t *dle)
+{
+    scriptlist_t scriptlist;
+
+    amfree(dle->disk);
+    amfree(dle->device);
+    amfree(dle->program);
+    g_slist_free(dle->estimatelist);
+    slist_free_full(dle->levellist, g_free);
+    amfree(dle->dumpdate);
+    amfree(dle->compprog);
+    amfree(dle->srv_encrypt);
+    amfree(dle->clnt_encrypt);
+    amfree(dle->srv_decrypt_opt);
+    amfree(dle->clnt_decrypt_opt);
+    amfree(dle->auth);
+    amfree(dle->application_client_name);
+    free_sl(dle->exclude_file);
+    free_sl(dle->exclude_list);
+    free_sl(dle->include_file);
+    free_sl(dle->include_list);
+    if (dle->property)
+	g_hash_table_destroy(dle->property);
+    if (dle->application_property)
+	g_hash_table_destroy(dle->application_property);
+    for(scriptlist = dle->scriptlist; scriptlist != NULL;
+				      scriptlist = scriptlist->next) {
+	free_script_data((script_t *)scriptlist->data);
+    }
+    slist_free_full(dle->scriptlist, g_free);
+    slist_free_full(dle->directtcp_list, g_free);
+    amfree(dle);
+}
+
+void
+free_script_data(
+    script_t *script)
+{
+    amfree(script->plugin);
+    amfree(script->client_name);
+    if (script->property)
+	g_hash_table_destroy(script->property);
+}
+
 void
 init_dle(
     dle_t *dle)
@@ -105,10 +151,12 @@ init_dle(
     dle->include_list = NULL;
     dle->exclude_optional = 0;
     dle->include_optional = 0;
+    dle->property = NULL;
     dle->application_property = NULL;
     dle->scriptlist = NULL;
     dle->data_path = DATA_PATH_AMANDA;
     dle->directtcp_list = NULL;
+    dle->application_client_name = NULL;
     dle->next = NULL;
 }
 
@@ -205,7 +253,8 @@ amstart_element(
 	data_user->has_optional = 0;
 	data_user->property_name = NULL;
 	data_user->property_data = NULL;
-	data_user->property = NULL;
+	data_user->property =
+	            g_hash_table_new_full(g_str_hash, g_str_equal, &g_free, &free_property_t);
 	data_user->script = NULL;
 	data_user->alevel = NULL;
 	data_user->encoding = NULL;
@@ -266,7 +315,7 @@ amstart_element(
 	if (strcmp(element_name, "exclude") == 0 || strcmp(element_name, "include") == 0)
 	   data_user->has_optional = 0;
 	if (strcmp(element_name, "level") == 0) {
-	    data_user->alevel = g_new0(level_t, 1);
+	    data_user->alevel = g_new0(am_level_t, 1);
 	}
     } else if (strcmp(element_name, "server") == 0) {
 	if (strcmp(last_element_name, "level") != 0) {
@@ -318,8 +367,10 @@ amstart_element(
 	    return;
 	}
     } else if(strcmp(element_name, "property") == 0) {
-	if (strcmp(last_element_name, "backup-program") != 0 &&
-	    strcmp(last_element_name, "script") != 0) {
+	if (!last_element ||
+	    (strcmp(last_element_name, "backup-program") != 0 &&
+	     strcmp(last_element_name, "script") != 0 &&
+	     strcmp(last_element_name, "dle") != 0)) {
 	    g_set_error(gerror, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
 			"XML: Invalid %s element", element_name);
 	    return;
@@ -375,17 +426,18 @@ amstart_element(
 	} else {
 	    data_user->has_backup_program = 1;
 	    data_user->property =
-	            g_hash_table_new_full(g_str_hash, g_str_equal, NULL, NULL);
+	            g_hash_table_new_full(g_str_hash, g_str_equal, &g_free, &free_property_t);
 	    data_user->has_plugin = 0;
 	}
     } else if (strcmp(element_name, "script") == 0) {
 	data_user->property =
-	            g_hash_table_new_full(g_str_hash, g_str_equal, NULL, NULL);
+	            g_hash_table_new_full(g_str_hash, g_str_equal, &g_free, &free_property_t);
 	data_user->script = malloc(sizeof(script_t));
 	data_user->script->plugin = NULL;
 	data_user->script->execute_on = 0;
 	data_user->script->execute_where = ES_CLIENT;
 	data_user->script->property = NULL;
+	data_user->script->client_name = NULL;
 	data_user->script->result = NULL;
 	data_user->has_plugin = 0;
     } else if (strcmp(element_name, "execute_on") == 0) {
@@ -396,6 +448,7 @@ amstart_element(
 			"XML: Invalid %s element", element_name);
 	    return;
 	}
+    } else if (strcmp(element_name, "client_name") == 0) {
     } else {
 	g_set_error(gerror, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
 		    "XML: Invalid %s element", element_name);
@@ -448,6 +501,7 @@ amend_element(
 	if (dle->estimatelist == NULL)
 	    dle->estimatelist = g_slist_append(dle->estimatelist, ES_CLIENT);
 /* Add check of required field */
+	data_user->property = NULL;
 	data_user->dle = NULL;
     } else if (strcmp(element_name, "backup-program") == 0) {
 	if (dle->program == NULL) {
@@ -456,7 +510,7 @@ amend_element(
 	    return;
 	}
 	dle->application_property = data_user->property;
-	data_user->property = NULL;
+	data_user->property = dle->property;
     } else if (strcmp(element_name, "script") == 0) {
 	if (data_user->script->plugin == NULL) {
 	    g_set_error(gerror, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
@@ -464,7 +518,7 @@ amend_element(
 	    return;
 	}
 	data_user->script->property = data_user->property;
-	data_user->property = NULL;
+	data_user->property = dle->property;
 	dle->scriptlist = g_slist_append(dle->scriptlist, data_user->script);
 	data_user->script = NULL;
     } else if (strcmp(element_name, "level") == 0) {
@@ -493,7 +547,6 @@ amtext(
     GSList   *last_element2;
     char     *last_element2_name;
     dle_t    *dle = data_user->dle;
-    int       i;
 
     if (!last_element) {
 	g_set_error(gerror, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
@@ -502,7 +555,7 @@ amtext(
     }
     last_element_name = last_element->data;
 
-    tt = malloc(text_len + 1);
+    tt = malloc(text_len + 8 + 1);
     strncpy(tt,text,text_len);
     tt[text_len] = '\0';
 
@@ -537,11 +590,13 @@ amtext(
 	strcmp(last_element_name, "include") == 0) {
 	g_set_error(gerror, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
 		    "XML: %s doesn't have text '%s'", last_element_name, tt);
+	amfree(tt);
 	return;
     } else if(strcmp(last_element_name, "disk") == 0) {
 	if (dle->disk != NULL) {
 	    g_set_error(gerror, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
 			"XML: multiple text in %s", last_element_name);
+	    amfree(tt);
 	    return;
 	}
 	dle->disk = tt;
@@ -549,6 +604,7 @@ amtext(
 	if (dle->device != NULL) {
 	    g_set_error(gerror, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
 			"XML: multiple text in %s", last_element_name);
+	    amfree(tt);
 	    return;
 	}
 	dle->device = tt;
@@ -587,12 +643,15 @@ amtext(
 	if (dle->program != NULL) {
 	    g_set_error(gerror, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
 			"XML: multiple text in %s", last_element_name);
+	    amfree(tt);
 	    return;
 	}
-	dle->program = tt;
 	if (strcmp(tt, "APPLICATION") == 0) {
 	    dle->program_is_application_api = 1;
 	    dle->program = NULL;
+	    amfree(tt);
+	} else {
+	    dle->program = tt;
 	}
     } else if(strcmp(last_element_name, "plugin") == 0) {
 	last_element2 = g_slist_nth(data_user->element_names, 1);
@@ -632,6 +691,7 @@ amtext(
 	} else {
 	    error("priority outside of property");
 	}
+	amfree(tt);
     } else if(strcmp(last_element_name, "value") == 0) {
 	last_element2 = g_slist_nth(data_user->element_names, 1);
 	if (!last_element2) {
@@ -694,10 +754,13 @@ amtext(
 	} else {
 	    g_set_error(gerror, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
 			"XML: Invalid %s (%s)", last_element_name, tt);
+	    amfree(tt);
 	    return;
 	}
+	amfree(tt);
     } else if(strcmp(last_element_name, "spindle") == 0) {
 	dle->spindle = atoi(tt);
+	amfree(tt);
     } else if(strcmp(last_element_name, "compress") == 0) {
 	if (strcmp(tt, "FAST") == 0) {
 	    dle->compress = COMP_FAST;
@@ -758,17 +821,24 @@ amtext(
 	    error("XML: optional");
 	}
 	last_element2_name = last_element2->data;
-	dle->clnt_encrypt = tt;
+	if (dle->encrypt == ENCRYPT_SERV_CUST)
+	    dle->srv_encrypt = tt;
+	else
+	    dle->clnt_encrypt = tt;
     } else if(strcmp(last_element_name, "decrypt-option") == 0) {
 	last_element2 = g_slist_nth(data_user->element_names, 1);
 	if (!last_element2) {
 	    error("XML: optional");
 	}
 	last_element2_name = last_element2->data;
-	dle->clnt_decrypt_opt = tt;
+	if (dle->encrypt == ENCRYPT_SERV_CUST)
+	    dle->srv_decrypt_opt = tt;
+	else
+	    dle->clnt_decrypt_opt = tt;
     } else if(strcmp(last_element_name, "exclude") == 0 ||
 	      strcmp(last_element_name, "include") == 0) {
 	data_user->has_optional = 0;
+	amfree(tt);
     } else if(strcmp(last_element_name, "file") == 0) {
 	last_element2 = g_slist_nth(data_user->element_names, 1);
 	if (!last_element2) {
@@ -796,7 +866,6 @@ amtext(
 	    error("bad list");
 	}
     } else if(strcmp(last_element_name, "optional") == 0) {
-	i = atoi(tt);
 	last_element2 = g_slist_nth(data_user->element_names, 1);
 	if (!last_element2) {
 	    error("XML: optional");
@@ -812,6 +881,7 @@ amtext(
 	data_user->has_optional = 1;
 	amfree(tt);
     } else if(strcmp(last_element_name, "script") == 0) {
+	amfree(tt);
     } else if(strcmp(last_element_name, "execute_on") == 0) {
 	char *sep;
 	char *tt1 = tt;
@@ -819,26 +889,38 @@ amtext(
 	    sep = strchr(tt1,',');
 	    if (sep)
 		*sep = '\0';
-	    if (strcmp(tt1,"PRE-DLE-AMCHECK") == 0)
+	    if (strcmp(tt1,"PRE-AMCHECK") == 0)
+		data_user->script->execute_on |= EXECUTE_ON_PRE_AMCHECK;
+	    else if (strcmp(tt1,"PRE-DLE-AMCHECK") == 0)
 		data_user->script->execute_on |= EXECUTE_ON_PRE_DLE_AMCHECK;
 	    else if (strcmp(tt1,"PRE-HOST-AMCHECK") == 0)
 		data_user->script->execute_on |= EXECUTE_ON_PRE_HOST_AMCHECK;
+	    else if (strcmp(tt1,"POST-AMCHECK") == 0)
+		data_user->script->execute_on |= EXECUTE_ON_POST_AMCHECK;
 	    else if (strcmp(tt1,"POST-DLE-AMCHECK") == 0)
 		data_user->script->execute_on |= EXECUTE_ON_POST_DLE_AMCHECK;
 	    else if (strcmp(tt1,"POST-HOST-AMCHECK") == 0)
 		data_user->script->execute_on |= EXECUTE_ON_POST_HOST_AMCHECK;
+	    else if (strcmp(tt1,"PRE-ESTIMATE") == 0)
+		data_user->script->execute_on |= EXECUTE_ON_PRE_ESTIMATE;
 	    else if (strcmp(tt1,"PRE-DLE-ESTIMATE") == 0)
 		data_user->script->execute_on |= EXECUTE_ON_PRE_DLE_ESTIMATE;
 	    else if (strcmp(tt1,"PRE-HOST-ESTIMATE") == 0)
 		data_user->script->execute_on |= EXECUTE_ON_PRE_HOST_ESTIMATE;
+	    else if (strcmp(tt1,"POST-ESTIMATE") == 0)
+		data_user->script->execute_on |= EXECUTE_ON_POST_ESTIMATE;
 	    else if (strcmp(tt1,"POST-DLE-ESTIMATE") == 0)
 		data_user->script->execute_on |= EXECUTE_ON_POST_DLE_ESTIMATE;
 	    else if (strcmp(tt1,"POST-HOST-ESTIMATE") == 0)
 		data_user->script->execute_on |= EXECUTE_ON_POST_HOST_ESTIMATE;
+	    else if (strcmp(tt1,"PRE-BACKUP") == 0)
+		data_user->script->execute_on |= EXECUTE_ON_PRE_BACKUP;
 	    else if (strcmp(tt1,"PRE-DLE-BACKUP") == 0)
 		data_user->script->execute_on |= EXECUTE_ON_PRE_DLE_BACKUP;
 	    else if (strcmp(tt1,"PRE-HOST-BACKUP") == 0)
 		data_user->script->execute_on |= EXECUTE_ON_PRE_HOST_BACKUP;
+	    else if (strcmp(tt1,"POST-BACKUP") == 0)
+		data_user->script->execute_on |= EXECUTE_ON_POST_BACKUP;
 	    else if (strcmp(tt1,"POST-DLE-BACKUP") == 0)
 		data_user->script->execute_on |= EXECUTE_ON_POST_DLE_BACKUP;
 	    else if (strcmp(tt1,"POST-HOST-BACKUP") == 0)
@@ -865,6 +947,7 @@ amtext(
 	} else {
 	    data_user->script->execute_where = ES_SERVER;
 	}
+	amfree(tt);
     } else if(strcmp(last_element_name, "datapath") == 0) {
 	if (strcmp(tt, "AMANDA") == 0) {
 	    dle->data_path = DATA_PATH_AMANDA;
@@ -877,9 +960,25 @@ amtext(
 	amfree(tt);
     } else if(strcmp(last_element_name, "directtcp") == 0) {
 	dle->directtcp_list = g_slist_append(dle->directtcp_list, tt);
+    } else if(strcmp(last_element_name, "client_name") == 0) {
+	last_element2 = g_slist_nth(data_user->element_names, 1);
+	if (!last_element2) {
+	    error("Invalid client_name text");
+	}
+	last_element2_name = last_element2->data;
+	if (strcmp(last_element2_name, "backup-program") == 0) {
+	    dle->application_client_name = tt;
+g_debug("set dle->application_client_name: %s", dle->application_client_name);
+	} else if (strcmp(last_element2_name, "script") == 0) {
+	    data_user->script->client_name = tt;
+g_debug("set data_user->script->client_name: %s", data_user->script->client_name);
+	} else {
+	    error("client_name outside of script or backup-program");
+	}
     } else {
 	g_set_error(gerror, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
 		    "XML: amtext not defined for '%s'", last_element_name);
+	amfree(tt);
 	return;
     }
 }