aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Yu <tlyu@mit.edu>1999-02-18 01:01:10 +0000
committerTom Yu <tlyu@mit.edu>1999-02-18 01:01:10 +0000
commit80df338cc344dff5ebf50f6d4e5616541dbde1fc (patch)
treee6d3e389a1a8aacc63f588066719dbb44ab77fc2
parent05d34d62d7485df256a596eccab7d00fe4fd5d93 (diff)
downloadkrb5-80df338cc344dff5ebf50f6d4e5616541dbde1fc.zip
krb5-80df338cc344dff5ebf50f6d4e5616541dbde1fc.tar.gz
krb5-80df338cc344dff5ebf50f6d4e5616541dbde1fc.tar.bz2
* sane_hostname.c (pty_make_sane_hostname): Remove unused
"char *scratch". * sane_hostname.c: Re-order so that pty-int.h precedes libpty.h to prevent conflicting definitions of struct sockaddr_in [pullup from trunk] git-svn-id: svn://anonsvn.mit.edu/krb5/branches/V1_0_BRANCH@11179 dc483132-0cff-0310-8789-dd5450dbe970
-rw-r--r--src/util/pty/ChangeLog10
-rw-r--r--src/util/pty/sane_hostname.c5
2 files changed, 12 insertions, 3 deletions
diff --git a/src/util/pty/ChangeLog b/src/util/pty/ChangeLog
index a72a7c8..0488509 100644
--- a/src/util/pty/ChangeLog
+++ b/src/util/pty/ChangeLog
@@ -1,3 +1,13 @@
+Wed Feb 17 19:47:36 1999 Tom Yu <tlyu@mit.edu>
+
+ * sane_hostname.c (pty_make_sane_hostname): Remove unused
+ "char *scratch".
+
+Tue Feb 16 20:18:40 1999 Tom Yu <tlyu@mit.edu>
+
+ * sane_hostname.c: Re-order so that pty-int.h precedes libpty.h to
+ prevent conflicting definitions of struct sockaddr_in
+
Thu Feb 11 22:24:03 1999 Tom Yu <tlyu@mit.edu>
* sane_hostname.c: Force maxlen to be 16 if it's less than 16,
diff --git a/src/util/pty/sane_hostname.c b/src/util/pty/sane_hostname.c
index 6871b3d..3f9ed6b 100644
--- a/src/util/pty/sane_hostname.c
+++ b/src/util/pty/sane_hostname.c
@@ -17,9 +17,9 @@
*
*/
#include <com_err.h>
-#include <arpa/inet.h>
-#include "libpty.h"
#include "pty-int.h"
+#include "libpty.h"
+#include <arpa/inet.h>
static long
do_ntoa(struct sockaddr_in *addr,
@@ -44,7 +44,6 @@ pty_make_sane_hostname(struct sockaddr_in *addr,
#else
struct utmpx utx;
#endif
- char *scratch;
char *cp, *domain;
char lhost[MAXHOSTNAMELEN];
size_t ut_host_len;