Imported Upstream version 3.3.1

[debian/amanda] / server-src / amindexd.c

diff --git a/server-src/amindexd.c b/server-src/amindexd.c
index 6465685c38ff94d13b1e97e07d002296136af6bb..bc56ed4f48cbedb83c61ce97b7ab5f95112ab6b7 100644 (file)
--- a/server-src/amindexd.c
+++ b/server-src/amindexd.c
@@ -640,7 +640,7 @@ is_disk_allowed(
     disk_t *disk)
 {
     dumptype_t *dt = disk->config;
-    recovery_limit_t *rl = NULL;
+    host_limit_t *rl = NULL;
     char *peer;
     char *dle_hostname;
     GSList *iter;
@@ -679,6 +679,19 @@ is_disk_allowed(
        }
     }
 
+    /* check server */
+    if (rl->server) {
+       char myhostname[MAX_HOSTNAME_LENGTH+1];
+       if (gethostname(myhostname, MAX_HOSTNAME_LENGTH) == 0) {
+           myhostname[MAX_HOSTNAME_LENGTH] = '\0';
+           g_debug("server hostname: %s", myhostname);
+           if (0 == g_ascii_strcasecmp(peer, myhostname)) {
+               g_debug("peer matched server ('%s')", myhostname);
+               return TRUE;
+           }
+       }
+    }
+
     /* check the match list */
     for (iter = rl->match_pats; iter; iter = iter->next) {
        char *pat = iter->data;
@@ -1278,6 +1291,11 @@ main(
     char his_hostname[MAX_HOSTNAME_LENGTH];
     char *cfg_opt = NULL;
 
+    if (argc > 1 && argv && argv[1] && g_str_equal(argv[1], "--version")) {
+       printf("amindexd-%s\n", VERSION);
+       return (0);
+    }
+
     /*
      * Configure program for internationalization:
      *   1) Only set the message locale for now.