88c5676 Move write check into pkgcli_update() — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Move write check into pkgcli_update()

Bryan Drewery committed 13 years ago

commit 88c5676dcce48633a1a9faa861c816ebf01df5c0
parent 76e21fa

3 files changed +5 -12

modified pkg/rquery.c

@@ -155,12 +155,6 @@ exec_rquery(int argc, char **argv)

 		sbuf_finish(sqlcond);
 	}
 	/* Only auto update if the user has write access. */
 	if (auto_update &&
 	    pkgdb_access(PKGDB_MODE_READ|PKGDB_MODE_WRITE|PKGDB_MODE_CREATE,
 	    PKGDB_DB_REPO) == EPKG_ENOACCESS)
 		auto_update = false;
 	ret = pkgdb_access(PKGDB_MODE_READ, PKGDB_DB_REPO);
 	if (ret == EPKG_ENOACCESS) {
 		warnx("Insufficient privilege to query package database");

modified pkg/search.c

@@ -353,12 +353,6 @@ exec_search(int argc, char **argv)

 		break;
 	}
 	/* Only auto update if the user has write access. */
 	if (auto_update &&
 	    pkgdb_access(PKGDB_MODE_READ|PKGDB_MODE_WRITE|PKGDB_MODE_CREATE,
 	    PKGDB_DB_REPO) == EPKG_ENOACCESS)
 		auto_update = false;
 	ret = pkgdb_access(PKGDB_MODE_READ, PKGDB_DB_REPO);
 	if (ret == EPKG_ENOACCESS) {
 		warnx("Insufficient privilege to query package database");

modified pkg/update.c

@@ -52,6 +52,11 @@ pkgcli_update(bool force) {

 	int retcode = EPKG_FATAL;
 	char name[MAXPATHLEN];
 	/* Only auto update if the user has write access. */
 	if (pkgdb_access(PKGDB_MODE_READ|PKGDB_MODE_WRITE|PKGDB_MODE_CREATE,
 	    PKGDB_DB_REPO) == EPKG_ENOACCESS)
 		return (EPKG_OK);
 	if (!quiet)
 		printf("Updating repository catalogue\n");