d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finally remove the restriction introduced from NetBSD in r.1.3 that

Browse Source 
pkg_delete be run as root.  Now honours -f and checks ownership of
${PKG_DBDIR} before errx()'ing.

Requested by: bin/5718, myself, bin/18373 (in order)
This commit is contained in:
Tim Vanderhoek 2000-05-13 12:58:18 +00:00
parent 214d1c55f7
commit 21014cca64
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=60499
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
usr.sbin/pkg_install/delete/main.c
View File

@ -24,6 +24,8 @@ static const char rcsid[] =
*
*/
#include <sys/types.h>
#include <sys/stat.h>
#include <err.h>
#include "lib.h"
#include "delete.h"
@ -42,6 +44,8 @@ main(int argc, char **argv)
int ch, error;
char **pkgs, **start;
char *pkgs_split;
char *tmp;
struct stat stat_s;
pkgs = start = argv;
while ((ch = getopt(argc, argv, Options)) != -1)
@ -107,8 +111,14 @@ main(int argc, char **argv)
if (pkgs == start)
warnx("missing package name(s)"), usage();
*pkgs = NULL;
if (!Fake && getuid() != 0)
errx(1, "you must be root to delete packages");
tmp = getenv(PKG_DBDIR) ? getenv(PKG_DBDIR) : DEF_LOG_DIR;
(void) stat(tmp, &stat_s);
if (!Fake && getuid() && geteuid() != stat_s.st_uid) {
if (!Force)
errx(1, "you do not own %s, use -f to force", tmp);
else
warnx("you do not own %s (proceeding anyways)", tmp);
}
if ((error = pkg_perform(start)) != 0) {
if (Verbose)
warnx("%d package deletion(s) failed", error);