X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=server-src%2Fdumper.c;h=32f9258780d457650c3d2f575c34f646b875a734;hb=3a9beabdb44ee1b2dcce141c2571fbb2b3fa90b1;hp=407628bba83f9d08dfcdd8f5383438b17fb78c3d;hpb=b221e8dc16f345f8c8d7df8df71f4d36daaabb4c;p=debian%2Famanda diff --git a/server-src/dumper.c b/server-src/dumper.c index 407628b..32f9258 100644 --- a/server-src/dumper.c +++ b/server-src/dumper.c @@ -328,6 +328,11 @@ main( char *cfg_opt = NULL; int dumper_setuid; + if (argc > 1 && argv && argv[1] && g_str_equal(argv[1], "--version")) { + printf("dumper-%s\n", VERSION); + return (0); + } + /* * Configure program for internationalization: * 1) Only set the message locale for now. @@ -1286,6 +1291,95 @@ do_dump( if (!errstr) errstr = stralloc(_("got no data")); } + if (indexfile_tmp) { + amwait_t index_status; + + /*@i@*/ aclose(indexout); + waitpid(indexpid,&index_status,0); + log_add(L_INFO, "pid-done %ld", (long)indexpid); + if (rename(indexfile_tmp, indexfile_real) != 0) { + log_add(L_WARNING, _("could not rename \"%s\" to \"%s\": %s"), + indexfile_tmp, indexfile_real, strerror(errno)); + } + amfree(indexfile_tmp); + amfree(indexfile_real); + } + + /* copy the header in a file on the index dir */ + { + FILE *a; + char *s; + char *f = getheaderfname(hostname, diskname, dumper_timestamp, level); + a = fopen(f,"w"); + if (a) { + s = build_header(&file, NULL, DISK_BLOCK_BYTES); + fprintf(a,"%s", s); + g_free(s); + fclose(a); + } + g_free(f); + } + + if (db->compresspid != -1 && dump_result < 2) { + amwait_t wait_status; + char *errmsg = NULL; + + waitpid(db->compresspid, &wait_status, 0); + if (WIFSIGNALED(wait_status)) { + errmsg = g_strdup_printf(_("%s terminated with signal %d"), + "compress", WTERMSIG(wait_status)); + } else if (WIFEXITED(wait_status)) { + if (WEXITSTATUS(wait_status) != 0) { + errmsg = g_strdup_printf(_("%s exited with status %d"), + "compress", WEXITSTATUS(wait_status)); + } + } else { + errmsg = g_strdup_printf(_("%s got bad exit"), + "compress"); + } + if (errmsg) { + g_fprintf(errf, _("? %s\n"), errmsg); + g_debug("%s", errmsg); + dump_result = max(dump_result, 2); + if (!errstr) + errstr = errmsg; + else + g_free(errmsg); + } + log_add(L_INFO, "pid-done %ld", (long)db->compresspid); + db->compresspid = -1; + } + + if (db->encryptpid != -1 && dump_result < 2) { + amwait_t wait_status; + char *errmsg = NULL; + + waitpid(db->encryptpid, &wait_status, 0); + if (WIFSIGNALED(wait_status)) { + errmsg = g_strdup_printf(_("%s terminated with signal %d"), + "encrypt", WTERMSIG(wait_status)); + } else if (WIFEXITED(wait_status)) { + if (WEXITSTATUS(wait_status) != 0) { + errmsg = g_strdup_printf(_("%s exited with status %d"), + "encrypt", WEXITSTATUS(wait_status)); + } + } else { + errmsg = g_strdup_printf(_("%s got bad exit"), + "encrypt"); + } + if (errmsg) { + g_fprintf(errf, _("? %s\n"), errmsg); + g_debug("%s", errmsg); + dump_result = max(dump_result, 2); + if (!errstr) + errstr = errmsg; + else + g_free(errmsg); + } + log_add(L_INFO, "pid-done %ld", (long)db->encryptpid); + db->encryptpid = -1; + } + if (dump_result > 1) goto failed; @@ -1334,29 +1428,6 @@ do_dump( if (data_path == DATA_PATH_AMANDA) aclose(db->fd); - if (indexfile_tmp) { - amwait_t index_status; - - /*@i@*/ aclose(indexout); - waitpid(indexpid,&index_status,0); - log_add(L_INFO, "pid-done %ld", (long)indexpid); - if (rename(indexfile_tmp, indexfile_real) != 0) { - log_add(L_WARNING, _("could not rename \"%s\" to \"%s\": %s"), - indexfile_tmp, indexfile_real, strerror(errno)); - } - amfree(indexfile_tmp); - amfree(indexfile_real); - } - - if(db->compresspid != -1) { - waitpid(db->compresspid,NULL,0); - log_add(L_INFO, "pid-done %ld", (long)db->compresspid); - } - if(db->encryptpid != -1) { - waitpid(db->encryptpid,NULL,0); - log_add(L_INFO, "pid-done %ld", (long)db->encryptpid); - } - amfree(errstr); dumpfile_free_data(&file); @@ -1441,6 +1512,9 @@ failed: amfree(indexfile_real); } + amfree(errstr); + dumpfile_free_data(&file); + return 0; } @@ -1508,10 +1582,8 @@ read_mesgfd( strerror(errno)); dump_result = 2; stop_dump(); - dumpfile_free_data(&file); return; } - dumpfile_free_data(&file); aclose(db->fd); if (data_path == DATA_PATH_AMANDA) { g_debug(_("Sending data to %s:%d\n"), data_host, data_port); @@ -1711,10 +1783,6 @@ handle_filter_stderr( nread = read(filter->fd, filter->buffer + filter->first + filter->size, filter->allocated_size - filter->first - filter->size - 2); - if (nread != 0) { - dump_result = max(dump_result, 2); - } - if (nread <= 0) { aclose(filter->fd); if (filter->size > 0 && filter->buffer[filter->first + filter->size - 1] != '\n') { @@ -1740,6 +1808,7 @@ handle_filter_stderr( filter->first += len; filter->size -= len; b = p + 1; + dump_result = max(dump_result, 1); } if (nread <= 0) { @@ -1960,7 +2029,8 @@ runencrypt( aclose(errpipe[0]); aclose(errpipe[1]); return (-1); - default: + default: { + char *base; rval = dup2(outpipe[1], outfd); if (rval < 0) errstr = newvstrallocf(errstr, _("couldn't dup2: %s"), strerror(errno)); @@ -1969,7 +2039,9 @@ runencrypt( aclose(errpipe[1]); filter = g_new0(filter_t, 1); filter->fd = errpipe[0]; - filter->name = "encrypt"; + base = g_strdup(srv_encrypt); + filter->name = g_strdup(basename(base)); + amfree(base); filter->buffer = NULL; filter->size = 0; filter->allocated_size = 0; @@ -1977,6 +2049,7 @@ runencrypt( handle_filter_stderr, filter); g_debug("event register %s %d", "encrypt data", filter->fd); return (rval); + } case 0: { char *base; if (dup2(outpipe[0], 0) < 0) { @@ -2131,6 +2204,7 @@ bad_nak: *p++ = '\0'; if(strncmp_const_skip(tok, "features=", tok, ch) == 0) { char *u = strchr(tok, ';'); + ch = ch; if (u) *u = '\0'; am_release_feature_set(their_features); @@ -2261,7 +2335,6 @@ startup_dump( { char level_string[NUM_STR_SIZE]; char *req = NULL; - char *authopt; int response_error; const security_driver_t *secdrv; char *application_api; @@ -2327,7 +2400,7 @@ startup_dump( } vstrextend(&p, " ", level_string, "\n", NULL); vstrextend(&p, options+1, "\n", NULL); - pclean = clean_dle_str_for_client(p); + pclean = clean_dle_str_for_client(p, their_features); vstrextend(&req, pclean, NULL); amfree(pclean); dle_str = p; @@ -2337,7 +2410,6 @@ startup_dump( amfree(req); return 2; } else { - authopt = strstr(options, "auth="); if (auth == NULL) { auth = "BSD"; }