fix up include files

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

diff --git a/src/lib/krb5/os/an_to_ln.c b/src/lib/krb5/os/an_to_ln.c
index be822395a7e73d56e89a58e50ebe34936f6dcb54..2e42f0627e9152898f520a4f9b086ac0d1180601 100644 (file)
--- a/src/lib/krb5/os/an_to_ln.c
+++ b/src/lib/krb5/os/an_to_ln.c
@@ -20,15 +20,12 @@ static char rcsid_an_to_ln_c[] =
 #include <krb5/osconf.h>
 
 #include <krb5/krb5.h>
-#include <krb5/krb5_err.h>
-#include <errno.h>
-#include <stdio.h>
 #include <krb5/libos-proto.h>
 #include <krb5/ext-proto.h>
 
 #ifdef USE_DBM_LNAME
 #include <krb5/dbm.h>
-#include <sys/file.h>
+#include <krb5/sysincl.h>
 #endif
 
 #ifndef min

diff --git a/src/lib/krb5/os/def_realm.c b/src/lib/krb5/os/def_realm.c
index 72b88465e57bc48c0ce0fb215c79a56abd8d9f94..1c21d7ffc7ef3b31eb6cb9c3101eb6162fcdf945 100644 (file)
--- a/src/lib/krb5/os/def_realm.c
+++ b/src/lib/krb5/os/def_realm.c
@@ -16,12 +16,10 @@ static char rcsid_def_realm_c[] =
 #endif /* !lint & !SABER */
 
 #include <krb5/copyright.h>
-
 #include <krb5/krb5.h>
-#include <krb5/krb5_err.h>
+#include <krb5/ext-proto.h>
 
 #include <stdio.h>
-#include <krb5/ext-proto.h>
 
 /*
  Retrieves the default realm to be used if no user-specified realm is

diff --git a/src/lib/krb5/os/get_krbhst.c b/src/lib/krb5/os/get_krbhst.c
index c04b9488364d4bfa66e5a7c6f13410ec1bbc76d9..120dcc876b5a88b59a638379467082baf41b7d0a 100644 (file)
--- a/src/lib/krb5/os/get_krbhst.c
+++ b/src/lib/krb5/os/get_krbhst.c
@@ -18,11 +18,8 @@ static char get_krbhst_c [] =
 #include <krb5/copyright.h>
 
 #include <krb5/krb5.h>
-#include <krb5/krb5_err.h>
-#include <errno.h>
-
-#include <stdio.h>
 #include <krb5/ext-proto.h>
+#include <stdio.h>
 
 /*
  Figures out the Kerberos server names for the given realm, filling in a

diff --git a/src/lib/krb5/os/hst_realm.c b/src/lib/krb5/os/hst_realm.c
index 92540d631d443ca8c5b8b2d00f0b1817dd4392dc..0c6cb0e4a81712dfbe0cf355d9bbc36503cca198 100644 (file)
--- a/src/lib/krb5/os/hst_realm.c
+++ b/src/lib/krb5/os/hst_realm.c
@@ -56,13 +56,12 @@ static char rcsid_hst_realm_c[] =
 
 
 #include <krb5/krb5.h>
-#include <krb5/krb5_err.h>
 #include <krb5/ext-proto.h>
-#include <stdio.h>
 #include <krb5/libos-proto.h>
-#include <errno.h>
+#include <krb5/sysincl.h>
 #include <ctype.h>
-#include <sys/param.h>
+
+#include <stdio.h>
 
 /* for old Unixes and friends ... */
 #ifndef MAXHOSTNAMELEN

diff --git a/src/lib/krb5/os/ktdefname.c b/src/lib/krb5/os/ktdefname.c
index 167167e359e6d91a3ecfd0d1f7e1b3d747341766..014540eb447b8ceee4d1b15ec68729baa7c1f51c 100644 (file)
--- a/src/lib/krb5/os/ktdefname.c
+++ b/src/lib/krb5/os/ktdefname.c
@@ -17,10 +17,8 @@ static char rcsid_ktdefname_c[] =
 
 #include <krb5/copyright.h>
 #include <krb5/krb5.h>
-#include <krb5/krb5_err.h>
 #include <krb5/osconf.h>
 
-#include <stdio.h>
 #include <krb5/ext-proto.h>
 
 extern char *krb5_defkeyname;

diff --git a/src/lib/krb5/os/kuserok.c b/src/lib/krb5/os/kuserok.c
index c08397c54a46e618e9dcf6fceef135571f8c1c08..eb26f1c75e798e4abeb9e02195ff7766936dfaa4 100644 (file)
--- a/src/lib/krb5/os/kuserok.c
+++ b/src/lib/krb5/os/kuserok.c
@@ -18,12 +18,10 @@ static char rcsid_kuserok_c [] =
 #include <krb5/copyright.h>
 #include <krb5/krb5.h>
 #include <krb5/ext-proto.h>
-#include <stdio.h>
 #include <krb5/libos-proto.h>
-#include <sys/types.h>
-#include <sys/param.h>                 /* for MAXPATHLEN */
-#include <sys/file.h>
-#include <sys/stat.h>
+#include <krb5/sysincl.h>
+
+#include <stdio.h>
 #include <pwd.h>
 
 #define MAX_USERNAME 10

diff --git a/src/lib/krb5/os/lock_file.c b/src/lib/krb5/os/lock_file.c
index e15e38fdd9f9d847605e4729b1719ce4be5d4df8..25b28395104fabbcd016287a2a7a43554a1b8dd0 100644 (file)
--- a/src/lib/krb5/os/lock_file.c
+++ b/src/lib/krb5/os/lock_file.c
@@ -18,7 +18,6 @@ static char rcsid_lock_file_c [] =
 #include <krb5/copyright.h>
 
 #include <krb5/krb5.h>
-#include <krb5/krb5_err.h>
 #include <krb5/libos.h>
 
 #include <stdio.h>

diff --git a/src/lib/krb5/os/read_pwd.c b/src/lib/krb5/os/read_pwd.c
index 50f613aab14aebd9ca98c2a997bc71953de76bbc..388256160c57584d5785f814dee40d2b1bf575af 100644 (file)
--- a/src/lib/krb5/os/read_pwd.c
+++ b/src/lib/krb5/os/read_pwd.c
@@ -18,7 +18,6 @@ static char rcsid_read_pwd_c[] =
 #include <krb5/copyright.h>
 
 #include <krb5/krb5.h>
-#include <krb5/krb5_err.h>
 
 #include <stdio.h>
 #include <errno.h>

diff --git a/src/lib/krb5/os/sendto_kdc.c b/src/lib/krb5/os/sendto_kdc.c
index 7c7dc294d25941aef82e4684e6c63820208abc68..555e56dbcf5ef6872b82515742ec80b5e29d8469 100644 (file)
--- a/src/lib/krb5/os/sendto_kdc.c
+++ b/src/lib/krb5/os/sendto_kdc.c
@@ -19,15 +19,12 @@ static char rcsid_sendto_kdc_c[] =
 #include <krb5/copyright.h>
 
 #include <krb5/krb5.h>
-#include <krb5/krb5_err.h>
-#include <errno.h>
 #include <krb5/ext-proto.h>
 
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 
-#include <stdio.h>
 #include <krb5/libos-proto.h>
 #include "os-proto.h"
 

diff --git a/src/lib/krb5/os/ustime.c b/src/lib/krb5/os/ustime.c
index 059b57fc672a73961da0d46be58db2dea15fb6de..6af86375ee9bd411422721ffc1882c69c16e5555 100644 (file)
--- a/src/lib/krb5/os/ustime.c
+++ b/src/lib/krb5/os/ustime.c
@@ -17,12 +17,10 @@ static char rcsid_mstime_c[] =
 
 #include <krb5/copyright.h>
 
-#include <sys/time.h>                  /* for timeval */
-#include <stdio.h>                     /* needed for libos-proto.h */
-
 #include <krb5/config.h>
 #include <krb5/krb5.h>
 #include <krb5/libos-proto.h>
+#include <krb5/sysincl.h>
 
 extern int errno;