X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=server-src%2Famindexd.c;h=e1e1ba10b92ea5f3e8eed2fe00cff1afd4816850;hb=d74dc4d908fcbc1a4ef474edaf51e61ec90eab6b;hp=34587d46eda991f76be13c0259de05df1cdf3f19;hpb=71325c297e0436e9930a3e129a26696e78c27f62;p=debian%2Famanda diff --git a/server-src/amindexd.c b/server-src/amindexd.c index 34587d4..e1e1ba1 100644 --- a/server-src/amindexd.c +++ b/server-src/amindexd.c @@ -24,7 +24,7 @@ * file named AUTHORS, in the root directory of this distribution. */ /* - * $Id: amindexd.c,v 1.106.2.2 2006/09/27 12:04:09 martinea Exp $ + * $Id: amindexd.c,v 1.106 2006/07/25 18:27:57 martinea Exp $ * * This is the server daemon part of the index client/server system. * It is assumed that this is launched from inetd instead of being @@ -50,14 +50,22 @@ #include "disk_history.h" #include "list_dir.h" #include "logfile.h" -#include "token.h" #include "find.h" #include "tapefile.h" #include "util.h" #include "amandad.h" +#include "pipespawn.h" +#include "sockaddr-util.h" +#include "amxml.h" #include +#define amindexd_debug(i,x) do { \ + if ((i) <= debug_amindexd) { \ + dbprintf(x); \ + } \ +} while (0) + typedef struct REMOVE_ITEM { char *filename; @@ -67,7 +75,6 @@ typedef struct REMOVE_ITEM /* state */ static int from_amandad; static char local_hostname[MAX_HOSTNAME_LENGTH+1]; /* me! */ -static char *remote_hostname = NULL; /* the client */ static char *dump_hostname = NULL; /* machine we are restoring */ static char *disk_name; /* disk we are restoring */ char *qdisk_name = NULL; /* disk we are restoring */ @@ -75,7 +82,6 @@ static char *target_date = NULL; static disklist_t disk_list; /* all disks in cur config */ static find_result_t *output_find = NULL; static g_option_t *g_options = NULL; -static int cmdfdin, cmdfdout; static int amindexd_debug = 0; @@ -95,15 +101,12 @@ static char *amandad_auth = NULL; static FILE *cmdin; static FILE *cmdout; -static void reply(int, char *, ...) - __attribute__ ((format (printf, 2, 3))); -static void lreply(int, char *, ...) - __attribute__ ((format (printf, 2, 3))); -static void fast_lreply(int, char *, ...) - __attribute__ ((format (printf, 2, 3))); -static int is_dump_host_valid(char *); +static void reply(int, char *, ...) G_GNUC_PRINTF(2, 3); +static void lreply(int, char *, ...) G_GNUC_PRINTF(2, 3); +static void fast_lreply(int, char *, ...) G_GNUC_PRINTF(2, 3); +static am_host_t *is_dump_host_valid(char *); static int is_disk_valid(char *); -static int is_config_valid(char *); +static int check_and_load_config(char *); static int build_disk_table(void); static int disk_history_list(void); static int is_dir_valid_opaque(char *); @@ -114,6 +117,11 @@ static int tapedev_is(void); static int are_dumps_compressed(void); static char *amindexd_nicedate (char *datestamp); static int cmp_date (const char *date1, const char *date2); +static char *clean_backslash(char *line); +static char *get_index_name(char *dump_hostname, char *hostname, + char *diskname, char *timestamps, int level); +static int get_index_dir(char *dump_hostname, char *hostname, char *diskname); + int main(int, char **); static REMOVE_ITEM * @@ -123,8 +131,7 @@ remove_files( REMOVE_ITEM *prev; while(remove) { - dbprintf(("%s: removing index file: %s\n", - debug_prefix_time(NULL), remove->filename)); + dbprintf(_("removing index file: %s\n"), remove->filename); unlink(remove->filename); amfree(remove->filename); prev = remove; @@ -144,6 +151,17 @@ uncompress_file( struct stat stat_filename; int result; size_t len; + int pipe_from_gzip; + int pipe_to_sort; + int indexfd; + int nullfd; + int debugfd; + char line[STR_SIZE]; + FILE *pipe_stream; + pid_t pid_gzip; + pid_t pid_sort; + amwait_t wait_status; + filename = stralloc(filename_gz); len = strlen(filename); @@ -163,36 +181,100 @@ uncompress_file( * Check that compressed file exists manually. */ if (stat(filename_gz, &statbuf) < 0) { - *emsg = newvstralloc(*emsg, "Compressed file '", - filename_gz, - "' is inaccessable: ", - strerror(errno), - NULL); - dbprintf(("%s\n",*emsg)); + *emsg = newvstrallocf(*emsg, + _("Compressed file '%s' is inaccessable: %s"), + filename_gz, strerror(errno)); + dbprintf("%s\n",*emsg); amfree(filename); return NULL; } - cmd = vstralloc(UNCOMPRESS_PATH, #ifdef UNCOMPRESS_OPT - " ", UNCOMPRESS_OPT, +# define PARAM_UNCOMPRESS_OPT UNCOMPRESS_OPT +#else +# define PARAM_UNCOMPRESS_OPT skip_argument #endif - " \'", filename_gz, "\'", - " 2>/dev/null", - " | (LC_ALL=C; export LC_ALL ; sort) ", - " > ", "\'", filename, "\'", - NULL); - dbprintf(("%s: uncompress command: %s\n", - debug_prefix_time(NULL), cmd)); - if (system(cmd) != 0) { - *emsg = newvstralloc(*emsg, "\"", cmd, "\" failed", NULL); - unlink(filename); - errno = -1; + + nullfd = open("/dev/null", O_RDONLY); + + indexfd = open(filename,O_WRONLY|O_CREAT, 0600); + if (indexfd == -1) { + *emsg = newvstrallocf(*emsg, _("Can't open '%s' for writting: %s"), + filename, strerror(errno)); + dbprintf("%s\n",*emsg); amfree(filename); - amfree(cmd); + aclose(nullfd); + return NULL; + } + + /* just use our stderr directly for the pipe's stderr; in + * main() we send stderr to the debug file, or /dev/null + * if debugging is disabled */ + debugfd = STDERR_FILENO; + + /* start the uncompress process */ + putenv(stralloc("LC_ALL=C")); + pid_gzip = pipespawn(UNCOMPRESS_PATH, STDOUT_PIPE, 0, + &nullfd, &pipe_from_gzip, &debugfd, + UNCOMPRESS_PATH, PARAM_UNCOMPRESS_OPT, + filename_gz, NULL); + aclose(nullfd); + + pipe_stream = fdopen(pipe_from_gzip,"r"); + if(pipe_stream == NULL) { + *emsg = newvstrallocf(*emsg, _("Can't fdopen pipe from gzip: %s"), + strerror(errno)); + dbprintf("%s\n",*emsg); + amfree(filename); + aclose(indexfd); return NULL; } + /* start the sort process */ + putenv(stralloc("LC_ALL=C")); + pid_sort = pipespawn(SORT_PATH, STDIN_PIPE, 0, + &pipe_to_sort, &indexfd, &debugfd, + SORT_PATH, NULL); + aclose(indexfd); + + /* send all ouput from uncompress process to sort process */ + /* clean the data with clean_backslash */ + while (fgets(line, STR_SIZE, pipe_stream) != NULL) { + if (line[0] != '\0') { + if (strchr(line,'/')) { + clean_backslash(line); + full_write(pipe_to_sort,line,strlen(line)); + } + } + } + + fclose(pipe_stream); + aclose(pipe_to_sort); + if (waitpid(pid_gzip, &wait_status, 0) < 0) { + if (!WIFEXITED(wait_status)) { + dbprintf(_("Uncompress exited with signal %d"), + WTERMSIG(wait_status)); + } else if (WEXITSTATUS(wait_status) != 0) { + dbprintf(_("Uncompress exited with status %d"), + WEXITSTATUS(wait_status)); + } else { + dbprintf(_("Uncompres returned negative value: %s"), + strerror(errno)); + } + } + if (waitpid(pid_sort, &wait_status, 0) < 0) { + if (!WIFEXITED(wait_status)) { + dbprintf(_("Sort exited with signal %d"), + WTERMSIG(wait_status)); + } else if (WEXITSTATUS(wait_status) != 0) { + dbprintf(_("Sort exited with status %d"), + WEXITSTATUS(wait_status)); + } else { + dbprintf(_("Sort returned negative value: %s"), + strerror(errno)); + } + } + /* add at beginning */ remove_file = (REMOVE_ITEM *)alloc(SIZEOF(REMOVE_ITEM)); remove_file->filename = stralloc(filename); @@ -200,7 +282,7 @@ uncompress_file( uncompress_remove = remove_file; } else if(!S_ISREG((stat_filename.st_mode))) { amfree(*emsg); - *emsg = vstralloc("\"", filename, "\" is not a regular file", NULL); + *emsg = vstrallocf(_("\"%s\" is not a regular file"), filename); errno = -1; amfree(filename); amfree(cmd); @@ -219,8 +301,7 @@ process_ls_dump( int recursive, char ** emsg) { - char *line = NULL; - char *old_line = NULL; + char line[STR_SIZE], old_line[STR_SIZE]; char *filename = NULL; char *filename_gz; char *dir_slash = NULL; @@ -229,15 +310,22 @@ process_ls_dump( int ch; size_t len_dir_slash; + old_line[0] = '\0'; if (strcmp(dir, "/") == 0) { dir_slash = stralloc(dir); } else { dir_slash = stralloc2(dir, "/"); } - filename_gz = getindexfname(dump_hostname, disk_name, dump_item->date, - dump_item->level); - if((filename = uncompress_file(filename_gz, emsg)) == NULL) { + filename_gz = get_index_name(dump_hostname, dump_item->hostname, disk_name, + dump_item->date, dump_item->level); + if (filename_gz == NULL) { + *emsg = stralloc(_("index file not found")); + amfree(filename_gz); + return -1; + } + filename = uncompress_file(filename_gz, emsg); + if(filename == NULL) { amfree(filename_gz); amfree(dir_slash); return -1; @@ -246,15 +334,18 @@ process_ls_dump( if((fp = fopen(filename,"r"))==0) { amfree(*emsg); - *emsg = stralloc(strerror(errno)); + *emsg = vstrallocf("%s", strerror(errno)); amfree(dir_slash); + amfree(filename); return -1; } len_dir_slash=strlen(dir_slash); - while ((line = agets(fp)) != NULL) { + while (fgets(line, STR_SIZE, fp) != NULL) { if (line[0] != '\0') { + if(line[strlen(line)-1] == '\n') + line[strlen(line)-1] = '\0'; if(strncmp(dir_slash, line, len_dir_slash) == 0) { if(!recursive) { s = line + len_dir_slash; @@ -266,18 +357,14 @@ process_ls_dump( } s[-1] = '\0'; } - if(old_line == NULL || strcmp(line, old_line) != 0) { + if(strcmp(line, old_line) != 0) { add_dir_list_item(dump_item, line); - amfree(old_line); - old_line = line; - line = NULL; + strcpy(old_line, line); } } } - /*@i@*/ amfree(line); } afclose(fp); - /*@i@*/ amfree(old_line); amfree(filename); amfree(dir_slash); return 0; @@ -294,7 +381,7 @@ printf_arglist_function1(static void reply, int, n, char *, fmt) while(1) { arglist_start(args, fmt); - len = vsnprintf(reply_buffer, reply_buffer_size, fmt, args); + len = g_vsnprintf(reply_buffer, reply_buffer_size, fmt, args); arglist_end(args); if (len > -1 && (size_t)len < reply_buffer_size-1) @@ -305,21 +392,19 @@ printf_arglist_function1(static void reply, int, n, char *, fmt) reply_buffer = alloc(reply_buffer_size); } - if (fprintf(cmdout,"%03d %s\r\n", n, reply_buffer) < 0) + if (g_fprintf(cmdout,"%03d %s\r\n", n, reply_buffer) < 0) { - dbprintf(("%s: ! error %d (%s) in printf\n", - debug_prefix_time(NULL), errno, strerror(errno))); + dbprintf(_("! error %d (%s) in printf\n"), errno, strerror(errno)); uncompress_remove = remove_files(uncompress_remove); exit(1); } if (fflush(cmdout) != 0) { - dbprintf(("%s: ! error %d (%s) in fflush\n", - debug_prefix_time(NULL), errno, strerror(errno))); + dbprintf(_("! error %d (%s) in fflush\n"), errno, strerror(errno)); uncompress_remove = remove_files(uncompress_remove); exit(1); } - dbprintf(("%s: < %03d %s\n", debug_prefix_time(NULL), n, reply_buffer)); + dbprintf(_("< %03d %s\n"), n, reply_buffer); } /* send one line of a multi-line response */ @@ -333,7 +418,7 @@ printf_arglist_function1(static void lreply, int, n, char *, fmt) while(1) { arglist_start(args, fmt); - len = vsnprintf(reply_buffer, reply_buffer_size, fmt, args); + len = g_vsnprintf(reply_buffer, reply_buffer_size, fmt, args); arglist_end(args); if (len > -1 && (size_t)len < reply_buffer_size-1) @@ -344,22 +429,22 @@ printf_arglist_function1(static void lreply, int, n, char *, fmt) reply_buffer = alloc(reply_buffer_size); } - if (fprintf(cmdout,"%03d-%s\r\n", n, reply_buffer) < 0) + if (g_fprintf(cmdout,"%03d-%s\r\n", n, reply_buffer) < 0) { - dbprintf(("%s: ! error %d (%s) in printf\n", - debug_prefix_time(NULL), errno, strerror(errno))); + dbprintf(_("! error %d (%s) in printf\n"), + errno, strerror(errno)); uncompress_remove = remove_files(uncompress_remove); exit(1); } if (fflush(cmdout) != 0) { - dbprintf(("%s: ! error %d (%s) in fflush\n", - debug_prefix_time(NULL), errno, strerror(errno))); + dbprintf(_("! error %d (%s) in fflush\n"), + errno, strerror(errno)); uncompress_remove = remove_files(uncompress_remove); exit(1); } - dbprintf(("%s: < %03d-%s\n", debug_prefix_time(NULL), n, reply_buffer)); + dbprintf("< %03d-%s\n", n, reply_buffer); } @@ -374,7 +459,7 @@ printf_arglist_function1(static void fast_lreply, int, n, char *, fmt) while(1) { arglist_start(args, fmt); - len = vsnprintf(reply_buffer, reply_buffer_size, fmt, args); + len = g_vsnprintf(reply_buffer, reply_buffer_size, fmt, args); arglist_end(args); if (len > -1 && (size_t)len < reply_buffer_size-1) @@ -385,15 +470,15 @@ printf_arglist_function1(static void fast_lreply, int, n, char *, fmt) reply_buffer = alloc(reply_buffer_size); } - if (fprintf(cmdout,"%03d-%s\r\n", n, reply_buffer) < 0) + if (g_fprintf(cmdout,"%03d-%s\r\n", n, reply_buffer) < 0) { - dbprintf(("%s: ! error %d (%s) in printf\n", - debug_prefix_time(NULL), errno, strerror(errno))); + dbprintf(_("! error %d (%s) in printf\n"), + errno, strerror(errno)); uncompress_remove = remove_files(uncompress_remove); exit(1); } - dbprintf(("%s: < %03d-%s\n", debug_prefix_time(NULL), n, reply_buffer)); + dbprintf("< %03d-%s\n", n, reply_buffer); } /* see if hostname is valid */ @@ -401,49 +486,40 @@ printf_arglist_function1(static void fast_lreply, int, n, char *, fmt) /* also do a security check on the requested dump hostname */ /* to restrict access to index records if required */ /* return -1 if not okay */ -static int +static am_host_t * is_dump_host_valid( char * host) { - struct stat dir_stat; - char *fn; - am_host_t *ihost; - - if (config_name == NULL) { - reply(501, "Must set config before setting host."); - return -1; - } + am_host_t *ihost; + disk_t *diskp; -#if 0 - /* only let a client restore itself for now unless it is the server */ - if (strcasecmp(remote_hostname, local_hostname) == 0) - return 0; - if (strcasecmp(remote_hostname, host) != 0) - { - reply(501, - "You don't have the necessary permissions to set dump host to %s.", - buf1); - return -1; + if (get_config_name() == NULL) { + reply(501, _("Must set config before setting host.")); + return NULL; } -#endif /* check that the config actually handles that host */ ihost = lookup_host(host); if(ihost == NULL) { - reply(501, "Host %s is not in your disklist.", host); - return -1; + reply(501, _("Host %s is not in your disklist."), host); + return NULL; } - /* assume an index dir already */ - fn = getindexfname(host, NULL, NULL, 0); - if (stat (fn, &dir_stat) != 0 || !S_ISDIR(dir_stat.st_mode)) { - reply(501, "No index records for host: %s. Have you enabled indexing?", host); - amfree(fn); - return -1; + /* check if an index dir exist */ + if(get_index_dir(host, ihost->hostname, NULL)) { + return ihost; } - amfree(fn); - return 0; + /* check if an index dir exist for at least one DLE */ + for(diskp = ihost->disks; diskp != NULL; diskp = diskp->hostnext) { + if (get_index_dir(diskp->hostname, NULL, NULL)) { + return ihost; + } + } + + reply(501, _("No index records for host: %s. Have you enabled indexing?"), + host); + return NULL; } @@ -451,17 +527,15 @@ static int is_disk_valid( char *disk) { - char *fn; - struct stat dir_stat; disk_t *idisk; char *qdisk; - if (config_name == NULL) { - reply(501, "Must set config,host before setting disk."); + if (get_config_name() == NULL) { + reply(501, _("Must set config,host before setting disk.")); return -1; } else if (dump_hostname == NULL) { - reply(501, "Must set host before setting disk."); + reply(501, _("Must set host before setting disk.")); return -1; } @@ -469,31 +543,27 @@ is_disk_valid( idisk = lookup_disk(dump_hostname, disk); if(idisk == NULL) { qdisk = quote_string(disk); - reply(501, "Disk %s:%s is not in your disklist.", dump_hostname, qdisk); + reply(501, _("Disk %s:%s is not in your disklist."), dump_hostname, qdisk); amfree(qdisk); return -1; } /* assume an index dir already */ - fn = getindexfname(dump_hostname, disk, NULL, 0); - if (stat (fn, &dir_stat) != 0 || !S_ISDIR(dir_stat.st_mode)) { + if (get_index_dir(dump_hostname, idisk->hostname, disk) == 0) { qdisk = quote_string(disk); - reply(501, "No index records for disk: %s. Invalid?", qdisk); - amfree(fn); + reply(501, _("No index records for disk: %s. Invalid?"), qdisk); amfree(qdisk); return -1; } - amfree(fn); return 0; } static int -is_config_valid( +check_and_load_config( char * config) { - char *conffile; char *conf_diskfile; char *conf_tapelist; char *conf_indexdir; @@ -501,58 +571,46 @@ is_config_valid( /* check that the config actually exists */ if (config == NULL) { - reply(501, "Must set config first."); + reply(501, _("Must set config first.")); return -1; } - /* read conffile */ - conffile = stralloc2(config_dir, CONFFILE_NAME); - if (read_conffile(conffile)) { - reply(501, "Could not read config file %s!", conffile); - amfree(conffile); + /* (re-)initialize configuration with the new config name */ + config_init(CONFIG_INIT_EXPLICIT_NAME, config); + if (config_errors(NULL) >= CFGERR_ERRORS) { + reply(501, _("Could not read config file for %s!"), config); return -1; } - amfree(conffile); - conf_diskfile = getconf_str(CNF_DISKFILE); - if (*conf_diskfile == '/') { - conf_diskfile = stralloc(conf_diskfile); - } else { - conf_diskfile = stralloc2(config_dir, conf_diskfile); - } - if (read_diskfile(conf_diskfile, &disk_list) < 0) { - reply(501, "Could not read disk file %s!", conf_diskfile); - amfree(conf_diskfile); + check_running_as(RUNNING_AS_DUMPUSER_PREFERRED); + + conf_diskfile = config_dir_relative(getconf_str(CNF_DISKFILE)); + read_diskfile(conf_diskfile, &disk_list); + amfree(conf_diskfile); + if (config_errors(NULL) >= CFGERR_ERRORS) { + reply(501, _("Could not read disk file %s!"), conf_diskfile); return -1; } - amfree(conf_diskfile); - conf_tapelist = getconf_str(CNF_TAPELIST); - if (*conf_tapelist == '/') { - conf_tapelist = stralloc(conf_tapelist); - } else { - conf_tapelist = stralloc2(config_dir, conf_tapelist); - } + conf_tapelist = config_dir_relative(getconf_str(CNF_TAPELIST)); if(read_tapelist(conf_tapelist)) { - reply(501, "Could not read tapelist file %s!", conf_tapelist); + reply(501, _("Could not read tapelist file %s!"), conf_tapelist); amfree(conf_tapelist); return -1; } amfree(conf_tapelist); - dbrename(config, DBG_SUBDIR_SERVER); + dbrename(get_config_name(), DBG_SUBDIR_SERVER); - output_find = find_dump(1, &disk_list); - sort_find_result("DLKHpB", &output_find); + output_find = find_dump(&disk_list); + /* the 'w' here sorts by write timestamp, so that the first instance of + * any particular datestamp/host/disk/level/part that we see is the one + * written earlier */ + sort_find_result("DLKHpwB", &output_find); - conf_indexdir = getconf_str(CNF_INDEXDIR); - if(*conf_indexdir == '/') { - conf_indexdir = stralloc(conf_indexdir); - } else { - conf_indexdir = stralloc2(config_dir, conf_indexdir); - } + conf_indexdir = config_dir_relative(getconf_str(CNF_INDEXDIR)); if (stat (conf_indexdir, &dir_stat) != 0 || !S_ISDIR(dir_stat.st_mode)) { - reply(501, "Index directory %s does not exist", conf_indexdir); + reply(501, _("Index directory %s does not exist"), conf_indexdir); amfree(conf_indexdir); return -1; } @@ -572,16 +630,16 @@ build_disk_table(void) int last_partnum; find_result_t *find_output; - if (config_name == NULL) { - reply(590, "Must set config,host,disk before building disk table"); + if (get_config_name() == NULL) { + reply(590, _("Must set config,host,disk before building disk table")); return -1; } else if (dump_hostname == NULL) { - reply(590, "Must set host,disk before building disk table"); + reply(590, _("Must set host,disk before building disk table")); return -1; } else if (disk_name == NULL) { - reply(590, "Must set disk before building disk table"); + reply(590, _("Must set disk before building disk table")); return -1; } @@ -597,8 +655,30 @@ build_disk_table(void) strcmp(disk_name , find_output->diskname) == 0 && strcmp("OK" , find_output->status) == 0) { int partnum = -1; - if(strcmp("--", find_output->partnum)){ + int maxpart = -1; + if (strcmp("1/1", find_output->partnum) == 0) { + partnum = -1; + } else if (strcmp("1/-1", find_output->partnum) == 0) { + if (find_output->next && + strcmp(dump_hostname, find_output->next->hostname) == 0 && + strcmp(disk_name, find_output->next->diskname) == 0 && + strcmp(find_output->timestamp, + find_output->next->timestamp) == 0 && + strcmp("OK", find_output->next->status) == 0 && + strcmp("2/-1", find_output->next->partnum) == 0) { + partnum = 1; + } + else { + partnum = -1; + } + } else if (strcmp("--", find_output->partnum)) { + char *c; partnum = atoi(find_output->partnum); + c = strchr(find_output->partnum,'/'); + if (c) + maxpart = atoi(c+1); + else + maxpart = -1; } /* * The sort order puts holding disk entries first. We want to @@ -612,20 +692,31 @@ build_disk_table(void) partnum == last_partnum && last_filenum == 0) { continue; } + /* ignore duplicate partnum */ + if(last_timestamp && + strcmp(find_output->timestamp, last_timestamp) == 0 && + find_output->level == last_level && + partnum == last_partnum) { + continue; + } last_timestamp = find_output->timestamp; last_filenum = find_output->filenum; last_level = find_output->level; last_partnum = partnum; date = amindexd_nicedate(find_output->timestamp); - add_dump(date, find_output->level, find_output->label, - find_output->filenum, partnum); - dbprintf(("%s: - %s %d %s " OFF_T_FMT " %d\n", - debug_prefix_time(NULL), date, find_output->level, + add_dump(find_output->hostname, date, find_output->level, + find_output->label, find_output->filenum, partnum, + maxpart); + dbprintf("- %s %d %s %lld %d %d\n", + date, find_output->level, find_output->label, - (OFF_T_FMT_TYPE)find_output->filenum, - partnum)); + (long long)find_output->filenum, + partnum, maxpart); } } + + clean_dump(); + return 0; } @@ -636,21 +727,21 @@ disk_history_list(void) DUMP_ITEM *item; char date[20]; - if (config_name == NULL) { - reply(502, "Must set config,host,disk before listing history"); + if (get_config_name() == NULL) { + reply(502, _("Must set config,host,disk before listing history")); return -1; } else if (dump_hostname == NULL) { - reply(502, "Must set host,disk before listing history"); + reply(502, _("Must set host,disk before listing history")); return -1; } else if (disk_name == NULL) { - reply(502, "Must set disk before listing history"); + reply(502, _("Must set disk before listing history")); return -1; } - lreply(200, " Dump history for config \"%s\" host \"%s\" disk %s", - config_name, dump_hostname, qdisk_name); + lreply(200, _(" Dump history for config \"%s\" host \"%s\" disk %s"), + get_config_name(), dump_hostname, qdisk_name); for (item=first_dump(); item!=NULL; item=next_dump(item)){ char *tapelist_str = marshal_tapelist(item->tapes, 1); @@ -664,14 +755,14 @@ disk_history_list(void) lreply(201, " %s %d %s", date, item->level, tapelist_str); } else{ - lreply(201, " %s %d %s " OFF_T_FMT, date, item->level, - tapelist_str, (OFF_T_FMT_TYPE)item->file); + lreply(201, " %s %d %s %lld", date, item->level, + tapelist_str, (long long)item->file); } amfree(tapelist_str); } - reply(200, "Dump history for config \"%s\" host \"%s\" disk %s", - config_name, dump_hostname, qdisk_name); + reply(200, _("Dump history for config \"%s\" host \"%s\" disk %s"), + get_config_name(), dump_hostname, qdisk_name); return 0; } @@ -687,7 +778,7 @@ is_dir_valid_opaque( char *dir) { DUMP_ITEM *item; - char *line = NULL; + char line[STR_SIZE]; FILE *fp; int last_level; char *ldir = NULL; @@ -696,23 +787,22 @@ is_dir_valid_opaque( size_t ldir_len; static char *emsg = NULL; - if (config_name == NULL || dump_hostname == NULL || disk_name == NULL) { - reply(502, "Must set config,host,disk before asking about directories"); + if (get_config_name() == NULL || dump_hostname == NULL || disk_name == NULL) { + reply(502, _("Must set config,host,disk before asking about directories")); return -1; } else if (dump_hostname == NULL) { - reply(502, "Must set host,disk before asking about directories"); + reply(502, _("Must set host,disk before asking about directories")); return -1; } else if (disk_name == NULL) { - reply(502, "Must set disk before asking about directories"); + reply(502, _("Must set disk before asking about directories")); return -1; } else if (target_date == NULL) { - reply(502, "Must set date before asking about directories"); + reply(502, _("Must set date before asking about directories")); return -1; } - /* scan through till we find first dump on or before date */ for (item=first_dump(); item!=NULL; item=next_dump(item)) if (cmp_date(item->date, target_date) <= 0) @@ -721,7 +811,7 @@ is_dir_valid_opaque( if (item == NULL) { /* no dump for given date */ - reply(500, "No dumps available on or before date \"%s\"", target_date); + reply(500, _("No dumps available on or before date \"%s\""), target_date); return -1; } @@ -736,32 +826,38 @@ is_dir_valid_opaque( do { amfree(filename); - filename_gz = getindexfname(dump_hostname, disk_name, - item->date, item->level); + filename_gz = get_index_name(dump_hostname, item->hostname, disk_name, + item->date, item->level); + if (filename_gz == NULL) { + reply(599, "index not found"); + amfree(ldir); + return -1; + } if((filename = uncompress_file(filename_gz, &emsg)) == NULL) { - reply(599, "System error %s", emsg); + reply(599, _("System error %s"), emsg); amfree(filename_gz); amfree(emsg); amfree(ldir); return -1; } amfree(filename_gz); - dbprintf(("%s: f %s\n", debug_prefix_time(NULL), filename)); + dbprintf("f %s\n", filename); if ((fp = fopen(filename, "r")) == NULL) { - reply(599, "System error %s", strerror(errno)); + reply(599, _("System error %s"), strerror(errno)); amfree(filename); amfree(ldir); return -1; } - for(; (line = agets(fp)) != NULL; free(line)) { + while (fgets(line, STR_SIZE, fp) != NULL) { if (line[0] == '\0') continue; + if(line[strlen(line)-1] == '\n') + line[strlen(line)-1] = '\0'; if (strncmp(line, ldir, ldir_len) != 0) { continue; /* not found yet */ } amfree(filename); amfree(ldir); - amfree(line); afclose(fp); return 0; } @@ -776,7 +872,7 @@ is_dir_valid_opaque( amfree(filename); amfree(ldir); - reply(500, "\"%s\" is an invalid directory", dir); + reply(500, _("\"%s\" is an invalid directory"), dir); return -1; } @@ -799,20 +895,20 @@ opaque_ls( clear_dir_list(); - if (config_name == NULL) { - reply(502, "Must set config,host,disk before listing a directory"); + if (get_config_name() == NULL) { + reply(502, _("Must set config,host,disk before listing a directory")); return -1; } else if (dump_hostname == NULL) { - reply(502, "Must set host,disk before listing a directory"); + reply(502, _("Must set host,disk before listing a directory")); return -1; } else if (disk_name == NULL) { - reply(502, "Must set disk before listing a directory"); + reply(502, _("Must set disk before listing a directory")); return -1; } else if (target_date == NULL) { - reply(502, "Must set date before listing a directory"); + reply(502, _("Must set date before listing a directory")); return -1; } @@ -824,13 +920,13 @@ opaque_ls( if (dump_item == NULL) { /* no dump for given date */ - reply(500, "No dumps available on or before date \"%s\"", target_date); + reply(500, _("No dumps available on or before date \"%s\""), target_date); return -1; } /* get data from that dump */ if (process_ls_dump(dir, dump_item, recursive, &emsg) == -1) { - reply(599, "System error %s", emsg); + reply(599, _("System error %s"), emsg); amfree(emsg); return -1; } @@ -843,7 +939,7 @@ opaque_ls( { last_level = dump_item->level; if (process_ls_dump(dir, dump_item, recursive, &emsg) == -1) { - reply(599, "System error %s", emsg); + reply(599, _("System error %s"), emsg); amfree(emsg); return -1; } @@ -851,7 +947,7 @@ opaque_ls( } /* return the information to the caller */ - lreply(200, " Opaque list of %s", dir); + lreply(200, _(" Opaque list of %s"), dir); for(level=0; level<=9; level++) { for (dir_item = get_dir_list(); dir_item != NULL; dir_item = dir_item->next) { @@ -860,8 +956,8 @@ opaque_ls( if (!am_has_feature(their_features, marshall_feature) && (num_entries(dir_item->dump->tapes) > 1 || dir_item->dump->tapes->numfiles > 1)) { - fast_lreply(501, " ERROR: Split dumps not supported" - " with old version of amrecover."); + fast_lreply(501, _(" ERROR: Split dumps not supported" + " with old version of amrecover.")); break; } else { @@ -870,7 +966,7 @@ opaque_ls( } } } - reply(200, " Opaque list of %s", dir); + reply(200, _(" Opaque list of %s"), dir); clear_dir_list(); return 0; @@ -901,11 +997,11 @@ void opaque_ls_one( fe_amindexd_fileno_in_OLSD)) || (recursive && am_has_feature(their_features, fe_amindexd_fileno_in_ORLD))) { - fast_lreply(201, " %s %d %s " OFF_T_FMT " %s", + fast_lreply(201, " %s %d %s %lld %s", date, dir_item->dump->level, tapelist_str, - (OFF_T_FMT_TYPE)dir_item->dump->file, + (long long)dir_item->dump->file, qpath); } else { @@ -931,39 +1027,36 @@ tapedev_is(void) char *result; /* check state okay to do this */ - if (config_name == NULL) { - reply(501, "Must set config before asking about tapedev."); + if (get_config_name() == NULL) { + reply(501, _("Must set config before asking about tapedev.")); return -1; } /* use amrecover_changer if possible */ if ((result = getconf_str(CNF_AMRECOVER_CHANGER)) != NULL && *result != '\0') { - dbprintf(("%s: tapedev_is amrecover_changer: %s\n", - debug_prefix_time(NULL), result)); - reply(200, result); + dbprintf(_("tapedev_is amrecover_changer: %s\n"), result); + reply(200, "%s", result); return 0; } /* use changer if possible */ if ((result = getconf_str(CNF_TPCHANGER)) != NULL && *result != '\0') { - dbprintf(("%s: tapedev_is tpchanger: %s\n", - debug_prefix_time(NULL), result)); - reply(200, result); + dbprintf(_("tapedev_is tpchanger: %s\n"), result); + reply(200, "%s", result); return 0; } /* get tapedev value */ if ((result = getconf_str(CNF_TAPEDEV)) != NULL && *result != '\0') { - dbprintf(("%s: tapedev_is tapedev: %s\n", - debug_prefix_time(NULL), result)); - reply(200, result); + dbprintf(_("tapedev_is tapedev: %s\n"), result); + reply(200, "%s", result); return 0; } - dbprintf(("%s: No tapedev or changer in config site.\n", - debug_prefix_time(NULL))); - reply(501, "Tapedev or changer not set in config file."); + dbprintf(_("No tapedev or tpchanger in config site.\n")); + + reply(501, _("Tapedev or tpchanger not set in config file.")); return -1; } @@ -975,16 +1068,16 @@ are_dumps_compressed(void) disk_t *diskp; /* check state okay to do this */ - if (config_name == NULL) { - reply(501, "Must set config,host,disk name before asking about dumps."); + if (get_config_name() == NULL) { + reply(501, _("Must set config,host,disk name before asking about dumps.")); return -1; } else if (dump_hostname == NULL) { - reply(501, "Must set host,disk name before asking about dumps."); + reply(501, _("Must set host,disk name before asking about dumps.")); return -1; } else if (disk_name == NULL) { - reply(501, "Must set disk name before asking about dumps."); + reply(501, _("Must set disk name before asking about dumps.")); return -1; } @@ -997,7 +1090,7 @@ are_dumps_compressed(void) } if (diskp == NULL) { - reply(501, "Couldn't find host/disk in disk file."); + reply(501, _("Couldn't find host/disk in disk file.")); return -1; } @@ -1016,18 +1109,28 @@ main( char ** argv) { char *line = NULL, *part = NULL; - char *s, *fp; + char *s; int ch; char *cmd_undo, cmd_undo_ch; - socklen_t socklen; - struct sockaddr_in his_addr; - struct hostent *his_name; + socklen_t_equiv socklen; + sockaddr_union his_addr; char *arg = NULL; char *cmd; size_t len; int user_validated = 0; char *errstr = NULL; char *pgm = "amindexd"; /* in case argv[0] is not set */ + char his_hostname[MAX_HOSTNAME_LENGTH]; + char *cfg_opt = NULL; + + /* + * Configure program for internationalization: + * 1) Only set the message locale for now. + * 2) Set textdomain for all amanda related programs to "amanda" + * We don't want to be forced to support dozens of message catalogs. + */ + setlocale(LC_MESSAGES, "C"); + textdomain("amanda"); safe_fd(DATA_FD_OFFSET, 2); safe_cd(); @@ -1051,43 +1154,18 @@ main( /* Don't die when child closes pipe */ signal(SIGPIPE, SIG_IGN); -#ifdef FORCE_USERID - - /* we'd rather not run as root */ - - if(geteuid() == 0) { - if(client_uid == (uid_t) -1) { - error("error [cannot find user %s in passwd file]\n", CLIENT_LOGIN); - /*NOTREACHED*/ - } - - /*@ignore@*/ - initgroups(CLIENT_LOGIN, client_gid); - /*@end@*/ - setgid(client_gid); - setuid(client_uid); - } - -#endif /* FORCE_USERID */ - dbopen(DBG_SUBDIR_SERVER); - dbprintf(("%s: version %s\n", get_pname(), version())); + dbprintf(_("version %s\n"), version()); if(argv == NULL) { error("argv == NULL\n"); } if (! (argc >= 1 && argv[0] != NULL)) { - dbprintf(("%s: WARNING: argv[0] not defined: check inetd.conf\n", - debug_prefix_time(NULL))); + dbprintf(_("WARNING: argv[0] not defined: check inetd.conf\n")); } - { - int db_fd = dbfd(); - if(db_fd != -1) { - dup2(db_fd, 2); - } - } + debug_dup_stderr_to_debug(); /* initialize */ @@ -1112,18 +1190,17 @@ main( } else { from_amandad = 0; - safe_fd(-1, 0); + safe_fd(dbfd(), 1); } if (argc > 0) { - config_name = stralloc(*argv); - config_dir = vstralloc(CONFIG_DIR, "/", config_name, "/", NULL); + cfg_opt = *argv; argc--; argv++; } if(gethostname(local_hostname, SIZEOF(local_hostname)-1) == -1) { - error("gethostname: %s", strerror(errno)); + error(_("gethostname: %s"), strerror(errno)); /*NOTREACHED*/ } local_hostname[SIZEOF(local_hostname)-1] = '\0'; @@ -1136,61 +1213,36 @@ main( if(from_amandad == 0) { - if(amindexd_debug) { - /* - * Fake the remote address as the local address enough to get - * through the security check. - */ - his_name = gethostbyname(local_hostname); - if(his_name == NULL) { - error("gethostbyname(%s) failed\n", local_hostname); - /*NOTREACHED*/ - } - assert((sa_family_t)his_name->h_addrtype == (sa_family_t)AF_INET); - his_addr.sin_family = (sa_family_t)his_name->h_addrtype; - his_addr.sin_port = (in_port_t)htons(0); - memcpy((void *)&his_addr.sin_addr.s_addr, - (void *)his_name->h_addr_list[0], - (size_t)his_name->h_length); - } else { + if(!amindexd_debug) { /* who are we talking to? */ socklen = sizeof (his_addr); if (getpeername(0, (struct sockaddr *)&his_addr, &socklen) == -1) - error("getpeername: %s", strerror(errno)); - } - if ((his_addr.sin_family != (sa_family_t)AF_INET) - || (ntohs(his_addr.sin_port) == 20)) { - error("connection rejected from %s family %d port %d", - inet_ntoa(his_addr.sin_addr), his_addr.sin_family, - htons(his_addr.sin_port)); - /*NOTREACHED*/ - } - if ((his_name = gethostbyaddr((char *)&(his_addr.sin_addr), - sizeof(his_addr.sin_addr), - AF_INET)) == NULL) { - error("gethostbyaddr(%s): hostname lookup failed", - inet_ntoa(his_addr.sin_addr)); - /*NOTREACHED*/ + error(_("getpeername: %s"), strerror(errno)); + + /* Try a reverse (IP->hostname) resolution, and fail if it does + * not work -- this is a basic security check */ + if (getnameinfo((struct sockaddr *)&his_addr, SS_LEN(&his_addr), + his_hostname, sizeof(his_hostname), + NULL, 0, + 0)) { + error(_("getnameinfo(%s): hostname lookup failed"), + str_sockaddr(&his_addr)); + /*NOTREACHED*/ + } } - fp = s = stralloc(his_name->h_name); - ch = *s++; - while(ch && ch != '.') ch = *s++; - s[-1] = '\0'; - remote_hostname = newstralloc(remote_hostname, fp); - s[-1] = (char)ch; - amfree(fp); + + /* Set up the input and output FILEs */ cmdout = stdout; cmdin = stdin; } else { - cmdfdout = DATA_FD_OFFSET + 0; - cmdfdin = DATA_FD_OFFSET + 1; - /* read the REQ packet */ for(; (line = agets(stdin)) != NULL; free(line)) { -#define sc "OPTIONS " - if(strncmp(line, sc, sizeof(sc)-1) == 0) { -#undef sc + if(strncmp_const(line, "OPTIONS ") == 0) { + if (g_options != NULL) { + dbprintf(_("REQ packet specified multiple OPTIONS.\n")); + free_g_options(g_options); + } g_options = parse_g_options(line+8, 1); if(!g_options->hostname) { g_options->hostname = alloc(MAX_HOSTNAME_LENGTH+1); @@ -1203,30 +1255,30 @@ main( if(amandad_auth && g_options->auth) { if(strcasecmp(amandad_auth, g_options->auth) != 0) { - printf("ERROR recover program ask for auth=%s while amindexd is configured for '%s'\n", + g_printf(_("ERROR recover program ask for auth=%s while amindexd is configured for '%s'\n"), g_options->auth, amandad_auth); - error("amindexd: ERROR recover program ask for auth=%s while amindexd is configured for '%s'", + error(_("amindexd: ERROR recover program ask for auth=%s while amindexd is configured for '%s'"), g_options->auth, amandad_auth); /*NOTREACHED*/ } } /* send the REP packet */ - printf("CONNECT MESG %d\n", DATA_FD_OFFSET); - printf("\n"); + g_printf("CONNECT MESG %d\n", DATA_FD_OFFSET); + g_printf("\n"); fflush(stdin); fflush(stdout); fclose(stdin); fclose(stdout); - cmdout = fdopen(cmdfdout, "a"); + cmdout = fdopen(DATA_FD_OFFSET + 0, "a"); if (!cmdout) { - error("amindexd: Can't fdopen(cmdfdout): %s", strerror(errno)); + error(_("amindexd: Can't fdopen(%d): %s"), DATA_FD_OFFSET + 0, strerror(errno)); /*NOTREACHED*/ } - cmdin = fdopen(cmdfdin, "r"); + cmdin = fdopen(DATA_FD_OFFSET + 1, "r"); if (!cmdin) { - error("amindexd: Can't fdopen(cmdfdin): %s", strerror(errno)); + error(_("amindexd: Can't fdopen(%d): %s"), DATA_FD_OFFSET + 1, strerror(errno)); /*NOTREACHED*/ } } @@ -1240,11 +1292,11 @@ main( our_features = am_init_feature_set(); their_features = am_set_default_feature_set(); - if (config_name != NULL && is_config_valid(config_name) != -1) { + if (cfg_opt != NULL && check_and_load_config(cfg_opt) != -1) { /* load the config */ return 1; } - reply(220, "%s AMANDA index server (%s) ready.", local_hostname, + reply(220, _("%s AMANDA index server (%s) ready."), local_hostname, version()); user_validated = from_amandad; @@ -1256,18 +1308,15 @@ main( while(1) { if((part = agets(cmdin)) == NULL) { if(errno != 0) { - dbprintf(("%s: ? read error: %s\n", - debug_prefix_time(NULL), strerror(errno))); + dbprintf(_("? read error: %s\n"), strerror(errno)); } else { - dbprintf(("%s: ? unexpected EOF\n", - debug_prefix_time(NULL))); + dbprintf(_("? unexpected EOF\n")); } if(line) { - dbprintf(("%s: ? unprocessed input:\n", - debug_prefix_time(NULL))); - dbprintf(("-----\n")); - dbprintf(("? %s\n", line)); - dbprintf(("-----\n")); + dbprintf(_("? unprocessed input:\n")); + dbprintf("-----\n"); + dbprintf("? %s\n", line); + dbprintf("-----\n"); } amfree(line); amfree(part); @@ -1293,7 +1342,7 @@ main( strappend(line, "\n"); } - dbprintf(("%s: > %s\n", debug_prefix_time(NULL), line)); + dbprintf("> %s\n", line); if (arg != NULL) amfree(arg); @@ -1302,7 +1351,7 @@ main( skip_whitespace(s, ch); if(ch == '\0') { - reply(500, "Command not recognised/incorrect: %s", line); + reply(500, _("Command not recognised/incorrect: %s"), line); amfree(line); continue; } @@ -1323,17 +1372,20 @@ main( amfree(errstr); if (!user_validated && strcmp(cmd, "SECURITY") == 0 && arg) { - user_validated = check_security(&his_addr, arg, 0, &errstr); + user_validated = amindexd_debug || + check_security( + (sockaddr_union *)&his_addr, + arg, 0, &errstr); if(user_validated) { - reply(200, "Access OK"); + reply(200, _("Access OK")); amfree(line); continue; } } if (!user_validated) { /* don't tell client the reason, just log it to debug log */ - reply(500, "Access not allowed"); + reply(500, _("Access not allowed")); if (errstr) { - dbprintf(("%s: %s\n", debug_prefix_time(NULL), errstr)); + dbprintf("%s\n", errstr); } break; } @@ -1342,12 +1394,13 @@ main( amfree(line); break; } else if (strcmp(cmd, "HOST") == 0 && arg) { + am_host_t *lhost; /* set host we are restoring */ s[-1] = '\0'; - if (is_dump_host_valid(arg) != -1) + if ((lhost = is_dump_host_valid(arg)) != NULL) { - dump_hostname = newstralloc(dump_hostname, arg); - reply(200, "Dump host set to %s.", dump_hostname); + dump_hostname = newstralloc(dump_hostname, lhost->hostname); + reply(200, _("Dump host set to %s."), dump_hostname); amfree(qdisk_name); /* invalidate any value */ amfree(disk_name); /* invalidate any value */ } @@ -1358,11 +1411,11 @@ main( int nbhost = 0, found = 0; s[-1] = '\0'; - if (config_name == NULL) { - reply(501, "Must set config before listhost"); + if (get_config_name() == NULL) { + reply(501, _("Must set config before listhost")); } else { - lreply(200, " List hosts for config %s", config_name); + lreply(200, _(" List hosts for config %s"), get_config_name()); for (disk = disk_list.head; disk!=NULL; disk = disk->next) { found = 0; for (diskdup = disk_list.head; diskdup!=disk; diskdup = diskdup->next) { @@ -1377,10 +1430,10 @@ main( } } if(nbhost > 0) { - reply(200, " List hosts for config %s", config_name); + reply(200, _(" List hosts for config %s"), get_config_name()); } else { - reply(200, "No hosts for config %s", config_name); + reply(200, _("No hosts for config %s"), get_config_name()); } } s[-1] = (char)ch; @@ -1390,27 +1443,61 @@ main( disk_name = newstralloc(disk_name, arg); qdisk_name = quote_string(disk_name); if (build_disk_table() != -1) { - reply(200, "Disk set to %s.", qdisk_name); + reply(200, _("Disk set to %s."), qdisk_name); } } s[-1] = (char)ch; + } else if (strcmp(cmd, "DLE") == 0) { + disk_t *dp; + char *optionstr; + char *b64disk; + char *l, *ql; + + dp = lookup_disk(dump_hostname, disk_name); + if (dp->line == 0) { + reply(200, "NODLE"); + } else { + b64disk = amxml_format_tag("disk", dp->name); + optionstr = xml_optionstr(dp, their_features, NULL, 0); + l = vstralloc("\n", + " ", dp->program, "\n", NULL); + if (dp->application) { + char *xml_app = xml_application(dp->application, + their_features); + vstrextend(&l, xml_app, NULL); + amfree(xml_app); + } + vstrextend(&l, " ", b64disk, "\n", NULL); + if (dp->device) { + char *b64device = amxml_format_tag("diskdevice", dp->device); + vstrextend(&l, " ", b64device, "\n", NULL); + amfree(b64device); + } + vstrextend(&l, optionstr, "\n", NULL); + ql = quote_string(l); + reply(200, "%s", ql); + amfree(optionstr); + amfree(l); + amfree(ql); + amfree(b64disk); + } } else if (strcmp(cmd, "LISTDISK") == 0) { char *qname; disk_t *disk; int nbdisk = 0; s[-1] = '\0'; - if (config_name == NULL) { - reply(501, "Must set config, host before listdisk"); + if (get_config_name() == NULL) { + reply(501, _("Must set config, host before listdisk")); } else if (dump_hostname == NULL) { - reply(501, "Must set host before listdisk"); + reply(501, _("Must set host before listdisk")); } else if(arg) { - lreply(200, " List of disk for device %s on host %s", arg, + lreply(200, _(" List of disk for device %s on host %s"), arg, dump_hostname); for (disk = disk_list.head; disk!=NULL; disk = disk->next) { - if (strcmp(disk->host->hostname, dump_hostname) == 0 && + if (strcasecmp(disk->host->hostname, dump_hostname) == 0 && ((disk->device && strcmp(disk->device, arg) == 0) || (!disk->device && strcmp(disk->name, arg) == 0))) { qname = quote_string(disk->name); @@ -1420,18 +1507,18 @@ main( } } if(nbdisk > 0) { - reply(200, "List of disk for device %s on host %s", arg, + reply(200, _("List of disk for device %s on host %s"), arg, dump_hostname); } else { - reply(200, "No disk for device %s on host %s", arg, + reply(200, _("No disk for device %s on host %s"), arg, dump_hostname); } } else { - lreply(200, " List of disk for host %s", dump_hostname); + lreply(200, _(" List of disk for host %s"), dump_hostname); for (disk = disk_list.head; disk!=NULL; disk = disk->next) { - if(strcmp(disk->host->hostname, dump_hostname) == 0) { + if(strcasecmp(disk->host->hostname, dump_hostname) == 0) { qname = quote_string(disk->name); fast_lreply(201, " %s", qname); amfree(qname); @@ -1439,28 +1526,21 @@ main( } } if(nbdisk > 0) { - reply(200, "List of disk for host %s", dump_hostname); + reply(200, _("List of disk for host %s"), dump_hostname); } else { - reply(200, "No disk for host %s", dump_hostname); + reply(200, _("No disk for host %s"), dump_hostname); } } s[-1] = (char)ch; } else if (strcmp(cmd, "SCNF") == 0 && arg) { s[-1] = '\0'; - amfree(config_name); - amfree(config_dir); - config_name = newstralloc(config_name, arg); - config_dir = vstralloc(CONFIG_DIR, "/", config_name, "/", NULL); - if (is_config_valid(arg) != -1) { + if (check_and_load_config(arg) != -1) { /* try to load the new config */ amfree(dump_hostname); /* invalidate any value */ amfree(qdisk_name); /* invalidate any value */ amfree(disk_name); /* invalidate any value */ - reply(200, "Config set to %s.", config_name); - } else { - amfree(config_name); - amfree(config_dir); - } + reply(200, _("Config set to %s."), get_config_name()); + } /* check_and_load_config replies with any failure messages */ s[-1] = (char)ch; } else if (strcmp(cmd, "FEATURES") == 0 && arg) { char *our_feature_string = NULL; @@ -1472,6 +1552,10 @@ main( our_feature_string = am_feature_to_string(our_features); their_feature_string = newstralloc(their_feature_string, arg); their_features = am_string_to_feature(their_feature_string); + if (!their_features) { + g_warning("Invalid client feature set '%s'", their_feature_string); + their_features = am_set_default_feature_set(); + } reply(200, "FEATURES %s", our_feature_string); amfree(our_feature_string); amfree(their_feature_string); @@ -1479,13 +1563,13 @@ main( } else if (strcmp(cmd, "DATE") == 0 && arg) { s[-1] = '\0'; target_date = newstralloc(target_date, arg); - reply(200, "Working date set to %s.", target_date); + reply(200, _("Working date set to %s."), target_date); s[-1] = (char)ch; } else if (strcmp(cmd, "DHST") == 0) { (void)disk_history_list(); } else if (strcmp(cmd, "OISD") == 0 && arg) { if (is_dir_valid_opaque(arg) != -1) { - reply(200, "\"%s\" is a valid directory", arg); + reply(200, _("\"%s\" is a valid directory"), arg); } } else if (strcmp(cmd, "OLSD") == 0 && arg) { (void)opaque_ls(arg,0); @@ -1497,7 +1581,7 @@ main( (void)are_dumps_compressed(); } else { *cmd_undo = cmd_undo_ch; /* restore the command line */ - reply(500, "Command not recognised/incorrect: %s", cmd); + reply(500, _("Command not recognised/incorrect: %s"), cmd); } amfree(line); } @@ -1505,7 +1589,7 @@ main( uncompress_remove = remove_files(uncompress_remove); free_find_result(&output_find); - reply(200, "Good bye."); + reply(200, _("Good bye.")); dbclose(); return 0; } @@ -1528,7 +1612,7 @@ amindexd_nicedate( day = numdate % 100; if(strlen(datestamp) <= 8) { - snprintf(nice, SIZEOF(nice), "%4d-%02d-%02d", + g_snprintf(nice, SIZEOF(nice), "%4d-%02d-%02d", year, month, day); } else { @@ -1539,7 +1623,7 @@ amindexd_nicedate( minutes = (numtime / 100) % 100; seconds = numtime % 100; - snprintf(nice, SIZEOF(nice), "%4d-%02d-%02d-%02d-%02d-%02d", + g_snprintf(nice, SIZEOF(nice), "%4d-%02d-%02d-%02d-%02d-%02d", year, month, day, hours, minutes, seconds); } @@ -1553,3 +1637,168 @@ cmp_date( { return strncmp(date1, date2, strlen(date2)); } + +static char * +clean_backslash( + char *line) +{ + char *s = line, *s1, *s2; + char *p = line; + int i; + + while(*s != '\0') { + if (*s == '\\') { + s++; + s1 = s+1; + s2 = s+2; + if (*s != '\0' && isdigit((int)*s) && + *s1 != '\0' && isdigit((int)*s1) && + *s2 != '\0' && isdigit((int)*s2)) { + /* this is \000, an octal value */ + i = ((*s)-'0')*64 + ((*s1)-'0')*8 + ((*s2)-'0'); + *p++ = i; + s += 3; + } else if (*s == '\\') { /* we remove one / */ + *p++ = *s++; + } else { /* we keep the / */ + *p++ = '\\'; + *p++ = *s++; + } + } else { + *p++ = *s++; + } + } + *p = '\0'; + + return line; +} + + +static int +get_index_dir( + char *dump_hostname, + char *hostname, + char *diskname) +{ + struct stat dir_stat; + char *fn; + char *s; + char *lower_hostname; + + lower_hostname = stralloc(dump_hostname); + for(s=lower_hostname; *s != '\0'; s++) + *s = tolower(*s); + + fn = getindexfname(dump_hostname, diskname, NULL, 0); + if (stat(fn, &dir_stat) == 0 && S_ISDIR(dir_stat.st_mode)) { + amfree(lower_hostname); + amfree(fn); + return 1; + } + amfree(fn); + if (hostname != NULL) { + fn = getindexfname(hostname, diskname, NULL, 0); + if (stat(fn, &dir_stat) == 0 && S_ISDIR(dir_stat.st_mode)) { + amfree(lower_hostname); + amfree(fn); + return 1; + } + } + amfree(fn); + fn = getindexfname(lower_hostname, diskname, NULL, 0); + if (stat(fn, &dir_stat) == 0 && S_ISDIR(dir_stat.st_mode)) { + amfree(lower_hostname); + amfree(fn); + return 1; + } + amfree(fn); + if(diskname != NULL) { + fn = getoldindexfname(dump_hostname, diskname, NULL, 0); + if (stat(fn, &dir_stat) == 0 && S_ISDIR(dir_stat.st_mode)) { + amfree(lower_hostname); + amfree(fn); + return 1; + } + amfree(fn); + if (hostname != NULL) { + fn = getoldindexfname(hostname, diskname, NULL, 0); + if (stat(fn, &dir_stat) == 0 && S_ISDIR(dir_stat.st_mode)) { + amfree(lower_hostname); + amfree(fn); + return 1; + } + } + amfree(fn); + fn = getoldindexfname(lower_hostname, diskname, NULL, 0); + if (stat(fn, &dir_stat) == 0 && S_ISDIR(dir_stat.st_mode)) { + amfree(lower_hostname); + amfree(fn); + return 1; + } + amfree(fn); + } + amfree(lower_hostname); + return -1; +} + +static char * +get_index_name( + char *dump_hostname, + char *hostname, + char *diskname, + char *timestamps, + int level) +{ + struct stat dir_stat; + char *fn; + char *s; + char *lower_hostname; + + lower_hostname = stralloc(dump_hostname); + for(s=lower_hostname; *s != '\0'; s++) + *s = tolower(*s); + + fn = getindexfname(dump_hostname, diskname, timestamps, level); + if (stat(fn, &dir_stat) == 0 && S_ISREG(dir_stat.st_mode)) { + amfree(lower_hostname); + return fn; + } + amfree(fn); + if(hostname != NULL) { + fn = getindexfname(hostname, diskname, timestamps, level); + if (stat(fn, &dir_stat) == 0 && S_ISREG(dir_stat.st_mode)) { + amfree(lower_hostname); + return fn; + } + } + amfree(fn); + fn = getindexfname(lower_hostname, diskname, timestamps, level); + if (stat(fn, &dir_stat) == 0 && S_ISREG(dir_stat.st_mode)) { + amfree(lower_hostname); + return fn; + } + amfree(fn); + if(diskname != NULL) { + fn = getoldindexfname(dump_hostname, diskname, timestamps, level); + if (stat(fn, &dir_stat) == 0 && S_ISREG(dir_stat.st_mode)) { + amfree(lower_hostname); + return fn; + } + amfree(fn); + if(hostname != NULL) { + fn = getoldindexfname(hostname, diskname, timestamps, level); + if (stat(fn, &dir_stat) == 0 && S_ISREG(dir_stat.st_mode)) { + amfree(lower_hostname); + return fn; + } + } + amfree(fn); + fn = getoldindexfname(lower_hostname, diskname, timestamps, level); + if (stat(fn, &dir_stat) == 0 && S_ISREG(dir_stat.st_mode)) { + amfree(lower_hostname); + return fn; + } + } + amfree(lower_hostname); + return NULL; +}