Remove delete of CVS files

[bacula/bacula] / bacula / src / lib / util.c

diff --git a/bacula/src/lib/util.c b/bacula/src/lib/util.c
index ed15119ab3d82f5c366e00e916b01eea32d06dcd..1d53dc2e227fc7d7a2da67043579f2cfd3911f34 100644 (file)
--- a/bacula/src/lib/util.c
+++ b/bacula/src/lib/util.c
@@ -468,9 +468,6 @@ void make_session_key(char *key, char *seed, int mode)
 #endif
 #ifdef HAVE_GETHOSTID
      sprintf(s + strlen(s), "%lu", (unsigned long) gethostid());
-#endif
-#ifdef HAVE_GETDOMAINNAME
-     getdomainname(s + strlen(s), 256);
 #endif
      gethostname(s + strlen(s), 256);
      sprintf(s + strlen(s), "%u", (unsigned)getuid());
@@ -546,7 +543,7 @@ POOLMEM *edit_job_codes(JCR *jcr, char *omsg, char *imsg, const char *to)
            if (jcr) {
               str = jcr->client_name;
            } else {
-               str = "*none*";
+               str = _("*none*");
            }
            break;
          case 'd':
@@ -556,7 +553,7 @@ POOLMEM *edit_job_codes(JCR *jcr, char *omsg, char *imsg, const char *to)
            if (jcr) {
               str = job_status_to_str(jcr->JobStatus);
            } else {
-               str = "*none*";
+               str = _("*none*");
            }
            break;
          case 'i':
@@ -564,21 +561,21 @@ POOLMEM *edit_job_codes(JCR *jcr, char *omsg, char *imsg, const char *to)
                bsnprintf(add, sizeof(add), "%d", jcr->JobId);
               str = add;
            } else {
-               str = "*none*";
+               str = _("*none*");
            }
            break;
          case 'j':                    /* Job name */
            if (jcr) {
               str = jcr->Job;
            } else {
-               str = "*none*";
+               str = _("*none*");
            }
            break;
          case 'l':
            if (jcr) {
               str = job_level_to_str(jcr->JobLevel);
            } else {
-               str = "*none*";
+               str = _("*none*");
            }
            break;
          case 'n':
@@ -592,7 +589,7 @@ POOLMEM *edit_job_codes(JCR *jcr, char *omsg, char *imsg, const char *to)
                }
                str = name;
             } else {
-                str = "*none*";
+                str = _("*none*");
             }
             break;
          case 'r':
@@ -602,14 +599,14 @@ POOLMEM *edit_job_codes(JCR *jcr, char *omsg, char *imsg, const char *to)
            if (jcr && jcr->stime) {
               str = jcr->stime;
            } else {
-               str = "*none*";
+               str = _("*none*");
            }
            break;
          case 't':
            if (jcr) {
               str = job_type_to_str(jcr->JobType);
            } else {
-               str = "*none*";
+               str = _("*none*");
            }
            break;
          case 'v':
@@ -620,7 +617,7 @@ POOLMEM *edit_job_codes(JCR *jcr, char *omsg, char *imsg, const char *to)
                   str = "";
               }
            } else {
-               str = "*none*";
+               str = _("*none*");
            }
            break;
         default: