89576d5 Use EPKG_ENOACCESS for consistency with EPKG_ENODB — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Use EPKG_ENOACCESS for consistency with EPKG_ENODB

Matthew Seaman committed 13 years ago

commit 89576d51ff305324f2a1466191bf2f0effb4f339
parent 0970255

3 files changed +6 -6

modified libpkg/pkg.h.in

@@ -418,7 +418,7 @@ typedef enum {

 	/**
          * Insufficient privilege for action
          */
 	EPKG_NOACCESS,
 	EPKG_ENOACCESS,
 } pkg_error_t;
 /**

modified libpkg/pkgdb.c

@@ -714,7 +714,7 @@ pkgdb_access(int mode)

 	 * EPKG_NODB:  local.sqlite doesn't exist (we don't want to create
 	 *             it.)
 	 *
 	 * EPKG_NOACCESS: we don't have privileges to read or write packages
 	 * EPKG_ENOACCESS: we don't have privileges to read or write packages
 	 *
 	 * EPKG_FATAL: Couldn't determine the answer for other reason,
 	 *     like configuration screwed up, read-only filesystem, etc.

@@ -750,7 +750,7 @@ pkgdb_access(int mode)

 			pkg_emit_nolocaldb();
 			return (EPKG_ENODB);
 		} else if (errno == EACCES)
 			return (EPKG_NOACCESS);
 			return (EPKG_ENOACCESS);
 		else
 			return (EPKG_FATAL);
 	}

@@ -768,7 +768,7 @@ pkgdb_access(int mode)

 	install_as_user = (getenv("INSTALL_AS_USER") != NULL);
 	if (!i_am_super && !install_as_user)
 		return (EPKG_NOACCESS);
 		return (EPKG_ENOACCESS);
 	/* We want to write to the DB and/or the system generally to
 	   manipulate packages.  If the local database doesn't exist,

@@ -782,7 +782,7 @@ pkgdb_access(int mode)

 	if (access != 0) {
 		if (errno == EACCES)
 			return (EPKG_NOACCESS);
 			return (EPKG_ENOACCESS);
 		else
 			return (EPKG_FATAL);
 	}

modified libpkg/update.c

@@ -129,7 +129,7 @@ pkg_update(const char *name, const char *packagesite, bool force)

 	if (eaccess(repofile, W_OK) == -1) {
 		pkg_emit_error("Insufficient privilege to update %s\n",
 			       repofile);
 		rc = EPKG_NOACCESS;
 		rc = EPKG_ENOACCESS;
 		goto cleanup;
 	}