Add new files

[bacula/bacula] / bacula / src / dird / ua_prune.c

diff --git a/bacula/src/dird/ua_prune.c b/bacula/src/dird/ua_prune.c
index fa93fafed5a6c5297faacb8ec6e64f2292646e26..447f468dc7a450e689e4939a8e21c11f592f6756 100644 (file)
--- a/bacula/src/dird/ua_prune.c
+++ b/bacula/src/dird/ua_prune.c
@@ -184,14 +184,14 @@ int prunecmd(UAContext *ua, char *cmd)
     
    switch (kw) {
    case 0:  /* prune files */
-      client = select_client_resource(ua);
+      client = get_client_resource(ua);
       if (!client || !confirm_retention(ua, &client->FileRetention, "File")) {
         return 0;
       }
       prune_files(ua, client);
       return 1;
    case 1:  /* prune jobs */
-      client = select_client_resource(ua);
+      client = get_client_resource(ua);
       if (!client || !confirm_retention(ua, &client->JobRetention, "Job")) {
         return 0;
       }
@@ -237,7 +237,7 @@ int prune_files(UAContext *ua, CLIENT *client)
    db_lock(ua->db);
    memset(&cr, 0, sizeof(cr));
    memset(&del, 0, sizeof(del));
-   strcpy(cr.Name, client->hdr.name);
+   bstrncpy(cr.Name, client->hdr.name, sizeof(cr.Name));
    if (!db_create_client_record(ua->jcr, ua->db, &cr)) {
       db_unlock(ua->db);
       return 0;
@@ -359,7 +359,7 @@ int prune_jobs(UAContext *ua, CLIENT *client, int JobType)
    db_lock(ua->db);
    memset(&cr, 0, sizeof(cr));
    memset(&del, 0, sizeof(del));
-   strcpy(cr.Name, client->hdr.name);
+   bstrncpy(cr.Name, client->hdr.name, sizeof(cr.Name));
    if (!db_create_client_record(ua->jcr, ua->db, &cr)) {
       db_unlock(ua->db);
       return 0;
@@ -391,7 +391,7 @@ int prune_jobs(UAContext *ua, CLIENT *client, int JobType)
    }
 
    /* Count Files to be deleted */
-   strcpy(query, cnt_DelCand);
+   pm_strcpy(&query, cnt_DelCand);
    Dmsg1(100, "select sql=%s\n", query);
    cnt.count = 0;
    if (!db_sql_query(ua->db, query, count_handler, (void *)&cnt)) {