tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-29 16:54:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

- (tim) [configure.ac defines.h openbsd-compat/port-uw.c

Browse Source 
openbsd-compat/xcrypt.c] Add SECUREWARE support to OpenServer 6 SVR5 ABI.
   OK djm@ dtucker@
This commit is contained in:
Tim Rice 2009-01-07 10:04:12 -08:00
parent 7ebfad789f
commit 351529ce30
5 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,8 @@
20090107
- (tim) [configure.ac defines.h openbsd-compat/port-uw.c
openbsd-compat/xcrypt.c] Add SECUREWARE support to OpenServer 6 SVR5 ABI.
OK djm@ dtucker@
20081209 20081209
- (djm) OpenBSD CVS Sync - (djm) OpenBSD CVS Sync
- djm@cvs.openbsd.org 2008/12/09 02:38:18 - djm@cvs.openbsd.org 2008/12/09 02:38:18
@ -4989,5 +4994,5 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@ passwords between UnixWare and OpenServer they will still work. OK dtucker@
$Id: ChangeLog,v 1.5155 2008/12/09 03:12:33 djm Exp $ $Id: ChangeLog,v 1.5156 2009/01/07 18:04:12 tim Exp $

9
configure.ac
View File

@ -1,4 +1,4 @@
# $Id: configure.ac,v 1.411 2008/12/07 22:35:36 djm Exp $ # $Id: configure.ac,v 1.412 2009/01/07 18:04:12 tim Exp $
# #
# Copyright (c) 1999-2004 Damien Miller # Copyright (c) 1999-2004 Damien Miller
# #
@ -15,7 +15,7 @@
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
AC_REVISION($Revision: 1.411 $) AC_REVISION($Revision: 1.412 $)
AC_CONFIG_SRCDIR([ssh.c]) AC_CONFIG_SRCDIR([ssh.c])
AC_CONFIG_HEADER(config.h) AC_CONFIG_HEADER(config.h)
@ -741,6 +741,11 @@ mips-sony-bsd|mips-sony-newsos4)
AC_DEFINE(BROKEN_LIBIAF, 1, AC_DEFINE(BROKEN_LIBIAF, 1,
[ia_uinfo routines not supported by OS yet]) [ia_uinfo routines not supported by OS yet])
AC_DEFINE(BROKEN_UPDWTMPX) AC_DEFINE(BROKEN_UPDWTMPX)
AC_CHECK_LIB(prot, getluid,[ LIBS="$LIBS -lprot"
AC_CHECK_FUNCS(getluid setluid,,,-lprot)
AC_DEFINE(HAVE_SECUREWARE)
AC_DEFINE(DISABLE_SHADOW)
],,)
;; ;;
*) AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*") *) AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*")
;; ;;

4
defines.h
View File

@ -25,7 +25,7 @@
#ifndef _DEFINES_H #ifndef _DEFINES_H
#define _DEFINES_H #define _DEFINES_H
/* $Id: defines.h,v 1.151 2008/07/04 13:10:49 djm Exp $ */ /* $Id: defines.h,v 1.152 2009/01/07 18:04:12 tim Exp $ */
/* Constants */ /* Constants */
@ -698,7 +698,7 @@ struct winsize {
# define CUSTOM_SYS_AUTH_PASSWD 1 # define CUSTOM_SYS_AUTH_PASSWD 1
#endif #endif
#if defined(HAVE_LIBIAF) && defined(HAVE_SET_ID) #if defined(HAVE_LIBIAF) && defined(HAVE_SET_ID) && !defined(HAVE_SECUREWARE)
# define CUSTOM_SYS_AUTH_PASSWD 1 # define CUSTOM_SYS_AUTH_PASSWD 1
#endif #endif
#if defined(HAVE_LIBIAF) && defined(HAVE_SET_ID) && !defined(BROKEN_LIBIAF) #if defined(HAVE_LIBIAF) && defined(HAVE_SET_ID) && !defined(BROKEN_LIBIAF)

4
openbsd-compat/port-uw.c
View File

@ -25,7 +25,7 @@
#include "includes.h" #include "includes.h"
#ifdef HAVE_LIBIAF #if defined(HAVE_LIBIAF) && !defined(HAVE_SECUREWARE)
#include <sys/types.h> #include <sys/types.h>
#ifdef HAVE_CRYPT_H #ifdef HAVE_CRYPT_H
# include <crypt.h> # include <crypt.h>
@ -145,5 +145,5 @@ get_iaf_password(struct passwd *pw)
fatal("ia_openinfo: Unable to open the shadow passwd file"); fatal("ia_openinfo: Unable to open the shadow passwd file");
} }
#endif /* USE_LIBIAF */ #endif /* USE_LIBIAF */
#endif /* HAVE_LIBIAF */ #endif /* HAVE_LIBIAF and not HAVE_SECUREWARE */

2
openbsd-compat/xcrypt.c
View File

@ -28,7 +28,7 @@
#include <unistd.h> #include <unistd.h>
#include <pwd.h> #include <pwd.h>
# ifdef HAVE_CRYPT_H # if defined(HAVE_CRYPT_H) && !defined(HAVE_SECUREWARE)
# include <crypt.h> # include <crypt.h>
# endif # endif