f5726e0 pkg_group and pkg_user are internal only — HardenedBSD-pkg

modified libpkg/libpkg.ver

@@ -66,8 +66,6 @@ global:

 	pkg_from_old;
 	pkg_get2;
 	pkg_get_myarch;
 	pkg_group_gidstr;
 	pkg_group_name;
 	pkg_groups;
 	pkg_has_dir;
 	pkg_has_file;

@@ -180,8 +178,6 @@ global:

 	pkg_try_installed;
 	pkg_type;
 	pkg_update;
 	pkg_user_name;
 	pkg_user_uidstr;
 	pkg_users;
 	pkg_utils_count_spaces;
 	pkg_utils_tokenize;

modified libpkg/pkg.h.in

@@ -890,14 +890,6 @@ const char *pkg_category_name(struct pkg_category const * const);

 /* pkg_license */
 const char *pkg_license_name(struct pkg_license const * const);
 /* pkg_user */
 const char *pkg_user_name(struct pkg_user const * const);
 const char *pkg_user_uidstr(struct pkg_user const * const);
 /* pkg_group */
 const char *pkg_group_name(struct pkg_group const * const);
 const char *pkg_group_gidstr(struct pkg_group const * const);
 /* pkg_script */
 const char *pkg_script_get(struct pkg const * const, pkg_script);

modified libpkg/pkg_attributes.c

@@ -149,22 +149,6 @@ pkg_user_free(struct pkg_user *u)

 	free(u);
 }
 const char *
 pkg_user_name(struct pkg_user const * const u)
 {
 	assert(u != NULL);
 	return (u->name);
 }
 const char *
 pkg_user_uidstr(struct pkg_user const * const u)
 {
 	assert(u != NULL);
 	return (u->uidstr);
 }
 /*
  * Group
  */

@@ -186,22 +170,6 @@ pkg_group_free(struct pkg_group *g)

 	free(g);
 }
 const char *
 pkg_group_name(struct pkg_group const * const g)
 {
 	assert(g != NULL);
 	return (g->name);
 }
 const char *
 pkg_group_gidstr(struct pkg_group const * const g)
 {
 	assert(g != NULL);
 	return (g->gidstr);
 }
 /*
  * Script
  */

modified libpkg/pkg_checksum.c

@@ -171,11 +171,11 @@ pkg_checksum_generate(struct pkg *pkg, char *dest, size_t destlen,

 	}
 	while (pkg_users(pkg, &user) == EPKG_OK) {
 		pkg_checksum_add_entry("user", pkg_user_name(user), &entries);
 		pkg_checksum_add_entry("user", user->name, &entries);
 	}
 	while (pkg_groups(pkg, &group) == EPKG_OK) {
 		pkg_checksum_add_entry("group", pkg_group_name(group), &entries);
 		pkg_checksum_add_entry("group", group->name, &entries);
 	}
 	while (pkg_deps(pkg, &dep) == EPKG_OK) {

modified libpkg/pkg_manifest.c

@@ -973,7 +973,7 @@ pkg_emit_object(struct pkg *pkg, short flags)

 	while (pkg_users(pkg, &user) == EPKG_OK) {
 		if (seq == NULL)
 			seq = ucl_object_typed_new(UCL_ARRAY);
 		ucl_array_append(seq, ucl_object_fromstring(pkg_user_name(user)));
 		ucl_array_append(seq, ucl_object_fromstring(user->name));
 	}
 	if (seq)
 		ucl_object_insert_key(top, seq, "users", 5, false);

@@ -983,7 +983,7 @@ pkg_emit_object(struct pkg *pkg, short flags)

 	while (pkg_groups(pkg, &group) == EPKG_OK) {
 		if (seq == NULL)
 			seq = ucl_object_typed_new(UCL_ARRAY);
 		ucl_array_append(seq, ucl_object_fromstring(pkg_group_name(group)));
 		ucl_array_append(seq, ucl_object_fromstring(group->name));
 	}
 	if (seq)
 		ucl_object_insert_key(top, seq, "groups", 6, false);

modified libpkg/pkg_printf.c

@@ -1157,7 +1157,7 @@ format_group_gidstr(struct sbuf *sbuf, const void *data, struct percent_esc *p)

 {
 	const struct pkg_group	*group = data;
 	return (string_val(sbuf, pkg_group_gidstr(group), p));
 	return (string_val(sbuf, group->gidstr, p));
 }
 /*

@@ -1168,7 +1168,7 @@ format_group_name(struct sbuf *sbuf, const void *data, struct percent_esc *p)

 {
 	const struct pkg_group	*group = data;
 	return (string_val(sbuf, pkg_group_name(group), p));
 	return (string_val(sbuf, group->name, p));
 }
 /*

@@ -1401,7 +1401,7 @@ format_user_name(struct sbuf *sbuf, const void *data, struct percent_esc *p)

 {
 	const struct pkg_user	*user = data;
 	return (string_val(sbuf, pkg_user_name(user), p));
 	return (string_val(sbuf, user->name, p));
 }
 /*

@@ -1412,7 +1412,7 @@ format_user_uidstr(struct sbuf *sbuf, const void *data, struct percent_esc *p)

 {
 	const struct pkg_user	*user = data;
 	return (string_val(sbuf, pkg_user_uidstr(user), p));
 	return (string_val(sbuf, user->uidstr, p));
 }
 /*

modified libpkg/pkgdb.c

@@ -1755,10 +1755,10 @@ pkgdb_register_pkg(struct pkgdb *db, struct pkg *pkg, int complete, int forced)

 	 */
 	while (pkg_users(pkg, &user) == EPKG_OK) {
 		if (run_prstmt(USERS1, pkg_user_name(user))
 		if (run_prstmt(USERS1, user->name)
 		    != SQLITE_DONE
 		    ||
 		    run_prstmt(USERS2, package_id, pkg_user_name(user))
 		    run_prstmt(USERS2, package_id, user->name)
 		    != SQLITE_DONE) {
 			ERROR_SQLITE(s, SQL(USERS2));
 			goto cleanup;

@@ -1770,10 +1770,10 @@ pkgdb_register_pkg(struct pkgdb *db, struct pkg *pkg, int complete, int forced)

 	 */
 	while (pkg_groups(pkg, &group) == EPKG_OK) {
 		if (run_prstmt(GROUPS1, pkg_group_name(group))
 		if (run_prstmt(GROUPS1, group->name)
 		    != SQLITE_DONE
 		    ||
 		    run_prstmt(GROUPS2, package_id, pkg_group_name(group))
 		    run_prstmt(GROUPS2, package_id, group->name)
 		    != SQLITE_DONE) {
 			ERROR_SQLITE(s, SQL(GROUPS2));
 			goto cleanup;

modified libpkg/pkgdb_iterator.c

@@ -429,7 +429,7 @@ pkgdb_load_user(sqlite3 *sqlite, struct pkg *pkg)

 	/* TODO get user uidstr from local database */
 /*	while (pkg_users(pkg, &u) == EPKG_OK) {
 		pwd = getpwnam(pkg_user_name(u));
 		pwd = getpwnam(u->name);
 		if (pwd == NULL)
 			continue;
 		strlcpy(u->uidstr, pw_make(pwd), sizeof(u->uidstr));

@@ -458,7 +458,7 @@ pkgdb_load_group(sqlite3 *sqlite, struct pkg *pkg)

 	    pkg_addgroup, PKG_GROUPS);
 	while (pkg_groups(pkg, &g) == EPKG_OK) {
 		grp = getgrnam(pkg_group_name(g));
 		grp = getgrnam(g->name);
 		if (grp == NULL)
 			continue;
 		strlcpy(g->gidstr, gr_make(grp), sizeof(g->gidstr));