Only system headers should declare errno

Many parts of krb5 declare errno in source files using extern int
errno.  This has not been needed in ANSI C for a long time,
and actively breaks modern versions of glibc.

So these declarations are removed and errno.h included where necessary.

Ticket: new
Component: krb5-build

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15082 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index 202ae14efe0005324fc5b919ea40ae21f0737ce8..46e005c5765e261edb1bd2e51ee9e09ca812e4b0 100644 (file)
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-05  Sam Hartman  <hartmans@mit.edu>
+
+       * login.c: Remove declaration of errno
+
 2003-01-03  Ezra Peisach  <epeisach@bu.edu>
 
        * compat_recv.c (accept_a_connection): Test if IPv6 socket returns

diff --git a/src/appl/bsd/login.c b/src/appl/bsd/login.c
index f1ebff4f7902646d088aebc2c0e19e38862f7e54..eeab4b2ac3e6e17f07655109e948e29e89c90d47 100644 (file)
--- a/src/appl/bsd/login.c
+++ b/src/appl/bsd/login.c
@@ -304,7 +304,7 @@ char term[64], *hostname, *username;
 char term[64], *username;
 #endif
 
-extern int errno;
+
 
 #ifdef KRB4
 #define KRB_ENVIRON    "KRBTKFILE"     /* Ticket file environment variable */

diff --git a/src/kadmin/v4server/ChangeLog b/src/kadmin/v4server/ChangeLog
index cdae9699179ff0cda217a89303ab334aa104d2dc..272af6668411e01a4d54d5f5f0fe0e943cd95194 100644 (file)
--- a/src/kadmin/v4server/ChangeLog
+++ b/src/kadmin/v4server/ChangeLog
@@ -1,3 +1,9 @@
+2003-01-05  Sam Hartman  <hartmans@mit.edu>
+
+       * admin_server.c (kadm_listen): Remove declaration of errno
+
+       * acl_files.c: Remove declaration of errno
+
 2002-11-26  Tom Yu  <tlyu@mit.edu>
 
        * Makefile.in (OBJS): Remove kadm_stream.o and kadm_err.o.  Also,

diff --git a/src/kadmin/v4server/acl_files.c b/src/kadmin/v4server/acl_files.c
index bbc9bb71bb98a898de986602bf2e41f1ef878895..1df4d3039497e80cd8772e08964c643ed8a3af35 100644 (file)
--- a/src/kadmin/v4server/acl_files.c
+++ b/src/kadmin/v4server/acl_files.c
@@ -22,7 +22,7 @@
 #include <sys/types.h>
 #include <sys/file.h>
 #include <sys/stat.h>
-#include <sys/errno.h>
+#include <errno.h>
 #include <ctype.h>
 #include <fcntl.h>
 #include "krb.h"
@@ -51,7 +51,6 @@
 
 #define COR(a,b) ((a!=NULL)?(a):(b))
 
-extern int errno;
 
 #ifndef HAVE_STDLIB_H
 extern char *malloc(), *calloc();

diff --git a/src/kadmin/v4server/admin_server.c b/src/kadmin/v4server/admin_server.c
index 8aaf0888fbfff5023dc3d2a2cf7423ce546eb308..527f19341a5abc39290a760b33bf2dcb9326f144 100644 (file)
--- a/src/kadmin/v4server/admin_server.c
+++ b/src/kadmin/v4server/admin_server.c
@@ -284,7 +284,6 @@ listen on the admin servers port for a request
 static int
 kadm_listen()
 {
-    extern int errno;
     int found;
     int admin_fd;
     int peer_fd;

diff --git a/src/lib/kadm5/srv/ChangeLog b/src/lib/kadm5/srv/ChangeLog
index 22e1d2d4ec9c96aff21be145d35fb6eae0824426..106c2bee7b88168b9aecf5ef6d0c01c1ffed1602 100644 (file)
--- a/src/lib/kadm5/srv/ChangeLog
+++ b/src/lib/kadm5/srv/ChangeLog
@@ -1,3 +1,9 @@
+2003-01-05  Sam Hartman  <hartmans@mit.edu>
+
+       * server_dict.c: Remove declaration of errno
+
+       * adb_policy.c: Remove declaration of errno
+
 2002-12-16  Ezra Peisach  <epeisach@bu.edu>
 
        * Makefile.in: Change to allow compilation with-system-db and

diff --git a/src/lib/kadm5/srv/adb_policy.c b/src/lib/kadm5/srv/adb_policy.c
index 7403d31a790ac04074e7cc410d6fc4483304af4d..f081551d733808bc0c64b85b9756c34e05c57dee 100644 (file)
--- a/src/lib/kadm5/srv/adb_policy.c
+++ b/src/lib/kadm5/srv/adb_policy.c
@@ -13,8 +13,8 @@ static char *rcsid = "$Header$";
 #include       "adb.h"
 #include       <stdlib.h>
 #include       <string.h>
+#include <errno.h>
 
-extern int errno;
 
 #define OPENLOCK(db, mode) \
 { \

diff --git a/src/lib/kadm5/srv/server_dict.c b/src/lib/kadm5/srv/server_dict.c
index 5b718d484d3236b5674ed7c65ff0f44fa2fcad38..53df800b908c4ae9edafd61cf4400730a5f91753 100644 (file)
--- a/src/lib/kadm5/srv/server_dict.c
+++ b/src/lib/kadm5/srv/server_dict.c
@@ -13,6 +13,7 @@ static char *rcsid = "$Header$";
 #include    <fcntl.h>
 #include    <sys/stat.h>
 #include    <unistd.h>
+#include <errno.h>
 #include    <kadm5/admin.h>
 #include    <stdlib.h>
 #include    <stdio.h>
@@ -27,7 +28,7 @@ static char *rcsid = "$Header$";
 static char        **word_list = NULL;     /* list of word pointers */
 static char        *word_block = NULL;     /* actual word data */
 static unsigned int word_count = 0;        /* number of words */
-extern int         errno;
+
 
 /*
  * Function: word_compare

diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog
index bff5f1c09d06065e2c0bbe7bb7c0f4be3b1b2a70..0b0a976c8ff0ec6fb36f43cfea231f3698778500 100644 (file)
--- a/src/lib/krb4/ChangeLog
+++ b/src/lib/krb4/ChangeLog
@@ -1,3 +1,9 @@
+2003-01-05  Sam Hartman  <hartmans@mit.edu>
+
+       * tf_util.c: Remove declaration of errno
+
+       * dest_tkt.c (dest_tkt): Remove declaration of errno
+
 2002-12-18  Tom Yu  <tlyu@mit.edu>
 
        * RealmsConfig-glue.c: Fix up KRB5_CALLCONV.

diff --git a/src/lib/krb4/dest_tkt.c b/src/lib/krb4/dest_tkt.c
index 5fd234443b4eea729150a482e9d69f12e0c655ef..676302509cdde53051e36a0f8c595ce67d377871 100644 (file)
--- a/src/lib/krb4/dest_tkt.c
+++ b/src/lib/krb4/dest_tkt.c
@@ -69,7 +69,6 @@ dest_tkt()
 {
     const char *file = TKT_FILE;
     int i,fd;
-    extern int errno;
     int ret;
     struct stat statpre, statpost;
     char buf[BUFSIZ];

diff --git a/src/lib/krb4/tf_util.c b/src/lib/krb4/tf_util.c
index 7de4b0ac426bf61318ba639af6abe4918ad6e290..6cb9eeb8f18be21abbffa5c0ee579275881df8e5 100644 (file)
--- a/src/lib/krb4/tf_util.c
+++ b/src/lib/krb4/tf_util.c
@@ -47,7 +47,6 @@
 #define TF_LCK_RETRY ((unsigned)2)     /* seconds to sleep before
                                         * retry if ticket file is
                                         * locked */
-extern int errno;
 extern int krb_debug;
 
 void tf_close();

diff --git a/src/lib/krb5/posix/ChangeLog b/src/lib/krb5/posix/ChangeLog
index 8112eb1d71634952092f063a76336f91538c7605..0a2cb1c817a56ee0b7fbe92b1470fb324d435e65 100644 (file)
--- a/src/lib/krb5/posix/ChangeLog
+++ b/src/lib/krb5/posix/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-05  Sam Hartman  <hartmans@mit.edu>
+
+       * syslog.c (vsyslog): Remove declaration of errno
+
 2002-08-29  Ken Raeburn  <raeburn@mit.edu>
 
        * Makefile.in: Revert $(S)=>/ change, for Windows support.

diff --git a/src/lib/krb5/posix/syslog.c b/src/lib/krb5/posix/syslog.c
index 7188e36f9b6e17d05dfb3ff4072ddb6122c99715..3a02e84259fd021d501c1c127c0794bc1542d1ad 100644 (file)
--- a/src/lib/krb5/posix/syslog.c
+++ b/src/lib/krb5/posix/syslog.c
@@ -41,6 +41,7 @@
 #define const
 #include <varargs.h>
 #endif
+#include <errno.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/file.h>
@@ -89,7 +90,6 @@ vsyslog(pri, fmt, ap)
        const register char *fmt;
        va_list ap;
 {
-       extern int errno;
        register int cnt;
        register char *p;
        time_t now, time();

diff --git a/src/lib/rpc/ChangeLog b/src/lib/rpc/ChangeLog
index 2a8bfe579e19abd87b978fd628d920aeb779710c..a3be9154c161dcf44dabc3fd45e61402ace14515 100644 (file)
--- a/src/lib/rpc/ChangeLog
+++ b/src/lib/rpc/ChangeLog
@@ -1,3 +1,10 @@
+2003-01-05  Sam Hartman  <hartmans@mit.edu>
+
+       * svc_run.c svc_udp.c : Remove declaration of errno
+
+       * clnt_udp.c pmap_getmaps.c pmap_rmt.c svc_auth_gssapi.c: Remove
+       declaration of errno 
+
 2002-12-18  Ken Raeburn  <raeburn@mit.edu>
 
        * auth_gssapi_misc.c (xdr_gss_buf, auth_gssapi_wrap_data,

diff --git a/src/lib/rpc/clnt_udp.c b/src/lib/rpc/clnt_udp.c
index 78102269e99ee008998b3c4f685612bb1b01d59b..6e20e579932ff9568c34819fd4a1499e4d241265 100644 (file)
--- a/src/lib/rpc/clnt_udp.c
+++ b/src/lib/rpc/clnt_udp.c
@@ -48,8 +48,8 @@ static char sccsid[] = "@(#)clnt_udp.c 1.39 87/08/11 Copyr 1984 Sun Micro";
 #include <netdb.h>
 #include <errno.h>
 #include <gssrpc/pmap_clnt.h>
+#include <errno.h>
 
-extern int errno;
 
 /*
  * UDP bases client side rpc operations

diff --git a/src/lib/rpc/pmap_getmaps.c b/src/lib/rpc/pmap_getmaps.c
index 7f90206176138cf903fd5ae815126a79179a6ebf..a4e1f9ca028b649df1701dc1b8f6945b22dbd36d 100644 (file)
--- a/src/lib/rpc/pmap_getmaps.c
+++ b/src/lib/rpc/pmap_getmaps.c
@@ -56,7 +56,6 @@ static char sccsid[] = "@(#)pmap_getmaps.c 1.10 87/08/11 Copyr 1984 Sun Micro";
 #define NAMELEN 255
 #define MAX_BROADCAST_SIZE 1400
 
-extern int errno;
 
 /*
  * Get a copy of the current port maps.

diff --git a/src/lib/rpc/pmap_rmt.c b/src/lib/rpc/pmap_rmt.c
index bc71ec060e85ec8e41a665cb346e35cab8dc25c2..3e82cea9140eef31da093cedc95e1f99199cd01a 100644 (file)
--- a/src/lib/rpc/pmap_rmt.c
+++ b/src/lib/rpc/pmap_rmt.c
@@ -60,7 +60,6 @@ static char sccsid[] = "@(#)pmap_rmt.c 1.21 87/08/27 Copyr 1984 Sun Micro";
 #define MAX_BROADCAST_SIZE 1400
 #include <string.h>
 
-extern int errno;
 static struct timeval timeout = { 3, 0 };
 
 

diff --git a/src/lib/rpc/svc_auth_gssapi.c b/src/lib/rpc/svc_auth_gssapi.c
index d3a634a00f4b2b3e50640d941f98c2c465b1ca8a..cb2844fc3a0fa79aa10641b35189134084158073 100644 (file)
--- a/src/lib/rpc/svc_auth_gssapi.c
+++ b/src/lib/rpc/svc_auth_gssapi.c
@@ -12,6 +12,7 @@
  */
 
 #include <stdio.h>
+#include <errno.h>
 #include <string.h>
 #include <gssrpc/rpc.h>
 #include <sys/stat.h>
@@ -114,7 +115,6 @@ typedef struct _client_list {
 
 static client_list *clients = NULL;
 
-extern int errno;
 
 enum auth_stat _gssrpc_svcauth_gssapi(rqst, msg, no_dispatch)
    register struct svc_req *rqst;

diff --git a/src/lib/rpc/svc_run.c b/src/lib/rpc/svc_run.c
index ca48364a139ac509a71de32bf45f0d689792344b..823b1d461cb45d99e345782bb2e33c9a902201b1 100644 (file)
--- a/src/lib/rpc/svc_run.c
+++ b/src/lib/rpc/svc_run.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)svc_run.c 1.1 87/10/13 Copyr 1984 Sun Micro";
  * Wait for input, call server program.
  */
 #include <gssrpc/rpc.h>
-#include <sys/errno.h>
+#include <errno.h>
 
 void
 svc_run()
@@ -47,7 +47,6 @@ svc_run()
 #else
       int readfds;
 #endif /* def FD_SETSIZE */
-       extern int errno;
 
        for (;;) {
 #ifdef FD_SETSIZE

diff --git a/src/lib/rpc/svc_udp.c b/src/lib/rpc/svc_udp.c
index 21b5c8f06039916503ed570cf45bfc966e86d30e..a1bcb86a905755bbbe22d03eb948f49c4a3e2ef1 100644 (file)
--- a/src/lib/rpc/svc_udp.c
+++ b/src/lib/rpc/svc_udp.c
@@ -74,7 +74,6 @@ static struct xp_ops svcudp_op = {
        svcudp_destroy
 };
 
-extern int errno;
 
 /*
  * kept in xprt->xp_p2

diff --git a/src/tests/dejagnu/ChangeLog b/src/tests/dejagnu/ChangeLog
index a0a6677536377edc607fb9ff65ebbf885f206a48..51affdd6ed0a76b41657a6697037f538fb8bdab3 100644 (file)
--- a/src/tests/dejagnu/ChangeLog
+++ b/src/tests/dejagnu/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-05  Sam Hartman  <hartmans@mit.edu>
+
+       * t_inetd.c: Remove declaration of errno
+
 2002-08-29  Ken Raeburn  <raeburn@mit.edu>
 
        * Makefile.in: Revert $(S)=>/ change, for Windows support.

diff --git a/src/tests/dejagnu/t_inetd.c b/src/tests/dejagnu/t_inetd.c
index fba21da5eaf4339dd38d35354a0a0a510f9591f3..80835b58b609e3d44a10aa5d60592513ef0c15fd 100644 (file)
--- a/src/tests/dejagnu/t_inetd.c
+++ b/src/tests/dejagnu/t_inetd.c
@@ -55,7 +55,6 @@
 
 #include "com_err.h"
 
-extern int errno;
 
 char *progname;
 

diff --git a/src/util/db2/ChangeLog b/src/util/db2/ChangeLog
index c1d16e2946402964e12d9a363fb21d8984dffff9..acbfb104e1af3d21a2a002304f1abbba5e62d7bd 100644 (file)
--- a/src/util/db2/ChangeLog
+++ b/src/util/db2/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-05  Sam Hartman  <hartmans@mit.edu>
+
+       * clib/mkstemp.c (_gettemp): Remove declaration of errno
+
 2002-09-05  Ken Raeburn  <raeburn@mit.edu>
 
        * configure.in: Check for stdint.h and inttypes.h.

diff --git a/src/util/db2/clib/mkstemp.c b/src/util/db2/clib/mkstemp.c
index 5b24b01a1b9c4583decbc3fd3943f4cf21be0524..71dc7d17a18af4e056bfbd793a20a7a5ab4e61aa 100644 (file)
--- a/src/util/db2/clib/mkstemp.c
+++ b/src/util/db2/clib/mkstemp.c
@@ -65,7 +65,6 @@ _gettemp(path, doopen)
        char *path;
        register int *doopen;
 {
-       extern int errno;
        register char *start, *trv;
        struct stat sbuf;
        u_int pid;

diff --git a/src/util/db2/test/ChangeLog b/src/util/db2/test/ChangeLog
index 042c84f9c992b9de431e1d28c6f4a3dd245d09a8..82072aa850c81499dbf592e3103a06588ed1b6a6 100644 (file)
--- a/src/util/db2/test/ChangeLog
+++ b/src/util/db2/test/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-05  Sam Hartman  <hartmans@mit.edu>
+
+       * SEQ_TEST/t.c (main): Remove declaration of errno
+
 2002-08-29  Ken Raeburn  <raeburn@mit.edu>
 
        * Makefile.in: Revert $(S)=>/ change, for Windows support.

diff --git a/src/util/db2/test/Makefile b/src/util/db2/test/Makefile
index 60b63dd5339017537c8943e625bbe10b123946ae..6685decb5bfbf59a43b97c0f9f07d815c56f82de 100644 (file)
--- a/src/util/db2/test/Makefile
+++ b/src/util/db2/test/Makefile
@@ -125,12 +125,12 @@ CONFIG_RELTOPDIR = ../..
 
 ALL_CFLAGS = $(DEFS) $(DEFINES) $(LOCALINCLUDES) $(CPPFLAGS) $(CFLAGS)
 CFLAGS = -g
-CPPFLAGS = -I$(BUILDTOP)/include -I$(SRCTOP)/include -I$(BUILDTOP)/include/krb5 -I$(SRCTOP)/include/krb5  -DKRB5_KRB4_COMPAT -DKRB5_PRIVATE=1
+CPPFLAGS = -I$(BUILDTOP)/include -I$(SRCTOP)/include -I$(BUILDTOP)/include/krb5 -I$(SRCTOP)/include/krb5 -I/usr/athena/include  -DKRB5_KRB4_COMPAT -DKRB5_PRIVATE=1
 DEFS = -DHAVE_CONFIG_H
 CC = /usr/gcc/bin/gcc
 LD = $(PURE) /usr/gcc/bin/gcc
 DEPLIBS = @DEPLIBS@
-LDFLAGS = 
+LDFLAGS = -L/usr/athena/lib 
 LD_UNRESOLVED_PREFIX = @LD_UNRESOLVED_PREFIX@
 LD_SHLIBDIR_PREFIX = @LD_SHLIBDIR_PREFIX@
 LDARGS = @LDARGS@
@@ -312,6 +312,13 @@ DB_DEPS-sys        =
 DB_DEPS-k5     = $(BUILDTOP)/include/db.h $(BUILDTOP)/include/db-config.h
 DB_DEPS-redirect = $(BUILDTOP)/include/db.h
 
+# Header file dependencies that might depend on whether krb4 support
+# is compiled.
+
+KRB_ERR_H_DEP  = $(BUILDTOP)/include/kerberosIV/krb_err.h
+KRB524_H_DEP   = $(BUILDTOP)/include/krb524.h
+KRB524_ERR_H_DEP= $(BUILDTOP)/include/krb524_err.h
+
 # LIBS gets substituted in... e.g. -lnsl -lsocket
 
 # GEN_LIB is -lgen if needed for regexp

diff --git a/src/util/db2/test/SEQ_TEST/t.c b/src/util/db2/test/SEQ_TEST/t.c
index 31262b2d9adf016668a90e5ec6b82ac1783dc7a1..f77b676f1480584563fdb78578cfa736a1ed6e9d 100644 (file)
--- a/src/util/db2/test/SEQ_TEST/t.c
+++ b/src/util/db2/test/SEQ_TEST/t.c
@@ -8,7 +8,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-extern int errno;
  
 void main(int argc, char *argv[]) {
   char id1[] = {"          "}, id2[] = {"          "};

diff --git a/src/util/ss/ChangeLog b/src/util/ss/ChangeLog
index 844830000c960dd11b98908c7eca66480554677e..431b0863f43a0c35ab70e3012bec4c9396c6991b 100644 (file)
--- a/src/util/ss/ChangeLog
+++ b/src/util/ss/ChangeLog
@@ -1,3 +1,9 @@
+2003-01-05  Sam Hartman  <hartmans@mit.edu>
+
+       * pager.c: Remove declaration of errno
+
+       * help.c: Remove declaration of errno
+
 2002-12-12  Tom Yu  <tlyu@mit.edu>
 
        * Makefile.in (depend-dependencies): Was previously

diff --git a/src/util/ss/help.c b/src/util/ss/help.c
index 3c9cbec51853ad7c2da94806c5fe8557ea32ea82..2752f40edc437ce3f8aec975e73ec64dc1fbebbb 100644 (file)
--- a/src/util/ss/help.c
+++ b/src/util/ss/help.c
@@ -6,13 +6,13 @@
 
 #include <sys/param.h>
 #include <sys/types.h>
+#include <errno.h>
 #include <sys/file.h>
 #include <fcntl.h>     /* just for O_* */
 #include <sys/wait.h>
 #include "ss_internal.h"
 #include "copyright.h"
 
-extern int errno;
 
 void ss_help (argc, argv, sci_idx, info_ptr)
     int argc;

diff --git a/src/util/ss/pager.c b/src/util/ss/pager.c
index 73311942398614741358acd190c30890aa3c248b..c8a52f07947812cbceed80ab278b7505e75866eb 100644 (file)
--- a/src/util/ss/pager.c
+++ b/src/util/ss/pager.c
@@ -9,6 +9,7 @@
 
 #include "ss_internal.h"
 #include "copyright.h"
+#include <errno.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/file.h>
@@ -17,7 +18,6 @@
 static char MORE[] = "more";
 extern char *_ss_pager_name;
 extern char *getenv();
-extern int errno;
 
 /*
  * this needs a *lot* of work....