src/usr.bin/passwd/passwd.c - diff

Return to passwd.c CVS log

Up to [local] / src / usr.bin / passwd

Diff for /src/usr.bin/passwd/passwd.c between version 1.22 and 1.23

version 1.22, 2005/12/18 12:29:26

version 1.23, 2006/01/22 06:04:28

Line 47

#include <err.h>

#include <rpcsvc/ypclnt.h>

#if defined(KRB5)

#include <sys/stat.h>

#endif

* Note on configuration:

* Generally one would not use both Kerberos and YP

Line 76

Line 80

#ifdef YP

int status = 0;

#endif

#if defined(KRB5)

char *ccfile;

struct stat sb;

#if defined(KERBEROS5)

if (!(ccfile = getenv("KRB5CCNAME")))

extern char realm[];

if (asprintf(&ccfile, "/tmp/krb5cc_%u", (unsigned)getuid()) ==

-1)

errx(1, "out of memory");

if (krb_get_lrealm(realm,1) == KSUCCESS)

if ((stat(ccfile, &sb) == 0) && (sb.st_uid == getuid()))

use_kerberos = 1;

#endif

#ifdef YP

Line 101

Line 110

use_yp = 0;

break;

case 'K':

#ifdef KRB5

#if defined(KRB5)

/* Skip programname and '-K' option */

argc -= 2;

argv += 2;

Line 147

Line 156

usage(1);

}

#if defined(KRB5)

if (use_kerberos)

exit(krb5_passwd(argc, argv));

#endif

#ifdef YP

if (force_yp || ((status = local_passwd(username, 0)) && use_yp))

exit(yp_passwd(username));