Get rid of more Kerberos 4 code.
This commit is contained in:
wiz
parent
ade0b1e1b5
commit
54cd24faa5
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: k5login.c,v 1.26 2005/01/20 15:41:14 xtraeme Exp $ */
|
||||
/* $NetBSD: k5login.c,v 1.27 2006/03/23 23:33:28 wiz Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1990 The Regents of the University of California.
|
||||
@ -51,16 +51,13 @@
|
||||
#if 0
|
||||
static char sccsid[] = "@(#)klogin.c 5.11 (Berkeley) 7/12/92";
|
||||
#endif
|
||||
__RCSID("$NetBSD: k5login.c,v 1.26 2005/01/20 15:41:14 xtraeme Exp $");
|
||||
__RCSID("$NetBSD: k5login.c,v 1.27 2006/03/23 23:33:28 wiz Exp $");
|
||||
#endif /* not lint */
|
||||
|
||||
#ifdef KERBEROS5
|
||||
#include <sys/param.h>
|
||||
#include <sys/syslog.h>
|
||||
#include <krb5/krb5.h>
|
||||
#ifdef KERBEROS
|
||||
#include <kerberosIV/krb.h>
|
||||
#endif
|
||||
#include <pwd.h>
|
||||
#include <netdb.h>
|
||||
#include <stdio.h>
|
||||
@ -82,9 +79,6 @@ extern int login_krb5_forwardable_tgt;
|
||||
extern int has_ccache;
|
||||
|
||||
static char tkt_location[MAXPATHLEN];
|
||||
#ifdef KERBEROS
|
||||
char krb4tkfile[MAXPATHLEN];
|
||||
#endif
|
||||
static krb5_creds forw_creds;
|
||||
int have_forward;
|
||||
static krb5_principal me, server;
|
||||
@ -95,11 +89,6 @@ int k5_verify_creds(krb5_context, krb5_ccache);
|
||||
int k5login(struct passwd *, char *, char *, char *);
|
||||
void k5destroy(void);
|
||||
|
||||
#ifdef KERBEROS
|
||||
static krb5_error_code
|
||||
krb5_to4 (struct passwd *pw, krb5_context context, krb5_ccache id);
|
||||
#endif
|
||||
|
||||
#ifndef krb5_realm_length
|
||||
#define krb5_realm_length(r) ((r).length)
|
||||
#endif
|
||||
@ -321,59 +310,6 @@ nuke_ccache_contents:
|
||||
return (kerror != 0);
|
||||
}
|
||||
|
||||
/*
|
||||
* Get krb4 credentials if needed
|
||||
*/
|
||||
#ifdef KERBEROS
|
||||
static krb5_error_code
|
||||
krb5_to4 (struct passwd *pw, krb5_context context, krb5_ccache id)
|
||||
{
|
||||
if (krb5_config_get_bool(context, NULL,
|
||||
"libdefaults",
|
||||
"krb4_get_tickets",
|
||||
NULL)) {
|
||||
CREDENTIALS c;
|
||||
krb5_creds mcred, cred;
|
||||
krb5_error_code ret;
|
||||
krb5_principal princ;
|
||||
|
||||
ret = krb5_cc_get_principal (context, id, &princ);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = krb5_make_principal(context, &mcred.server,
|
||||
princ->realm,
|
||||
"krbtgt",
|
||||
princ->realm,
|
||||
NULL);
|
||||
krb5_free_principal (context, princ);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = krb5_cc_retrieve_cred(context, id, 0, &mcred, &cred);
|
||||
if(ret == 0) {
|
||||
ret = krb524_convert_creds_kdc_ccache(context, id,
|
||||
&cred, &c);
|
||||
if(ret == 0) {
|
||||
snprintf(krb4tkfile, sizeof(krb4tkfile),
|
||||
"%s%d",TKT_ROOT, pw->pw_uid);
|
||||
krb_set_tkt_string(krb4tkfile);
|
||||
tf_setup(&c, c.pname, c.pinst);
|
||||
if (chown(krb4tkfile, pw->pw_uid,
|
||||
pw->pw_gid) < 0)
|
||||
syslog(LOG_ERR,
|
||||
"chown tkfile (%s): %m",
|
||||
krb4tkfile);
|
||||
}
|
||||
memset(&c, 0, sizeof(c));
|
||||
krb5_free_creds_contents(context, &cred);
|
||||
}
|
||||
krb5_free_principal(context, mcred.server);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
#endif /* KERBEROS */
|
||||
|
||||
/*
|
||||
* Attempt to log the user in using Kerberos authentication
|
||||
*
|
||||
@ -518,11 +454,6 @@ k5login(struct passwd *pw, char *instance, char *localhost, char *password)
|
||||
if (k5_verify_creds(kcontext, ccache) < 0)
|
||||
return (1);
|
||||
|
||||
#ifdef KERBEROS
|
||||
if ((kerror = krb5_to4(pw, kcontext, ccache)) != 0)
|
||||
krb5_warn(kcontext, kerror, "error converting krb4 creds");
|
||||
#endif
|
||||
|
||||
/* Success */
|
||||
notickets = 0;
|
||||
return (0);
|
||||
|
||||
@ -1,273 +0,0 @@
|
||||
/* $NetBSD: klogin.c,v 1.20 2005/01/20 15:41:14 xtraeme Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1990, 1993, 1994
|
||||
* The Regents of the University of California. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. Neither the name of the University nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
#ifndef lint
|
||||
#if 0
|
||||
static char sccsid[] = "@(#)klogin.c 8.3 (Berkeley) 4/2/94";
|
||||
#endif
|
||||
__RCSID("$NetBSD: klogin.c,v 1.20 2005/01/20 15:41:14 xtraeme Exp $");
|
||||
#endif /* not lint */
|
||||
|
||||
#ifdef KERBEROS
|
||||
#include <sys/param.h>
|
||||
#include <sys/syslog.h>
|
||||
#include <des.h>
|
||||
#include <kerberosIV/krb.h>
|
||||
|
||||
#include <err.h>
|
||||
#include <netdb.h>
|
||||
#include <pwd.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <fcntl.h>
|
||||
|
||||
#define INITIAL_TICKET "krbtgt"
|
||||
#define VERIFY_SERVICE "rcmd"
|
||||
|
||||
int notickets;
|
||||
int krb_configured;
|
||||
char *krbtkfile_env;
|
||||
char *tty;
|
||||
extern int has_ccache;
|
||||
|
||||
static char tkt_location[MAXPATHLEN]; /* a pointer to this is returned... */
|
||||
|
||||
int klogin(struct passwd *, char *, char *, char *);
|
||||
void kdestroy(void);
|
||||
|
||||
/*
|
||||
* Attempt to log the user in using Kerberos authentication
|
||||
*
|
||||
* return 0 on success (will be logged in)
|
||||
* 1 if Kerberos failed (try local password in login)
|
||||
*/
|
||||
int
|
||||
klogin(struct passwd *pw, char *instance, char *localhost, char *password)
|
||||
{
|
||||
int kerror;
|
||||
AUTH_DAT authdata;
|
||||
KTEXT_ST ticket;
|
||||
struct hostent *hp;
|
||||
unsigned long faddr;
|
||||
char realm[REALM_SZ], savehost[MAXHOSTNAMELEN];
|
||||
|
||||
krb_configured = 1;
|
||||
|
||||
/*
|
||||
* Root logins don't use Kerberos.
|
||||
* If we have a realm, try getting a ticket-granting ticket
|
||||
* and using it to authenticate. Otherwise, return
|
||||
* failure so that we can try the normal passwd file
|
||||
* for a password. If that's ok, log the user in
|
||||
* without issuing any tickets.
|
||||
*/
|
||||
if (strcmp(pw->pw_name, "root") == 0 ||
|
||||
krb_get_lrealm(realm, 0) != KSUCCESS) {
|
||||
krb_configured = 0;
|
||||
return (1);
|
||||
}
|
||||
|
||||
/*
|
||||
* get TGT for local realm
|
||||
* tickets are stored in a file named TKT_ROOT plus uid plus tty
|
||||
* except for user.root tickets.
|
||||
*/
|
||||
|
||||
if (strcmp(instance, "root") != 0)
|
||||
(void)snprintf(tkt_location, sizeof tkt_location, "%s%d.%s",
|
||||
TKT_ROOT, pw->pw_uid, tty);
|
||||
else
|
||||
(void)snprintf(tkt_location, sizeof tkt_location,
|
||||
"%s_root_%d.%s", TKT_ROOT, pw->pw_uid, tty);
|
||||
krbtkfile_env = tkt_location;
|
||||
has_ccache = 1;
|
||||
(void)krb_set_tkt_string(tkt_location);
|
||||
|
||||
/*
|
||||
* Set real as well as effective ID to 0 for the moment,
|
||||
* to make the kerberos library do the right thing.
|
||||
*/
|
||||
if (setuid(0) < 0) {
|
||||
warnx("setuid");
|
||||
return (1);
|
||||
}
|
||||
kerror = krb_get_pw_in_tkt(pw->pw_name, instance,
|
||||
realm, INITIAL_TICKET, realm, DEFAULT_TKT_LIFE, password);
|
||||
/*
|
||||
* If we got a TGT, get a local "rcmd" ticket and check it so as to
|
||||
* ensure that we are not talking to a bogus Kerberos server.
|
||||
*
|
||||
* There are 2 cases where we still allow a login:
|
||||
* 1: the VERIFY_SERVICE doesn't exist in the KDC
|
||||
* 2: local host has no srvtab, as (hopefully) indicated by a
|
||||
* return value of RD_AP_UNDEC from krb_rd_req().
|
||||
*/
|
||||
if (kerror != INTK_OK) {
|
||||
if (kerror != INTK_BADPW && kerror != KDC_PR_UNKNOWN) {
|
||||
syslog(LOG_ERR, "Kerberos intkt error: %s",
|
||||
krb_err_txt[kerror]);
|
||||
dest_tkt();
|
||||
}
|
||||
return (1);
|
||||
}
|
||||
|
||||
if (chown(TKT_FILE, pw->pw_uid, pw->pw_gid) < 0)
|
||||
syslog(LOG_ERR, "chown tkfile (%s): %m", TKT_FILE);
|
||||
|
||||
(void)strlcpy(savehost, krb_get_phost(localhost), sizeof(savehost));
|
||||
|
||||
/*
|
||||
* if the "VERIFY_SERVICE" doesn't exist in the KDC for this host,
|
||||
* still allow login with tickets, but log the error condition.
|
||||
*/
|
||||
|
||||
kerror = krb_mk_req(&ticket, VERIFY_SERVICE, savehost, realm, 33);
|
||||
if (kerror == KDC_PR_UNKNOWN) {
|
||||
syslog(LOG_NOTICE,
|
||||
"warning: TGT not verified (%s); %s.%s not registered, or srvtab is wrong?",
|
||||
krb_err_txt[kerror], VERIFY_SERVICE, savehost);
|
||||
notickets = 0;
|
||||
/*
|
||||
* but for security, don't allow root instances in under
|
||||
* this condition!
|
||||
*/
|
||||
if (strcmp(instance, "root") == 0) {
|
||||
syslog(LOG_ERR, "Kerberos %s root instance login refused\n",
|
||||
pw->pw_name);
|
||||
dest_tkt();
|
||||
return (1);
|
||||
}
|
||||
return (0);
|
||||
}
|
||||
|
||||
if (kerror != KSUCCESS) {
|
||||
warnx("unable to use TGT: (%s)", krb_err_txt[kerror]);
|
||||
syslog(LOG_NOTICE, "unable to use TGT: (%s)",
|
||||
krb_err_txt[kerror]);
|
||||
dest_tkt();
|
||||
return (1);
|
||||
}
|
||||
|
||||
if (!(hp = gethostbyname(localhost))) {
|
||||
syslog(LOG_ERR, "couldn't get local host address");
|
||||
dest_tkt();
|
||||
return (1);
|
||||
}
|
||||
|
||||
memmove((void *)&faddr, (void *)hp->h_addr, sizeof(faddr));
|
||||
|
||||
kerror = krb_rd_req(&ticket, VERIFY_SERVICE, savehost, faddr,
|
||||
&authdata, "");
|
||||
|
||||
if (kerror == KSUCCESS) {
|
||||
notickets = 0;
|
||||
return (0);
|
||||
}
|
||||
|
||||
/* undecipherable: probably didn't have a srvtab on the local host */
|
||||
if (kerror == RD_AP_UNDEC) {
|
||||
syslog(LOG_NOTICE, "krb_rd_req: (%s)\n", krb_err_txt[kerror]);
|
||||
dest_tkt();
|
||||
return (1);
|
||||
}
|
||||
/* failed for some other reason */
|
||||
warnx("unable to verify %s ticket: (%s)", VERIFY_SERVICE,
|
||||
krb_err_txt[kerror]);
|
||||
syslog(LOG_NOTICE, "couldn't verify %s ticket: %s", VERIFY_SERVICE,
|
||||
krb_err_txt[kerror]);
|
||||
dest_tkt();
|
||||
return (1);
|
||||
}
|
||||
|
||||
void
|
||||
kdestroy(void)
|
||||
{
|
||||
char *file = krbtkfile_env;
|
||||
int i, fd;
|
||||
extern int errno;
|
||||
struct stat statb;
|
||||
char buf[BUFSIZ];
|
||||
#ifdef TKT_SHMEM
|
||||
char shmidname[MAXPATHLEN];
|
||||
#endif /* TKT_SHMEM */
|
||||
|
||||
if (krbtkfile_env == NULL)
|
||||
return;
|
||||
|
||||
errno = 0;
|
||||
if (lstat(file, &statb) < 0)
|
||||
goto out;
|
||||
|
||||
if (!S_ISREG(statb.st_mode)
|
||||
#ifdef notdef
|
||||
|| statb.st_mode & 077
|
||||
#endif
|
||||
)
|
||||
goto out;
|
||||
|
||||
if ((fd = open(file, O_RDWR, 0)) < 0)
|
||||
goto out;
|
||||
|
||||
memset(buf, 0, BUFSIZ);
|
||||
|
||||
for (i = 0; i < statb.st_size; i += BUFSIZ)
|
||||
if (write(fd, buf, BUFSIZ) != BUFSIZ) {
|
||||
(void) fsync(fd);
|
||||
(void) close(fd);
|
||||
goto out;
|
||||
}
|
||||
|
||||
(void) fsync(fd);
|
||||
(void) close(fd);
|
||||
|
||||
(void) unlink(file);
|
||||
|
||||
out:
|
||||
if (errno != 0)
|
||||
return;
|
||||
#ifdef TKT_SHMEM
|
||||
/*
|
||||
* handle the shared memory case
|
||||
*/
|
||||
(void)strlcpy(shmidname, file, sizeof(shmidname));
|
||||
(void)strlcat(shmidname, ".shm", sizeof(shmidname));
|
||||
if (krb_shm_dest(shmidname) != KSUCCESS)
|
||||
return;
|
||||
#endif /* TKT_SHMEM */
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: login.c,v 1.88 2006/03/08 02:49:18 jnemeth Exp $ */
|
||||
/* $NetBSD: login.c,v 1.89 2006/03/23 23:33:28 wiz Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1980, 1987, 1988, 1991, 1993, 1994
|
||||
@ -40,7 +40,7 @@ __COPYRIGHT(
|
||||
#if 0
|
||||
static char sccsid[] = "@(#)login.c 8.4 (Berkeley) 4/2/94";
|
||||
#endif
|
||||
__RCSID("$NetBSD: login.c,v 1.88 2006/03/08 02:49:18 jnemeth Exp $");
|
||||
__RCSID("$NetBSD: login.c,v 1.89 2006/03/23 23:33:28 wiz Exp $");
|
||||
#endif /* not lint */
|
||||
|
||||
/*
|
||||
@ -94,7 +94,6 @@ __RCSID("$NetBSD: login.c,v 1.88 2006/03/08 02:49:18 jnemeth Exp $");
|
||||
|
||||
#ifdef KERBEROS5
|
||||
int login_krb5_get_tickets = 1;
|
||||
int login_krb4_get_tickets = 0;
|
||||
int login_krb5_forwardable_tgt = 0;
|
||||
int login_krb5_retain_ccache = 0;
|
||||
#endif
|
||||
@ -117,17 +116,13 @@ void sigint(int);
|
||||
void sleepexit(int);
|
||||
const char *stypeof(const char *);
|
||||
void timedout(int);
|
||||
#if defined(KERBEROS)
|
||||
int klogin(struct passwd *, char *, char *, char *);
|
||||
void kdestroy(void);
|
||||
#endif
|
||||
#ifdef KERBEROS5
|
||||
int k5login(struct passwd *, char *, char *, char *);
|
||||
void k5destroy(void);
|
||||
int k5_read_creds(char*);
|
||||
int k5_write_creds(void);
|
||||
#endif
|
||||
#if defined(KERBEROS) || defined(KERBEROS5)
|
||||
#if defined(KERBEROS5)
|
||||
void dofork(void);
|
||||
#endif
|
||||
void decode_ss(const char *);
|
||||
@ -144,27 +139,17 @@ void usage(void);
|
||||
*/
|
||||
u_int timeout = 300;
|
||||
|
||||
#if defined(KERBEROS) || defined(KERBEROS5)
|
||||
#if defined(KERBEROS5)
|
||||
int notickets = 1;
|
||||
char *instance;
|
||||
int has_ccache = 0;
|
||||
#endif
|
||||
#ifdef KERBEROS
|
||||
extern char *krbtkfile_env;
|
||||
extern int krb_configured;
|
||||
#endif
|
||||
#ifdef KERBEROS5
|
||||
extern krb5_context kcontext;
|
||||
extern int have_forward;
|
||||
extern char *krb5tkfile_env;
|
||||
extern int krb5_configured;
|
||||
#endif
|
||||
|
||||
#if defined(KERBEROS) && defined(KERBEROS5)
|
||||
#define KERBEROS_CONFIGURED (krb_configured || krb5_configured)
|
||||
#elif defined(KERBEROS)
|
||||
#define KERBEROS_CONFIGURED krb_configured
|
||||
#elif defined(KERBEROS5)
|
||||
#if defined(KERBEROS5)
|
||||
#define KERBEROS_CONFIGURED krb5_configured
|
||||
#endif
|
||||
|
||||
@ -198,7 +183,7 @@ main(int argc, char *argv[])
|
||||
#ifdef KERBEROS5
|
||||
krb5_error_code kerror;
|
||||
#endif
|
||||
#if defined(KERBEROS) || defined(KERBEROS5)
|
||||
#if defined(KERBEROS5)
|
||||
int got_tickets = 0;
|
||||
#endif
|
||||
#ifdef LOGIN_CAP
|
||||
@ -353,9 +338,6 @@ main(int argc, char *argv[])
|
||||
#endif /* KERBEROS5 */
|
||||
|
||||
for (cnt = 0;; ask = 1) {
|
||||
#if defined(KERBEROS)
|
||||
kdestroy();
|
||||
#endif
|
||||
#if defined(KERBEROS5)
|
||||
if (login_krb5_get_tickets)
|
||||
k5destroy();
|
||||
@ -365,12 +347,6 @@ main(int argc, char *argv[])
|
||||
getloginname();
|
||||
}
|
||||
rootlogin = 0;
|
||||
#ifdef KERBEROS
|
||||
if ((instance = strchr(username, '.')) != NULL)
|
||||
*instance++ = '\0';
|
||||
else
|
||||
instance = "";
|
||||
#endif
|
||||
#ifdef KERBEROS5
|
||||
if ((instance = strchr(username, '/')) != NULL)
|
||||
*instance++ = '\0';
|
||||
@ -452,20 +428,6 @@ main(int argc, char *argv[])
|
||||
rval = 1;
|
||||
goto skip;
|
||||
}
|
||||
#ifdef KERBEROS
|
||||
if (
|
||||
#ifdef KERBEROS5
|
||||
/* allow a user to get both krb4 and krb5 tickets, if
|
||||
* desired. If krb5 is compiled in, the default action
|
||||
* is to ignore krb4 and get krb5 tickets, but the user
|
||||
* can override this in the krb5.conf. */
|
||||
login_krb4_get_tickets &&
|
||||
#endif
|
||||
klogin(pwd, instance, localhost, p) == 0) {
|
||||
rval = 0;
|
||||
got_tickets = 1;
|
||||
}
|
||||
#endif
|
||||
#ifdef KERBEROS5
|
||||
if (login_krb5_get_tickets &&
|
||||
k5login(pwd, instance, localhost, p) == 0) {
|
||||
@ -473,7 +435,7 @@ main(int argc, char *argv[])
|
||||
got_tickets = 1;
|
||||
}
|
||||
#endif
|
||||
#if defined(KERBEROS) || defined(KERBEROS5)
|
||||
#if defined(KERBEROS5)
|
||||
if (got_tickets)
|
||||
goto skip;
|
||||
#endif
|
||||
@ -627,13 +589,9 @@ main(int argc, char *argv[])
|
||||
if (ttyaction(ttyn, "login", pwd->pw_name))
|
||||
(void)printf("Warning: ttyaction failed.\n");
|
||||
|
||||
#if defined(KERBEROS) || defined(KERBEROS5)
|
||||
#if defined(KERBEROS5)
|
||||
/* Fork so that we can call kdestroy */
|
||||
if (
|
||||
#ifdef KERBEROS5
|
||||
! login_krb5_retain_ccache &&
|
||||
#endif
|
||||
has_ccache)
|
||||
if (! login_krb5_retain_ccache && has_ccache)
|
||||
dofork();
|
||||
#endif
|
||||
|
||||
@ -700,10 +658,6 @@ main(int argc, char *argv[])
|
||||
(void)setenv("PATH", _PATH_DEFPATH, 0);
|
||||
#endif
|
||||
|
||||
#ifdef KERBEROS
|
||||
if (krbtkfile_env)
|
||||
(void)setenv("KRBTKFILE", krbtkfile_env, 1);
|
||||
#endif
|
||||
#ifdef KERBEROS5
|
||||
if (krb5tkfile_env)
|
||||
(void)setenv("KRB5CCNAME", krb5tkfile_env, 1);
|
||||
@ -722,7 +676,7 @@ main(int argc, char *argv[])
|
||||
username, tty);
|
||||
}
|
||||
|
||||
#if defined(KERBEROS) || defined(KERBEROS5)
|
||||
#if defined(KERBEROS5)
|
||||
if (KERBEROS_CONFIGURED && !quietlog && notickets == 1)
|
||||
(void)printf("Warning: no Kerberos tickets issued.\n");
|
||||
#endif
|
||||
@ -797,13 +751,13 @@ main(int argc, char *argv[])
|
||||
err(1, "%s", pwd->pw_shell);
|
||||
}
|
||||
|
||||
#if defined(KERBEROS) || defined(KERBEROS5)
|
||||
#if defined(KERBEROS5)
|
||||
#define NBUFSIZ (MAXLOGNAME + 1 + 5) /* .root suffix */
|
||||
#else
|
||||
#define NBUFSIZ (MAXLOGNAME + 1)
|
||||
#endif
|
||||
|
||||
#if defined(KERBEROS) || defined(KERBEROS5)
|
||||
#if defined(KERBEROS5)
|
||||
/*
|
||||
* This routine handles cleanup stuff, and the like.
|
||||
* It exists only in the child process.
|
||||
@ -829,13 +783,8 @@ dofork(void)
|
||||
|
||||
/* Cleanup stuff */
|
||||
/* Run kdestroy to destroy tickets */
|
||||
#ifdef KERBEROS
|
||||
kdestroy();
|
||||
#endif
|
||||
#ifdef KERBEROS5
|
||||
if (login_krb5_get_tickets)
|
||||
k5destroy();
|
||||
#endif
|
||||
|
||||
/* Leave */
|
||||
exit(0);
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: extern.h,v 1.12 2005/02/26 07:19:25 thorpej Exp $ */
|
||||
/* $NetBSD: extern.h,v 1.13 2006/03/23 23:37:07 wiz Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1994
|
||||
@ -68,13 +68,6 @@ int krb5_arg_end __P((void));
|
||||
void krb5_end __P((void));
|
||||
int krb5_chpw __P((const char *));
|
||||
#endif
|
||||
#ifdef KERBEROS
|
||||
int krb4_init __P((const char *));
|
||||
int krb4_arg __P((char, const char *));
|
||||
int krb4_arg_end __P((void));
|
||||
void krb4_end __P((void));
|
||||
int krb4_chpw __P((const char *));
|
||||
#endif
|
||||
#ifdef YP
|
||||
int yp_init __P((const char *));
|
||||
int yp_arg __P((char, const char *));
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: passwd.c,v 1.25 2005/02/26 07:19:25 thorpej Exp $ */
|
||||
/* $NetBSD: passwd.c,v 1.26 2006/03/23 23:37:07 wiz Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1988, 1993, 1994
|
||||
@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1993, 1994\n\
|
||||
#if 0
|
||||
static char sccsid[] = "from: @(#)passwd.c 8.3 (Berkeley) 4/2/94";
|
||||
#else
|
||||
__RCSID("$NetBSD: passwd.c,v 1.25 2005/02/26 07:19:25 thorpej Exp $");
|
||||
__RCSID("$NetBSD: passwd.c,v 1.26 2006/03/23 23:37:07 wiz Exp $");
|
||||
#endif
|
||||
#endif /* not lint */
|
||||
|
||||
@ -217,12 +217,6 @@ static struct pw_module_s {
|
||||
{ "kpasswd", "5ku:", "[-5] [-k] [-u principal]",
|
||||
krb5_init, krb5_arg, krb5_arg_end, krb5_end, krb5_chpw, 0, 0 },
|
||||
#endif
|
||||
#ifdef KERBEROS
|
||||
{ NULL, "4ku:i:r:", "[-4] [-k] [-u user] [-i instance] [-r realm]",
|
||||
krb4_init, krb4_arg, krb4_arg_end, krb4_end, krb4_chpw, 0, 0 },
|
||||
{ "kpasswd", "4ku:i:r:", "[-4] [-k] [-u user] [-i instance] [-r realm]",
|
||||
krb4_init, krb4_arg, krb4_arg_end, krb4_end, krb4_chpw, 0, 0 },
|
||||
#endif
|
||||
#ifdef YP
|
||||
{ NULL, "y", "[-y]",
|
||||
yp_init, yp_arg, yp_arg_end, yp_end, yp_chpw, 0, 0 },
|
||||
|
||||
Loading…
Reference in New Issue
Block a user