fossology
diff --git a/‎src/delagent/agent/delagent.c‎
Lines changed: 19 additions & 14 deletions b/‎src/delagent/agent/delagent.c‎
Lines changed: 19 additions & 14 deletions
diff --git a/‎src/delagent/agent/delagent.h‎
Lines changed: 4 additions & 1 deletion b/‎src/delagent/agent/delagent.h‎
Lines changed: 4 additions & 1 deletion
@@ -2,6 +2,7 @@
  delagent: Remove an upload from the DB and repository
 
  Copyright (C) 2007-2013 Hewlett-Packard Development Company, L.P.
+ Copyright (C) 2015-2016 Siemens AG
 
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License
@@ -68,37 +69,41 @@ void writeMessageAfterDelete(char *kind, long id, char *user_name, int returnedC
   {
     fprintf(stdout, "The %s '%ld' is deleted by the user '%s'.\n", kind, id, user_name);
   }
+  else if (2 == returnedCode)
+  {
+    fprintf(stdout, "The %s '%ld' could not be found by the user '%s'.\n", kind, id, user_name);
+  }
   else
   {
-    LOG_FATAL("You '%s' does not have the permsssion to delete the %s '%ld', or the %s '%ld' does not exist.\n", user_name, kind, id, kind, id);
-    exit(returnedCode);
+    fprintf(stdout, "Deletion failed: user '%s' does not have the permsssion to delete the %s '%ld', or the %s '%ld' does not exist.\n", user_name, kind, id, kind, id);
+    exit(-1);
   }
 }
 
 /**
  * \brief main function for the delagent
  *
  * There are 2 ways to use the delagent agent:
- *   1. Command Line :: delete/list upload from the command line
+ *   1. Command Line :: delete/list upload/folder/license from the command line
  *   2. Agent Based  :: run from the scheduler
  *
  * +-----------------------+
  * | Command Line Analysis |
  * +-----------------------+
  *
  * List or delete uploads.
- *   -h   :: help (print this message), then exit.
- *   -i   :: Initialize the DB
- *   -u   :: List uploads IDs.
- *   -U # :: Delete upload ID.
- *   -L # :: Delete ALL licenses associated with upload ID.
- *   -f   :: List folder IDs.
- *   -F # :: Delete folder ID and all uploads under this folder.
- *   -T   :: TEST -- do not update the DB or delete any files (just pretend).
- *   -v   :: Verbose (-vv for more verbose).
- *   -V   :: print the version info, then exit.
+ *   -h            :: help (print this message), then exit.
+ *   -i            :: Initialize the DB
+ *   -u            :: List uploads IDs.
+ *   -U #          :: Delete upload ID.
+ *   -L #          :: Delete ALL licenses associated with upload ID.
+ *   -f            :: List folder IDs.
+ *   -F #          :: Delete folder ID and all uploads under this folder.
+ *   -T            :: TEST -- do not update the DB or delete any files (just pretend).
+ *   -v            :: Verbose (-vv for more verbose).
+ *   -V            :: print the version info, then exit.
  *   -c SYSCONFDIR :: Specify the directory for the system configuration.
- *   --user #  :: user name
+ *   --user #      :: user name
  *   --password #  :: password
  *
  * +----------------------+
 
@@ -1,5 +1,6 @@
 /********************************************************
  Copyright (C) 2007-2012 Hewlett-Packard Development Company, L.P.
+ Copyright (C) 2015-2016 Siemens AG
 
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License
@@ -46,7 +47,9 @@ extern PGconn* db_conn;
 /* authentication and permission checking */
 int authentication(char *user, char * password, int *user_id, int *user_perm);
 
-int check_permission_upload(long upload_id, int user_id, int user_perm);
+int check_permission_upload(int wantedPermissions, long upload_id, int user_id, int user_perm);
+int check_read_permission_upload(long upload_id, int user_id, int user_perm);
+int check_write_permission_upload(long upload_id, int user_id, int user_perm);
 int check_permission_folder(long folder_id, int user_id, int user_perm);
 int check_permission_license(long license_id, int user_perm);