Add %h option in runscript to get client address

diff --git a/bacula/src/dird/dird_conf.c b/bacula/src/dird/dird_conf.c
index 96479d0121dd1fd34a3eccb63c620baf1366b66a..46027bd86e928f58b2c9da16aaff6b9384784db7 100644 (file)
--- a/bacula/src/dird/dird_conf.c
+++ b/bacula/src/dird/dird_conf.c
@@ -2061,11 +2061,13 @@ static void store_runscript(LEX *lc, RES_ITEM *item, int index, int pass)
 /* callback function for edit_job_codes */
 extern "C" char *job_code_callback_filesetname(JCR *jcr, const char* param)
 {
-   if (param[0] == 'f') {
+   if (param[0] == 'f' && jcr->fileset) {
       return jcr->fileset->name();
-   } else {
-      return NULL;
-   }
+
+   } else if (param[0] == 'h' && jcr->client) {
+      return jcr->client->address;
+   } 
+   return NULL;
 }
 
 bool parse_dir_config(CONFIG *config, const char *configfile, int exit_code)