aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Nugent <davidn@FreeBSD.org>1997-05-10 19:02:03 +0000
committerDavid Nugent <davidn@FreeBSD.org>1997-05-10 19:02:03 +0000
commit5d0bfe39ec79e990f43244945547410287956825 (patch)
tree2beea6deb6d3d8f4db094f3349238e917edf318b
parentf56bc51b0f49fde49db90e21815e68f6f8da61d8 (diff)
Notes
-rw-r--r--libexec/ftpd/ftpd.c4
-rw-r--r--libexec/rshd/rshd.c4
-rw-r--r--usr.bin/su/su.c4
-rw-r--r--usr.sbin/inetd/inetd.c5
4 files changed, 8 insertions, 9 deletions
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c
index 82c10dd7ba00..5fb0e3aeb7bc 100644
--- a/libexec/ftpd/ftpd.c
+++ b/libexec/ftpd/ftpd.c
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: ftpd.c,v 1.37 1997/04/27 08:29:21 davidn Exp $
+ * $Id: ftpd.c,v 1.38 1997/04/29 12:42:07 davidn Exp $
*/
#if 0
@@ -967,7 +967,7 @@ skip:
/* May be overridden by login.conf */
(void) umask(defumask);
#ifdef LOGIN_CAP
- if ((lc = login_getclass(pw)) != NULL) {
+ if ((lc = login_getpwclass(pw)) != NULL) {
char remote_ip[MAXHOSTNAMELEN];
strncpy(remote_ip, inet_ntoa(his_addr.sin_addr),
diff --git a/libexec/rshd/rshd.c b/libexec/rshd/rshd.c
index 2e98c12b5a06..a4080b653064 100644
--- a/libexec/rshd/rshd.c
+++ b/libexec/rshd/rshd.c
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: rshd.c,v 1.15 1997/03/29 12:35:06 peter Exp $
+ * $Id: rshd.c,v 1.16 1997/04/23 03:06:47 davidn Exp $
*/
#ifndef lint
@@ -448,7 +448,7 @@ doit(fromp)
goto fail;
}
#ifdef LOGIN_CAP
- lc = login_getclass(pwd);
+ lc = login_getpwclass(pwd);
#endif
if (chdir(pwd->pw_dir) < 0) {
#ifdef LOGIN_CAP
diff --git a/usr.bin/su/su.c b/usr.bin/su/su.c
index 1c17d5c594b8..fb137d898904 100644
--- a/usr.bin/su/su.c
+++ b/usr.bin/su/su.c
@@ -42,7 +42,7 @@ static const char copyright[] =
static char sccsid[] = "@(#)su.c 8.3 (Berkeley) 4/2/94";
*/
static const char rcsid[] =
- "$Id: su.c,v 1.18 1997/02/24 20:32:24 guido Exp $";
+ "$Id: su.c,v 1.19 1997/03/29 04:32:40 imp Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -206,7 +206,7 @@ main(argc, argv)
errx(1, "unknown login: %s", user);
}
#ifdef LOGIN_CAP
- lc = login_getclass(pwd);
+ lc = login_getpwclass(pwd);
#endif
#ifdef WHEELSU
diff --git a/usr.sbin/inetd/inetd.c b/usr.sbin/inetd/inetd.c
index 3316bfb609aa..86bb95d08c3d 100644
--- a/usr.sbin/inetd/inetd.c
+++ b/usr.sbin/inetd/inetd.c
@@ -40,7 +40,7 @@ static char copyright[] __attribute__ ((unused)) =
#ifndef lint
/* from: @(#)inetd.c 8.4 (Berkeley) 4/13/94"; */
static char inetd_c_rcsid[] __attribute__ ((unused)) =
- "$Id: inetd.c,v 1.22 1997/03/31 05:10:10 imp Exp $";
+ "$Id: inetd.c,v 1.23 1997/04/28 13:55:07 wollman Exp $";
#endif /* not lint */
/*
@@ -128,7 +128,6 @@ static char inetd_c_rcsid[] __attribute__ ((unused)) =
#include <sysexits.h>
#ifdef LOGIN_CAP
-#undef AUTH_NONE /* conflicts with rpc stuff */
#include <login_cap.h>
#endif
@@ -516,7 +515,7 @@ main(argc, argv, envp)
* Establish the class now, falls back to
* the "default" if unavailable.
*/
- lc = login_getclass(pwd);
+ lc = login_getpwclass(pwd);
#endif
if (setsid() < 0) {
syslog(LOG_ERR,