diff options
| author | kensmith <kensmith@FreeBSD.org> | 2005-07-07 14:16:38 +0000 |
|---|---|---|
| committer | kensmith <kensmith@FreeBSD.org> | 2005-07-07 14:16:38 +0000 |
| commit | 28b7f562fc678fae0db68e2f56a58b703f9a93dd (patch) | |
| tree | 710b8b002dddd551dd4f24a9841dfdb5fa2d4ee6 /lib | |
| parent | 0d69457df8ccd88ca9066d313c9d76c6bd22f148 (diff) | |
| download | FreeBSD-src-28b7f562fc678fae0db68e2f56a58b703f9a93dd.zip FreeBSD-src-28b7f562fc678fae0db68e2f56a58b703f9a93dd.tar.gz | |
This is sort of an MFS. Peter made these changes to the RELENG_*
branches but missed HEAD. This patch extends his a little bit,
setting it up via the Makefiles so that adding _FREEFALL_CONFIG
to /etc/make.conf is the only thing needed to cluster-ize things
(current setup also requires overriding CFLAGS).
From Peter's commit to the RELENG_* branches:
> Add the freebsd.org custer's source modifications under #ifdefs to aid
> keeping things in sync. For ksu:
> * install suid-root by default
> * don't fall back to asking for a unix password (ie: be pure kerberos)
> * allow custom user instances for things like www and not just root
The Makefile tweaks will be MFC-ed, the rest is already done.
MFC after: 3 days
Approved by: re (dwhite)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libpam/modules/pam_krb5/Makefile | 3 | ||||
| -rw-r--r-- | lib/libpam/modules/pam_krb5/pam_krb5.c | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/lib/libpam/modules/pam_krb5/Makefile b/lib/libpam/modules/pam_krb5/Makefile index 9bbe345..8d33284 100644 --- a/lib/libpam/modules/pam_krb5/Makefile +++ b/lib/libpam/modules/pam_krb5/Makefile @@ -27,6 +27,9 @@ LIB= pam_krb5 SRCS= pam_krb5.c MAN= pam_krb5.8 +.if defined(_FREEFALL_CONFIG) +CFLAGS+=-D_FREEFALL_CONFIG +.endif DPADD= ${LIBKRB5} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR} ${LIBCRYPT} ${LIBCRYPTO} LDADD= -lkrb5 -lasn1 -lroken -lcom_err -lcrypt -lcrypto diff --git a/lib/libpam/modules/pam_krb5/pam_krb5.c b/lib/libpam/modules/pam_krb5/pam_krb5.c index 2cfddbc..0ed57f9 100644 --- a/lib/libpam/modules/pam_krb5/pam_krb5.c +++ b/lib/libpam/modules/pam_krb5/pam_krb5.c @@ -333,6 +333,9 @@ PAM_EXTERN int pam_sm_setcred(pam_handle_t *pamh, int flags, int argc __unused, const char *argv[] __unused) { +#ifdef _FREEFALL_CONFIG + return (PAM_SUCCESS); +#else krb5_error_code krbret; krb5_context pam_context; @@ -570,6 +573,7 @@ cleanup3: free(cache_name_buf); return (retval); +#endif } /* |
