From: Ezra Peisach <epeisach@mit.edu>
Date: Mon, 11 Jun 2001 14:49:37 +0000 (+0000)
Subject: 	* krshd.c: Include <grp.h>, <libpty.h>, and <sys/wait.h> for
X-Git-Tag: krb5-1.3-alpha1~1441
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=587c9e92286e24ec0bb8642f8c3955e622be18f9;p=krb5.git

	* krshd.c: Include <grp.h>, <libpty.h>, and <sys/wait.h> for
	initgroups(), pty_logwtmp()/pty_make_sane_hostname(), and wait()
	prototypes. For local initgroups definition, conditionalize on
	HAVE_INITGROUPS and not __SCO__.

	* krcp.c: Include <sys/wait.h> for wait()/waitpid() prototype.

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

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index 4ecd9503f..6e158b9ff 100644
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,3 +1,12 @@
+2001-06-11  Ezra Peisach  <epeisach@mit.edu>
+
+	* krshd.c: Include <grp.h>, <libpty.h>, and <sys/wait.h> for
+	initgroups(), pty_logwtmp()/pty_make_sane_hostname(), and wait()
+	prototypes. For local initgroups definition, conditionalize on
+	HAVE_INITGROUPS and not __SCO__.
+
+	* krcp.c: Include <sys/wait.h> for wait()/waitpid() prototype.
+
 2001-06-04  Ezra Peisach  <epeisach@mit.edu>
 
 	* krlogin.c: Always provide prototype for setsignal and not if
diff --git a/src/appl/bsd/krcp.c b/src/appl/bsd/krcp.c
index 89e62ba10..63d6bf0ef 100644
--- a/src/appl/bsd/krcp.c
+++ b/src/appl/bsd/krcp.c
@@ -65,6 +65,7 @@ char copyright[] =
 #else
 #include <varargs.h>
 #endif
+#include <sys/wait.h>
 
 #ifdef KERBEROS
 #include <krb5.h>
diff --git a/src/appl/bsd/krshd.c b/src/appl/bsd/krshd.c
index 59e517159..cd5cd3b7b 100644
--- a/src/appl/bsd/krshd.c
+++ b/src/appl/bsd/krshd.c
@@ -105,10 +105,13 @@ char copyright[] =
 #include <arpa/inet.h>
      
 #include <stdio.h>
+#include <grp.h>
 #include <errno.h>
 #include <pwd.h>
 #include <ctype.h>
 #include <string.h>
+#include <libpty.h>
+#include <sys/wait.h>
      
 #ifdef HAVE_SYS_LABEL_H
 /* only SunOS 4? */
@@ -254,8 +257,7 @@ void	error();
 void usage(void), getstr(int, char *, int, char *), 
     doit(int, struct sockaddr_in *);
 
-#ifdef __SCO__
-/* sco has getgroups and setgroups but no initgroups */
+#ifndef HAVE_INITGROUPS
 int initgroups(char* name, gid_t basegid) {
   gid_t others[NGROUPS_MAX+1];
   int ngrps;
@@ -606,7 +608,6 @@ void doit(f, fromp)
 #endif
     int valid_checksum;
     int cnt;
-    register char *p;
     char *crypt();
     struct passwd *pwd;
     char *path;