Imported Upstream version 2.5.1p3

[debian/amanda] / changer-src / chg-scsi.c

diff --git a/changer-src/chg-scsi.c b/changer-src/chg-scsi.c
index 4282269f4db5c54d5364d5926274afac35da4c74..1e679a17a720a01ba4c3a2c1eaf45bfd1ef3c37c 100644 (file)
--- a/changer-src/chg-scsi.c
+++ b/changer-src/chg-scsi.c
@@ -1,4 +1,4 @@
-static char rcsid[] = "$Id: chg-scsi.c,v 1.52 2006/07/25 18:18:46 martinea Exp $";
+static char rcsid[] = "$Id: chg-scsi.c,v 1.52.2.2 2006/12/12 14:56:37 martinea Exp $";
 /*
  * 
  *
@@ -200,7 +200,7 @@ dump_changer_struct(
   dbprintf (("\traw: %d\n",chg->emubarcode));
   if (chg->debuglevel != NULL)
      dbprintf(("debug level     : %s\n", chg->debuglevel));
-  dbprintf(("Tapes need sleep: %d seconds\n",chg->sleep));
+  dbprintf(("Tapes need sleep: %d seconds\n", (int)chg->sleep));
   dbprintf(("Cleancycles     : %d\n",chg->cleanmax));
   dbprintf(("Changerdevice   : %s\n",chg->device));
   if (chg->labelfile != NULL)
@@ -399,15 +399,17 @@ read_config(
            fprintf(stderr,"drivenum %d is bad\n", drivenum);
            drivenum = 0;
          }
-          p = chg->conf[drivenum].changerident;
-          while (*p != '\0')
-          {
-            if (*p == '_')
+         if (strcmp(chg->conf[drivenum].changerident,"generic_changer") != 0) {
+            p = chg->conf[drivenum].changerident;
+            while (*p != '\0')
             {
-              *p=' ';
+              if (*p == '_')
+              {
+                *p=' ';
+              }
+              p++;
             }
-            p++;
-          }
+         }
           break;
         case TAPEIDENT:
           chg->conf[drivenum].tapeident = stralloc(value);