X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=server-src%2Famindexd.c;h=920da30290a0ef15417bd307b0d48c5f108e0440;hb=fb2bd066c2f8b34addafe48d62550e3033a59431;hp=38079b0949d838c1d375d6768421cc9281c103d9;hpb=3ab887b9bc819a846c75dd7f2ee5d41fac22b19f;p=debian%2Famanda diff --git a/server-src/amindexd.c b/server-src/amindexd.c index 38079b0..920da30 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.39.2.11.4.4.2.13 2003/10/27 18:33:03 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 @@ -45,9 +45,7 @@ #include "diskfile.h" #include "arglist.h" #include "clock.h" -#include "dgram.h" #include "version.h" -#include "protocol.h" #include "amindex.h" #include "disk_history.h" #include "list_dir.h" @@ -55,17 +53,19 @@ #include "token.h" #include "find.h" #include "tapefile.h" - -#ifdef HAVE_NETINET_IN_SYSTM_H -#include -#endif - -#ifdef HAVE_NETINET_IP_H -#include -#endif +#include "util.h" +#include "amandad.h" +#include "pipespawn.h" +#include "sockaddr-util.h" #include +#define amindexd_debug(i,x) do { \ + if ((i) <= debug_amindexd) { \ + dbprintf(x); \ + } \ +} while (0) + typedef struct REMOVE_ITEM { char *filename; @@ -73,13 +73,15 @@ typedef struct REMOVE_ITEM } REMOVE_ITEM; /* state */ -char local_hostname[MAX_HOSTNAME_LENGTH+1]; /* me! */ -char *remote_hostname = NULL; /* the client */ -char *dump_hostname = NULL; /* machine we are restoring */ -char *disk_name; /* disk we are restoring */ -char *target_date = NULL; -disklist_t *disk_list; /* all disks in cur config */ -find_result_t *output_find = NULL; +static int from_amandad; +static char local_hostname[MAX_HOSTNAME_LENGTH+1]; /* me! */ +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 */ +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 amindexd_debug = 0; @@ -89,21 +91,47 @@ static REMOVE_ITEM *uncompress_remove = NULL; static am_feature_t *our_features = NULL; static am_feature_t *their_features = NULL; -static void reply P((int n, char * fmt, ...)) - __attribute__ ((format (printf, 2, 3))); -static void lreply P((int n, char * fmt, ...)) - __attribute__ ((format (printf, 2, 3))); -static void fast_lreply P((int n, char * fmt, ...)) - __attribute__ ((format (printf, 2, 3))); - -REMOVE_ITEM *remove_files(remove) -REMOVE_ITEM *remove; +static REMOVE_ITEM *remove_files(REMOVE_ITEM *); +static char *uncompress_file(char *, char **); +static int process_ls_dump(char *, DUMP_ITEM *, int, char **); + +static size_t reply_buffer_size = 1; +static char *reply_buffer = NULL; +static char *amandad_auth = NULL; +static FILE *cmdin; +static FILE *cmdout; + +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 check_and_load_config(char *); +static int build_disk_table(void); +static int disk_history_list(void); +static int is_dir_valid_opaque(char *); +static int opaque_ls(char *, int); +static void opaque_ls_one (DIR_ITEM *dir_item, am_feature_e marshall_feature, + int recursive); +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 * +remove_files( + REMOVE_ITEM *remove) { 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; @@ -113,15 +141,27 @@ REMOVE_ITEM *remove; return remove; } -char *uncompress_file(filename_gz, emsg) -char *filename_gz; -char **emsg; +static char * +uncompress_file( + char * filename_gz, + char ** emsg) { char *cmd = NULL; char *filename = NULL; struct stat stat_filename; int result; - int len; + 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); @@ -134,42 +174,117 @@ char **emsg; /* uncompress the file */ result=stat(filename,&stat_filename); if(result==-1 && errno==ENOENT) { /* file does not exist */ + struct stat statbuf; REMOVE_ITEM *remove_file; - cmd = vstralloc(UNCOMPRESS_PATH, + + /* + * Check that compressed file exists manually. + */ + if (stat(filename_gz, &statbuf) < 0) { + *emsg = newvstrallocf(*emsg, + _("Compressed file '%s' is inaccessable: %s"), + filename_gz, strerror(errno)); + dbprintf("%s\n",*emsg); + amfree(filename); + return NULL; + } + #ifdef UNCOMPRESS_OPT - " ", UNCOMPRESS_OPT, +# define PARAM_UNCOMPRESS_OPT UNCOMPRESS_OPT +#else +# define PARAM_UNCOMPRESS_OPT skip_argument #endif - " \'", filename_gz, "\'", - " 2>/dev/null", - " | sort", - " > ", "\'", filename, "\'", - NULL); - dbprintf(("%s: uncompress command: %s\n", - debug_prefix_time(NULL), cmd)); - if (system(cmd)!=0) { - amfree(*emsg); - *emsg = vstralloc("\"", 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); + 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, + &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); - amfree(cmd); return NULL; } + /* start the sort process */ + putenv(stralloc("LC_ALL=C")); + pid_sort = pipespawn(SORT_PATH, STDIN_PIPE, + &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 (index(line,'/')) { + clean_backslash(line); + fullwrite(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 = (REMOVE_ITEM *)alloc(SIZEOF(REMOVE_ITEM)); remove_file->filename = stralloc(filename); remove_file->next = uncompress_remove; 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); return NULL; - } else { - /* already uncompressed */ } amfree(cmd); return filename; @@ -177,13 +292,14 @@ char **emsg; /* find all matching entries in a dump listing */ /* return -1 if error */ -static int process_ls_dump(dir, dump_item, recursive, emsg) -char *dir; -DUMP_ITEM *dump_item; -int recursive; -char **emsg; +static int +process_ls_dump( + char * dir, + DUMP_ITEM * dump_item, + int recursive, + char ** emsg) { - char *line = NULL; + char line[STR_SIZE]; char *old_line = NULL; char *filename = NULL; char *filename_gz; @@ -191,7 +307,7 @@ char **emsg; FILE *fp; char *s; int ch; - int len_dir_slash; + size_t len_dir_slash; if (strcmp(dir, "/") == 0) { dir_slash = stralloc(dir); @@ -199,8 +315,13 @@ char **emsg; dir_slash = stralloc2(dir, "/"); } - filename_gz = getindexfname(dump_hostname, disk_name, dump_item->date, - dump_item->level); + 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; + } if((filename = uncompress_file(filename_gz, emsg)) == NULL) { amfree(filename_gz); amfree(dir_slash); @@ -210,35 +331,38 @@ char **emsg; if((fp = fopen(filename,"r"))==0) { amfree(*emsg); - *emsg = stralloc(strerror(errno)); + *emsg = vstrallocf("%s", strerror(errno)); amfree(dir_slash); return -1; } len_dir_slash=strlen(dir_slash); - for(; (line = agets(fp)) != NULL; free(line)) { - if(strncmp(dir_slash, line, len_dir_slash) == 0) { - if(!recursive) { - s = line + len_dir_slash; - ch = *s++; - while(ch && ch != '/') ch = *s++;/* find end of the file name */ - if(ch == '/') { + 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; ch = *s++; + while(ch && ch != '/') + ch = *s++;/* find end of the file name */ + if(ch == '/') { + ch = *s++; + } + s[-1] = '\0'; + } + if(old_line == NULL || strcmp(line, old_line) != 0) { + add_dir_list_item(dump_item, line); + amfree(old_line); + old_line = stralloc(line); } - s[-1] = '\0'; - } - if(old_line == NULL || strcmp(line, old_line) != 0) { - add_dir_list_item(dump_item, line); - amfree(old_line); - old_line = line; - line = NULL; } } } afclose(fp); - amfree(old_line); - amfree(line); + /*@i@*/ amfree(old_line); amfree(filename); amfree(dir_slash); return 0; @@ -248,77 +372,111 @@ char **emsg; printf_arglist_function1(static void reply, int, n, char *, fmt) { va_list args; - char buf[STR_SIZE]; + int len; + + if(!reply_buffer) + reply_buffer = alloc(reply_buffer_size); + + while(1) { + arglist_start(args, fmt); + len = g_vsnprintf(reply_buffer, reply_buffer_size, fmt, args); + arglist_end(args); + + if (len > -1 && (size_t)len < reply_buffer_size-1) + break; - arglist_start(args, fmt); - ap_snprintf(buf, sizeof(buf), "%03d ", n); - ap_vsnprintf(buf+4, sizeof(buf)-4, fmt, args); - arglist_end(args); + reply_buffer_size *= 2; + amfree(reply_buffer); + reply_buffer = alloc(reply_buffer_size); + } - if (printf("%s\r\n", buf) < 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(stdout) != 0) + 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: < %s\n", debug_prefix_time(NULL), buf)); + dbprintf(_("< %03d %s\n"), n, reply_buffer); } /* send one line of a multi-line response */ printf_arglist_function1(static void lreply, int, n, char *, fmt) { va_list args; - char buf[STR_SIZE]; + int len; + + if(!reply_buffer) + reply_buffer = alloc(reply_buffer_size); + + while(1) { + arglist_start(args, fmt); + len = g_vsnprintf(reply_buffer, reply_buffer_size, fmt, args); + arglist_end(args); - arglist_start(args, fmt); - ap_snprintf(buf, sizeof(buf), "%03d-", n); - ap_vsnprintf(buf+4, sizeof(buf)-4, fmt, args); - arglist_end(args); + if (len > -1 && (size_t)len < reply_buffer_size-1) + break; + + reply_buffer_size *= 2; + amfree(reply_buffer); + reply_buffer = alloc(reply_buffer_size); + } - if (printf("%s\r\n", buf) < 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(stdout) != 0) + 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: < %s\n", debug_prefix_time(NULL), buf)); + dbprintf("< %03d-%s\n", n, reply_buffer); + } /* send one line of a multi-line response */ printf_arglist_function1(static void fast_lreply, int, n, char *, fmt) { va_list args; - char buf[STR_SIZE]; + int len; - arglist_start(args, fmt); - ap_snprintf(buf, sizeof(buf), "%03d-", n); - ap_vsnprintf(buf+4, sizeof(buf)-4, fmt, args); - arglist_end(args); + if(!reply_buffer) + reply_buffer = alloc(reply_buffer_size); + + while(1) { + arglist_start(args, fmt); + len = g_vsnprintf(reply_buffer, reply_buffer_size, fmt, args); + arglist_end(args); + + if (len > -1 && (size_t)len < reply_buffer_size-1) + break; + + reply_buffer_size *= 2; + amfree(reply_buffer); + reply_buffer = alloc(reply_buffer_size); + } - if (printf("%s\r\n", buf) < 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("< %03d-%s\n", n, reply_buffer); } /* see if hostname is valid */ @@ -326,87 +484,84 @@ 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 */ -int is_dump_host_valid(host) -char *host; +static am_host_t * +is_dump_host_valid( + char * host) { - struct stat dir_stat; - char *fn; - host_t *ihost; + am_host_t *ihost; + disk_t *diskp; if (config_name == NULL) { - reply(501, "Must set config before setting host."); - return -1; - } - -#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; + 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; } -int is_disk_valid(disk) -char *disk; +static int +is_disk_valid( + char *disk) { - char *fn; - struct stat dir_stat; disk_t *idisk; + char *qdisk; - if (config_name == NULL || dump_hostname == NULL) { - reply(501, "Must set config,host before setting disk."); + if (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.")); return -1; } /* check that the config actually handles that disk */ idisk = lookup_disk(dump_hostname, disk); if(idisk == NULL) { - reply(501, "Disk %s:%s is not in your disklist.", dump_hostname, disk); + qdisk = quote_string(disk); + 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)) { - reply(501, "No index records for disk: %s. Invalid?", disk); - amfree(fn); + 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(qdisk); return -1; } - amfree(fn); return 0; } -int is_config_valid(config) -char *config; +static int +check_and_load_config( + char * config) { - char *conffile; char *conf_diskfile; char *conf_tapelist; char *conf_indexdir; @@ -414,55 +569,42 @@ char *config; /* 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 */ + if (!config_init(CONFIG_INIT_EXPLICIT_NAME, config)) { + 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 ((disk_list = read_diskfile(conf_diskfile)) == NULL) { - reply(501, "Could not read disk file %s!", conf_diskfile); + + check_running_as(RUNNING_AS_DUMPUSER_PREFERRED); + + conf_diskfile = config_dir_relative(getconf_str(CNF_DISKFILE)); + if (read_diskfile(conf_diskfile, &disk_list) < 0) { + reply(501, _("Could not read disk file %s!"), conf_diskfile); amfree(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); - output_find = find_dump(1, disk_list); - sort_find_result("DLKHB", &output_find); + dbrename(config_name, DBG_SUBDIR_SERVER); - /* okay, now look for the index directory */ - conf_indexdir = getconf_str(CNF_INDEXDIR); - if(*conf_indexdir == '/') { - conf_indexdir = stralloc(conf_indexdir); - } else { - conf_indexdir = stralloc2(config_dir, conf_indexdir); - } + output_find = find_dump(&disk_list); + sort_find_result("DLKHpB", &output_find); + + 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; } @@ -472,114 +614,198 @@ char *config; } -int build_disk_table P((void)) +static int +build_disk_table(void) { - char date[3 * NUM_STR_SIZE + 2 + 1]; - long last_datestamp; - int last_filenum; + char *date; + char *last_timestamp; + off_t last_filenum; int last_level; + int last_partnum; find_result_t *find_output; - if (config_name == NULL || dump_hostname == NULL || disk_name == NULL) { - reply(590, "Must set config,host,disk before building disk table"); + if (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")); + return -1; + } + else if (disk_name == NULL) { + reply(590, _("Must set disk before building disk table")); return -1; } clear_list(); - last_datestamp = -1; - last_filenum = -1; + last_timestamp = NULL; + last_filenum = (off_t)-1; last_level = -1; + last_partnum = -1; for(find_output = output_find; find_output != NULL; find_output = find_output->next) { if(strcasecmp(dump_hostname, find_output->hostname) == 0 && strcmp(disk_name , find_output->diskname) == 0 && strcmp("OK" , find_output->status) == 0) { + int partnum = -1; + 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 + * The sort order puts holding disk entries first. We want to * use them if at all possible, so ignore any other entries * for the same datestamp after we see a holding disk entry * (as indicated by a filenum of zero). */ - if(find_output->datestamp == last_datestamp && - find_output->level == last_level && last_filenum == 0) { + if(last_timestamp && + strcmp(find_output->timestamp, last_timestamp) == 0 && + find_output->level == last_level && + 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_datestamp = find_output->datestamp; + last_timestamp = find_output->timestamp; last_filenum = find_output->filenum; last_level = find_output->level; - ap_snprintf(date, sizeof(date), "%04d-%02d-%02d", - find_output->datestamp/10000, - (find_output->datestamp/100) %100, - find_output->datestamp %100); - add_dump(date, find_output->level, find_output->label, - find_output->filenum); - dbprintf(("%s: - %s %d %s %d\n", - debug_prefix_time(NULL), date, find_output->level, - find_output->label, find_output->filenum)); + last_partnum = partnum; + date = amindexd_nicedate(find_output->timestamp); + 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, + (long long)find_output->filenum, + partnum, maxpart); } } + + clean_dump(); + return 0; } -int disk_history_list P((void)) +static int +disk_history_list(void) { DUMP_ITEM *item; + char date[20]; - if (config_name == NULL || dump_hostname == NULL || disk_name == NULL) { - reply(502, "Must set config,host,disk before listing history"); + if (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")); + return -1; + } + else if (disk_name == NULL) { + 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, disk_name); + lreply(200, _(" Dump history for config \"%s\" host \"%s\" disk %s"), + config_name, dump_hostname, qdisk_name); - for (item=first_dump(); item!=NULL; item=next_dump(item)) - lreply(201, " %s %d %s %d", item->date, item->level, item->tape, - item->file); + for (item=first_dump(); item!=NULL; item=next_dump(item)){ + char *tapelist_str = marshal_tapelist(item->tapes, 1); + + strncpy(date, item->date, 20); + date[19] = '\0'; + if(!am_has_feature(their_features,fe_amrecover_timestamp)) + date[10] = '\0'; + + if(am_has_feature(their_features, fe_amindexd_marshall_in_DHST)){ + lreply(201, " %s %d %s", date, item->level, tapelist_str); + } + else{ + 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, disk_name); + reply(200, _("Dump history for config \"%s\" host \"%s\" disk %s"), + config_name, dump_hostname, qdisk_name); return 0; } -/* is the directory dir backed up - dir assumed complete relative to - disk mount point */ +/* + * is the directory dir backed up - dir assumed complete relative to + * disk mount point + */ /* opaque version of command */ -int is_dir_valid_opaque(dir) -char *dir; +static int +is_dir_valid_opaque( + char *dir) { DUMP_ITEM *item; - char *line = NULL; + char line[STR_SIZE]; FILE *fp; int last_level; char *ldir = NULL; char *filename_gz = NULL; char *filename = NULL; - int ldir_len; + 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"); + reply(502, _("Must set config,host,disk before asking about directories")); return -1; } - if (target_date == NULL) { - reply(502, "Must set date before asking about directories"); + else if (dump_hostname == NULL) { + 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")); + return -1; + } + else if (target_date == NULL) { + 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 (strcmp(item->date, target_date) <= 0) + if (cmp_date(item->date, target_date) <= 0) break; 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; } @@ -594,30 +820,38 @@ char *dir; 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; } @@ -632,45 +866,61 @@ char *dir; amfree(filename); amfree(ldir); - reply(500, "\"%s\" is an invalid directory", dir); + reply(500, _("\"%s\" is an invalid directory"), dir); return -1; } -int opaque_ls(dir,recursive) -char *dir; -int recursive; +static int +opaque_ls( + char * dir, + int recursive) { DUMP_ITEM *dump_item; DIR_ITEM *dir_item; - int last_level; + int level, last_level; static char *emsg = NULL; + am_feature_e marshall_feature; + + if (recursive) { + marshall_feature = fe_amindexd_marshall_in_ORLD; + } else { + marshall_feature = fe_amindexd_marshall_in_OLSD; + } clear_dir_list(); - if (config_name == NULL || dump_hostname == NULL || disk_name == NULL) { - reply(502, "Must set config,host,disk before listing a directory"); + if (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")); return -1; } - if (target_date == NULL) { - reply(502, "Must set date before listing a directory"); + else if (disk_name == NULL) { + 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")); return -1; } /* scan through till we find first dump on or before date */ for (dump_item=first_dump(); dump_item!=NULL; dump_item=next_dump(dump_item)) - if (strcmp(dump_item->date, target_date) <= 0) + if (cmp_date(dump_item->date, target_date) <= 0) break; 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; } @@ -683,7 +933,7 @@ int recursive; { 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; } @@ -691,93 +941,150 @@ int recursive; } /* return the information to the caller */ - if(recursive) - { - lreply(200, " Opaque recursive list of %s", dir); - for (dir_item = get_dir_list(); dir_item != NULL; - dir_item = dir_item->next) { - if(am_has_feature(their_features, fe_amindexd_fileno_in_ORLD)){ - fast_lreply(201, " %s %d %-16s %d %s", - dir_item->dump->date, dir_item->dump->level, - dir_item->dump->tape, dir_item->dump->file, - dir_item->path); - } - else { - fast_lreply(201, " %s %d %-16s %s", - dir_item->dump->date, dir_item->dump->level, - dir_item->dump->tape, dir_item->path); - } - } - reply(200, " Opaque recursive list of %s", dir); - } - else - { - 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) { - if(am_has_feature(their_features, fe_amindexd_fileno_in_OLSD)){ - lreply(201, " %s %d %-16s %d %s", - dir_item->dump->date, dir_item->dump->level, - dir_item->dump->tape, dir_item->dump->file, - dir_item->path); - } - else { - lreply(201, " %s %d %-16s %s", - dir_item->dump->date, dir_item->dump->level, - dir_item->dump->tape, dir_item->path); + + if(dir_item->dump->level == level) { + 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.")); + break; + } + else { + opaque_ls_one(dir_item, marshall_feature, recursive); + } } } - reply(200, " Opaque list of %s", dir); } + reply(200, _(" Opaque list of %s"), dir); + clear_dir_list(); return 0; } +void opaque_ls_one( + DIR_ITEM * dir_item, + am_feature_e marshall_feature, + int recursive) +{ + char date[20]; + char *tapelist_str; + char *qpath; -/* returns the value of tapedev from the amanda.conf file if set, - otherwise reports an error */ -int tapedev_is P((void)) + if (am_has_feature(their_features, marshall_feature)) { + tapelist_str = marshal_tapelist(dir_item->dump->tapes, 1); + } else { + tapelist_str = dir_item->dump->tapes->label; + } + + strncpy(date, dir_item->dump->date, 20); + date[19] = '\0'; + if(!am_has_feature(their_features,fe_amrecover_timestamp)) + date[10] = '\0'; + + qpath = quote_string(dir_item->path); + if((!recursive && am_has_feature(their_features, + fe_amindexd_fileno_in_OLSD)) || + (recursive && am_has_feature(their_features, + fe_amindexd_fileno_in_ORLD))) { + fast_lreply(201, " %s %d %s %lld %s", + date, + dir_item->dump->level, + tapelist_str, + (long long)dir_item->dump->file, + qpath); + } + else { + + fast_lreply(201, " %s %d %s %s", + date, dir_item->dump->level, + tapelist_str, qpath); + } + amfree(qpath); + if(am_has_feature(their_features, marshall_feature)) { + amfree(tapelist_str); + } +} + +/* + * returns the value of changer or tapedev from the amanda.conf file if set, + * otherwise reports an error + */ + +static int +tapedev_is(void) { char *result; /* check state okay to do this */ if (config_name == NULL) { - reply(501, "Must set config before asking about tapedev."); + 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(_("tapedev_is amrecover_changer: %s\n"), result); + reply(200, result); + return 0; + } + + /* use changer if possible */ + if ((result = getconf_str(CNF_TPCHANGER)) != NULL && *result != '\0') { + dbprintf(_("tapedev_is tpchanger: %s\n"), result); + reply(200, result); + return 0; + } + /* get tapedev value */ - if ((result = getconf_str(CNF_TAPEDEV)) == NULL) - { - reply(501, "Tapedev not set in config file."); - return -1; + if ((result = getconf_str(CNF_TAPEDEV)) != NULL && *result != '\0') { + dbprintf(_("tapedev_is tapedev: %s\n"), result); + reply(200, result); + return 0; } - reply(200, result); - return 0; + dbprintf(_("No tapedev or tpchanger in config site.\n")); + + reply(501, _("Tapedev or tpchanger not set in config file.")); + return -1; } /* returns YES if dumps for disk are compressed, NO if not */ -int are_dumps_compressed P((void)) +static int +are_dumps_compressed(void) { disk_t *diskp; /* check state okay to do this */ - if (config_name == NULL || dump_hostname == NULL || disk_name == NULL) { - reply(501, "Must set config,host,disk name before asking about dumps."); + if (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.")); + return -1; + } + else if (disk_name == NULL) { + reply(501, _("Must set disk name before asking about dumps.")); return -1; } /* now go through the list of disks and find which have indexes */ - for (diskp = disk_list->head; diskp != NULL; diskp = diskp->next) + for (diskp = disk_list.head; diskp != NULL; diskp = diskp->next) { if ((strcasecmp(diskp->host->hostname, dump_hostname) == 0) - && (strcmp(diskp->name, disk_name) == 0)) + && (strcmp(diskp->name, disk_name) == 0)) { break; + } + } - if (diskp == NULL) - { - reply(501, "Couldn't find host/disk in disk file."); + if (diskp == NULL) { + reply(501, _("Couldn't find host/disk in disk file.")); return -1; } @@ -790,35 +1097,36 @@ int are_dumps_compressed P((void)) return 0; } -int main(argc, argv) -int argc; -char **argv; +int +main( + int argc, + char ** argv) { char *line = NULL, *part = NULL; - char *s, *fp; + char *s; int ch; char *cmd_undo, cmd_undo_ch; - int i; - struct sockaddr_in his_addr; - struct hostent *his_name; - char *arg; + socklen_t_equiv socklen; + sockaddr_union his_addr; + char *arg = NULL; char *cmd; - int len; - int fd; + size_t len; int user_validated = 0; char *errstr = NULL; - char *pgm = "amindexd"; /* in case argv[0] is not set */ - - for(fd = 3; fd < FD_SETSIZE; fd++) { - /* - * Make sure nobody spoofs us with a lot of extra open files - * that would cause an open we do to get a very high file - * descriptor, which in turn might be used as an index into - * an array (e.g. an fd_set). - */ - close(fd); - } + 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(); /* @@ -837,37 +1145,21 @@ char **argv; set_pname(pgm); -#ifdef FORCE_USERID - - /* we'd rather not run as root */ + /* Don't die when child closes pipe */ + signal(SIGPIPE, SIG_IGN); - if(geteuid() == 0) { - if(client_uid == (uid_t) -1) { - error("error [cannot find user %s in passwd file]\n", CLIENT_LOGIN); - } + dbopen(DBG_SUBDIR_SERVER); + dbprintf(_("version %s\n"), version()); - initgroups(CLIENT_LOGIN, client_gid); - setgid(client_gid); - setuid(client_uid); + if(argv == NULL) { + error("argv == NULL\n"); } -#endif /* FORCE_USERID */ - - dbopen(); - startclock(); - dbprintf(("%s: version %s\n", get_pname(), version())); - - if (! (argc >= 1 && argv != NULL && argv[0] != NULL)) { - dbprintf(("%s: WARNING: argv[0] not defined: check inetd.conf\n", - debug_prefix_time(NULL))); + if (! (argc >= 1 && argv[0] != 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 */ @@ -880,16 +1172,32 @@ char **argv; argv++; } + if(argc > 0 && strcmp(*argv, "amandad") == 0) { + from_amandad = 1; + argc--; + argv++; + if(argc > 0) { + amandad_auth = *argv; + argc--; + argv++; + } + } + else { + from_amandad = 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)); - local_hostname[sizeof(local_hostname)-1] = '\0'; + if(gethostname(local_hostname, SIZEOF(local_hostname)-1) == -1) { + error(_("gethostname: %s"), strerror(errno)); + /*NOTREACHED*/ + } + local_hostname[SIZEOF(local_hostname)-1] = '\0'; /* now trim domain off name */ s = local_hostname; @@ -897,80 +1205,108 @@ char **argv; while(ch && ch != '.') ch = *s++; s[-1] = '\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); + + if(from_amandad == 0) { + 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)); + + /* 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*/ + } } - assert(his_name->h_addrtype == AF_INET); - his_addr.sin_family = his_name->h_addrtype; - his_addr.sin_port = htons(0); - memcpy((char *)&his_addr.sin_addr.s_addr, - (char *)his_name->h_addr_list[0], his_name->h_length); - } else { - /* who are we talking to? */ - i = sizeof (his_addr); - if (getpeername(0, (struct sockaddr *)&his_addr, &i) == -1) - error("getpeername: %s", strerror(errno)); - } - if (his_addr.sin_family != 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)); + + /* Set up the input and output FILEs */ + cmdout = stdout; + cmdin = stdin; } - 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)); + else { + /* read the REQ packet */ + for(; (line = agets(stdin)) != NULL; free(line)) { + if(strncmp_const(line, "OPTIONS ") == 0) { + g_options = parse_g_options(line+8, 1); + if(!g_options->hostname) { + g_options->hostname = alloc(MAX_HOSTNAME_LENGTH+1); + gethostname(g_options->hostname, MAX_HOSTNAME_LENGTH); + g_options->hostname[MAX_HOSTNAME_LENGTH] = '\0'; + } + } + } + amfree(line); + + if(amandad_auth && g_options->auth) { + if(strcasecmp(amandad_auth, g_options->auth) != 0) { + 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'"), + g_options->auth, amandad_auth); + /*NOTREACHED*/ + } + } + /* send the REP packet */ + g_printf("CONNECT MESG %d\n", DATA_FD_OFFSET); + g_printf("\n"); + fflush(stdin); + fflush(stdout); + fclose(stdin); + fclose(stdout); + + cmdout = fdopen(DATA_FD_OFFSET + 0, "a"); + if (!cmdout) { + error(_("amindexd: Can't fdopen(%d): %s"), DATA_FD_OFFSET + 0, strerror(errno)); + /*NOTREACHED*/ + } + + cmdin = fdopen(DATA_FD_OFFSET + 1, "r"); + if (!cmdin) { + error(_("amindexd: Can't fdopen(%d): %s"), DATA_FD_OFFSET + 1, strerror(errno)); + /*NOTREACHED*/ + } } - fp = s = his_name->h_name; - ch = *s++; - while(ch && ch != '.') ch = *s++; - s[-1] = '\0'; - remote_hostname = newstralloc(remote_hostname, fp); - s[-1] = ch; /* clear these so we can detect when the have not been set by the client */ amfree(dump_hostname); + amfree(qdisk_name); amfree(disk_name); amfree(target_date); 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; + /* a real simple parser since there are only a few commands */ while (1) { /* get a line from the client */ - amfree(line); while(1) { - if((part = agets(stdin)) == NULL) { + 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); @@ -978,13 +1314,9 @@ char **argv; dbclose(); return 1; /* they hung up? */ } - if(line) { - strappend(line, part); - amfree(part); - } else { - line = part; - part = NULL; - } + strappend(line, part); /* Macro: line can be null */ + amfree(part); + if(amindexd_debug) { break; /* we have a whole line */ } @@ -1000,15 +1332,17 @@ char **argv; strappend(line, "\n"); } - dbprintf(("%s: > %s\n", debug_prefix_time(NULL), line)); + dbprintf("> %s\n", line); - arg = NULL; + if (arg != NULL) + amfree(arg); s = line; ch = *s++; 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; } cmd = s - 1; @@ -1021,106 +1355,149 @@ char **argv; skip_whitespace(s, ch); /* find the argument */ if (ch) { arg = s-1; - skip_non_whitespace(s, ch); + skip_quoted_string(s, ch); + arg = unquote_string(arg); } } amfree(errstr); if (!user_validated && strcmp(cmd, "SECURITY") == 0 && arg) { - user_validated = security_ok(&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) { - if (errstr) { - reply(500, "Access not allowed: %s", errstr); - } else { - reply(500, "Access not allowed"); + if (!user_validated) { /* don't tell client the reason, just log it to debug log */ + reply(500, _("Access not allowed")); + if (errstr) { + dbprintf("%s\n", errstr); } break; } if (strcmp(cmd, "QUIT") == 0) { + 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 */ } - s[-1] = ch; + s[-1] = (char)ch; + } else if (strcmp(cmd, "LISTHOST") == 0) { + disk_t *disk, + *diskdup; + int nbhost = 0, + found = 0; + s[-1] = '\0'; + if (config_name == NULL) { + reply(501, _("Must set config before listhost")); + } + else { + lreply(200, _(" List hosts for config %s"), config_name); + for (disk = disk_list.head; disk!=NULL; disk = disk->next) { + found = 0; + for (diskdup = disk_list.head; diskdup!=disk; diskdup = diskdup->next) { + if(strcmp(diskdup->host->hostname, disk->host->hostname) == 0) { + found = 1; + break; + } + } + if(!found){ + fast_lreply(201, " %s", disk->host->hostname); + nbhost++; + } + } + if(nbhost > 0) { + reply(200, _(" List hosts for config %s"), config_name); + } + else { + reply(200, _("No hosts for config %s"), config_name); + } + } + s[-1] = (char)ch; } else if (strcmp(cmd, "DISK") == 0 && arg) { s[-1] = '\0'; if (is_disk_valid(arg) != -1) { disk_name = newstralloc(disk_name, arg); + qdisk_name = quote_string(disk_name); if (build_disk_table() != -1) { - reply(200, "Disk set to %s.", disk_name); + reply(200, _("Disk set to %s."), qdisk_name); } } - s[-1] = ch; + s[-1] = (char)ch; } else if (strcmp(cmd, "LISTDISK") == 0) { + char *qname; disk_t *disk; int nbdisk = 0; s[-1] = '\0'; - if (config_name == NULL || dump_hostname == NULL) { - reply(501, "Must set config, host before listdisk"); + if (config_name == NULL) { + reply(501, _("Must set config, host before listdisk")); + } + else if (dump_hostname == NULL) { + 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 && - ((disk->device && strcmp(disk->device, arg) == 0) || - (!disk->device && strcmp(disk->name, arg) == 0))) { - fast_lreply(201, " %s", disk->name); + for (disk = disk_list.head; disk!=NULL; disk = disk->next) { + + 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); + fast_lreply(201, " %s", qname); + amfree(qname); nbdisk++; } } 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); - for (disk = disk_list->head; disk!=NULL; disk = disk->next) { - if(strcmp(disk->host->hostname, dump_hostname) == 0) { - fast_lreply(201, " %s", disk->name); + lreply(200, _(" List of disk for host %s"), dump_hostname); + for (disk = disk_list.head; disk!=NULL; disk = disk->next) { + if(strcasecmp(disk->host->hostname, dump_hostname) == 0) { + qname = quote_string(disk->name); + fast_lreply(201, " %s", qname); + amfree(qname); nbdisk++; } } 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] = ch; + 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); - } - s[-1] = ch; + reply(200, _("Config set to %s."), 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; char *their_feature_string = NULL; @@ -1129,41 +1506,251 @@ char **argv; am_release_feature_set(their_features); our_features = am_init_feature_set(); our_feature_string = am_feature_to_string(our_features); - their_feature_string = newstralloc(target_date, arg); + their_feature_string = newstralloc(their_feature_string, arg); their_features = am_string_to_feature(their_feature_string); reply(200, "FEATURES %s", our_feature_string); amfree(our_feature_string); amfree(their_feature_string); - s[-1] = ch; + s[-1] = (char)ch; } 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); - s[-1] = ch; + 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); } else if (strcmp(cmd, "ORLD") == 0 && arg) { - (void)opaque_ls(arg,1); + (void)opaque_ls(arg, 1); } else if (strcmp(cmd, "TAPE") == 0) { (void)tapedev_is(); } else if (strcmp(cmd, "DCMP") == 0) { (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); } - amfree(line); - + amfree(arg); + uncompress_remove = remove_files(uncompress_remove); free_find_result(&output_find); - reply(200, "Good bye."); + reply(200, _("Good bye.")); dbclose(); return 0; } + +static char * +amindexd_nicedate( + char * datestamp) +{ + static char nice[20]; + int year, month, day; + int hours, minutes, seconds; + char date[9], atime[7]; + int numdate, numtime; + + strncpy(date, datestamp, 8); + date[8] = '\0'; + numdate = atoi(date); + year = numdate / 10000; + month = (numdate / 100) % 100; + day = numdate % 100; + + if(strlen(datestamp) <= 8) { + g_snprintf(nice, SIZEOF(nice), "%4d-%02d-%02d", + year, month, day); + } + else { + strncpy(atime, &(datestamp[8]), 6); + atime[6] = '\0'; + numtime = atoi(atime); + hours = numtime / 10000; + minutes = (numtime / 100) % 100; + seconds = numtime % 100; + + g_snprintf(nice, SIZEOF(nice), "%4d-%02d-%02d-%02d-%02d-%02d", + year, month, day, hours, minutes, seconds); + } + + return nice; +} + +static int +cmp_date( + const char * date1, + const char * date2) +{ + 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; +}