From 7d2880e5fb67480b4b16112f31e9feb68879b599 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 19 Jun 1996 14:30:19 +0000 Subject: [PATCH] remove pub/sec ring stuff, set defaults properly CVS patchset: 649 CVS date: 1996/06/19 14:30:19 --- lib/rpmrc.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/rpmrc.c b/lib/rpmrc.c index ebc9ed4..edd0e76 100644 --- a/lib/rpmrc.c +++ b/lib/rpmrc.c @@ -29,8 +29,6 @@ struct option optionTable[] = { { "optflags", RPMVAR_OPTFLAGS, 1 }, { "pgp_name", RPMVAR_PGP_NAME, 0 }, { "pgp_path", RPMVAR_PGP_PATH, 0 }, - { "pgp_pubring", RPMVAR_PGP_PUBRING, 0 }, - { "pgp_secring", RPMVAR_PGP_SECRING, 0 }, { "require_distribution", RPMVAR_REQUIREDISTRIBUTION, 0 }, { "require_group", RPMVAR_REQUIREGROUP, 0 }, { "require_icon", RPMVAR_REQUIREICON, 0 }, @@ -169,9 +167,8 @@ static void setDefaults(void) { setVar(RPMVAR_DOCDIR, "/usr/doc"); setVar(RPMVAR_OPTFLAGS, "-O2"); setVar(RPMVAR_SIGTYPE, "none"); - setVar(RPMVAR_PGP_PATH, "/usr/lib/rpm"); - setVar(RPMVAR_PGP_PUBRING, "/usr/lib/rpm/pubring.pgp"); - setVar(RPMVAR_PGP_SECRING, "/usr/lib/rpm/secring.pgp"); + setVar(RPMVAR_PGP_PATH, NULL); + setVar(RPMVAR_PGP_NAME, NULL); } int readConfigFiles(char * file) { -- 2.7.4