oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Kerberos 5 patches

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3495 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1997-09-13 04:47:04 +00:00
parent 07ec6dbbf5
commit dda7a7f327
2 changed files with 63 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
appl/xnlock/Makefile.am Normal file
View File

@@ -0,0 +1,12 @@
# $Id$
AUTOMAKE_OPTIONS = no-dependencies foreign
XINCS = @X_CFLAGS@
XLIBS = @X_LIBS@ -lXt @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@
INCLUDES = -I$(top_builddir)/include $(INCLUDE_krb4) $(X_CFLAGS) -DBINDIR=\"$(bindir)\"
bin_PROGRAMS = xnlock
LDADD = $(top_builddir)/lib/kafs/libkafs.a $(LIB_krb4) $(top_builddir)/lib/krb5/libkrb5.a $(top_builddir)/lib/asn1/libasn1.a $(top_builddir)/lib/des/libdes.a $(top_builddir)/lib/roken/libroken.a $(XLIBS)

57
appl/xnlock/xnlock.c
View File

@@ -8,7 +8,6 @@
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#include <protos.h>
RCSID("$Id$"); RCSID("$Id$");
#endif #endif
@@ -29,8 +28,15 @@ RCSID("$Id$");
#include <pwd.h> #include <pwd.h>
#endif #endif
#ifdef KRB5
#include <krb5.h>
#endif
#ifdef KRB4
#include <krb.h> #include <krb.h>
#endif
#if defined(KRB4) || defined(KRB5)
#include <kafs.h> #include <kafs.h>
#endif
#include <roken.h> #include <roken.h>
#include <err.h> #include <err.h>
@@ -223,8 +229,7 @@ init_words (int argc, char **argv)
errx (1, "cannot allocate memory for message"); errx (1, "cannot allocate memory for message");
} }
} else { } else {
appres.text = malloc(128); appres.text = strdup("");
appres.text[0] = 0;
if (appres.text == NULL) if (appres.text == NULL)
errx (1, "cannot allocate memory for message"); errx (1, "cannot allocate memory for message");
while (argv[i]) { while (argv[i]) {
@@ -233,7 +238,6 @@ init_words (int argc, char **argv)
strlen(appres.text) + n + 2); strlen(appres.text) + n + 2);
if (tmp == NULL) if (tmp == NULL)
errx (1, "cannot allocate memory for message"); errx (1, "cannot allocate memory for message");
appres.text = tmp;
strcat (appres.text, argv[i]); strcat (appres.text, argv[i]);
strcat (appres.text, " "); strcat (appres.text, " ");
++i; ++i;
@@ -541,6 +545,41 @@ countdown(XtPointer _t, XtIntervalId *_d)
return; return;
} }
static int
verify_krb5(const char *name, const char *inst, const char *realm,
const char *password)
{
krb5_context context;
krb5_principal client;
krb5_error_code ret;
krb5_ccache id;
krb5_init_context(&context);
if(inst && inst[0] == 0)
inst = NULL;
krb5_make_principal(context, &client, realm, name, inst, NULL);
krb5_cc_default(context, &id);
ret = krb5_verify_user(context,
client,
id,
password,
0,
NULL);
krb5_free_principal(context, client);
if (ret == 0){
if (k_hasafs())
krb5_afslog(context, id, NULL, NULL);
krb5_free_context(context);
return 0;
}
if (ret != INTK_BADPW)
krb5_warn(context, ret, "verify_krb5");
krb5_free_context(context);
return -1;
}
static int static int
verify(char *password) verify(char *password)
{ {
@@ -582,12 +621,18 @@ verify(char *password)
return 0; return 0;
/* /*
* Try to verify as user with kerberos. * Try to verify as user with kerberos 5.
*/
if(verify_krb5(name, inst, realm, password) == 0)
return 0;
/*
* Try to verify as user with kerberos 4.
*/ */
ret = krb_verify_user(name, inst, realm, password, 0, NULL); ret = krb_verify_user(name, inst, realm, password, 0, NULL);
if (ret == KSUCCESS){ if (ret == KSUCCESS){
if (k_hasafs()) if (k_hasafs())
k_afsklog(0, 0); krb_afslog(NULL, NULL);
return 0; return 0;
} }
if (ret != INTK_BADPW) if (ret != INTK_BADPW)