diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 9 | ||||
| -rw-r--r-- | g10/Makefile.am | 2 | ||||
| -rw-r--r-- | g10/g10.c | 7 |
3 files changed, 17 insertions, 1 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 1827e8c36..2f1204475 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,12 @@ +2004-08-09 Werner Koch <[email protected]> + + * Makefile.am (LDADD): Replaced INTLLIBS by LIBINTL. + +2004-08-02 Werner Koch <[email protected]> + + * g10.c (main): Extra paranoid check to make sure we are not + running setuid anymore. + 2004-07-30 Werner Koch <[email protected]> * g10.c: New alias --throw-keyid for --throw-keyids, so that it diff --git a/g10/Makefile.am b/g10/Makefile.am index 6bfbea3f6..0bbe2768c 100644 --- a/g10/Makefile.am +++ b/g10/Makefile.am @@ -114,7 +114,7 @@ gpgv_SOURCES = gpgv.c \ # ks-db.h \ # $(common_source) -LDADD = $(needed_libs) @INTLLIBS@ @CAPLIBS@ @ZLIBS@ @W32LIBS@ +LDADD = $(needed_libs) @LIBINTL@ @CAPLIBS@ @ZLIBS@ @W32LIBS@ # gpg gets LIBOBJS to add in mkdtemp if the platform doesn't have it gpg_LDADD = @LIBOBJS@ $(LDADD) @DLLIBS@ @NETLIBS@ @@ -1426,6 +1426,13 @@ main( int argc, char **argv ) maybe_setuid = 0; /* Okay, we are now working under our real uid */ +#if defined(HAVE_GETUID) && defined(HAVE_GETEUID) + /* There should be no way to get to this spot while still carrying + setuid privs. Just in case, bomb out if we are. */ + if(getuid()!=geteuid()) + BUG(); +#endif + set_native_charset (NULL); /* Try to auto set the character set */ if( default_config ) |