diff options
| author | Darren J Moffat <Darren.Moffat@oracle.com> | 2010-05-06 15:46:48 +0100 |
|---|---|---|
| committer | Darren J Moffat <Darren.Moffat@oracle.com> | 2010-05-06 15:46:48 +0100 |
| commit | bdb005b59455f11dc7f68cad9b1ec5b07de11e5d (patch) | |
| tree | 9c44a5b5c619ef88232312812820900e163ddf5f /usr/src/cmd/ssh/include | |
| parent | 960c63051304dfa89fe85ae0d0d46a893eb59b41 (diff) | |
| download | illumos-joyent-bdb005b59455f11dc7f68cad9b1ec5b07de11e5d.tar.gz | |
PSARC/2010/155 sshd(1M) PAM Service name options
4877708 PAM service name for sshd needs to be configurable
Diffstat (limited to 'usr/src/cmd/ssh/include')
| -rw-r--r-- | usr/src/cmd/ssh/include/auth-pam.h | 26 | ||||
| -rw-r--r-- | usr/src/cmd/ssh/include/servconf.h | 6 |
2 files changed, 15 insertions, 17 deletions
diff --git a/usr/src/cmd/ssh/include/auth-pam.h b/usr/src/cmd/ssh/include/auth-pam.h index 70f9a3d388..3c3dd409fd 100644 --- a/usr/src/cmd/ssh/include/auth-pam.h +++ b/usr/src/cmd/ssh/include/auth-pam.h @@ -1,15 +1,3 @@ -/* $Id: auth-pam.h,v 1.16 2002/07/23 00:44:07 stevesk Exp $ */ - -#ifndef _AUTH_PAM_H -#define _AUTH_PAM_H - -#pragma ident "%Z%%M% %I% %E% SMI" - -#ifdef __cplusplus -extern "C" { -#endif - - /* * Copyright (c) 2000 Damien Miller. All rights reserved. * @@ -34,14 +22,22 @@ extern "C" { * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. */ +/* $Id: auth-pam.h,v 1.16 2002/07/23 00:44:07 stevesk Exp $ */ + +#ifndef _AUTH_PAM_H +#define _AUTH_PAM_H + +#ifdef __cplusplus +extern "C" { +#endif + #include "includes.h" #ifdef USE_PAM -const char * derive_pam_svc_name(Authmethod *method); +char * derive_pam_svc_name(Authmethod *method); void new_start_pam(Authctxt *authctxt, struct pam_conv *conv); int auth_pam_password(Authctxt *authctxt, const char *password); int do_pam_non_initial_userauth(Authctxt *authctxt); diff --git a/usr/src/cmd/ssh/include/servconf.h b/usr/src/cmd/ssh/include/servconf.h index d6458ab619..4d7022f1a1 100644 --- a/usr/src/cmd/ssh/include/servconf.h +++ b/usr/src/cmd/ssh/include/servconf.h @@ -11,8 +11,7 @@ * called by a name other than "ssh" or "Secure Shell". */ /* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. */ /* $OpenBSD: servconf.h,v 1.59 2002/07/30 17:03:55 markus Exp $ */ @@ -42,6 +41,7 @@ extern "C" { /* Magic name for internal sftp-server */ #define INTERNAL_SFTP_NAME "internal-sftp" +#define _SSH_PAM_SERVICE_PREFIX "sshd" typedef struct { u_int num_ports; @@ -164,6 +164,8 @@ typedef struct { int use_openssl_engine; char *chroot_directory; char *pre_userauth_hook; + char *pam_service_prefix; + char *pam_service_name; } ServerOptions; |